summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2004-02-20 20:08:14 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2004-02-20 20:08:14 +0000
commitd35d07569f91428c6316b2460044fd1d379674f0 (patch)
treefa4ec5cb87bde1542d597fd440bec3aefc2a73c0 /net-misc
parentVersion bumped. Included a manpage. This closes bug #41842 (Manifest recommit) (diff)
downloadgentoo-2-d35d07569f91428c6316b2460044fd1d379674f0.tar.gz
gentoo-2-d35d07569f91428c6316b2460044fd1d379674f0.tar.bz2
gentoo-2-d35d07569f91428c6316b2460044fd1d379674f0.zip
Partial fix for #41804.
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/freeswan/ChangeLog5
-rw-r--r--net-misc/freeswan/files/freeswan-1.99-spi.c.patch11
-rw-r--r--net-misc/freeswan/freeswan-1.99.ebuild15
3 files changed, 23 insertions, 8 deletions
diff --git a/net-misc/freeswan/ChangeLog b/net-misc/freeswan/ChangeLog
index da82f4e7f90e..2432aecea716 100644
--- a/net-misc/freeswan/ChangeLog
+++ b/net-misc/freeswan/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/freeswan
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freeswan/ChangeLog,v 1.17 2004/02/06 10:45:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freeswan/ChangeLog,v 1.18 2004/02/20 20:08:14 aliz Exp $
+
+ 20 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> freeswan-1.99.ebuild:
+ Patching spi.c, part of #41804.
06 Feb 2004; Daniel Ahlberg <aliz@gentoo.org>
files/freeswan-2.02-gentoo.patch, files/freeswan-2.03-gentoo.patch,
diff --git a/net-misc/freeswan/files/freeswan-1.99-spi.c.patch b/net-misc/freeswan/files/freeswan-1.99-spi.c.patch
new file mode 100644
index 000000000000..5949f41bba84
--- /dev/null
+++ b/net-misc/freeswan/files/freeswan-1.99-spi.c.patch
@@ -0,0 +1,11 @@
+--- klips/utils/spi.c 2004-02-20 19:53:43.000000000 +0000
++++ klips/utils/spi.c 2004-02-20 19:56:30.672334238 +0000
+@@ -103,7 +103,7 @@
+ spi --comp <algo> <SA>\n\
+ where <algo> is: deflate\n\
+ [ --debug ] is optional to any spi command.\n\
+-[ --label <label> ] is optional to any spi command.
++[ --label <label> ] is optional to any spi command.\
+ ";
+
+
diff --git a/net-misc/freeswan/freeswan-1.99.ebuild b/net-misc/freeswan/freeswan-1.99.ebuild
index 606ef506f2a6..f23319756a6b 100644
--- a/net-misc/freeswan/freeswan-1.99.ebuild
+++ b/net-misc/freeswan/freeswan-1.99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freeswan/freeswan-1.99.ebuild,v 1.8 2004/01/03 14:06:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freeswan/freeswan-1.99.ebuild,v 1.9 2004/02/20 20:08:14 aliz Exp $
X509_PATCH=0.9.34
S=${WORKDIR}/${P}
@@ -23,16 +23,17 @@ pkg_setup() {
echo You need to have the crypto-enabled version of Gentoo Sources
echo with a symlink to it in /usr/src/linux in order to have IPSec
echo kernel compatibility.
- exit 1
+# exit 1
}
}
src_unpack() {
- unpack ${A}
+ unpack ${A} ; cd ${S}
+ epatch ${FILESDIR}/freeswan-gentoo-cflags.patch
+ epatch ${FILESDIR}/${P}-spi.c.patch
- cd ${S}
- patch -p1 < ${FILESDIR}/freeswan-gentoo-cflags.patch || die
- sed 's:/etc/ipsec.d:/etc/ipsec/ipsec.d:g' ${WORKDIR}/x509patch-${X509_PATCH}-${P}/freeswan.diff | patch -p1 || die
+ sed -i 's:/etc/ipsec.d:/etc/ipsec/ipsec.d:g' ${WORKDIR}/x509patch-${X509_PATCH}-${P}/freeswan.diff
+ epatch ${WORKDIR}/x509patch-${X509_PATCH}-${P}/freeswan.diff
}
src_compile() {