Added a patch to fix a typo in Makefile CFLAGS; Closes Bug #29783

3 files changed, 48 insertions, 3 deletions

diff --git a/net-misc/super-freeswan/Manifest b/net-misc/super-freeswan/Manifest
index 3ac22e363f4e..81258cf1de54 100644
--- a/net-misc/super-freeswan/Manifest
+++ b/net-misc/super-freeswan/Manifest
@@ -1,5 +1,5 @@
-MD5 5e4da2811692b968a330093651a0f2b5 ChangeLog 785
-MD5 52ab4a27862eb62dd772149657618963 super-freeswan-1.99.7.3.ebuild 1941
+MD5 b9ce9162a6b6223ed2c2cf4e87bfb766 ChangeLog 783
+MD5 10c8281406c75cc8436b08ece5d5d21f super-freeswan-1.99.7.3.ebuild 1938
 MD5 dced3ccfc5f08b862540e664f92beb55 super-freeswan-1.99_p4.ebuild 1742
 MD5 44a2ec27e0c44cc49e47662f0958978f files/digest-super-freeswan-1.99.7.3 76
 MD5 e626dabcb8cd06c149e85833da018cf9 files/digest-super-freeswan-1.99_p4 76
diff --git a/net-misc/super-freeswan/files/super-freeswan-1.99.7.3-bad-cflags-fix.patch b/net-misc/super-freeswan/files/super-freeswan-1.99.7.3-bad-cflags-fix.patch
new file mode 100644
index 000000000000..640e797d0a9c
--- /dev/null
+++ b/net-misc/super-freeswan/files/super-freeswan-1.99.7.3-bad-cflags-fix.patch
@@ -0,0 +1,37 @@
+diff -Naurp super-freeswan-1.99.7.3.orig/libcrypto/libaes/Makefile super-freeswan-1.99.7.3/libcrypto/libaes/Makefile
+--- super-freeswan-1.99.7.3.orig/libcrypto/libaes/Makefile	2003-02-07 08:14:26.000000000 -0500
++++ super-freeswan-1.99.7.3/libcrypto/libaes/Makefile	2003-10-02 13:54:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-CFLAGS=-O3 -omit-frame-pointer -D__KERNEL__  -Wall  -Wcast-qual $(EXTRA_CFLAGS)
++CFLAGS=-O3 -fomit-frame-pointer -D__KERNEL__  -Wall  -Wcast-qual $(EXTRA_CFLAGS)
+ INC=-I../include 
+ 
+ AES_CORE_OBJ:=aes.o
+diff -Naurp super-freeswan-1.99.7.3.orig/libcrypto/libserpent/Makefile super-freeswan-1.99.7.3/libcrypto/libserpent/Makefile
+--- super-freeswan-1.99.7.3.orig/libcrypto/libserpent/Makefile	2002-09-04 23:43:55.000000000 -0400
++++ super-freeswan-1.99.7.3/libcrypto/libserpent/Makefile	2003-10-02 13:54:35.000000000 -0400
+@@ -1,4 +1,4 @@
+-CFLAGS=-O3 -omit-frame-pointer -D__KERNEL__  -Wall $(EXTRA_CFLAGS)
++CFLAGS=-O3 -fomit-frame-pointer -D__KERNEL__  -Wall $(EXTRA_CFLAGS)
+ INC=-I../include 
+ LIBOBJ=serpent.o serpent_cbc.o
+ BLIB=libserpent.a
+diff -Naurp super-freeswan-1.99.7.3.orig/libcrypto/libsha2/Makefile super-freeswan-1.99.7.3/libcrypto/libsha2/Makefile
+--- super-freeswan-1.99.7.3.orig/libcrypto/libsha2/Makefile	2002-09-04 23:32:57.000000000 -0400
++++ super-freeswan-1.99.7.3/libcrypto/libsha2/Makefile	2003-10-02 13:54:44.000000000 -0400
+@@ -1,4 +1,4 @@
+-CFLAGS=-O3 -omit-frame-pointer -I../include $(EXTRA_CFLAGS)
++CFLAGS=-O3 -fomit-frame-pointer -I../include $(EXTRA_CFLAGS)
+ 
+ LIBOBJ := hmac_sha2.o sha2.o
+ 
+diff -Naurp super-freeswan-1.99.7.3.orig/libcrypto/libtwofish/Makefile super-freeswan-1.99.7.3/libcrypto/libtwofish/Makefile
+--- super-freeswan-1.99.7.3.orig/libcrypto/libtwofish/Makefile	2002-09-04 23:41:17.000000000 -0400
++++ super-freeswan-1.99.7.3/libcrypto/libtwofish/Makefile	2003-10-02 13:54:55.000000000 -0400
+@@ -1,4 +1,4 @@
+-CFLAGS=-O3 -omit-frame-pointer -D__KERNEL__  -Wall $(EXTRA_CFLAGS)
++CFLAGS=-O3 -fomit-frame-pointer -D__KERNEL__  -Wall $(EXTRA_CFLAGS)
+ INC=-I../include 
+ 
+ LIBOBJ=twofish.o twofish_cbc.o
+
diff --git a/net-misc/super-freeswan/super-freeswan-1.99.7.3.ebuild b/net-misc/super-freeswan/super-freeswan-1.99.7.3.ebuild
index 05885a910450..c84159cf9f42 100644
--- a/net-misc/super-freeswan/super-freeswan-1.99.7.3.ebuild
+++ b/net-misc/super-freeswan/super-freeswan-1.99.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/super-freeswan/super-freeswan-1.99.7.3.ebuild,v 1.2 2003/09/05 22:01:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/super-freeswan/super-freeswan-1.99.7.3.ebuild,v 1.3 2003/10/05 04:25:22 kumba Exp $
 
 MY_P=${P/_p/_kb}
 S=${WORKDIR}/${MY_P}
@@ -26,6 +26,14 @@ pkg_setup() {
 	}
 }
 
+src_unpack() {
+	unpack ${A}
+
+	# Patch that fixes some bad CFLAGS specified in the Makefiles.
+	# Closes Bug #29783
+	epatch ${FILESDIR}/${P}-bad-cflags-fix.patch
+}
+
 src_compile() {
 	cp ${S}/libdes/Makefile ${S}/libdes/Makefile.orig
 	sed s:/usr/local:/usr:g < ${S}/libdes/Makefile.orig \