Version bump.

8 files changed, 346 insertions, 395 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index e638d3c66495..ccf617d3fb28 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.15 2004/09/12 06:23:19 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.16 2004/09/18 02:24:56 pfeifer Exp $
+
+*strongswan-2.2.1 (17 Sep 2004)
+
+  17 Sep 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.2.1.ebuild:
+  Version bump.
 
   12 Sep 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.3.ebuild,
   strongswan-2.1.3-r1.ebuild, strongswan-2.1.5.ebuild, strongswan-2.2.0.ebuild:
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 8193bca6e6c3..ec1f565db1dd 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1,16 +1,16 @@
-MD5 35a00544a8e16576c57b43ce03df93b3 strongswan-2.1.3-r1.ebuild 3698
 MD5 41f2633de5a666520e14de69729994bf strongswan-2.1.3.ebuild 3101
+MD5 8f9cf30436bf40811fa6a4f33fe9bdc9 strongswan-2.2.1.ebuild 3555
 MD5 9a5225212d9eb761a4f03718be03247e strongswan-2.1.5.ebuild 3660
-MD5 3ddbd7a882197f8302aa42d6c9eea893 ChangeLog 2259
-MD5 3ec03071fd0d12cb6296c3bdf5e1cd23 strongswan-2.2.0.ebuild 3661
+MD5 5abbd9ee5e3607a85a037dd08463e539 ChangeLog 2382
+MD5 1a19c70b9d0270d04542641cedcb9aa3 strongswan-2.2.0.ebuild 3660
 MD5 a64b79eda14e03e130f7dde467dfa860 metadata.xml 706
-MD5 056cc14af9a978c9b1bbe57bdb6ccf3f files/digest-strongswan-2.1.3-r1 69
 MD5 98cbee623e8b61da488c286699bd184c files/strongswan-2.1.3-gentoo.patch 17672
 MD5 c75b166cb55a2bcbd020f38f0d3e6671 files/strongswan-2.1.3-gcc34.patch 600
 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
+MD5 4b0049a6ec44eed18d06a2a06c67cdef files/strongswan-2.2.1-gentoo.patch 15278
 MD5 d1d0e3ec8fd21afe3f0536db642d2348 files/strongswan-2.1.5-gentoo.patch 17672
 MD5 4cf321ca7fc437e5f97799750fba57a2 files/strongswan-2.2.0-gentoo.patch 17672
 MD5 056cc14af9a978c9b1bbe57bdb6ccf3f files/digest-strongswan-2.1.3 69
 MD5 cd600bde91d911f84530dbd4146edebf files/digest-strongswan-2.1.5 69
 MD5 9a29fb994889b751fbc635cf737dc461 files/digest-strongswan-2.2.0 69
-MD5 e5e5e7cd97782f0f68071bf485248294 files/strongswan-2.1.3-r1-gentoo.patch 17678
+MD5 f114c8c4d9bea79db167485981f469ae files/digest-strongswan-2.2.1 69
diff --git a/net-misc/strongswan/files/digest-strongswan-2.1.3-r1 b/net-misc/strongswan/files/digest-strongswan-2.1.3-r1
deleted file mode 100644
index 7f7b3bd798f8..000000000000
--- a/net-misc/strongswan/files/digest-strongswan-2.1.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 595024b8a1273c59d86e7dc799cd0fb8 strongswan-2.1.3.tar.gz 3598010
diff --git a/net-misc/strongswan/files/digest-strongswan-2.2.1 b/net-misc/strongswan/files/digest-strongswan-2.2.1
new file mode 100644
index 000000000000..6661b8dbc5b0
--- /dev/null
+++ b/net-misc/strongswan/files/digest-strongswan-2.2.1
@@ -0,0 +1 @@
+MD5 f12fdb8e27dd4f3b9a343be8ebd370c3 strongswan-2.2.1.tar.gz 3575948
diff --git a/net-misc/strongswan/files/strongswan-2.1.3-r1-gentoo.patch b/net-misc/strongswan/files/strongswan-2.1.3-r1-gentoo.patch
deleted file mode 100644
index 0c32a07240e2..000000000000
--- a/net-misc/strongswan/files/strongswan-2.1.3-r1-gentoo.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-diff -Naupr strongswan-2.1.3/Makefile.inc strongswan-2.1.3-gentoo/Makefile.inc
---- strongswan-2.1.3/Makefile.inc	2004-03-15 14:35:21.000000000 -0600
-+++ strongswan-2.1.3-gentoo/Makefile.inc	2004-06-19 08:01:14.298812524 -0500
-@@ -62,7 +62,7 @@ POLICYLIB=${FREESWANSRCDIR}/lib/libipsec
- DESTDIR?=
- 
- # "local" part of tree, used in building other pathnames
--INC_USRLOCAL=/usr/local
-+INC_USRLOCAL=/usr
- 
- # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
- # settings which are assumed to include it (or at least, to include *some*
-@@ -96,7 +96,7 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_
- MANPLACES=man3 man5 man8
- 
- # where configuration files go
--FINALCONFFILE?=/etc/ipsec.conf
-+FINALCONFFILE?=/etc/ipsec/ipsec.conf
- CONFFILE=$(DESTDIR)$(FINALCONFFILE)
- 
- FINALCONFDIR?=/etc
-@@ -107,10 +107,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR)
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
--FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.1.3-r1
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.1.3-r1
- DOCDIR=${DESTDIR}${FINALDOCDIR}
- 
- # where per-conn pluto logs go
-@@ -239,7 +239,7 @@ RH_KERNELSRC?=/usr/src/linux-2.4
- # installed one in RH 7.2, won't work - you wind up depending upon
- # openssl.
- 
--BIND9STATICLIBDIR?=/usr/local/lib
-+BIND9STATICLIBDIR?=/usr/lib
- 
- # FreeSWAN 3.x will require bind9. 
- USE_LWRES?=false
-diff -Naupr strongswan-2.1.3/lib/libdes/Makefile strongswan-2.1.3-gentoo/lib/libdes/Makefile
---- strongswan-2.1.3/lib/libdes/Makefile	2004-03-15 14:35:24.000000000 -0600
-+++ strongswan-2.1.3-gentoo/lib/libdes/Makefile	2004-06-19 08:01:14.299812350 -0500
-@@ -60,7 +60,7 @@ MAKE=make -f Makefile
- # normally overridden by FreeS/WAN Makefiles anyway
- CFLAG= -O3 -fomit-frame-pointer -I${KLIPSD}/include -I${SRCDIR}
- 
--CFLAGS=$(OPTS) $(CFLAG)
-+CFLAGS=$(OPTS) $(CFLAG) $(USERCOMPILE)
- CPP=$(CC) -E
- 
- # Assember version of des_encrypt*().
-diff -Naupr strongswan-2.1.3/linux/crypto/ciphers/des/asm/crypt586.pl strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- strongswan-2.1.3/linux/crypto/ciphers/des/asm/crypt586.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-06-19 08:01:14.299812350 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # The inner loop instruction sequence and the IP/FP modifications are from
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
-diff -Naupr strongswan-2.1.3/linux/crypto/ciphers/des/asm/des-586.pl strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- strongswan-2.1.3/linux/crypto/ciphers/des/asm/des-586.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-06-19 08:01:14.299812350 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # The inner loop instruction sequence and the IP/FP modifications are from
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
-diff -Naupr strongswan-2.1.3/linux/crypto/ciphers/des/asm/des686.pl strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- strongswan-2.1.3/linux/crypto/ciphers/des/asm/des686.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-06-19 08:01:14.300812175 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Naupr strongswan-2.1.3/linux/crypto/ciphers/des/asm/desboth.pl strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- strongswan-2.1.3/linux/crypto/ciphers/des/asm/desboth.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-06-19 08:01:14.300812175 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Naupr strongswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/cbc.pl strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- strongswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-06-19 08:01:14.300812175 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
- # des_cblock (*input);
-diff -Naupr strongswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- strongswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-06-19 08:01:14.301812001 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # require 'x86asm.pl';
- # &asm_init("cpp","des-586.pl");
-diff -Naupr strongswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- strongswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-06-19 08:01:14.301812001 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Naupr strongswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- strongswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-06-19 08:01:14.301812001 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Naupr strongswan-2.1.3/programs/_include/_include.in strongswan-2.1.3-gentoo/programs/_include/_include.in
---- strongswan-2.1.3/programs/_include/_include.in	2004-03-15 15:03:06.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/_include/_include.in	2004-06-19 08:01:14.302811827 -0500
-@@ -49,10 +49,10 @@ for f
- do
- 	if test ! -r "$f"
- 	then
--		if test ! "$f" = "/etc/ipsec.conf"
-+		if test ! "$f" = "/etc/ipsec/ipsec.conf"
- 		then
- 			echo "#:cannot open configuration file \'$f\'"
--			if test "$f" = "/etc/ipsec.secrets"
-+			if test "$f" = "/etc/ipsec/ipsec.secrets"
- 			then
- 				echo "#:Your secrets file will be created when you start $IPSEC_NAME for the first time."
- 			fi
-diff -Naupr strongswan-2.1.3/programs/barf/barf.in strongswan-2.1.3-gentoo/programs/barf/barf.in
---- strongswan-2.1.3/programs/barf/barf.in	2004-03-15 15:03:06.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/barf/barf.in	2004-06-19 08:01:14.302811827 -0500
-@@ -19,7 +19,7 @@ IPSEC_NAME="strongSwan"
- KERNSRC=${KERNSRC-/usr/src/linux}
- LOGS=${LOGS-/var/log}
- CONFS=${IPSEC_CONFS-/etc}
--CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
-+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
- me="ipsec barf"
- 
- # kludge to produce no barf output mentioning policygroups if none are present.
-@@ -209,13 +209,13 @@ then
- 	done
- fi
- _________________________ ipsec/ls-libdir
--ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec}
-+ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec}
- _________________________ ipsec/ls-execdir
--ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}
-+ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec}
- _________________________ ipsec/updowns
--for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown`
-+for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown`
- do
--	cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f
-+	cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f
- done
- _________________________ proc/net/dev
- cat /proc/net/dev
-diff -Naupr strongswan-2.1.3/programs/eroute/eroute.5 strongswan-2.1.3-gentoo/programs/eroute/eroute.5
---- strongswan-2.1.3/programs/eroute/eroute.5	2004-03-15 14:35:27.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/eroute/eroute.5	2004-06-19 08:01:14.302811827 -0500
-@@ -223,7 +223,7 @@ Parameters Index of
- in hexadecimal using Authentication Header protocol (51,
- IPPROTO_AH) with no identies defined for either end.
- .SH FILES
--/proc/net/ipsec_eroute, /usr/local/bin/ipsec
-+/proc/net/ipsec_eroute, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_spi(5),
- ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_eroute(8), ipsec_version(5),
-diff -Naupr strongswan-2.1.3/programs/eroute/eroute.8 strongswan-2.1.3-gentoo/programs/eroute/eroute.8
---- strongswan-2.1.3/programs/eroute/eroute.8	2004-03-15 14:35:27.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/eroute/eroute.8	2004-06-19 08:01:14.303811653 -0500
-@@ -308,7 +308,7 @@ will be in clear text.
- .br
- .LP
- .SH FILES
--/proc/net/ipsec_eroute, /usr/local/bin/ipsec
-+/proc/net/ipsec_eroute, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8),
- ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5)
-diff -Naupr strongswan-2.1.3/programs/ipsec/ipsec.8 strongswan-2.1.3-gentoo/programs/ipsec/ipsec.8
---- strongswan-2.1.3/programs/ipsec/ipsec.8	2004-03-15 14:35:27.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/ipsec/ipsec.8	2004-06-19 08:01:14.303811653 -0500
-@@ -81,7 +81,7 @@ reports where
- .I ipsec
- thinks the IPsec configuration files are stored.
- .SH FILES
--/usr/local/lib/ipsec	usual utilities directory
-+/usr/lib/ipsec	usual utilities directory
- .SH ENVIRONMENT
- .PP
- The following environment variables control where FreeS/WAN finds its
-diff -Naupr strongswan-2.1.3/programs/klipsdebug/klipsdebug.5 strongswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.5
---- strongswan-2.1.3/programs/klipsdebug/klipsdebug.5	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.5	2004-06-19 08:01:14.303811653 -0500
-@@ -103,7 +103,7 @@ full
- sockets debugging has been set and everything else is not set.
- .LP
- .SH FILES
--/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
-+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
- ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5), ipsec_version(5),
-diff -Naupr strongswan-2.1.3/programs/klipsdebug/klipsdebug.8 strongswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.8
---- strongswan-2.1.3/programs/klipsdebug/klipsdebug.8	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.8	2004-06-19 08:01:14.304811479 -0500
-@@ -117,7 +117,7 @@ turns off only the
- debugging messages.
- .LP
- .SH FILES
--/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
-+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
- ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5)
-diff -Naupr strongswan-2.1.3/programs/lwdnsq/lwdnsq.xml.in strongswan-2.1.3-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- strongswan-2.1.3/programs/lwdnsq/lwdnsq.xml.in	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-06-19 08:01:14.305811305 -0500
-@@ -430,7 +430,7 @@ information.
- <refsect1><title>Special IPSECKEY processing</title>
- 
- <programlisting>
--/etc/ipsec.d/lwdnsq.conf
-+/etc/ipsec/ipsec.d/lwdnsq.conf
- </programlisting>
- 
- </refsect1>
-diff -Naupr strongswan-2.1.3/programs/mailkey/mailkey.in strongswan-2.1.3-gentoo/programs/mailkey/mailkey.in
---- strongswan-2.1.3/programs/mailkey/mailkey.in	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/mailkey/mailkey.in	2004-06-19 08:01:14.305811305 -0500
-@@ -60,7 +60,7 @@ with the following error:
- 
- "$test1st"
- 
--Common concerns: This account must be able to read /etc/ipsec.secrets. 
-+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. 
- If you haven't generated your key yet, please run 'ipsec newhostkey'." 
- exit 0
- }
-diff -Naupr strongswan-2.1.3/programs/pluto/Makefile strongswan-2.1.3-gentoo/programs/pluto/Makefile
---- strongswan-2.1.3/programs/pluto/Makefile	2004-06-17 00:14:44.000000000 -0500
-+++ strongswan-2.1.3-gentoo/programs/pluto/Makefile	2004-06-19 08:01:14.306811131 -0500
-@@ -151,7 +151,7 @@ CPPFLAGS = $(HDRDIRS) $(DEFINES) \
- 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
- 	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
- 
--ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
-+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
- 
- # libefence is a free memory allocation debugger
- # Solaris 2 needs -lsocket -lnsl
-diff -Naupr strongswan-2.1.3/programs/setup/Makefile strongswan-2.1.3-gentoo/programs/setup/Makefile
---- strongswan-2.1.3/programs/setup/Makefile	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/setup/Makefile	2004-06-19 08:01:14.306811131 -0500
-@@ -33,25 +33,10 @@ install:: setup
- 	@rm -f $(BINDIR)/setup
- 	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
- 	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
--	-@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
--	-@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K68ipsec
--	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K68ipsec
--	-@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K68ipsec
- 
- install_file_list::
- 	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
--	@echo $(RCDIR)/../rc0.d/K68ipsec
--	@echo $(RCDIR)/../rc1.d/K68ipsec
--	@echo $(RCDIR)/../rc2.d/S47ipsec
--	@echo $(RCDIR)/../rc3.d/S47ipsec
--	@echo $(RCDIR)/../rc4.d/S47ipsec
--	@echo $(RCDIR)/../rc5.d/S47ipsec
--	@echo $(RCDIR)/../rc6.d/K68ipsec
- 
- clean::
- 	@rm -f setup
-diff -Naupr strongswan-2.1.3/programs/showhostkey/showhostkey.in strongswan-2.1.3-gentoo/programs/showhostkey/showhostkey.in
---- strongswan-2.1.3/programs/showhostkey/showhostkey.in	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/showhostkey/showhostkey.in	2004-06-19 08:01:14.307810957 -0500
-@@ -18,7 +18,7 @@ me="ipsec showhostkey"
- usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
-                   [--dhclient]"
- 
--file=/etc/ipsec.secrets
-+file=/etc/ipsec/ipsec.secrets
- fmt=""
- gw=
- id=
-diff -Naupr strongswan-2.1.3/programs/spi/spi.5 strongswan-2.1.3-gentoo/programs/spi/spi.5
---- strongswan-2.1.3/programs/spi/spi.5	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/spi/spi.5	2004-06-19 08:01:14.307810957 -0500
-@@ -162,7 +162,7 @@ since 1 of 8 bits is a parity bit), has 
- 3858 seconds ago and has been idle for 23 seconds.
- .LP
- .SH FILES
--/proc/net/ipsec_spi, /usr/local/bin/ipsec
-+/proc/net/ipsec_spi, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5),
- ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_spi(8), ipsec_version(5),
-diff -Naupr strongswan-2.1.3/programs/spi/spi.8 strongswan-2.1.3-gentoo/programs/spi/spi.8
---- strongswan-2.1.3/programs/spi/spi.8	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/spi/spi.8	2004-06-19 08:01:14.307810957 -0500
-@@ -461,7 +461,7 @@ and protocol
- (4).
- .LP
- .SH FILES
--/proc/net/ipsec_spi, /usr/local/bin/ipsec
-+/proc/net/ipsec_spi, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
- ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5)
-diff -Naupr strongswan-2.1.3/programs/spigrp/spigrp.5 strongswan-2.1.3-gentoo/programs/spigrp/spigrp.5
---- strongswan-2.1.3/programs/spigrp/spigrp.5	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/spigrp/spigrp.5	2004-06-19 08:01:14.308810783 -0500
-@@ -77,7 +77,7 @@ be an incoming or outgoing group, depend
- machine.
- .LP
- .SH FILES
--/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
-+/proc/net/ipsec_spigrp, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5),
- ipsec_spi(5), ipsec_klipsdebug(5), ipsec_spigrp(8), ipsec_version(5),
-diff -Naupr strongswan-2.1.3/programs/spigrp/spigrp.8 strongswan-2.1.3-gentoo/programs/spigrp/spigrp.8
---- strongswan-2.1.3/programs/spigrp/spigrp.8	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/spigrp/spigrp.8	2004-06-19 08:01:14.308810783 -0500
-@@ -128,7 +128,7 @@ and finally an AH header to authenticate
- .BR 0x236 .
- .LP
- .SH FILES
--/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
-+/proc/net/ipsec_spigrp, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
- ipsec_spi(8), ipsec_klipsdebug(8), ipsec_spigrp(5)
-diff -Naupr strongswan-2.1.3/programs/tncfg/tncfg.5 strongswan-2.1.3-gentoo/programs/tncfg/tncfg.5
---- strongswan-2.1.3/programs/tncfg/tncfg.5	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/tncfg/tncfg.5	2004-06-19 08:01:14.308810783 -0500
-@@ -75,7 +75,7 @@ shows that virtual device
- is not connected to any physical device.
- .LP
- .SH "FILES"
--/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
-+/proc/net/ipsec_tncfg, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5),
- ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5),
-diff -Naupr strongswan-2.1.3/programs/tncfg/tncfg.8 strongswan-2.1.3-gentoo/programs/tncfg/tncfg.8
---- strongswan-2.1.3/programs/tncfg/tncfg.8	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.3-gentoo/programs/tncfg/tncfg.8	2004-06-19 08:01:14.309810609 -0500
-@@ -76,7 +76,7 @@ virtual device to the
- physical device.
- .LP
- .SH "FILES"
--/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
-+/proc/net/ipsec_tncfg, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_eroute(8), ipsec_spi(8),
- ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_tncfg(5)
diff --git a/net-misc/strongswan/files/strongswan-2.2.1-gentoo.patch b/net-misc/strongswan/files/strongswan-2.2.1-gentoo.patch
new file mode 100644
index 000000000000..54e3ce64b6e2
--- /dev/null
+++ b/net-misc/strongswan/files/strongswan-2.2.1-gentoo.patch
@@ -0,0 +1,329 @@
+diff -Naupr strongswan-2.2.1/Makefile.inc strongswan-2.2.1-gentoo/Makefile.inc
+--- strongswan-2.2.1/Makefile.inc	2004-09-17 12:15:20.000000000 -0500
++++ strongswan-2.2.1-gentoo/Makefile.inc	2004-09-17 21:04:25.922487111 -0500
+@@ -62,7 +62,7 @@ POLICYLIB=${FREESWANSRCDIR}/lib/libipsec
+ DESTDIR?=
+ 
+ # "local" part of tree, used in building other pathnames
+-INC_USRLOCAL=/usr/local
++INC_USRLOCAL=/usr
+ 
+ # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
+ # settings which are assumed to include it (or at least, to include *some*
+@@ -96,7 +96,7 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_
+ MANPLACES=man3 man5 man8
+ 
+ # where configuration files go
+-FINALCONFFILE?=/etc/ipsec.conf
++FINALCONFFILE?=/etc/ipsec/ipsec.conf
+ CONFFILE=$(DESTDIR)$(FINALCONFFILE)
+ 
+ FINALCONFDIR?=/etc
+@@ -107,10 +107,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR)
+ 
+ # sample configuration files go into
+ INC_DOCDIR?=share/doc
+-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan
++FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.2.1
+ EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
+ 
+-FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan
++FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.2.1
+ DOCDIR=${DESTDIR}${FINALDOCDIR}
+ 
+ # where per-conn pluto logs go
+@@ -239,7 +239,7 @@ RH_KERNELSRC?=/usr/src/linux-2.4
+ # installed one in RH 7.2, won't work - you wind up depending upon
+ # openssl.
+ 
+-BIND9STATICLIBDIR?=/usr/local/lib
++BIND9STATICLIBDIR?=/usr/lib
+ 
+ # FreeSWAN 3.x will require bind9. 
+ USE_LWRES?=false
+diff -Naupr strongswan-2.2.1/linux/crypto/ciphers/des/asm/crypt586.pl strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
+--- strongswan-2.2.1/linux/crypto/ciphers/des/asm/crypt586.pl	2004-03-15 14:35:25.000000000 -0600
++++ strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-09-17 21:04:25.922487111 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # The inner loop instruction sequence and the IP/FP modifications are from
+ # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
+diff -Naupr strongswan-2.2.1/linux/crypto/ciphers/des/asm/des-586.pl strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
+--- strongswan-2.2.1/linux/crypto/ciphers/des/asm/des-586.pl	2004-03-15 14:35:25.000000000 -0600
++++ strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-09-17 21:04:25.923486938 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # The inner loop instruction sequence and the IP/FP modifications are from
+ # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
+diff -Naupr strongswan-2.2.1/linux/crypto/ciphers/des/asm/des686.pl strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/des686.pl
+--- strongswan-2.2.1/linux/crypto/ciphers/des/asm/des686.pl	2004-03-15 14:35:25.000000000 -0600
++++ strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-09-17 21:04:25.923486938 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ $prog="des686.pl";
+ 
+diff -Naupr strongswan-2.2.1/linux/crypto/ciphers/des/asm/desboth.pl strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
+--- strongswan-2.2.1/linux/crypto/ciphers/des/asm/desboth.pl	2004-03-15 14:35:25.000000000 -0600
++++ strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-09-17 21:04:25.923486938 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ $L="edi";
+ $R="esi";
+diff -Naupr strongswan-2.2.1/linux/crypto/ciphers/des/asm/perlasm/cbc.pl strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
+--- strongswan-2.2.1/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-03-15 14:35:25.000000000 -0600
++++ strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-09-17 21:04:25.924486765 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
+ # des_cblock (*input);
+diff -Naupr strongswan-2.2.1/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
+--- strongswan-2.2.1/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-03-15 14:35:25.000000000 -0600
++++ strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-09-17 21:04:25.924486765 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ # require 'x86asm.pl';
+ # &asm_init("cpp","des-586.pl");
+diff -Naupr strongswan-2.2.1/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
+--- strongswan-2.2.1/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-03-15 14:35:25.000000000 -0600
++++ strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-09-17 21:04:25.924486765 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ package x86ms;
+ 
+diff -Naupr strongswan-2.2.1/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
+--- strongswan-2.2.1/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-03-15 14:35:25.000000000 -0600
++++ strongswan-2.2.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-09-17 21:04:25.925486593 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ package x86unix;
+ 
+diff -Naupr strongswan-2.2.1/programs/_include/_include.in strongswan-2.2.1-gentoo/programs/_include/_include.in
+--- strongswan-2.2.1/programs/_include/_include.in	2004-03-15 15:03:06.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/_include/_include.in	2004-09-17 21:04:25.925486593 -0500
+@@ -49,10 +49,10 @@ for f
+ do
+ 	if test ! -r "$f"
+ 	then
+-		if test ! "$f" = "/etc/ipsec.conf"
++		if test ! "$f" = "/etc/ipsec/ipsec.conf"
+ 		then
+ 			echo "#:cannot open configuration file \'$f\'"
+-			if test "$f" = "/etc/ipsec.secrets"
++			if test "$f" = "/etc/ipsec/ipsec.secrets"
+ 			then
+ 				echo "#:Your secrets file will be created when you start $IPSEC_NAME for the first time."
+ 			fi
+diff -Naupr strongswan-2.2.1/programs/barf/barf.in strongswan-2.2.1-gentoo/programs/barf/barf.in
+--- strongswan-2.2.1/programs/barf/barf.in	2004-07-09 07:37:40.000000000 -0500
++++ strongswan-2.2.1-gentoo/programs/barf/barf.in	2004-09-17 21:04:25.926486420 -0500
+@@ -19,7 +19,7 @@ IPSEC_NAME="strongSwan"
+ KERNSRC=${KERNSRC-/usr/src/linux}
+ LOGS=${LOGS-/var/log}
+ CONFS=${IPSEC_CONFS-/etc}
+-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
++CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
+ me="ipsec barf"
+ 
+ # kludge to produce no barf output mentioning policygroups if none are present.
+@@ -209,13 +209,13 @@ then
+ 	done
+ fi
+ _________________________ ipsec/ls-libdir
+-ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec}
++ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec}
+ _________________________ ipsec/ls-execdir
+-ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}
++ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec}
+ _________________________ ipsec/updowns
+-for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown`
++for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown`
+ do
+-	cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f
++	cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f
+ done
+ _________________________ proc/net/dev
+ cat /proc/net/dev
+diff -Naupr strongswan-2.2.1/programs/eroute/eroute.5 strongswan-2.2.1-gentoo/programs/eroute/eroute.5
+--- strongswan-2.2.1/programs/eroute/eroute.5	2004-03-15 14:35:27.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/eroute/eroute.5	2004-09-17 21:04:25.926486420 -0500
+@@ -223,7 +223,7 @@ Parameters Index of
+ in hexadecimal using Authentication Header protocol (51,
+ IPPROTO_AH) with no identies defined for either end.
+ .SH FILES
+-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
++/proc/net/ipsec_eroute, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_spi(5),
+ ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_eroute(8), ipsec_version(5),
+diff -Naupr strongswan-2.2.1/programs/eroute/eroute.8 strongswan-2.2.1-gentoo/programs/eroute/eroute.8
+--- strongswan-2.2.1/programs/eroute/eroute.8	2004-03-15 14:35:27.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/eroute/eroute.8	2004-09-17 21:04:25.926486420 -0500
+@@ -308,7 +308,7 @@ will be in clear text.
+ .br
+ .LP
+ .SH FILES
+-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
++/proc/net/ipsec_eroute, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8),
+ ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5)
+diff -Naupr strongswan-2.2.1/programs/ipsec/ipsec.8 strongswan-2.2.1-gentoo/programs/ipsec/ipsec.8
+--- strongswan-2.2.1/programs/ipsec/ipsec.8	2004-03-15 14:35:27.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/ipsec/ipsec.8	2004-09-17 21:04:25.927486247 -0500
+@@ -81,7 +81,7 @@ reports where
+ .I ipsec
+ thinks the IPsec configuration files are stored.
+ .SH FILES
+-/usr/local/lib/ipsec	usual utilities directory
++/usr/lib/ipsec	usual utilities directory
+ .SH ENVIRONMENT
+ .PP
+ The following environment variables control where FreeS/WAN finds its
+diff -Naupr strongswan-2.2.1/programs/klipsdebug/klipsdebug.5 strongswan-2.2.1-gentoo/programs/klipsdebug/klipsdebug.5
+--- strongswan-2.2.1/programs/klipsdebug/klipsdebug.5	2004-03-15 14:35:28.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/klipsdebug/klipsdebug.5	2004-09-17 21:04:25.927486247 -0500
+@@ -103,7 +103,7 @@ full
+ sockets debugging has been set and everything else is not set.
+ .LP
+ .SH FILES
+-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
+ ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5), ipsec_version(5),
+diff -Naupr strongswan-2.2.1/programs/klipsdebug/klipsdebug.8 strongswan-2.2.1-gentoo/programs/klipsdebug/klipsdebug.8
+--- strongswan-2.2.1/programs/klipsdebug/klipsdebug.8	2004-03-15 14:35:28.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/klipsdebug/klipsdebug.8	2004-09-17 21:04:25.928486074 -0500
+@@ -117,7 +117,7 @@ turns off only the
+ debugging messages.
+ .LP
+ .SH FILES
+-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
+ ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5)
+diff -Naupr strongswan-2.2.1/programs/lwdnsq/lwdnsq.xml.in strongswan-2.2.1-gentoo/programs/lwdnsq/lwdnsq.xml.in
+--- strongswan-2.2.1/programs/lwdnsq/lwdnsq.xml.in	2004-03-15 14:35:28.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-09-17 21:04:25.928486074 -0500
+@@ -430,7 +430,7 @@ information.
+ <refsect1><title>Special IPSECKEY processing</title>
+ 
+ <programlisting>
+-/etc/ipsec.d/lwdnsq.conf
++/etc/ipsec/ipsec.d/lwdnsq.conf
+ </programlisting>
+ 
+ </refsect1>
+diff -Naupr strongswan-2.2.1/programs/mailkey/mailkey.in strongswan-2.2.1-gentoo/programs/mailkey/mailkey.in
+--- strongswan-2.2.1/programs/mailkey/mailkey.in	2004-03-15 14:35:28.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/mailkey/mailkey.in	2004-09-17 21:04:25.928486074 -0500
+@@ -60,7 +60,7 @@ with the following error:
+ 
+ "$test1st"
+ 
+-Common concerns: This account must be able to read /etc/ipsec.secrets. 
++Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. 
+ If you haven't generated your key yet, please run 'ipsec newhostkey'." 
+ exit 0
+ }
+diff -Naupr strongswan-2.2.1/programs/showhostkey/showhostkey.in strongswan-2.2.1-gentoo/programs/showhostkey/showhostkey.in
+--- strongswan-2.2.1/programs/showhostkey/showhostkey.in	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/showhostkey/showhostkey.in	2004-09-17 21:04:25.929485901 -0500
+@@ -18,7 +18,7 @@ me="ipsec showhostkey"
+ usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
+                   [--dhclient]"
+ 
+-file=/etc/ipsec.secrets
++file=/etc/ipsec/ipsec.secrets
+ fmt=""
+ gw=
+ id=
+diff -Naupr strongswan-2.2.1/programs/spi/spi.5 strongswan-2.2.1-gentoo/programs/spi/spi.5
+--- strongswan-2.2.1/programs/spi/spi.5	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/spi/spi.5	2004-09-17 21:04:25.929485901 -0500
+@@ -162,7 +162,7 @@ since 1 of 8 bits is a parity bit), has 
+ 3858 seconds ago and has been idle for 23 seconds.
+ .LP
+ .SH FILES
+-/proc/net/ipsec_spi, /usr/local/bin/ipsec
++/proc/net/ipsec_spi, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5),
+ ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_spi(8), ipsec_version(5),
+diff -Naupr strongswan-2.2.1/programs/spi/spi.8 strongswan-2.2.1-gentoo/programs/spi/spi.8
+--- strongswan-2.2.1/programs/spi/spi.8	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/spi/spi.8	2004-09-17 21:04:25.930485728 -0500
+@@ -461,7 +461,7 @@ and protocol
+ (4).
+ .LP
+ .SH FILES
+-/proc/net/ipsec_spi, /usr/local/bin/ipsec
++/proc/net/ipsec_spi, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
+ ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5)
+diff -Naupr strongswan-2.2.1/programs/spigrp/spigrp.5 strongswan-2.2.1-gentoo/programs/spigrp/spigrp.5
+--- strongswan-2.2.1/programs/spigrp/spigrp.5	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/spigrp/spigrp.5	2004-09-17 21:04:25.930485728 -0500
+@@ -77,7 +77,7 @@ be an incoming or outgoing group, depend
+ machine.
+ .LP
+ .SH FILES
+-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
++/proc/net/ipsec_spigrp, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5),
+ ipsec_spi(5), ipsec_klipsdebug(5), ipsec_spigrp(8), ipsec_version(5),
+diff -Naupr strongswan-2.2.1/programs/spigrp/spigrp.8 strongswan-2.2.1-gentoo/programs/spigrp/spigrp.8
+--- strongswan-2.2.1/programs/spigrp/spigrp.8	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/spigrp/spigrp.8	2004-09-17 21:04:25.930485728 -0500
+@@ -128,7 +128,7 @@ and finally an AH header to authenticate
+ .BR 0x236 .
+ .LP
+ .SH FILES
+-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
++/proc/net/ipsec_spigrp, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
+ ipsec_spi(8), ipsec_klipsdebug(8), ipsec_spigrp(5)
+diff -Naupr strongswan-2.2.1/programs/tncfg/tncfg.5 strongswan-2.2.1-gentoo/programs/tncfg/tncfg.5
+--- strongswan-2.2.1/programs/tncfg/tncfg.5	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/tncfg/tncfg.5	2004-09-17 21:04:25.931485556 -0500
+@@ -75,7 +75,7 @@ shows that virtual device
+ is not connected to any physical device.
+ .LP
+ .SH "FILES"
+-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
++/proc/net/ipsec_tncfg, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5),
+ ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5),
+diff -Naupr strongswan-2.2.1/programs/tncfg/tncfg.8 strongswan-2.2.1-gentoo/programs/tncfg/tncfg.8
+--- strongswan-2.2.1/programs/tncfg/tncfg.8	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.1-gentoo/programs/tncfg/tncfg.8	2004-09-17 21:04:25.931485556 -0500
+@@ -76,7 +76,7 @@ virtual device to the
+ physical device.
+ .LP
+ .SH "FILES"
+-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
++/proc/net/ipsec_tncfg, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_eroute(8), ipsec_spi(8),
+ ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_tncfg(5)
diff --git a/net-misc/strongswan/strongswan-2.2.0.ebuild b/net-misc/strongswan/strongswan-2.2.0.ebuild
index 30edf1769083..c18026c7e4cb 100644
--- a/net-misc/strongswan/strongswan-2.2.0.ebuild
+++ b/net-misc/strongswan/strongswan-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.2.0.ebuild,v 1.2 2004/09/12 06:23:19 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.2.0.ebuild,v 1.3 2004/09/18 02:24:56 pfeifer Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~ppc"
+KEYWORDS="-* x86 ~ppc"
 IUSE="curl ldap smartcard"
 
 DEPEND="!net-misc/openswan
diff --git a/net-misc/strongswan/strongswan-2.1.3-r1.ebuild b/net-misc/strongswan/strongswan-2.2.1.ebuild
index 9b7cc434e2bb..18f9cd5430cf 100644
--- a/net-misc/strongswan/strongswan-2.1.3-r1.ebuild
+++ b/net-misc/strongswan/strongswan-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.1.3-r1.ebuild,v 1.6 2004/09/12 06:23:19 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.2.1.ebuild,v 1.1 2004/09/18 02:24:56 pfeifer Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86 ~ppc"
 IUSE="curl ldap smartcard"
 
 DEPEND="!net-misc/openswan
@@ -95,8 +95,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/${P}-r1-gentoo.patch
-	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/${P}-gentoo.patch
 
 	cd programs/pluto