summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny van Dyk <kugelfang@gentoo.org>2004-06-19 14:52:35 +0000
committerDanny van Dyk <kugelfang@gentoo.org>2004-06-19 14:52:35 +0000
commitd680874efb49f8afa9a5c86a6453b4e2e47227aa (patch)
tree5891805edf1e1dded194541b856a935c3fb2a385 /net-misc/strongswan
parentminor fix (Manifest recommit) (diff)
downloadgentoo-2-d680874efb49f8afa9a5c86a6453b4e2e47227aa.tar.gz
gentoo-2-d680874efb49f8afa9a5c86a6453b4e2e47227aa.tar.bz2
gentoo-2-d680874efb49f8afa9a5c86a6453b4e2e47227aa.zip
Added gcc-3.4 patch.
Diffstat (limited to 'net-misc/strongswan')
-rw-r--r--net-misc/strongswan/ChangeLog6
-rw-r--r--net-misc/strongswan/files/strongswan-2.1.3-gcc34.patch22
-rw-r--r--net-misc/strongswan/strongswan-2.1.3.ebuild3
3 files changed, 29 insertions, 2 deletions
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/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() {