Version bump with security fixes. See ChangeLog for details.

9 files changed, 102 insertions, 604 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index a61cfd42bae1..5a7f509ab0f1 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,13 +1,20 @@
 # 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.3 2004/06/18 20:17:16 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.4 2004/06/19 13:25:04 pfeifer Exp $
+
+*strongswan-2.1.3 (19 Jun 2004)
+
+  19 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.1.3.ebuild
+  Version bump. Contains fixes for potential security issues.
+  Info here: http://lists.openswan.org/pipermail/dev/2004-June/000370.html
+  Removing all prior versions.
 
   18 Jun 2004; David Holm <dholm@gentoo.org> strongswan-2.1.1.ebuild:
   Added to ~ppc.
 
 *strongswan-2.1.1 (15 Jun 2004)
 
-  19 May 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.1.1.ebuild
+  15 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.1.1.ebuild
   Version bump.
 
 *strongswan-2.0.2 (19 May 2004)
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 3f042f870203..fda51736bb86 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1,9 +1,6 @@
-MD5 e650494facea105f0b12bd56ba4093c5 ChangeLog 671
+MD5 22b4271432a55687cf9cba668825e497 strongswan-2.1.3.ebuild 3044
+MD5 7c07b1413f3569562603a178b1704198 ChangeLog 947
 MD5 a64b79eda14e03e130f7dde467dfa860 metadata.xml 706
-MD5 0726403df581f6f91016830d113d8186 strongswan-2.0.2.ebuild 3043
-MD5 73b9002d62f976f998ab660a9db4517f strongswan-2.1.1.ebuild 3045
-MD5 874140675e403d9a3b5ab609d73fab56 files/digest-strongswan-2.0.2 69
+MD5 98cbee623e8b61da488c286699bd184c files/strongswan-2.1.3-gentoo.patch 17672
 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
-MD5 d092d971aee29fa685c6f7c998690f11 files/strongswan-2.0.2-gentoo.patch 17672
-MD5 4cb2e623f54d3f83b8233313aab08cb3 files/digest-strongswan-2.1.1 69
-MD5 40ba249c41300996c9e2788722ec141d files/strongswan-2.1.1-gentoo.patch 17672
+MD5 056cc14af9a978c9b1bbe57bdb6ccf3f files/digest-strongswan-2.1.3 69
diff --git a/net-misc/strongswan/files/digest-strongswan-2.0.2 b/net-misc/strongswan/files/digest-strongswan-2.0.2
deleted file mode 100644
index ef898b18040f..000000000000
--- a/net-misc/strongswan/files/digest-strongswan-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7cbb725cafaa04ee4a0cab7b84285744 strongswan-2.0.2.tar.gz 3644301
diff --git a/net-misc/strongswan/files/digest-strongswan-2.1.1 b/net-misc/strongswan/files/digest-strongswan-2.1.1
deleted file mode 100644
index 5c93baa652c1..000000000000
--- a/net-misc/strongswan/files/digest-strongswan-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 00038f9941fdfa3230078380e8bc2923 strongswan-2.1.1.tar.gz 3597866
diff --git a/net-misc/strongswan/files/digest-strongswan-2.1.3 b/net-misc/strongswan/files/digest-strongswan-2.1.3
new file mode 100644
index 000000000000..7f7b3bd798f8
--- /dev/null
+++ b/net-misc/strongswan/files/digest-strongswan-2.1.3
@@ -0,0 +1 @@
+MD5 595024b8a1273c59d86e7dc799cd0fb8 strongswan-2.1.3.tar.gz 3598010
diff --git a/net-misc/strongswan/files/strongswan-2.0.2-gentoo.patch b/net-misc/strongswan/files/strongswan-2.0.2-gentoo.patch
deleted file mode 100644
index d95fb4cbecf1..000000000000
--- a/net-misc/strongswan/files/strongswan-2.0.2-gentoo.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-diff -Naupr strongswan-2.0.2/Makefile.inc strongswan-2.0.2-gentoo/Makefile.inc
---- strongswan-2.0.2/Makefile.inc	2004-03-15 14:35:21.000000000 -0600
-+++ strongswan-2.0.2-gentoo/Makefile.inc	2004-05-19 09:02:53.021439012 -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.0.2
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.0.2
- 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.0.2/lib/libdes/Makefile strongswan-2.0.2-gentoo/lib/libdes/Makefile
---- strongswan-2.0.2/lib/libdes/Makefile	2004-03-15 14:35:24.000000000 -0600
-+++ strongswan-2.0.2-gentoo/lib/libdes/Makefile	2004-05-19 09:02:53.022438837 -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.0.2/linux/crypto/ciphers/des/asm/crypt586.pl strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- strongswan-2.0.2/linux/crypto/ciphers/des/asm/crypt586.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-05-19 09:02:53.022438837 -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.0.2/linux/crypto/ciphers/des/asm/des-586.pl strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- strongswan-2.0.2/linux/crypto/ciphers/des/asm/des-586.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-05-19 09:02:53.023438663 -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.0.2/linux/crypto/ciphers/des/asm/des686.pl strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- strongswan-2.0.2/linux/crypto/ciphers/des/asm/des686.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-05-19 09:02:53.023438663 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Naupr strongswan-2.0.2/linux/crypto/ciphers/des/asm/desboth.pl strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- strongswan-2.0.2/linux/crypto/ciphers/des/asm/desboth.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-05-19 09:02:53.023438663 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Naupr strongswan-2.0.2/linux/crypto/ciphers/des/asm/perlasm/cbc.pl strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- strongswan-2.0.2/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-05-19 09:02:53.023438663 -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.0.2/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- strongswan-2.0.2/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-05-19 09:02:53.024438489 -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.0.2/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- strongswan-2.0.2/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-05-19 09:02:53.024438489 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Naupr strongswan-2.0.2/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- strongswan-2.0.2/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.0.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-05-19 09:02:53.025438315 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Naupr strongswan-2.0.2/programs/_include/_include.in strongswan-2.0.2-gentoo/programs/_include/_include.in
---- strongswan-2.0.2/programs/_include/_include.in	2004-03-15 15:03:06.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/_include/_include.in	2004-05-19 09:02:53.025438315 -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.0.2/programs/barf/barf.in strongswan-2.0.2-gentoo/programs/barf/barf.in
---- strongswan-2.0.2/programs/barf/barf.in	2004-03-15 15:03:06.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/barf/barf.in	2004-05-19 09:02:53.025438315 -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.0.2/programs/eroute/eroute.5 strongswan-2.0.2-gentoo/programs/eroute/eroute.5
---- strongswan-2.0.2/programs/eroute/eroute.5	2004-03-15 14:35:27.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/eroute/eroute.5	2004-05-19 09:02:53.026438141 -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.0.2/programs/eroute/eroute.8 strongswan-2.0.2-gentoo/programs/eroute/eroute.8
---- strongswan-2.0.2/programs/eroute/eroute.8	2004-03-15 14:35:27.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/eroute/eroute.8	2004-05-19 09:02:53.026438141 -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.0.2/programs/ipsec/ipsec.8 strongswan-2.0.2-gentoo/programs/ipsec/ipsec.8
---- strongswan-2.0.2/programs/ipsec/ipsec.8	2004-03-15 14:35:27.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/ipsec/ipsec.8	2004-05-19 09:02:53.026438141 -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.0.2/programs/klipsdebug/klipsdebug.5 strongswan-2.0.2-gentoo/programs/klipsdebug/klipsdebug.5
---- strongswan-2.0.2/programs/klipsdebug/klipsdebug.5	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/klipsdebug/klipsdebug.5	2004-05-19 09:02:53.027437967 -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.0.2/programs/klipsdebug/klipsdebug.8 strongswan-2.0.2-gentoo/programs/klipsdebug/klipsdebug.8
---- strongswan-2.0.2/programs/klipsdebug/klipsdebug.8	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/klipsdebug/klipsdebug.8	2004-05-19 09:02:53.027437967 -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.0.2/programs/lwdnsq/lwdnsq.xml.in strongswan-2.0.2-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- strongswan-2.0.2/programs/lwdnsq/lwdnsq.xml.in	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-05-19 09:02:53.027437967 -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.0.2/programs/mailkey/mailkey.in strongswan-2.0.2-gentoo/programs/mailkey/mailkey.in
---- strongswan-2.0.2/programs/mailkey/mailkey.in	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/mailkey/mailkey.in	2004-05-19 09:02:53.028437793 -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.0.2/programs/pluto/Makefile strongswan-2.0.2-gentoo/programs/pluto/Makefile
---- strongswan-2.0.2/programs/pluto/Makefile	2004-03-22 16:00:55.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/pluto/Makefile	2004-05-19 09:02:53.028437793 -0500
-@@ -144,7 +144,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.0.2/programs/setup/Makefile strongswan-2.0.2-gentoo/programs/setup/Makefile
---- strongswan-2.0.2/programs/setup/Makefile	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/setup/Makefile	2004-05-19 09:04:14.999163444 -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.0.2/programs/showhostkey/showhostkey.in strongswan-2.0.2-gentoo/programs/showhostkey/showhostkey.in
---- strongswan-2.0.2/programs/showhostkey/showhostkey.in	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/showhostkey/showhostkey.in	2004-05-19 09:02:53.030437445 -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.0.2/programs/spi/spi.5 strongswan-2.0.2-gentoo/programs/spi/spi.5
---- strongswan-2.0.2/programs/spi/spi.5	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/spi/spi.5	2004-05-19 09:02:53.030437445 -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.0.2/programs/spi/spi.8 strongswan-2.0.2-gentoo/programs/spi/spi.8
---- strongswan-2.0.2/programs/spi/spi.8	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/spi/spi.8	2004-05-19 09:02:53.031437270 -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.0.2/programs/spigrp/spigrp.5 strongswan-2.0.2-gentoo/programs/spigrp/spigrp.5
---- strongswan-2.0.2/programs/spigrp/spigrp.5	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/spigrp/spigrp.5	2004-05-19 09:02:53.031437270 -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.0.2/programs/spigrp/spigrp.8 strongswan-2.0.2-gentoo/programs/spigrp/spigrp.8
---- strongswan-2.0.2/programs/spigrp/spigrp.8	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/spigrp/spigrp.8	2004-05-19 09:02:53.031437270 -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.0.2/programs/tncfg/tncfg.5 strongswan-2.0.2-gentoo/programs/tncfg/tncfg.5
---- strongswan-2.0.2/programs/tncfg/tncfg.5	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/tncfg/tncfg.5	2004-05-19 09:02:53.032437096 -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.0.2/programs/tncfg/tncfg.8 strongswan-2.0.2-gentoo/programs/tncfg/tncfg.8
---- strongswan-2.0.2/programs/tncfg/tncfg.8	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.0.2-gentoo/programs/tncfg/tncfg.8	2004-05-19 09:02:53.032437096 -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.1.1-gentoo.patch b/net-misc/strongswan/files/strongswan-2.1.3-gentoo.patch
index 5379c0c16940..6423f68946f3 100644
--- a/net-misc/strongswan/files/strongswan-2.1.1-gentoo.patch
+++ b/net-misc/strongswan/files/strongswan-2.1.3-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Naupr strongswan-2.1.1/Makefile.inc strongswan-2.1.1-gentoo/Makefile.inc
---- strongswan-2.1.1/Makefile.inc	2004-03-15 14:35:21.000000000 -0600
-+++ strongswan-2.1.1-gentoo/Makefile.inc	2004-06-15 12:05:32.851956478 -0500
+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?=
  
@@ -24,11 +24,11 @@ diff -Naupr strongswan-2.1.1/Makefile.inc strongswan-2.1.1-gentoo/Makefile.inc
  # sample configuration files go into
  INC_DOCDIR?=share/doc
 -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.1.1
++FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.1.3
  EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
  
 -FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.1.1
++FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.1.3
  DOCDIR=${DESTDIR}${FINALDOCDIR}
  
  # where per-conn pluto logs go
@@ -41,9 +41,9 @@ diff -Naupr strongswan-2.1.1/Makefile.inc strongswan-2.1.1-gentoo/Makefile.inc
  
  # FreeSWAN 3.x will require bind9. 
  USE_LWRES?=false
-diff -Naupr strongswan-2.1.1/lib/libdes/Makefile strongswan-2.1.1-gentoo/lib/libdes/Makefile
---- strongswan-2.1.1/lib/libdes/Makefile	2004-03-15 14:35:24.000000000 -0600
-+++ strongswan-2.1.1-gentoo/lib/libdes/Makefile	2004-06-15 12:05:32.852956304 -0500
+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}
@@ -53,81 +53,81 @@ diff -Naupr strongswan-2.1.1/lib/libdes/Makefile strongswan-2.1.1-gentoo/lib/lib
  CPP=$(CC) -E
  
  # Assember version of des_encrypt*().
-diff -Naupr strongswan-2.1.1/linux/crypto/ciphers/des/asm/crypt586.pl strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- strongswan-2.1.1/linux/crypto/ciphers/des/asm/crypt586.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-06-15 12:05:32.852956304 -0500
+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.1/linux/crypto/ciphers/des/asm/des-586.pl strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- strongswan-2.1.1/linux/crypto/ciphers/des/asm/des-586.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-06-15 12:05:32.852956304 -0500
+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.1/linux/crypto/ciphers/des/asm/des686.pl strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- strongswan-2.1.1/linux/crypto/ciphers/des/asm/des686.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-06-15 12:05:32.853956130 -0500
+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.1/linux/crypto/ciphers/des/asm/desboth.pl strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- strongswan-2.1.1/linux/crypto/ciphers/des/asm/desboth.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-06-15 12:05:32.853956130 -0500
+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.1/linux/crypto/ciphers/des/asm/perlasm/cbc.pl strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- strongswan-2.1.1/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-06-15 12:05:32.853956130 -0500
+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.1/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- strongswan-2.1.1/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-06-15 12:05:32.854955956 -0500
+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.1/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- strongswan-2.1.1/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-06-15 12:05:32.854955956 -0500
+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.1/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- strongswan-2.1.1/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-03-15 14:35:25.000000000 -0600
-+++ strongswan-2.1.1-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-06-15 12:05:32.855955782 -0500
+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.1/programs/_include/_include.in strongswan-2.1.1-gentoo/programs/_include/_include.in
---- strongswan-2.1.1/programs/_include/_include.in	2004-03-15 15:03:06.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/_include/_include.in	2004-06-15 12:05:32.855955782 -0500
+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"
@@ -141,9 +141,9 @@ diff -Naupr strongswan-2.1.1/programs/_include/_include.in strongswan-2.1.1-gent
  			then
  				echo "#:Your secrets file will be created when you start $IPSEC_NAME for the first time."
  			fi
-diff -Naupr strongswan-2.1.1/programs/barf/barf.in strongswan-2.1.1-gentoo/programs/barf/barf.in
---- strongswan-2.1.1/programs/barf/barf.in	2004-03-15 15:03:06.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/barf/barf.in	2004-06-15 12:05:32.855955782 -0500
+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}
@@ -171,9 +171,9 @@ diff -Naupr strongswan-2.1.1/programs/barf/barf.in strongswan-2.1.1-gentoo/progr
  done
  _________________________ proc/net/dev
  cat /proc/net/dev
-diff -Naupr strongswan-2.1.1/programs/eroute/eroute.5 strongswan-2.1.1-gentoo/programs/eroute/eroute.5
---- strongswan-2.1.1/programs/eroute/eroute.5	2004-03-15 14:35:27.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/eroute/eroute.5	2004-06-15 12:05:32.856955608 -0500
+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.
@@ -183,9 +183,9 @@ diff -Naupr strongswan-2.1.1/programs/eroute/eroute.5 strongswan-2.1.1-gentoo/pr
  .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.1/programs/eroute/eroute.8 strongswan-2.1.1-gentoo/programs/eroute/eroute.8
---- strongswan-2.1.1/programs/eroute/eroute.8	2004-03-15 14:35:27.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/eroute/eroute.8	2004-06-15 12:05:32.856955608 -0500
+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
@@ -195,9 +195,9 @@ diff -Naupr strongswan-2.1.1/programs/eroute/eroute.8 strongswan-2.1.1-gentoo/pr
  .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.1/programs/ipsec/ipsec.8 strongswan-2.1.1-gentoo/programs/ipsec/ipsec.8
---- strongswan-2.1.1/programs/ipsec/ipsec.8	2004-03-15 14:35:27.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/ipsec/ipsec.8	2004-06-15 12:05:32.856955608 -0500
+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.
@@ -207,9 +207,9 @@ diff -Naupr strongswan-2.1.1/programs/ipsec/ipsec.8 strongswan-2.1.1-gentoo/prog
  .SH ENVIRONMENT
  .PP
  The following environment variables control where FreeS/WAN finds its
-diff -Naupr strongswan-2.1.1/programs/klipsdebug/klipsdebug.5 strongswan-2.1.1-gentoo/programs/klipsdebug/klipsdebug.5
---- strongswan-2.1.1/programs/klipsdebug/klipsdebug.5	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/klipsdebug/klipsdebug.5	2004-06-15 12:05:32.857955434 -0500
+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
@@ -219,9 +219,9 @@ diff -Naupr strongswan-2.1.1/programs/klipsdebug/klipsdebug.5 strongswan-2.1.1-g
  .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.1/programs/klipsdebug/klipsdebug.8 strongswan-2.1.1-gentoo/programs/klipsdebug/klipsdebug.8
---- strongswan-2.1.1/programs/klipsdebug/klipsdebug.8	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/klipsdebug/klipsdebug.8	2004-06-15 12:05:32.857955434 -0500
+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
@@ -231,9 +231,9 @@ diff -Naupr strongswan-2.1.1/programs/klipsdebug/klipsdebug.8 strongswan-2.1.1-g
  .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.1/programs/lwdnsq/lwdnsq.xml.in strongswan-2.1.1-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- strongswan-2.1.1/programs/lwdnsq/lwdnsq.xml.in	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-06-15 12:05:32.857955434 -0500
+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>
  
@@ -243,9 +243,9 @@ diff -Naupr strongswan-2.1.1/programs/lwdnsq/lwdnsq.xml.in strongswan-2.1.1-gent
  </programlisting>
  
  </refsect1>
-diff -Naupr strongswan-2.1.1/programs/mailkey/mailkey.in strongswan-2.1.1-gentoo/programs/mailkey/mailkey.in
---- strongswan-2.1.1/programs/mailkey/mailkey.in	2004-03-15 14:35:28.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/mailkey/mailkey.in	2004-06-15 12:05:32.858955259 -0500
+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"
@@ -255,9 +255,9 @@ diff -Naupr strongswan-2.1.1/programs/mailkey/mailkey.in strongswan-2.1.1-gentoo
  If you haven't generated your key yet, please run 'ipsec newhostkey'." 
  exit 0
  }
-diff -Naupr strongswan-2.1.1/programs/pluto/Makefile strongswan-2.1.1-gentoo/programs/pluto/Makefile
---- strongswan-2.1.1/programs/pluto/Makefile	2004-06-03 06:49:47.000000000 -0500
-+++ strongswan-2.1.1-gentoo/programs/pluto/Makefile	2004-06-15 12:05:32.858955259 -0500
+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\"
@@ -267,9 +267,9 @@ diff -Naupr strongswan-2.1.1/programs/pluto/Makefile strongswan-2.1.1-gentoo/pro
  
  # libefence is a free memory allocation debugger
  # Solaris 2 needs -lsocket -lnsl
-diff -Naupr strongswan-2.1.1/programs/setup/Makefile strongswan-2.1.1-gentoo/programs/setup/Makefile
---- strongswan-2.1.1/programs/setup/Makefile	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/setup/Makefile	2004-06-15 12:05:32.859955085 -0500
+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
@@ -296,9 +296,9 @@ diff -Naupr strongswan-2.1.1/programs/setup/Makefile strongswan-2.1.1-gentoo/pro
  
  clean::
  	@rm -f setup
-diff -Naupr strongswan-2.1.1/programs/showhostkey/showhostkey.in strongswan-2.1.1-gentoo/programs/showhostkey/showhostkey.in
---- strongswan-2.1.1/programs/showhostkey/showhostkey.in	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/showhostkey/showhostkey.in	2004-06-15 12:05:32.859955085 -0500
+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]"
@@ -308,9 +308,9 @@ diff -Naupr strongswan-2.1.1/programs/showhostkey/showhostkey.in strongswan-2.1.
  fmt=""
  gw=
  id=
-diff -Naupr strongswan-2.1.1/programs/spi/spi.5 strongswan-2.1.1-gentoo/programs/spi/spi.5
---- strongswan-2.1.1/programs/spi/spi.5	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/spi/spi.5	2004-06-15 12:05:32.859955085 -0500
+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
@@ -320,9 +320,9 @@ diff -Naupr strongswan-2.1.1/programs/spi/spi.5 strongswan-2.1.1-gentoo/programs
  .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.1/programs/spi/spi.8 strongswan-2.1.1-gentoo/programs/spi/spi.8
---- strongswan-2.1.1/programs/spi/spi.8	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/spi/spi.8	2004-06-15 12:05:32.860954911 -0500
+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
@@ -332,9 +332,9 @@ diff -Naupr strongswan-2.1.1/programs/spi/spi.8 strongswan-2.1.1-gentoo/programs
  .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.1/programs/spigrp/spigrp.5 strongswan-2.1.1-gentoo/programs/spigrp/spigrp.5
---- strongswan-2.1.1/programs/spigrp/spigrp.5	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/spigrp/spigrp.5	2004-06-15 12:05:32.860954911 -0500
+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
@@ -344,9 +344,9 @@ diff -Naupr strongswan-2.1.1/programs/spigrp/spigrp.5 strongswan-2.1.1-gentoo/pr
  .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.1/programs/spigrp/spigrp.8 strongswan-2.1.1-gentoo/programs/spigrp/spigrp.8
---- strongswan-2.1.1/programs/spigrp/spigrp.8	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/spigrp/spigrp.8	2004-06-15 12:05:32.861954737 -0500
+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
@@ -356,9 +356,9 @@ diff -Naupr strongswan-2.1.1/programs/spigrp/spigrp.8 strongswan-2.1.1-gentoo/pr
  .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.1/programs/tncfg/tncfg.5 strongswan-2.1.1-gentoo/programs/tncfg/tncfg.5
---- strongswan-2.1.1/programs/tncfg/tncfg.5	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/tncfg/tncfg.5	2004-06-15 12:05:32.861954737 -0500
+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
@@ -368,9 +368,9 @@ diff -Naupr strongswan-2.1.1/programs/tncfg/tncfg.5 strongswan-2.1.1-gentoo/prog
  .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.1/programs/tncfg/tncfg.8 strongswan-2.1.1-gentoo/programs/tncfg/tncfg.8
---- strongswan-2.1.1/programs/tncfg/tncfg.8	2004-03-15 14:35:31.000000000 -0600
-+++ strongswan-2.1.1-gentoo/programs/tncfg/tncfg.8	2004-06-15 12:05:32.861954737 -0500
+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
diff --git a/net-misc/strongswan/strongswan-2.1.1.ebuild b/net-misc/strongswan/strongswan-2.1.1.ebuild
deleted file mode 100644
index b4841f9b4ab9..000000000000
--- a/net-misc/strongswan/strongswan-2.1.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.1.ebuild,v 1.2 2004/06/18 20:17:16 dholm Exp $
-
-inherit eutils
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system."
-HOMEPAGE="http://www.strongswan.org/"
-SRC_URI="http://download.strongswan.org/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~x86 ~ppc"
-IUSE=""
-
-DEPEND="virtual/glibc
-	virtual/linux-sources
-	>=dev-libs/gmp-3.1.1
-	net-misc/host
-	sys-apps/iproute2"
-RDEPEND=""
-
-check_version_h() {
-	if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ]
-	then
-		eerror "Please verify that your /usr/src/linux symlink is pointing"
-		eerror "to your current kernel sources, and that you have a running kernel"
-		die "/usr/src/linux symlink not setup!"
-	fi
-}
-
-get_KV_info() {
-	check_version_h
-
-	# Get the kernel version of sources in /usr/src/linux ...
-	export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \
-		"${ROOT}/usr/src/linux/include/linux/version.h")"
-	export KV_major="$(echo "${KV_full}" | cut -d. -f1)"
-	export KV_minor="$(echo "${KV_full}" | cut -d. -f2)"
-	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
-}
-
-is_kernel() {
-	[ -z "$1" -o -z "$2" ] && return 1
-
-	get_KV_info
-
-	if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-pkg_setup() {
-	get_KV_info
-
-	einfo "Linux kernel is version ${KV_major}.${KV_minor}.${KV_micro}"
-
-	if is_kernel 2 5
-	then
-	eerror "Kernel version ${KV_major}.${KV_minor}.${KV_micro} will not work with this ebuild."
-	die "Please install a 2.6.x version of the Linux kernel."
-	fi
-
-	if is_kernel 2 6
-	then
-	einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-	einfo "KLIPS will not be compiled/installed."
-	export MYMAKE="programs"
-
-	elif is_kernel 2 4
-	then
-		[ -d /usr/src/linux/net/ipsec ] || {
-		eerror "You need to have an IPsec enabled 2.4.x kernel."
-		eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
-		}
-	einfo "Using patched-in IPsec code for kernel 2.4"
-	einfo "Your kernel only supports KLIPS for kernel level IPsec."
-	export MYMAKE="confcheck programs"
-
-	else
-	eerror "Sorry, no support for your kernel version ${KV_major}.${KV_minor}.${KV_micro}."
-	die "Install an IPsec enabled 2.4 or 2.6 kernel."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	make \
-		DESTDIR=${D} \
-		USERCOMPILE="${CFLAGS}" \
-		FINALCONFDIR=/etc/ipsec \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		${MYMAKE} || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		USERCOMPILE="${CFLAGS}" \
-		FINALCONFDIR=/etc/ipsec \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		install || die
-
-	dodoc INSTALL CREDITS BUGS CHANGES README doc/*
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	exeinto /etc/init.d/
-	doexe ${FILESDIR}/ipsec
-}
diff --git a/net-misc/strongswan/strongswan-2.0.2.ebuild b/net-misc/strongswan/strongswan-2.1.3.ebuild
index 866ff75f89c2..e2702e02cefa 100644
--- a/net-misc/strongswan/strongswan-2.0.2.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.0.2.ebuild,v 1.1 2004/05/19 14:26:23 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.1.3.ebuild,v 1.1 2004/06/19 13:25:04 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=""
 
 DEPEND="virtual/glibc