Version bump with security fixes. See ChangeLog for details.

12 files changed, 101 insertions, 1118 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 089076d2b392..2b72ee8716a0 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.7 2004/06/15 05:36:44 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.8 2004/06/19 13:39:12 pfeifer Exp $
+
+*openswan-2.1.3 (19 Jun 2004)
+
+  19 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-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.
 
   15 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> openswan-2.1.1.ebuild:
   Marked stable on amd64.
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index d8eb3bd4f81b..02de1f75a895 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,12 +1,6 @@
-MD5 e2554e72420302275c35a117f195de76 ChangeLog 1230
+MD5 ef946e1865d2c0f6da3d525199d5e0fe openswan-2.1.3.ebuild 3104
+MD5 a974a6b0507de99bb186c5e91d7f7590 ChangeLog 1500
 MD5 5d96d9e4b6f6b113db0983e211adf85a metadata.xml 639
-MD5 2e0e100ef399f37ccd5a7d7e3747822b openswan-2.1.0.ebuild 3105
-MD5 a8327933d5a07edc7244237dac447f82 openswan-2.1.1.ebuild 3107
-MD5 4342d9c5080d3c76ad76fb2f87187ad9 openswan-2.1.2.ebuild 3106
-MD5 b5c3156a7b2bcb688f0c1e87281a9307 files/digest-openswan-2.1.2 67
-MD5 3bdbbae31ca8b13fccdff288afbd668b files/digest-openswan-2.1.0 67
-MD5 6e098ea6a1f53748ee8f4e020daab7b4 files/digest-openswan-2.1.1 67
 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
-MD5 5424c9eb40ad2aa623d88d0839f06a13 files/openswan-2.1.2-gentoo.patch 17438
-MD5 96804dd9c4c16552847cce548327ce79 files/openswan-2.1.0-gentoo.patch 17438
-MD5 96804dd9c4c16552847cce548327ce79 files/openswan-2.1.1-gentoo.patch 17438
+MD5 ec7eac89ca0ff22dfa5b9e4f157cf520 files/digest-openswan-2.1.3 67
+MD5 bd37ab9094716cd96868a501bc3a44f3 files/openswan-2.1.3-gentoo.patch 17438
diff --git a/net-misc/openswan/files/digest-openswan-2.1.0 b/net-misc/openswan/files/digest-openswan-2.1.0
deleted file mode 100644
index b4613063dbf4..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47017b2e1ad4f88b3ec92645aeee1938 openswan-2.1.0.tar.gz 4539969
diff --git a/net-misc/openswan/files/digest-openswan-2.1.1 b/net-misc/openswan/files/digest-openswan-2.1.1
deleted file mode 100644
index 4e8a879b4fbd..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 852b777b870beea676b8b2796c7c566e openswan-2.1.1.tar.gz 4654413
diff --git a/net-misc/openswan/files/digest-openswan-2.1.2 b/net-misc/openswan/files/digest-openswan-2.1.2
deleted file mode 100644
index f93468fad09f..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3504c480097136b5df5988b313315811 openswan-2.1.2.tar.gz 4541607
diff --git a/net-misc/openswan/files/digest-openswan-2.1.3 b/net-misc/openswan/files/digest-openswan-2.1.3
new file mode 100644
index 000000000000..49742a7c07d8
--- /dev/null
+++ b/net-misc/openswan/files/digest-openswan-2.1.3
@@ -0,0 +1 @@
+MD5 ac65d15905e73ea6ce68f527f9a375ce openswan-2.1.3.tar.gz 4541726
diff --git a/net-misc/openswan/files/openswan-2.1.0-gentoo.patch b/net-misc/openswan/files/openswan-2.1.0-gentoo.patch
deleted file mode 100644
index e018d0b7c06b..000000000000
--- a/net-misc/openswan/files/openswan-2.1.0-gentoo.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-diff -Naupr openswan-2.1.0/Makefile.inc openswan-2.1.0-gentoo/Makefile.inc
---- openswan-2.1.0/Makefile.inc	2004-03-01 21:13:58.000000000 -0600
-+++ openswan-2.1.0-gentoo/Makefile.inc	2004-03-17 19:54:33.956576200 -0600
-@@ -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}/openswan-2.1.0
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.0
- 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
- 
- # if you install elsewere, you may need to point the include files to it.
- #BIND9STATICLIBDIR?=/sandel/lib
-diff -Naupr openswan-2.1.0/lib/libdes/Makefile openswan-2.1.0-gentoo/lib/libdes/Makefile
---- openswan-2.1.0/lib/libdes/Makefile	2003-04-22 19:38:03.000000000 -0500
-+++ openswan-2.1.0-gentoo/lib/libdes/Makefile	2004-03-17 19:54:34.174538214 -0600
-@@ -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 openswan-2.1.0/linux/crypto/ciphers/des/asm/crypt586.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-03-17 19:54:34.175538040 -0600
-@@ -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 openswan-2.1.0/linux/crypto/ciphers/des/asm/des-586.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-03-17 19:54:34.175538040 -0600
-@@ -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 openswan-2.1.0/linux/crypto/ciphers/des/asm/des686.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-03-17 19:54:34.175538040 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Naupr openswan-2.1.0/linux/crypto/ciphers/des/asm/desboth.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-03-17 19:54:34.175538040 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Naupr openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/cbc.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-03-17 19:54:34.176537865 -0600
-@@ -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 openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-03-17 19:54:34.176537865 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # require 'x86asm.pl';
- # &asm_init("cpp","des-586.pl");
-diff -Naupr openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-03-17 19:54:34.177537691 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Naupr openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-03-17 19:54:34.177537691 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Naupr openswan-2.1.0/programs/_include/_include.in openswan-2.1.0-gentoo/programs/_include/_include.in
---- openswan-2.1.0/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/_include/_include.in	2004-03-17 19:54:34.177537691 -0600
-@@ -47,10 +47,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 FreeS/WAN for the first time."
- 			fi
-diff -Naupr openswan-2.1.0/programs/barf/barf.in openswan-2.1.0-gentoo/programs/barf/barf.in
---- openswan-2.1.0/programs/barf/barf.in	2004-03-17 13:27:20.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/barf/barf.in	2004-03-17 19:54:34.178537517 -0600
-@@ -16,7 +16,7 @@
- 
- 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.
-@@ -227,13 +227,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 openswan-2.1.0/programs/eroute/eroute.5 openswan-2.1.0-gentoo/programs/eroute/eroute.5
---- openswan-2.1.0/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/eroute/eroute.5	2004-03-17 19:54:34.178537517 -0600
-@@ -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 openswan-2.1.0/programs/eroute/eroute.8 openswan-2.1.0-gentoo/programs/eroute/eroute.8
---- openswan-2.1.0/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/eroute/eroute.8	2004-03-17 19:54:34.178537517 -0600
-@@ -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 openswan-2.1.0/programs/ipsec/ipsec.8 openswan-2.1.0-gentoo/programs/ipsec/ipsec.8
---- openswan-2.1.0/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/ipsec/ipsec.8	2004-03-17 19:54:34.179537343 -0600
-@@ -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 openswan-2.1.0/programs/klipsdebug/klipsdebug.5 openswan-2.1.0-gentoo/programs/klipsdebug/klipsdebug.5
---- openswan-2.1.0/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/klipsdebug/klipsdebug.5	2004-03-17 19:54:34.179537343 -0600
-@@ -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 openswan-2.1.0/programs/klipsdebug/klipsdebug.8 openswan-2.1.0-gentoo/programs/klipsdebug/klipsdebug.8
---- openswan-2.1.0/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/klipsdebug/klipsdebug.8	2004-03-17 19:54:34.179537343 -0600
-@@ -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 openswan-2.1.0/programs/lwdnsq/lwdnsq.xml.in openswan-2.1.0-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- openswan-2.1.0/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-03-17 19:54:34.180537168 -0600
-@@ -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 openswan-2.1.0/programs/mailkey/mailkey.in openswan-2.1.0-gentoo/programs/mailkey/mailkey.in
---- openswan-2.1.0/programs/mailkey/mailkey.in	2003-06-30 00:34:22.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/mailkey/mailkey.in	2004-03-17 19:54:34.180537168 -0600
-@@ -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 openswan-2.1.0/programs/pluto/Makefile openswan-2.1.0-gentoo/programs/pluto/Makefile
---- openswan-2.1.0/programs/pluto/Makefile	2004-01-18 20:09:43.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/pluto/Makefile	2004-03-17 19:54:34.181536994 -0600
-@@ -206,7 +206,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 openswan-2.1.0/programs/setup/Makefile openswan-2.1.0-gentoo/programs/setup/Makefile
---- openswan-2.1.0/programs/setup/Makefile	2003-12-01 20:35:46.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/setup/Makefile	2004-03-17 19:54:34.181536994 -0600
-@@ -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 K76ipsec
--	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
--	-@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 K76ipsec
- 
- install_file_list::
- 	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
--	@echo $(RCDIR)/../rc0.d/K76ipsec
--	@echo $(RCDIR)/../rc1.d/K76ipsec
--	@echo $(RCDIR)/../rc2.d/S47ipsec
--	@echo $(RCDIR)/../rc3.d/S47ipsec
--	@echo $(RCDIR)/../rc4.d/S47ipsec
--	@echo $(RCDIR)/../rc5.d/S47ipsec
--	@echo $(RCDIR)/../rc6.d/K76ipsec
- 
- clean::
- 	@rm -f setup
-diff -Naupr openswan-2.1.0/programs/showhostkey/showhostkey.in openswan-2.1.0-gentoo/programs/showhostkey/showhostkey.in
---- openswan-2.1.0/programs/showhostkey/showhostkey.in	2003-07-14 07:35:57.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/showhostkey/showhostkey.in	2004-03-17 19:54:34.182536820 -0600
-@@ -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 openswan-2.1.0/programs/spi/spi.5 openswan-2.1.0-gentoo/programs/spi/spi.5
---- openswan-2.1.0/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/spi/spi.5	2004-03-17 19:54:34.182536820 -0600
-@@ -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 openswan-2.1.0/programs/spi/spi.8 openswan-2.1.0-gentoo/programs/spi/spi.8
---- openswan-2.1.0/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/spi/spi.8	2004-03-17 19:54:34.182536820 -0600
-@@ -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 openswan-2.1.0/programs/spigrp/spigrp.5 openswan-2.1.0-gentoo/programs/spigrp/spigrp.5
---- openswan-2.1.0/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/spigrp/spigrp.5	2004-03-17 19:54:34.183536646 -0600
-@@ -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 openswan-2.1.0/programs/spigrp/spigrp.8 openswan-2.1.0-gentoo/programs/spigrp/spigrp.8
---- openswan-2.1.0/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/spigrp/spigrp.8	2004-03-17 19:54:34.219530373 -0600
-@@ -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 openswan-2.1.0/programs/tncfg/tncfg.5 openswan-2.1.0-gentoo/programs/tncfg/tncfg.5
---- openswan-2.1.0/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/tncfg/tncfg.5	2004-03-17 19:54:34.219530373 -0600
-@@ -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 openswan-2.1.0/programs/tncfg/tncfg.8 openswan-2.1.0-gentoo/programs/tncfg/tncfg.8
---- openswan-2.1.0/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/tncfg/tncfg.8	2004-03-17 19:54:34.220530198 -0600
-@@ -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/openswan/files/openswan-2.1.1-gentoo.patch b/net-misc/openswan/files/openswan-2.1.1-gentoo.patch
deleted file mode 100644
index e018d0b7c06b..000000000000
--- a/net-misc/openswan/files/openswan-2.1.1-gentoo.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-diff -Naupr openswan-2.1.0/Makefile.inc openswan-2.1.0-gentoo/Makefile.inc
---- openswan-2.1.0/Makefile.inc	2004-03-01 21:13:58.000000000 -0600
-+++ openswan-2.1.0-gentoo/Makefile.inc	2004-03-17 19:54:33.956576200 -0600
-@@ -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}/openswan-2.1.0
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.0
- 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
- 
- # if you install elsewere, you may need to point the include files to it.
- #BIND9STATICLIBDIR?=/sandel/lib
-diff -Naupr openswan-2.1.0/lib/libdes/Makefile openswan-2.1.0-gentoo/lib/libdes/Makefile
---- openswan-2.1.0/lib/libdes/Makefile	2003-04-22 19:38:03.000000000 -0500
-+++ openswan-2.1.0-gentoo/lib/libdes/Makefile	2004-03-17 19:54:34.174538214 -0600
-@@ -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 openswan-2.1.0/linux/crypto/ciphers/des/asm/crypt586.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-03-17 19:54:34.175538040 -0600
-@@ -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 openswan-2.1.0/linux/crypto/ciphers/des/asm/des-586.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-03-17 19:54:34.175538040 -0600
-@@ -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 openswan-2.1.0/linux/crypto/ciphers/des/asm/des686.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-03-17 19:54:34.175538040 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Naupr openswan-2.1.0/linux/crypto/ciphers/des/asm/desboth.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-03-17 19:54:34.175538040 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Naupr openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/cbc.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-03-17 19:54:34.176537865 -0600
-@@ -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 openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-03-17 19:54:34.176537865 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # require 'x86asm.pl';
- # &asm_init("cpp","des-586.pl");
-diff -Naupr openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-03-17 19:54:34.177537691 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Naupr openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- openswan-2.1.0/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-03-17 19:54:34.177537691 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Naupr openswan-2.1.0/programs/_include/_include.in openswan-2.1.0-gentoo/programs/_include/_include.in
---- openswan-2.1.0/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/_include/_include.in	2004-03-17 19:54:34.177537691 -0600
-@@ -47,10 +47,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 FreeS/WAN for the first time."
- 			fi
-diff -Naupr openswan-2.1.0/programs/barf/barf.in openswan-2.1.0-gentoo/programs/barf/barf.in
---- openswan-2.1.0/programs/barf/barf.in	2004-03-17 13:27:20.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/barf/barf.in	2004-03-17 19:54:34.178537517 -0600
-@@ -16,7 +16,7 @@
- 
- 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.
-@@ -227,13 +227,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 openswan-2.1.0/programs/eroute/eroute.5 openswan-2.1.0-gentoo/programs/eroute/eroute.5
---- openswan-2.1.0/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/eroute/eroute.5	2004-03-17 19:54:34.178537517 -0600
-@@ -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 openswan-2.1.0/programs/eroute/eroute.8 openswan-2.1.0-gentoo/programs/eroute/eroute.8
---- openswan-2.1.0/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/eroute/eroute.8	2004-03-17 19:54:34.178537517 -0600
-@@ -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 openswan-2.1.0/programs/ipsec/ipsec.8 openswan-2.1.0-gentoo/programs/ipsec/ipsec.8
---- openswan-2.1.0/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/ipsec/ipsec.8	2004-03-17 19:54:34.179537343 -0600
-@@ -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 openswan-2.1.0/programs/klipsdebug/klipsdebug.5 openswan-2.1.0-gentoo/programs/klipsdebug/klipsdebug.5
---- openswan-2.1.0/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/klipsdebug/klipsdebug.5	2004-03-17 19:54:34.179537343 -0600
-@@ -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 openswan-2.1.0/programs/klipsdebug/klipsdebug.8 openswan-2.1.0-gentoo/programs/klipsdebug/klipsdebug.8
---- openswan-2.1.0/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/klipsdebug/klipsdebug.8	2004-03-17 19:54:34.179537343 -0600
-@@ -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 openswan-2.1.0/programs/lwdnsq/lwdnsq.xml.in openswan-2.1.0-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- openswan-2.1.0/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-03-17 19:54:34.180537168 -0600
-@@ -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 openswan-2.1.0/programs/mailkey/mailkey.in openswan-2.1.0-gentoo/programs/mailkey/mailkey.in
---- openswan-2.1.0/programs/mailkey/mailkey.in	2003-06-30 00:34:22.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/mailkey/mailkey.in	2004-03-17 19:54:34.180537168 -0600
-@@ -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 openswan-2.1.0/programs/pluto/Makefile openswan-2.1.0-gentoo/programs/pluto/Makefile
---- openswan-2.1.0/programs/pluto/Makefile	2004-01-18 20:09:43.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/pluto/Makefile	2004-03-17 19:54:34.181536994 -0600
-@@ -206,7 +206,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 openswan-2.1.0/programs/setup/Makefile openswan-2.1.0-gentoo/programs/setup/Makefile
---- openswan-2.1.0/programs/setup/Makefile	2003-12-01 20:35:46.000000000 -0600
-+++ openswan-2.1.0-gentoo/programs/setup/Makefile	2004-03-17 19:54:34.181536994 -0600
-@@ -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 K76ipsec
--	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
--	-@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 K76ipsec
- 
- install_file_list::
- 	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
--	@echo $(RCDIR)/../rc0.d/K76ipsec
--	@echo $(RCDIR)/../rc1.d/K76ipsec
--	@echo $(RCDIR)/../rc2.d/S47ipsec
--	@echo $(RCDIR)/../rc3.d/S47ipsec
--	@echo $(RCDIR)/../rc4.d/S47ipsec
--	@echo $(RCDIR)/../rc5.d/S47ipsec
--	@echo $(RCDIR)/../rc6.d/K76ipsec
- 
- clean::
- 	@rm -f setup
-diff -Naupr openswan-2.1.0/programs/showhostkey/showhostkey.in openswan-2.1.0-gentoo/programs/showhostkey/showhostkey.in
---- openswan-2.1.0/programs/showhostkey/showhostkey.in	2003-07-14 07:35:57.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/showhostkey/showhostkey.in	2004-03-17 19:54:34.182536820 -0600
-@@ -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 openswan-2.1.0/programs/spi/spi.5 openswan-2.1.0-gentoo/programs/spi/spi.5
---- openswan-2.1.0/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/spi/spi.5	2004-03-17 19:54:34.182536820 -0600
-@@ -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 openswan-2.1.0/programs/spi/spi.8 openswan-2.1.0-gentoo/programs/spi/spi.8
---- openswan-2.1.0/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/spi/spi.8	2004-03-17 19:54:34.182536820 -0600
-@@ -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 openswan-2.1.0/programs/spigrp/spigrp.5 openswan-2.1.0-gentoo/programs/spigrp/spigrp.5
---- openswan-2.1.0/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/spigrp/spigrp.5	2004-03-17 19:54:34.183536646 -0600
-@@ -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 openswan-2.1.0/programs/spigrp/spigrp.8 openswan-2.1.0-gentoo/programs/spigrp/spigrp.8
---- openswan-2.1.0/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/spigrp/spigrp.8	2004-03-17 19:54:34.219530373 -0600
-@@ -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 openswan-2.1.0/programs/tncfg/tncfg.5 openswan-2.1.0-gentoo/programs/tncfg/tncfg.5
---- openswan-2.1.0/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/tncfg/tncfg.5	2004-03-17 19:54:34.219530373 -0600
-@@ -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 openswan-2.1.0/programs/tncfg/tncfg.8 openswan-2.1.0-gentoo/programs/tncfg/tncfg.8
---- openswan-2.1.0/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.0-gentoo/programs/tncfg/tncfg.8	2004-03-17 19:54:34.220530198 -0600
-@@ -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/openswan/files/openswan-2.1.2-gentoo.patch b/net-misc/openswan/files/openswan-2.1.3-gentoo.patch
index 036124508c77..5851155670f8 100644
--- a/net-misc/openswan/files/openswan-2.1.2-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.1.3-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Naupr openswan-2.1.2/Makefile.inc openswan-2.1.2-gentoo/Makefile.inc
---- openswan-2.1.2/Makefile.inc	2004-05-06 22:12:52.000000000 -0500
-+++ openswan-2.1.2-gentoo/Makefile.inc	2004-05-19 08:16:33.717382082 -0500
+diff -Naupr openswan-2.1.3/Makefile.inc openswan-2.1.3-gentoo/Makefile.inc
+--- openswan-2.1.3/Makefile.inc	2004-06-16 19:54:01.000000000 -0500
++++ openswan-2.1.3-gentoo/Makefile.inc	2004-06-19 08:02:12.258722284 -0500
 @@ -62,7 +62,7 @@ POLICYLIB=${FREESWANSRCDIR}/lib/libipsec
  DESTDIR?=
  
@@ -24,11 +24,11 @@ diff -Naupr openswan-2.1.2/Makefile.inc openswan-2.1.2-gentoo/Makefile.inc
  # sample configuration files go into
  INC_DOCDIR?=share/doc
 -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.2
++FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.3
  EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
  
 -FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.2
++FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.3
  DOCDIR=${DESTDIR}${FINALDOCDIR}
  
  # where per-conn pluto logs go
@@ -41,9 +41,9 @@ diff -Naupr openswan-2.1.2/Makefile.inc openswan-2.1.2-gentoo/Makefile.inc
  
  # if you install elsewere, you may need to point the include files to it.
  #BIND9STATICLIBDIR?=/sandel/lib
-diff -Naupr openswan-2.1.2/lib/libdes/Makefile openswan-2.1.2-gentoo/lib/libdes/Makefile
---- openswan-2.1.2/lib/libdes/Makefile	2003-04-22 19:38:03.000000000 -0500
-+++ openswan-2.1.2-gentoo/lib/libdes/Makefile	2004-05-19 08:16:33.717382082 -0500
+diff -Naupr openswan-2.1.3/lib/libdes/Makefile openswan-2.1.3-gentoo/lib/libdes/Makefile
+--- openswan-2.1.3/lib/libdes/Makefile	2003-04-22 19:38:03.000000000 -0500
++++ openswan-2.1.3-gentoo/lib/libdes/Makefile	2004-06-19 08:02:12.259722110 -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 openswan-2.1.2/lib/libdes/Makefile openswan-2.1.2-gentoo/lib/libdes/
  CPP=$(CC) -E
  
  # Assember version of des_encrypt*().
-diff -Naupr openswan-2.1.2/linux/crypto/ciphers/des/asm/crypt586.pl openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- openswan-2.1.2/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-05-19 08:16:33.718381908 -0500
+diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/crypt586.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
+--- openswan-2.1.3/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-06-19 08:02:12.259722110 -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 openswan-2.1.2/linux/crypto/ciphers/des/asm/des-586.pl openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- openswan-2.1.2/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-05-19 08:16:33.718381908 -0500
+diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/des-586.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
+--- openswan-2.1.3/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-06-19 08:02:12.259722110 -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 openswan-2.1.2/linux/crypto/ciphers/des/asm/des686.pl openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- openswan-2.1.2/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-05-19 08:16:33.718381908 -0500
+diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/des686.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des686.pl
+--- openswan-2.1.3/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-06-19 08:02:12.260721936 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  $prog="des686.pl";
  
-diff -Naupr openswan-2.1.2/linux/crypto/ciphers/des/asm/desboth.pl openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- openswan-2.1.2/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-05-19 08:16:33.718381908 -0500
+diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/desboth.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
+--- openswan-2.1.3/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-06-19 08:02:12.260721936 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  $L="edi";
  $R="esi";
-diff -Naupr openswan-2.1.2/linux/crypto/ciphers/des/asm/perlasm/cbc.pl openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- openswan-2.1.2/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-05-19 08:16:33.719381734 -0500
+diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/cbc.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
+--- openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-06-19 08:02:12.260721936 -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 openswan-2.1.2/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- openswan-2.1.2/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-05-19 08:16:33.719381734 -0500
+diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
+--- openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-06-19 08:02:12.261721762 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  # require 'x86asm.pl';
  # &asm_init("cpp","des-586.pl");
-diff -Naupr openswan-2.1.2/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- openswan-2.1.2/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-05-19 08:16:33.719381734 -0500
+diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
+--- openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-06-19 08:02:12.261721762 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  package x86ms;
  
-diff -Naupr openswan-2.1.2/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- openswan-2.1.2/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.2-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-05-19 08:16:33.720381560 -0500
+diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
+--- openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-06-19 08:02:12.261721762 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  package x86unix;
  
-diff -Naupr openswan-2.1.2/programs/_include/_include.in openswan-2.1.2-gentoo/programs/_include/_include.in
---- openswan-2.1.2/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ openswan-2.1.2-gentoo/programs/_include/_include.in	2004-05-19 08:16:33.720381560 -0500
+diff -Naupr openswan-2.1.3/programs/_include/_include.in openswan-2.1.3-gentoo/programs/_include/_include.in
+--- openswan-2.1.3/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
++++ openswan-2.1.3-gentoo/programs/_include/_include.in	2004-06-19 08:02:12.262721588 -0500
 @@ -47,10 +47,10 @@ for f
  do
  	if test ! -r "$f"
@@ -141,9 +141,9 @@ diff -Naupr openswan-2.1.2/programs/_include/_include.in openswan-2.1.2-gentoo/p
  			then
  				echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
  			fi
-diff -Naupr openswan-2.1.2/programs/barf/barf.in openswan-2.1.2-gentoo/programs/barf/barf.in
---- openswan-2.1.2/programs/barf/barf.in	2004-04-14 22:46:50.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/barf/barf.in	2004-05-19 08:16:33.721381386 -0500
+diff -Naupr openswan-2.1.3/programs/barf/barf.in openswan-2.1.3-gentoo/programs/barf/barf.in
+--- openswan-2.1.3/programs/barf/barf.in	2004-04-14 22:46:50.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/barf/barf.in	2004-06-19 08:02:12.262721588 -0500
 @@ -16,7 +16,7 @@
  
  LOGS=${LOGS-/var/log}
@@ -171,9 +171,9 @@ diff -Naupr openswan-2.1.2/programs/barf/barf.in openswan-2.1.2-gentoo/programs/
  done
  _________________________ proc/net/dev
  cat /proc/net/dev
-diff -Naupr openswan-2.1.2/programs/eroute/eroute.5 openswan-2.1.2-gentoo/programs/eroute/eroute.5
---- openswan-2.1.2/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.2-gentoo/programs/eroute/eroute.5	2004-05-19 08:16:33.721381386 -0500
+diff -Naupr openswan-2.1.3/programs/eroute/eroute.5 openswan-2.1.3-gentoo/programs/eroute/eroute.5
+--- openswan-2.1.3/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
++++ openswan-2.1.3-gentoo/programs/eroute/eroute.5	2004-06-19 08:02:12.262721588 -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 openswan-2.1.2/programs/eroute/eroute.5 openswan-2.1.2-gentoo/progra
  .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 openswan-2.1.2/programs/eroute/eroute.8 openswan-2.1.2-gentoo/programs/eroute/eroute.8
---- openswan-2.1.2/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.2-gentoo/programs/eroute/eroute.8	2004-05-19 08:16:33.721381386 -0500
+diff -Naupr openswan-2.1.3/programs/eroute/eroute.8 openswan-2.1.3-gentoo/programs/eroute/eroute.8
+--- openswan-2.1.3/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
++++ openswan-2.1.3-gentoo/programs/eroute/eroute.8	2004-06-19 08:02:12.263721414 -0500
 @@ -308,7 +308,7 @@ will be in clear text.
  .br
  .LP
@@ -195,9 +195,9 @@ diff -Naupr openswan-2.1.2/programs/eroute/eroute.8 openswan-2.1.2-gentoo/progra
  .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 openswan-2.1.2/programs/ipsec/ipsec.8 openswan-2.1.2-gentoo/programs/ipsec/ipsec.8
---- openswan-2.1.2/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ openswan-2.1.2-gentoo/programs/ipsec/ipsec.8	2004-05-19 08:16:33.721381386 -0500
+diff -Naupr openswan-2.1.3/programs/ipsec/ipsec.8 openswan-2.1.3-gentoo/programs/ipsec/ipsec.8
+--- openswan-2.1.3/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
++++ openswan-2.1.3-gentoo/programs/ipsec/ipsec.8	2004-06-19 08:02:12.263721414 -0500
 @@ -81,7 +81,7 @@ reports where
  .I ipsec
  thinks the IPsec configuration files are stored.
@@ -207,9 +207,9 @@ diff -Naupr openswan-2.1.2/programs/ipsec/ipsec.8 openswan-2.1.2-gentoo/programs
  .SH ENVIRONMENT
  .PP
  The following environment variables control where FreeS/WAN finds its
-diff -Naupr openswan-2.1.2/programs/klipsdebug/klipsdebug.5 openswan-2.1.2-gentoo/programs/klipsdebug/klipsdebug.5
---- openswan-2.1.2/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/klipsdebug/klipsdebug.5	2004-05-19 08:16:33.722381212 -0500
+diff -Naupr openswan-2.1.3/programs/klipsdebug/klipsdebug.5 openswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.5
+--- openswan-2.1.3/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.5	2004-06-19 08:02:12.263721414 -0500
 @@ -103,7 +103,7 @@ full
  sockets debugging has been set and everything else is not set.
  .LP
@@ -219,9 +219,9 @@ diff -Naupr openswan-2.1.2/programs/klipsdebug/klipsdebug.5 openswan-2.1.2-gento
  .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 openswan-2.1.2/programs/klipsdebug/klipsdebug.8 openswan-2.1.2-gentoo/programs/klipsdebug/klipsdebug.8
---- openswan-2.1.2/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/klipsdebug/klipsdebug.8	2004-05-19 08:16:33.722381212 -0500
+diff -Naupr openswan-2.1.3/programs/klipsdebug/klipsdebug.8 openswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.8
+--- openswan-2.1.3/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.8	2004-06-19 08:02:12.264721240 -0500
 @@ -117,7 +117,7 @@ turns off only the
  debugging messages.
  .LP
@@ -231,9 +231,9 @@ diff -Naupr openswan-2.1.2/programs/klipsdebug/klipsdebug.8 openswan-2.1.2-gento
  .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 openswan-2.1.2/programs/lwdnsq/lwdnsq.xml.in openswan-2.1.2-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- openswan-2.1.2/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
-+++ openswan-2.1.2-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-05-19 08:16:33.723381038 -0500
+diff -Naupr openswan-2.1.3/programs/lwdnsq/lwdnsq.xml.in openswan-2.1.3-gentoo/programs/lwdnsq/lwdnsq.xml.in
+--- openswan-2.1.3/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
++++ openswan-2.1.3-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-06-19 08:02:12.264721240 -0500
 @@ -430,7 +430,7 @@ information.
  <refsect1><title>Special IPSECKEY processing</title>
  
@@ -243,9 +243,9 @@ diff -Naupr openswan-2.1.2/programs/lwdnsq/lwdnsq.xml.in openswan-2.1.2-gentoo/p
  </programlisting>
  
  </refsect1>
-diff -Naupr openswan-2.1.2/programs/mailkey/mailkey.in openswan-2.1.2-gentoo/programs/mailkey/mailkey.in
---- openswan-2.1.2/programs/mailkey/mailkey.in	2003-06-30 00:34:22.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/mailkey/mailkey.in	2004-05-19 08:16:33.723381038 -0500
+diff -Naupr openswan-2.1.3/programs/mailkey/mailkey.in openswan-2.1.3-gentoo/programs/mailkey/mailkey.in
+--- openswan-2.1.3/programs/mailkey/mailkey.in	2003-06-30 00:34:22.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/mailkey/mailkey.in	2004-06-19 08:02:12.264721240 -0500
 @@ -60,7 +60,7 @@ with the following error:
  
  "$test1st"
@@ -255,9 +255,9 @@ diff -Naupr openswan-2.1.2/programs/mailkey/mailkey.in openswan-2.1.2-gentoo/pro
  If you haven't generated your key yet, please run 'ipsec newhostkey'." 
  exit 0
  }
-diff -Naupr openswan-2.1.2/programs/pluto/Makefile openswan-2.1.2-gentoo/programs/pluto/Makefile
---- openswan-2.1.2/programs/pluto/Makefile	2004-03-20 23:23:32.000000000 -0600
-+++ openswan-2.1.2-gentoo/programs/pluto/Makefile	2004-05-19 08:16:33.723381038 -0500
+diff -Naupr openswan-2.1.3/programs/pluto/Makefile openswan-2.1.3-gentoo/programs/pluto/Makefile
+--- openswan-2.1.3/programs/pluto/Makefile	2004-06-16 19:35:21.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/pluto/Makefile	2004-06-19 08:02:12.265721065 -0500
 @@ -208,7 +208,7 @@ CPPFLAGS = $(HDRDIRS) $(DEFINES) \
  	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
  	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
@@ -267,9 +267,9 @@ diff -Naupr openswan-2.1.2/programs/pluto/Makefile openswan-2.1.2-gentoo/program
  
  # libefence is a free memory allocation debugger
  # Solaris 2 needs -lsocket -lnsl
-diff -Naupr openswan-2.1.2/programs/setup/Makefile openswan-2.1.2-gentoo/programs/setup/Makefile
---- openswan-2.1.2/programs/setup/Makefile	2003-12-01 20:35:46.000000000 -0600
-+++ openswan-2.1.2-gentoo/programs/setup/Makefile	2004-05-19 08:16:33.724380864 -0500
+diff -Naupr openswan-2.1.3/programs/setup/Makefile openswan-2.1.3-gentoo/programs/setup/Makefile
+--- openswan-2.1.3/programs/setup/Makefile	2003-12-01 20:35:46.000000000 -0600
++++ openswan-2.1.3-gentoo/programs/setup/Makefile	2004-06-19 08:02:12.265721065 -0500
 @@ -33,25 +33,10 @@ install:: setup
  	@rm -f $(BINDIR)/setup
  	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
@@ -296,9 +296,9 @@ diff -Naupr openswan-2.1.2/programs/setup/Makefile openswan-2.1.2-gentoo/program
  
  clean::
  	@rm -f setup
-diff -Naupr openswan-2.1.2/programs/showhostkey/showhostkey.in openswan-2.1.2-gentoo/programs/showhostkey/showhostkey.in
---- openswan-2.1.2/programs/showhostkey/showhostkey.in	2003-07-14 07:35:57.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/showhostkey/showhostkey.in	2004-05-19 08:16:33.724380864 -0500
+diff -Naupr openswan-2.1.3/programs/showhostkey/showhostkey.in openswan-2.1.3-gentoo/programs/showhostkey/showhostkey.in
+--- openswan-2.1.3/programs/showhostkey/showhostkey.in	2003-07-14 07:35:57.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/showhostkey/showhostkey.in	2004-06-19 08:02:12.266720891 -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 openswan-2.1.2/programs/showhostkey/showhostkey.in openswan-2.1.2-ge
  fmt=""
  gw=
  id=
-diff -Naupr openswan-2.1.2/programs/spi/spi.5 openswan-2.1.2-gentoo/programs/spi/spi.5
---- openswan-2.1.2/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/spi/spi.5	2004-05-19 08:16:33.725380690 -0500
+diff -Naupr openswan-2.1.3/programs/spi/spi.5 openswan-2.1.3-gentoo/programs/spi/spi.5
+--- openswan-2.1.3/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/spi/spi.5	2004-06-19 08:02:12.266720891 -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 openswan-2.1.2/programs/spi/spi.5 openswan-2.1.2-gentoo/programs/spi
  .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 openswan-2.1.2/programs/spi/spi.8 openswan-2.1.2-gentoo/programs/spi/spi.8
---- openswan-2.1.2/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/spi/spi.8	2004-05-19 08:16:33.725380690 -0500
+diff -Naupr openswan-2.1.3/programs/spi/spi.8 openswan-2.1.3-gentoo/programs/spi/spi.8
+--- openswan-2.1.3/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/spi/spi.8	2004-06-19 08:02:12.266720891 -0500
 @@ -461,7 +461,7 @@ and protocol
  (4).
  .LP
@@ -332,9 +332,9 @@ diff -Naupr openswan-2.1.2/programs/spi/spi.8 openswan-2.1.2-gentoo/programs/spi
  .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 openswan-2.1.2/programs/spigrp/spigrp.5 openswan-2.1.2-gentoo/programs/spigrp/spigrp.5
---- openswan-2.1.2/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/spigrp/spigrp.5	2004-05-19 08:16:33.725380690 -0500
+diff -Naupr openswan-2.1.3/programs/spigrp/spigrp.5 openswan-2.1.3-gentoo/programs/spigrp/spigrp.5
+--- openswan-2.1.3/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/spigrp/spigrp.5	2004-06-19 08:02:12.267720717 -0500
 @@ -77,7 +77,7 @@ be an incoming or outgoing group, depend
  machine.
  .LP
@@ -344,9 +344,9 @@ diff -Naupr openswan-2.1.2/programs/spigrp/spigrp.5 openswan-2.1.2-gentoo/progra
  .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 openswan-2.1.2/programs/spigrp/spigrp.8 openswan-2.1.2-gentoo/programs/spigrp/spigrp.8
---- openswan-2.1.2/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/spigrp/spigrp.8	2004-05-19 08:16:33.726380516 -0500
+diff -Naupr openswan-2.1.3/programs/spigrp/spigrp.8 openswan-2.1.3-gentoo/programs/spigrp/spigrp.8
+--- openswan-2.1.3/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/spigrp/spigrp.8	2004-06-19 08:02:12.267720717 -0500
 @@ -128,7 +128,7 @@ and finally an AH header to authenticate
  .BR 0x236 .
  .LP
@@ -356,9 +356,9 @@ diff -Naupr openswan-2.1.2/programs/spigrp/spigrp.8 openswan-2.1.2-gentoo/progra
  .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 openswan-2.1.2/programs/tncfg/tncfg.5 openswan-2.1.2-gentoo/programs/tncfg/tncfg.5
---- openswan-2.1.2/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/tncfg/tncfg.5	2004-05-19 08:16:33.726380516 -0500
+diff -Naupr openswan-2.1.3/programs/tncfg/tncfg.5 openswan-2.1.3-gentoo/programs/tncfg/tncfg.5
+--- openswan-2.1.3/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/tncfg/tncfg.5	2004-06-19 08:02:12.267720717 -0500
 @@ -75,7 +75,7 @@ shows that virtual device
  is not connected to any physical device.
  .LP
@@ -368,9 +368,9 @@ diff -Naupr openswan-2.1.2/programs/tncfg/tncfg.5 openswan-2.1.2-gentoo/programs
  .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 openswan-2.1.2/programs/tncfg/tncfg.8 openswan-2.1.2-gentoo/programs/tncfg/tncfg.8
---- openswan-2.1.2/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.2-gentoo/programs/tncfg/tncfg.8	2004-05-19 08:16:33.726380516 -0500
+diff -Naupr openswan-2.1.3/programs/tncfg/tncfg.8 openswan-2.1.3-gentoo/programs/tncfg/tncfg.8
+--- openswan-2.1.3/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
++++ openswan-2.1.3-gentoo/programs/tncfg/tncfg.8	2004-06-19 08:02:12.268720543 -0500
 @@ -76,7 +76,7 @@ virtual device to the
  physical device.
  .LP
diff --git a/net-misc/openswan/openswan-2.1.0.ebuild b/net-misc/openswan/openswan-2.1.0.ebuild
deleted file mode 100644
index d1af1bb86b51..000000000000
--- a/net-misc/openswan/openswan-2.1.0.ebuild
+++ /dev/null
@@ -1,127 +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/openswan/openswan-2.1.0.ebuild,v 1.3 2004/04/27 21:45:34 agriffis Exp $
-
-inherit eutils
-
-MY_P=${P/_p/_kb}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
-SRC_URI="http://www.openswan.org/code/${MY_P}.tar.gz
-		mirror://gentoo/${MY_P}.tar.gz"
-HOMEPAGE="http://www.openswan.org/"
-
-DEPEND="virtual/glibc
-	virtual/linux-sources
-	>=dev-libs/gmp-3.1.1
-	net-misc/host
-	sys-apps/iproute2"
-RDEPEND=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -*"
-
-
-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 COPYING 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/openswan/openswan-2.1.1.ebuild b/net-misc/openswan/openswan-2.1.1.ebuild
deleted file mode 100644
index e383d6034618..000000000000
--- a/net-misc/openswan/openswan-2.1.1.ebuild
+++ /dev/null
@@ -1,125 +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/openswan/openswan-2.1.1.ebuild,v 1.5 2004/06/15 05:36:44 kugelfang Exp $
-
-inherit eutils
-
-MY_P=${P/_p/_kb}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
-HOMEPAGE="http://www.openswan.org/"
-SRC_URI="http://www.openswan.org/code/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~x86 amd64"
-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/openswan/openswan-2.1.2.ebuild b/net-misc/openswan/openswan-2.1.3.ebuild
index 2bfb393f0a3a..60fc17fe565c 100644
--- a/net-misc/openswan/openswan-2.1.2.ebuild
+++ b/net-misc/openswan/openswan-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/openswan/openswan-2.1.2.ebuild,v 1.1 2004/05/19 13:32:09 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.1.3.ebuild,v 1.1 2004/06/19 13:39:12 pfeifer Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.openswan.org/code/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 amd64"
 IUSE=""
 
 DEPEND="virtual/glibc