Added gcc-3.4 patch.

5 files changed, 36 insertions, 8 deletions

diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 02de1f75a895..c52687523a58 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,6 +1,6 @@
-MD5 ef946e1865d2c0f6da3d525199d5e0fe openswan-2.1.3.ebuild 3104
-MD5 a974a6b0507de99bb186c5e91d7f7590 ChangeLog 1500
+MD5 bb1c6554e770c2c74c3a68df9303ca92 ChangeLog 1584
 MD5 5d96d9e4b6f6b113db0983e211adf85a metadata.xml 639
+MD5 e3b004485647282277b804f9d5a7b2eb openswan-2.1.3.ebuild 3107
 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
 MD5 ec7eac89ca0ff22dfa5b9e4f157cf520 files/digest-openswan-2.1.3 67
 MD5 bd37ab9094716cd96868a501bc3a44f3 files/openswan-2.1.3-gentoo.patch 17438
diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 5a7f509ab0f1..dbe594d34493 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.4 2004/06/19 13:25:04 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.5 2004/06/19 14:52:35 kugelfang Exp $
+
+  19 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/strongswan-2.1.3-gcc34.patch, strongswan-2.1.3.ebuild:
+  Added patch to make strongswan compile with gcc-3.4.
 
 *strongswan-2.1.3 (19 Jun 2004)
 
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 82133ba7f2b0..5d25cd195b39 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1,6 +1,7 @@
-MD5 d1f1629e87834ce6a1afe0e4db284fe6 strongswan-2.1.3.ebuild 3046
-MD5 6b06374a9f7e0fa59c396cb81c47c640 ChangeLog 949
+MD5 13c70e4ef8c286a9d60702846d8992b8 ChangeLog 1123
 MD5 a64b79eda14e03e130f7dde467dfa860 metadata.xml 706
-MD5 98cbee623e8b61da488c286699bd184c files/strongswan-2.1.3-gentoo.patch 17672
-MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
+MD5 1ab5a5392dbbd233cd50c48369ae064c strongswan-2.1.3.ebuild 3085
 MD5 056cc14af9a978c9b1bbe57bdb6ccf3f files/digest-strongswan-2.1.3 69
+MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
+MD5 98cbee623e8b61da488c286699bd184c files/strongswan-2.1.3-gentoo.patch 17672
+MD5 c75b166cb55a2bcbd020f38f0d3e6671 files/strongswan-2.1.3-gcc34.patch 600
diff --git a/net-misc/strongswan/files/strongswan-2.1.3-gcc34.patch b/net-misc/strongswan/files/strongswan-2.1.3-gcc34.patch
new file mode 100644
index 000000000000..1a5a3a7ea992
--- /dev/null
+++ b/net-misc/strongswan/files/strongswan-2.1.3-gcc34.patch
@@ -0,0 +1,22 @@
+--- programs/pluto/connections.c.orig	2004-06-19 16:36:38.350887032 +0200
++++ programs/pluto/connections.c	2004-06-19 16:37:02.264251648 +0200
+@@ -787,7 +787,7 @@
+ 		    dst->ca = dst->cert.u.x509->issuer;
+ 	    }
+ 	    break;
+-	default:
++	default:;
+ 	}
+ 
+ 	/* cache the certificate that was last retrieved from the smartcard */
+--- programs/pluto/x509.c.orig	2004-06-19 16:38:58.583568424 +0200
++++ programs/pluto/x509.c	2004-06-19 16:39:16.865789104 +0200
+@@ -732,7 +732,7 @@
+ 		state = SEARCH_OID;
+ 	    }
+ 	    break;
+-	case UNKNOWN_OID:
++	case UNKNOWN_OID:;
+ 	}
+     } while (*src++ != '\0');
+ 
diff --git a/net-misc/strongswan/strongswan-2.1.3.ebuild b/net-misc/strongswan/strongswan-2.1.3.ebuild
index e2702e02cefa..c968f1223ef1 100644
--- a/net-misc/strongswan/strongswan-2.1.3.ebuild
+++ b/net-misc/strongswan/strongswan-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.1.3.ebuild,v 1.1 2004/06/19 13:25:04 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.1.3.ebuild,v 1.2 2004/06/19 14:52:35 kugelfang Exp $
 
 inherit eutils
 
@@ -92,6 +92,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
 }
 
 src_compile() {