Version bump fixing bug #112568.

(Portage version: 2.0.53_rc7)

18 files changed, 120 insertions, 1797 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index de7767ba8b75..535ce356db71 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.23 2005/07/15 10:47:05 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.24 2005/11/15 03:07:16 pfeifer Exp $
+
+*openswan-2.4.2 (15 Nov 2005)
+
+  15 Nov 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  -files/openswan-2.1.4-gentoo.patch, -files/openswan-2.1.5-gentoo.patch,
+  -files/openswan-2.3.0-gentoo.patch, -files/openswan-2.3.1-gentoo.patch,
+  +files/openswan-2.4.2-gentoo.patch, -openswan-1.0.6.ebuild,
+  -openswan-2.1.4.ebuild, -openswan-2.1.5.ebuild, openswan-2.2.0.ebuild,
+  -openswan-2.3.0.ebuild, -openswan-2.3.1.ebuild, +openswan-2.4.2.ebuild:
+  Version bump fixing bug #112568.
+  Cleaning-up old ebuilds.
 
   15 Jul 2005; George Shapovalov <george@gentoo.org> openswan-*.ebuild:
   changed dependency net-misc/host -> net-dns/host to account for package move
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index e930d8a2d043..67daa4e8141a 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,22 +1,11 @@
-MD5 6e024f039baaa21ae409f042004a8c5a openswan-1.0.7.ebuild 1885
-MD5 a4fba77e4ec1eaa759850ccd17cf5bce openswan-2.1.5.ebuild 3120
-MD5 0df8411158be3c4a9645ea3f4301102c openswan-2.3.1.ebuild 3077
-MD5 e1253081a5b5628d2ba97f3105ad1337 openswan-1.0.6.ebuild 1885
-MD5 e6a4ddf50bc70c5914c43d5e81ce78bf openswan-2.2.0.ebuild 3120
-MD5 f492596a5a93fa8b13a8a895a6efc27a openswan-2.1.4.ebuild 3120
-MD5 3abefb31506d8191a4cc28cb960f5a8c openswan-2.3.0.ebuild 3073
-MD5 61871662cc956e12d3cec4c242e88672 ChangeLog 3654
-MD5 0f26f5619b06afba5889ea1982b99557 metadata.xml 568
-MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
-MD5 cd5f8cc1a1e4a42483b45bc18c87f95b files/openswan-2.3.0-gentoo.patch 19127
-MD5 c455249e331da80c3619b2e474e2af67 files/openswan-2.1.5-gentoo.patch 17438
-MD5 9b866b02f096fc3ce577165fd17a82ec files/openswan-2.2.0-gentoo.patch 17438
-MD5 6ececd32bf85e7cd883a626e99c18e9d files/digest-openswan-1.0.6 67
+MD5 ef4fb0e3efb5a74ac66c0a4078b84d81 ChangeLog 4153
 MD5 5a79041189d29ce8568c635f841cebd4 files/digest-openswan-1.0.7 67
-MD5 a89d62cdc2c6087f9828b1586b0a78ec files/digest-openswan-2.1.4 67
-MD5 23643094e10b2d1822e4ed1a782ba418 files/digest-openswan-2.1.5 67
 MD5 0ddd2a0be9ddea1e37f659f9d529ee19 files/digest-openswan-2.2.0 67
-MD5 31031b397c28bfb7ea42f1954d7f208b files/digest-openswan-2.3.0 67
-MD5 471a22b8395c36582a864e3f3065ab6b files/digest-openswan-2.3.1 67
-MD5 8e740d4b962bb189f52cf890e2c98c8f files/openswan-2.1.4-gentoo.patch 17438
-MD5 46a256af7b493db30d1856f4e995d992 files/openswan-2.3.1-gentoo.patch 18793
+MD5 b6a2da6dfd14ecac53087bf2064a601c files/digest-openswan-2.4.2 67
+MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
+MD5 9b866b02f096fc3ce577165fd17a82ec files/openswan-2.2.0-gentoo.patch 17438
+MD5 1ac8999f0cbc3032b95cf133cd74ff2b files/openswan-2.4.2-gentoo.patch 17758
+MD5 0f26f5619b06afba5889ea1982b99557 metadata.xml 568
+MD5 6e024f039baaa21ae409f042004a8c5a openswan-1.0.7.ebuild 1885
+MD5 46e65a56edcbb29939e0861fb6219409 openswan-2.2.0.ebuild 3159
+MD5 80311bb49eac9543401f29d0d46af17e openswan-2.4.2.ebuild 3015
diff --git a/net-misc/openswan/files/digest-openswan-1.0.6 b/net-misc/openswan/files/digest-openswan-1.0.6
deleted file mode 100644
index 6d4e7c7b409e..000000000000
--- a/net-misc/openswan/files/digest-openswan-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 893f1c6bd41ab0200168d4566fc8ad90 openswan-1.0.6.tar.gz 2731569
diff --git a/net-misc/openswan/files/digest-openswan-2.1.4 b/net-misc/openswan/files/digest-openswan-2.1.4
deleted file mode 100644
index d350ca207feb..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5fd6e1866c392ab7e53b605ec70db11b openswan-2.1.4.tar.gz 4547143
diff --git a/net-misc/openswan/files/digest-openswan-2.1.5 b/net-misc/openswan/files/digest-openswan-2.1.5
deleted file mode 100644
index 3e7fe44ad7eb..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5f09a22e7d2d831163ce4ab9534c0a2 openswan-2.1.5.tar.gz 4538909
diff --git a/net-misc/openswan/files/digest-openswan-2.3.0 b/net-misc/openswan/files/digest-openswan-2.3.0
deleted file mode 100644
index 48ad03a8d2ee..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 709d2b1102ddf6e50620b2fb5038e62b openswan-2.3.0.tar.gz 4991013
diff --git a/net-misc/openswan/files/digest-openswan-2.3.1 b/net-misc/openswan/files/digest-openswan-2.3.1
deleted file mode 100644
index 785ca789d8c6..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3dcf1cd7efcbe8db3148fc288d429db1 openswan-2.3.1.tar.gz 4729239
diff --git a/net-misc/openswan/files/digest-openswan-2.4.2 b/net-misc/openswan/files/digest-openswan-2.4.2
new file mode 100644
index 000000000000..80540eca51ce
--- /dev/null
+++ b/net-misc/openswan/files/digest-openswan-2.4.2
@@ -0,0 +1 @@
+MD5 38c7ad91312bdd67fa57fe987b21183e openswan-2.4.2.tar.gz 3585824
diff --git a/net-misc/openswan/files/openswan-2.1.4-gentoo.patch b/net-misc/openswan/files/openswan-2.1.4-gentoo.patch
deleted file mode 100644
index 5835991c3fd4..000000000000
--- a/net-misc/openswan/files/openswan-2.1.4-gentoo.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-diff -Naupr openswan-2.1.4/Makefile.inc openswan-2.1.4-gentoo/Makefile.inc
---- openswan-2.1.4/Makefile.inc	2004-06-23 07:44:59.000000000 -0500
-+++ openswan-2.1.4-gentoo/Makefile.inc	2004-06-23 20:19:18.601866871 -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}/openswan-2.1.4
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.4
- 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.4/lib/libdes/Makefile openswan-2.1.4-gentoo/lib/libdes/Makefile
---- openswan-2.1.4/lib/libdes/Makefile	2003-04-22 19:38:03.000000000 -0500
-+++ openswan-2.1.4-gentoo/lib/libdes/Makefile	2004-06-23 20:19:18.601866871 -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 openswan-2.1.4/linux/crypto/ciphers/des/asm/crypt586.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- openswan-2.1.4/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-06-23 20:19:18.601866871 -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.4/linux/crypto/ciphers/des/asm/des-586.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- openswan-2.1.4/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-06-23 20:19:18.602866697 -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.4/linux/crypto/ciphers/des/asm/des686.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- openswan-2.1.4/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-06-23 20:19:18.602866697 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/desboth.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- openswan-2.1.4/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-06-23 20:19:18.602866697 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/cbc.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-06-23 20:19:18.603866523 -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.4/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-06-23 20:19:18.603866523 -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.4/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-06-23 20:19:18.603866523 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-06-23 20:19:18.604866348 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Naupr openswan-2.1.4/programs/_include/_include.in openswan-2.1.4-gentoo/programs/_include/_include.in
---- openswan-2.1.4/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ openswan-2.1.4-gentoo/programs/_include/_include.in	2004-06-23 20:19:18.604866348 -0500
-@@ -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.4/programs/barf/barf.in openswan-2.1.4-gentoo/programs/barf/barf.in
---- openswan-2.1.4/programs/barf/barf.in	2004-04-14 22:46:50.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/barf/barf.in	2004-06-23 20:19:18.605866174 -0500
-@@ -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.4/programs/eroute/eroute.5 openswan-2.1.4-gentoo/programs/eroute/eroute.5
---- openswan-2.1.4/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.4-gentoo/programs/eroute/eroute.5	2004-06-23 20:19:18.605866174 -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 openswan-2.1.4/programs/eroute/eroute.8 openswan-2.1.4-gentoo/programs/eroute/eroute.8
---- openswan-2.1.4/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.4-gentoo/programs/eroute/eroute.8	2004-06-23 20:19:18.606866000 -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 openswan-2.1.4/programs/ipsec/ipsec.8 openswan-2.1.4-gentoo/programs/ipsec/ipsec.8
---- openswan-2.1.4/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ openswan-2.1.4-gentoo/programs/ipsec/ipsec.8	2004-06-23 20:19:18.606866000 -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 openswan-2.1.4/programs/klipsdebug/klipsdebug.5 openswan-2.1.4-gentoo/programs/klipsdebug/klipsdebug.5
---- openswan-2.1.4/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/klipsdebug/klipsdebug.5	2004-06-23 20:19:18.606866000 -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 openswan-2.1.4/programs/klipsdebug/klipsdebug.8 openswan-2.1.4-gentoo/programs/klipsdebug/klipsdebug.8
---- openswan-2.1.4/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/klipsdebug/klipsdebug.8	2004-06-23 20:19:18.606866000 -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 openswan-2.1.4/programs/lwdnsq/lwdnsq.xml.in openswan-2.1.4-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- openswan-2.1.4/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
-+++ openswan-2.1.4-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-06-23 20:19:18.607865826 -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 openswan-2.1.4/programs/mailkey/mailkey.in openswan-2.1.4-gentoo/programs/mailkey/mailkey.in
---- openswan-2.1.4/programs/mailkey/mailkey.in	2003-06-30 00:34:22.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/mailkey/mailkey.in	2004-06-23 20:19:18.607865826 -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 openswan-2.1.4/programs/pluto/Makefile openswan-2.1.4-gentoo/programs/pluto/Makefile
---- openswan-2.1.4/programs/pluto/Makefile	2004-06-16 19:35:21.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/pluto/Makefile	2004-06-23 20:19:18.608865651 -0500
-@@ -208,7 +208,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.4/programs/setup/Makefile openswan-2.1.4-gentoo/programs/setup/Makefile
---- openswan-2.1.4/programs/setup/Makefile	2003-12-01 20:35:46.000000000 -0600
-+++ openswan-2.1.4-gentoo/programs/setup/Makefile	2004-06-23 20:19:18.608865651 -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 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.4/programs/showhostkey/showhostkey.in openswan-2.1.4-gentoo/programs/showhostkey/showhostkey.in
---- openswan-2.1.4/programs/showhostkey/showhostkey.in	2003-07-14 07:35:57.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/showhostkey/showhostkey.in	2004-06-23 20:19:18.609865477 -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 openswan-2.1.4/programs/spi/spi.5 openswan-2.1.4-gentoo/programs/spi/spi.5
---- openswan-2.1.4/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/spi/spi.5	2004-06-23 20:19:18.609865477 -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 openswan-2.1.4/programs/spi/spi.8 openswan-2.1.4-gentoo/programs/spi/spi.8
---- openswan-2.1.4/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/spi/spi.8	2004-06-23 20:19:18.609865477 -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 openswan-2.1.4/programs/spigrp/spigrp.5 openswan-2.1.4-gentoo/programs/spigrp/spigrp.5
---- openswan-2.1.4/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/spigrp/spigrp.5	2004-06-23 20:19:18.610865303 -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 openswan-2.1.4/programs/spigrp/spigrp.8 openswan-2.1.4-gentoo/programs/spigrp/spigrp.8
---- openswan-2.1.4/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/spigrp/spigrp.8	2004-06-23 20:19:18.610865303 -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 openswan-2.1.4/programs/tncfg/tncfg.5 openswan-2.1.4-gentoo/programs/tncfg/tncfg.5
---- openswan-2.1.4/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/tncfg/tncfg.5	2004-06-23 20:19:18.610865303 -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 openswan-2.1.4/programs/tncfg/tncfg.8 openswan-2.1.4-gentoo/programs/tncfg/tncfg.8
---- openswan-2.1.4/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.4-gentoo/programs/tncfg/tncfg.8	2004-06-23 20:19:18.611865128 -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/openswan/files/openswan-2.1.5-gentoo.patch b/net-misc/openswan/files/openswan-2.1.5-gentoo.patch
deleted file mode 100644
index 3033629d2426..000000000000
--- a/net-misc/openswan/files/openswan-2.1.5-gentoo.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-diff -Naupr openswan-2.1.5/Makefile.inc openswan-2.1.5-gentoo/Makefile.inc
---- openswan-2.1.5/Makefile.inc	2004-06-23 07:44:59.000000000 -0500
-+++ openswan-2.1.5-gentoo/Makefile.inc	2004-08-12 18:00:12.739262903 -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}/openswan-2.1.5
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.5
- 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.5/lib/libdes/Makefile openswan-2.1.5-gentoo/lib/libdes/Makefile
---- openswan-2.1.5/lib/libdes/Makefile	2003-04-22 19:38:03.000000000 -0500
-+++ openswan-2.1.5-gentoo/lib/libdes/Makefile	2004-08-12 18:00:12.739262903 -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 openswan-2.1.5/linux/crypto/ciphers/des/asm/crypt586.pl openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- openswan-2.1.5/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-08-12 18:00:12.739262903 -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.5/linux/crypto/ciphers/des/asm/des-586.pl openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- openswan-2.1.5/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-08-12 18:00:12.740262728 -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.5/linux/crypto/ciphers/des/asm/des686.pl openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- openswan-2.1.5/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-08-12 18:00:12.740262728 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Naupr openswan-2.1.5/linux/crypto/ciphers/des/asm/desboth.pl openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- openswan-2.1.5/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-08-12 18:00:12.740262728 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Naupr openswan-2.1.5/linux/crypto/ciphers/des/asm/perlasm/cbc.pl openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- openswan-2.1.5/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-08-12 18:00:12.741262554 -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.5/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- openswan-2.1.5/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-08-12 18:00:12.741262554 -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.5/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- openswan-2.1.5/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-08-12 18:00:12.742262380 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Naupr openswan-2.1.5/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- openswan-2.1.5/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.5-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-08-12 18:00:12.742262380 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Naupr openswan-2.1.5/programs/_include/_include.in openswan-2.1.5-gentoo/programs/_include/_include.in
---- openswan-2.1.5/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ openswan-2.1.5-gentoo/programs/_include/_include.in	2004-08-12 18:00:12.742262380 -0500
-@@ -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.5/programs/barf/barf.in openswan-2.1.5-gentoo/programs/barf/barf.in
---- openswan-2.1.5/programs/barf/barf.in	2004-04-14 22:46:50.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/barf/barf.in	2004-08-12 18:00:12.743262205 -0500
-@@ -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.5/programs/eroute/eroute.5 openswan-2.1.5-gentoo/programs/eroute/eroute.5
---- openswan-2.1.5/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.5-gentoo/programs/eroute/eroute.5	2004-08-12 18:00:12.743262205 -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 openswan-2.1.5/programs/eroute/eroute.8 openswan-2.1.5-gentoo/programs/eroute/eroute.8
---- openswan-2.1.5/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.5-gentoo/programs/eroute/eroute.8	2004-08-12 18:00:12.743262205 -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 openswan-2.1.5/programs/ipsec/ipsec.8 openswan-2.1.5-gentoo/programs/ipsec/ipsec.8
---- openswan-2.1.5/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ openswan-2.1.5-gentoo/programs/ipsec/ipsec.8	2004-08-12 18:00:12.744262031 -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 openswan-2.1.5/programs/klipsdebug/klipsdebug.5 openswan-2.1.5-gentoo/programs/klipsdebug/klipsdebug.5
---- openswan-2.1.5/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/klipsdebug/klipsdebug.5	2004-08-12 18:00:12.744262031 -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 openswan-2.1.5/programs/klipsdebug/klipsdebug.8 openswan-2.1.5-gentoo/programs/klipsdebug/klipsdebug.8
---- openswan-2.1.5/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/klipsdebug/klipsdebug.8	2004-08-12 18:00:12.744262031 -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 openswan-2.1.5/programs/lwdnsq/lwdnsq.xml.in openswan-2.1.5-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- openswan-2.1.5/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
-+++ openswan-2.1.5-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-08-12 18:00:12.745261856 -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 openswan-2.1.5/programs/mailkey/mailkey.in openswan-2.1.5-gentoo/programs/mailkey/mailkey.in
---- openswan-2.1.5/programs/mailkey/mailkey.in	2003-06-30 00:34:22.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/mailkey/mailkey.in	2004-08-12 18:00:12.745261856 -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 openswan-2.1.5/programs/pluto/Makefile openswan-2.1.5-gentoo/programs/pluto/Makefile
---- openswan-2.1.5/programs/pluto/Makefile	2004-06-16 19:35:21.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/pluto/Makefile	2004-08-12 18:00:12.746261682 -0500
-@@ -208,7 +208,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.5/programs/setup/Makefile openswan-2.1.5-gentoo/programs/setup/Makefile
---- openswan-2.1.5/programs/setup/Makefile	2003-12-01 20:35:46.000000000 -0600
-+++ openswan-2.1.5-gentoo/programs/setup/Makefile	2004-08-12 18:00:12.746261682 -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 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.5/programs/showhostkey/showhostkey.in openswan-2.1.5-gentoo/programs/showhostkey/showhostkey.in
---- openswan-2.1.5/programs/showhostkey/showhostkey.in	2003-07-14 07:35:57.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/showhostkey/showhostkey.in	2004-08-12 18:00:12.747261508 -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 openswan-2.1.5/programs/spi/spi.5 openswan-2.1.5-gentoo/programs/spi/spi.5
---- openswan-2.1.5/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/spi/spi.5	2004-08-12 18:00:12.747261508 -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 openswan-2.1.5/programs/spi/spi.8 openswan-2.1.5-gentoo/programs/spi/spi.8
---- openswan-2.1.5/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/spi/spi.8	2004-08-12 18:00:12.747261508 -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 openswan-2.1.5/programs/spigrp/spigrp.5 openswan-2.1.5-gentoo/programs/spigrp/spigrp.5
---- openswan-2.1.5/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/spigrp/spigrp.5	2004-08-12 18:00:12.748261333 -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 openswan-2.1.5/programs/spigrp/spigrp.8 openswan-2.1.5-gentoo/programs/spigrp/spigrp.8
---- openswan-2.1.5/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/spigrp/spigrp.8	2004-08-12 18:00:12.748261333 -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 openswan-2.1.5/programs/tncfg/tncfg.5 openswan-2.1.5-gentoo/programs/tncfg/tncfg.5
---- openswan-2.1.5/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/tncfg/tncfg.5	2004-08-12 18:00:12.748261333 -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 openswan-2.1.5/programs/tncfg/tncfg.8 openswan-2.1.5-gentoo/programs/tncfg/tncfg.8
---- openswan-2.1.5/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.5-gentoo/programs/tncfg/tncfg.8	2004-08-12 18:00:12.749261159 -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/openswan/files/openswan-2.3.0-gentoo.patch b/net-misc/openswan/files/openswan-2.3.0-gentoo.patch
deleted file mode 100644
index 392f168a9dc5..000000000000
--- a/net-misc/openswan/files/openswan-2.3.0-gentoo.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-diff -Naupr openswan-2.3.0/Makefile.inc openswan-2.3.0-gentoo/Makefile.inc
---- openswan-2.3.0/Makefile.inc	2004-12-31 18:52:53.000000000 -0600
-+++ openswan-2.3.0-gentoo/Makefile.inc	2005-01-20 20:24:20.384146880 -0600
-@@ -65,7 +65,7 @@ POLICYLIB=${OPENSWANSRCDIR}/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*
-@@ -99,7 +99,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
-@@ -110,10 +110,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR)
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
--FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.3.0
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.3.0
- DOCDIR=${DESTDIR}${FINALDOCDIR}
- 
- # where per-conn pluto logs go
-@@ -247,7 +247,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.3.0/doc/Makefile openswan-2.3.0-gentoo/doc/Makefile
---- openswan-2.3.0/doc/Makefile	2004-09-18 13:59:18.000000000 -0500
-+++ openswan-2.3.0-gentoo/doc/Makefile	2005-01-20 20:25:36.702578773 -0600
-@@ -1,6 +1,6 @@
- # Makefile to generate various formats from HTML source
- #
--# Assumes the htmldoc utility is available.
-+# No longer cares if the htmldoc utility is available.
- # This can be downloaded from www.easysw.com
- #
- # Also needs lynx(1) for HTML-to-text conversion
-@@ -67,28 +67,11 @@ HMANDIR=manpage.d
- # dependencies build most of it
- # then we add index
- index.html: toc.html HowTo.html manpages src/index.html
--	cp src/index.html index.html
--
--# separate files plus table of contents
--# and then remove HTML formatting added by htmldoc
--toc.html : $(sections)
--	-@htmldoc -t html --path ".;${TESTINGDIR}/doc" -d .  $(sections)
--	@$(SCRIPTDIR)/cleanhtml.sh $(SCRIPTDIR)/cleanhtml.sed $(separate)
--
--# one big HTML file
--HowTo.html : $(sections)
--	-@htmldoc -t html --toclevels 4 --header ' cf' -f $@ $(sections)
- 
- # other HowTo formats
- HowTo.txt: HowTo.html
- 	lynx -dump $< > $@
- 
--HowTo.ps : $(sections)
--	-@htmldoc -f $@ $(sections)
--
--HowTo.pdf : $(sections)
--	-@htmldoc -f $@ $(sections)
--
- manpages:	manp
- 
- manp:	$(SCRIPTDIR)/mkhtmlman
-diff -Naupr openswan-2.3.0/lib/libcrypto/libdes/Makefile openswan-2.3.0-gentoo/lib/libcrypto/libdes/Makefile
---- openswan-2.3.0/lib/libcrypto/libdes/Makefile	2004-07-15 19:25:17.000000000 -0500
-+++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/Makefile	2005-01-20 20:24:20.385146703 -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.3.0/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/crypt586.pl
---- openswan-2.3.0/lib/libcrypto/libdes/asm/crypt586.pl	2004-07-15 19:24:45.000000000 -0500
-+++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/crypt586.pl	2005-01-20 20:24:20.385146703 -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.3.0/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl
---- openswan-2.3.0/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2004-07-10 03:07:06.000000000 -0500
-+++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2005-01-20 20:24:20.385146703 -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.3.0/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
---- openswan-2.3.0/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2004-07-10 03:07:06.000000000 -0500
-+++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2005-01-20 20:24:20.386146525 -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.3.0/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
---- openswan-2.3.0/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2004-07-10 03:07:07.000000000 -0500
-+++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2005-01-20 20:24:20.386146525 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Naupr openswan-2.3.0/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
---- openswan-2.3.0/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2004-07-10 03:07:07.000000000 -0500
-+++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2005-01-20 20:24:20.386146525 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Naupr openswan-2.3.0/lib/liblwres/Makefile openswan-2.3.0-gentoo/lib/liblwres/Makefile
---- openswan-2.3.0/lib/liblwres/Makefile	2004-11-16 16:11:54.000000000 -0600
-+++ openswan-2.3.0-gentoo/lib/liblwres/Makefile	2005-01-20 20:24:20.387146347 -0600
-@@ -24,7 +24,7 @@ CINCLUDES =	-I${srcdir}/unix/include \
- CDEFINES = -g
- CWARNINGS = -Werror
- 
--CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
-+CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE)
- 
- VERSION="@(\#) openswan-hacking-9.3-for-osw2"
- LIBINTERFACE=2
-diff -Naupr openswan-2.3.0/linux/net/ipsec/des/asm/des-586.pl openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/des-586.pl
---- openswan-2.3.0/linux/net/ipsec/des/asm/des-586.pl	2004-07-10 03:06:50.000000000 -0500
-+++ openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/des-586.pl	2005-01-20 20:24:20.387146347 -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.3.0/linux/net/ipsec/des/asm/des686.pl openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/des686.pl
---- openswan-2.3.0/linux/net/ipsec/des/asm/des686.pl	2004-07-10 03:06:50.000000000 -0500
-+++ openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/des686.pl	2005-01-20 20:24:20.387146347 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Naupr openswan-2.3.0/linux/net/ipsec/des/asm/desboth.pl openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/desboth.pl
---- openswan-2.3.0/linux/net/ipsec/des/asm/desboth.pl	2004-07-10 03:06:50.000000000 -0500
-+++ openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/desboth.pl	2005-01-20 20:24:20.388146169 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Naupr openswan-2.3.0/programs/_include/_include.in openswan-2.3.0-gentoo/programs/_include/_include.in
---- openswan-2.3.0/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ openswan-2.3.0-gentoo/programs/_include/_include.in	2005-01-20 20:24:20.388146169 -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.3.0/programs/barf/barf.in openswan-2.3.0-gentoo/programs/barf/barf.in
---- openswan-2.3.0/programs/barf/barf.in	2004-12-29 19:59:10.000000000 -0600
-+++ openswan-2.3.0-gentoo/programs/barf/barf.in	2005-01-20 20:24:20.388146169 -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"
- # Max lines to use for things like 'route -n'
- maxlines=100
-@@ -238,13 +238,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.3.0/programs/eroute/eroute.5 openswan-2.3.0-gentoo/programs/eroute/eroute.5
---- openswan-2.3.0/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.3.0-gentoo/programs/eroute/eroute.5	2005-01-20 20:24:20.389145992 -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.3.0/programs/eroute/eroute.8 openswan-2.3.0-gentoo/programs/eroute/eroute.8
---- openswan-2.3.0/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.3.0-gentoo/programs/eroute/eroute.8	2005-01-20 20:24:20.389145992 -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.3.0/programs/ipsec/ipsec.8 openswan-2.3.0-gentoo/programs/ipsec/ipsec.8
---- openswan-2.3.0/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ openswan-2.3.0-gentoo/programs/ipsec/ipsec.8	2005-01-20 20:24:20.389145992 -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.3.0/programs/klipsdebug/klipsdebug.5 openswan-2.3.0-gentoo/programs/klipsdebug/klipsdebug.5
---- openswan-2.3.0/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ openswan-2.3.0-gentoo/programs/klipsdebug/klipsdebug.5	2005-01-20 20:24:20.390145814 -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.3.0/programs/klipsdebug/klipsdebug.8 openswan-2.3.0-gentoo/programs/klipsdebug/klipsdebug.8
---- openswan-2.3.0/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.3.0-gentoo/programs/klipsdebug/klipsdebug.8	2005-01-20 20:24:20.390145814 -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.3.0/programs/lwdnsq/lwdnsq.xml.in openswan-2.3.0-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- openswan-2.3.0/programs/lwdnsq/lwdnsq.xml.in	2004-04-03 19:50:56.000000000 -0600
-+++ openswan-2.3.0-gentoo/programs/lwdnsq/lwdnsq.xml.in	2005-01-20 20:24:20.390145814 -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.3.0/programs/mailkey/mailkey.in openswan-2.3.0-gentoo/programs/mailkey/mailkey.in
---- openswan-2.3.0/programs/mailkey/mailkey.in	2003-06-30 00:34:22.000000000 -0500
-+++ openswan-2.3.0-gentoo/programs/mailkey/mailkey.in	2005-01-20 20:24:20.391145636 -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.3.0/programs/pluto/Makefile openswan-2.3.0-gentoo/programs/pluto/Makefile
---- openswan-2.3.0/programs/pluto/Makefile	2004-12-15 19:27:56.000000000 -0600
-+++ openswan-2.3.0-gentoo/programs/pluto/Makefile	2005-01-20 20:24:20.391145636 -0600
-@@ -244,7 +244,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.3.0/programs/setup/Makefile openswan-2.3.0-gentoo/programs/setup/Makefile
---- openswan-2.3.0/programs/setup/Makefile	2004-04-03 13:44:48.000000000 -0600
-+++ openswan-2.3.0-gentoo/programs/setup/Makefile	2005-01-20 20:24:20.391145636 -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.3.0/programs/showhostkey/showhostkey.in openswan-2.3.0-gentoo/programs/showhostkey/showhostkey.in
---- openswan-2.3.0/programs/showhostkey/showhostkey.in	2004-11-14 07:40:41.000000000 -0600
-+++ openswan-2.3.0-gentoo/programs/showhostkey/showhostkey.in	2005-01-20 20:24:20.392145458 -0600
-@@ -18,7 +18,7 @@ me="ipsec showhostkey"
- usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
-                   [--dhclient] [--ipseckey]"
- 
--file=/etc/ipsec.secrets
-+file=/etc/ipsec/ipsec.secrets
- fmt=""
- gw=
- id=
-diff -Naupr openswan-2.3.0/programs/spi/spi.5 openswan-2.3.0-gentoo/programs/spi/spi.5
---- openswan-2.3.0/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.3.0-gentoo/programs/spi/spi.5	2005-01-20 20:24:20.392145458 -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.3.0/programs/spi/spi.8 openswan-2.3.0-gentoo/programs/spi/spi.8
---- openswan-2.3.0/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.3.0-gentoo/programs/spi/spi.8	2005-01-20 20:24:20.392145458 -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.3.0/programs/spigrp/spigrp.5 openswan-2.3.0-gentoo/programs/spigrp/spigrp.5
---- openswan-2.3.0/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.3.0-gentoo/programs/spigrp/spigrp.5	2005-01-20 20:24:20.393145280 -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.3.0/programs/spigrp/spigrp.8 openswan-2.3.0-gentoo/programs/spigrp/spigrp.8
---- openswan-2.3.0/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.3.0-gentoo/programs/spigrp/spigrp.8	2005-01-20 20:24:20.393145280 -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.3.0/programs/tncfg/tncfg.5 openswan-2.3.0-gentoo/programs/tncfg/tncfg.5
---- openswan-2.3.0/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.3.0-gentoo/programs/tncfg/tncfg.5	2005-01-20 20:24:20.393145280 -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.3.0/programs/tncfg/tncfg.8 openswan-2.3.0-gentoo/programs/tncfg/tncfg.8
---- openswan-2.3.0/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.3.0-gentoo/programs/tncfg/tncfg.8	2005-01-20 20:24:20.394145103 -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.3.1-gentoo.patch b/net-misc/openswan/files/openswan-2.4.2-gentoo.patch
index d1aeb0f489d3..ee289995997f 100644
--- a/net-misc/openswan/files/openswan-2.3.1-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.4.2-gentoo.patch
@@ -1,7 +1,7 @@
-diff -Naupr openswan-2.3.1/Makefile.inc openswan-2.3.1-gentoo/Makefile.inc
---- openswan-2.3.1/Makefile.inc	2005-03-31 15:20:36.000000000 -0600
-+++ openswan-2.3.1-gentoo/Makefile.inc	2005-04-12 16:33:00.000000000 -0500
-@@ -69,7 +69,7 @@ POLICYLIB=${OBJDIRTOP}/lib/libipsecpolic
+diff -Naupr openswan-2.4.2/Makefile.inc openswan-2.4.2-gentoo/Makefile.inc
+--- openswan-2.4.2/Makefile.inc	2005-11-13 20:35:41.000000000 -0600
++++ openswan-2.4.2-gentoo/Makefile.inc	2005-11-14 20:14:24.000000000 -0600
+@@ -46,7 +46,7 @@ SHELL=/bin/sh
  DESTDIR?=
  
  # "local" part of tree, used in building other pathnames
@@ -10,7 +10,7 @@ diff -Naupr openswan-2.3.1/Makefile.inc openswan-2.3.1-gentoo/Makefile.inc
  
  # 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*
-@@ -103,7 +103,7 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_
+@@ -80,7 +80,7 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_
  MANPLACES=man3 man5 man8
  
  # where configuration files go
@@ -19,20 +19,20 @@ diff -Naupr openswan-2.3.1/Makefile.inc openswan-2.3.1-gentoo/Makefile.inc
  CONFFILE=$(DESTDIR)$(FINALCONFFILE)
  
  FINALCONFDIR?=/etc
-@@ -114,10 +114,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR)
+@@ -91,10 +91,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR)
  
  # sample configuration files go into
  INC_DOCDIR?=share/doc
 -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.3.1
++FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.4.2
  EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
  
 -FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.3.1
++FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.4.2
  DOCDIR=${DESTDIR}${FINALDOCDIR}
  
  # where per-conn pluto logs go
-@@ -262,7 +262,7 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
+@@ -239,7 +239,7 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
  # installed one in RH 7.2, won't work - you wind up depending upon
  # openssl.
  
@@ -41,9 +41,9 @@ diff -Naupr openswan-2.3.1/Makefile.inc openswan-2.3.1-gentoo/Makefile.inc
  
  # if you install elsewere, you may need to point the include files to it.
  #BIND9STATICLIBDIR?=/sandel/lib
-diff -Naupr openswan-2.3.1/doc/Makefile openswan-2.3.1-gentoo/doc/Makefile
---- openswan-2.3.1/doc/Makefile	2005-02-13 22:24:40.000000000 -0600
-+++ openswan-2.3.1-gentoo/doc/Makefile	2005-04-12 16:35:29.000000000 -0500
+diff -Naupr openswan-2.4.2/doc/Makefile openswan-2.4.2-gentoo/doc/Makefile
+--- openswan-2.4.2/doc/Makefile	2005-11-08 15:32:45.000000000 -0600
++++ openswan-2.4.2-gentoo/doc/Makefile	2005-11-14 20:14:24.000000000 -0600
 @@ -1,6 +1,6 @@
  # Makefile to generate various formats from HTML source
  #
@@ -52,79 +52,54 @@ diff -Naupr openswan-2.3.1/doc/Makefile openswan-2.3.1-gentoo/doc/Makefile
  # This can be downloaded from www.easysw.com
  #
  # Also needs lynx(1) for HTML-to-text conversion
-@@ -69,12 +69,6 @@ all: #$(howto) $(manpages) index.html
- index.html: toc.html manpages src/index.html
- 	cp src/index.html index.html
- 
--# separate files plus table of contents
--# and then remove HTML formatting added by htmldoc
--toc.html : $(sections)
--	-@htmldoc -t html --path ".;${TESTINGDIR}/doc" -d .  $(sections)
--	@$(SCRIPTDIR)/cleanhtml.sh $(SCRIPTDIR)/cleanhtml.sed $(separate)
--
- manpages:	manp
- 
- manp:	$(SCRIPTDIR)/mkhtmlman
-diff -Naupr openswan-2.3.1/lib/libcrypto/libdes/Makefile openswan-2.3.1-gentoo/lib/libcrypto/libdes/Makefile
---- openswan-2.3.1/lib/libcrypto/libdes/Makefile	2004-12-18 12:13:34.000000000 -0600
-+++ openswan-2.3.1-gentoo/lib/libcrypto/libdes/Makefile	2005-04-12 16:33:00.000000000 -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 openswan-2.3.1/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.3.1-gentoo/lib/libcrypto/libdes/asm/crypt586.pl
---- openswan-2.3.1/lib/libcrypto/libdes/asm/crypt586.pl	2004-07-15 19:24:45.000000000 -0500
-+++ openswan-2.3.1-gentoo/lib/libcrypto/libdes/asm/crypt586.pl	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/crypt586.pl
+--- openswan-2.4.2/lib/libcrypto/libdes/asm/crypt586.pl	2004-07-15 19:24:45.000000000 -0500
++++ openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/crypt586.pl	2005-11-14 20:14:24.000000000 -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.3.1/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.3.1-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl
---- openswan-2.3.1/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2004-07-10 03:07:06.000000000 -0500
-+++ openswan-2.3.1-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl
+--- openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2004-07-10 03:07:06.000000000 -0500
++++ openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2005-11-14 20:14:24.000000000 -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.3.1/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.3.1-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
---- openswan-2.3.1/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2004-07-10 03:07:06.000000000 -0500
-+++ openswan-2.3.1-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
+--- openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2004-07-10 03:07:06.000000000 -0500
++++ openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2005-11-14 20:14:24.000000000 -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.3.1/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.3.1-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
---- openswan-2.3.1/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2004-07-10 03:07:07.000000000 -0500
-+++ openswan-2.3.1-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
+--- openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2004-07-10 03:07:07.000000000 -0500
++++ openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2005-11-14 20:14:24.000000000 -0600
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  package x86ms;
  
-diff -Naupr openswan-2.3.1/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.3.1-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
---- openswan-2.3.1/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2004-07-10 03:07:07.000000000 -0500
-+++ openswan-2.3.1-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
+--- openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2004-07-10 03:07:07.000000000 -0500
++++ openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2005-11-14 20:14:24.000000000 -0600
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  package x86unix;
  
-diff -Naupr openswan-2.3.1/lib/liblwres/Makefile openswan-2.3.1-gentoo/lib/liblwres/Makefile
---- openswan-2.3.1/lib/liblwres/Makefile	2004-12-18 12:13:34.000000000 -0600
-+++ openswan-2.3.1-gentoo/lib/liblwres/Makefile	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/lib/liblwres/Makefile openswan-2.4.2-gentoo/lib/liblwres/Makefile
+--- openswan-2.4.2/lib/liblwres/Makefile	2004-12-18 12:13:34.000000000 -0600
++++ openswan-2.4.2-gentoo/lib/liblwres/Makefile	2005-11-14 20:14:24.000000000 -0600
 @@ -20,7 +20,7 @@ CINCLUDES =	-I${srcdir}/unix/include \
  CDEFINES = -g
  CWARNINGS = -Werror
@@ -134,36 +109,36 @@ diff -Naupr openswan-2.3.1/lib/liblwres/Makefile openswan-2.3.1-gentoo/lib/liblw
  
  VERSION="@(\#) openswan-hacking-9.3-for-osw2"
  LIBINTERFACE=2
-diff -Naupr openswan-2.3.1/linux/net/ipsec/des/asm/des-586.pl openswan-2.3.1-gentoo/linux/net/ipsec/des/asm/des-586.pl
---- openswan-2.3.1/linux/net/ipsec/des/asm/des-586.pl	2004-07-10 03:06:50.000000000 -0500
-+++ openswan-2.3.1-gentoo/linux/net/ipsec/des/asm/des-586.pl	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/des-586.pl
+--- openswan-2.4.2/linux/net/ipsec/des/asm/des-586.pl	2004-07-10 03:06:50.000000000 -0500
++++ openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/des-586.pl	2005-11-14 20:14:24.000000000 -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.3.1/linux/net/ipsec/des/asm/des686.pl openswan-2.3.1-gentoo/linux/net/ipsec/des/asm/des686.pl
---- openswan-2.3.1/linux/net/ipsec/des/asm/des686.pl	2004-07-10 03:06:50.000000000 -0500
-+++ openswan-2.3.1-gentoo/linux/net/ipsec/des/asm/des686.pl	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/linux/net/ipsec/des/asm/des686.pl openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/des686.pl
+--- openswan-2.4.2/linux/net/ipsec/des/asm/des686.pl	2004-07-10 03:06:50.000000000 -0500
++++ openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/des686.pl	2005-11-14 20:14:24.000000000 -0600
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  $prog="des686.pl";
  
-diff -Naupr openswan-2.3.1/linux/net/ipsec/des/asm/desboth.pl openswan-2.3.1-gentoo/linux/net/ipsec/des/asm/desboth.pl
---- openswan-2.3.1/linux/net/ipsec/des/asm/desboth.pl	2004-07-10 03:06:50.000000000 -0500
-+++ openswan-2.3.1-gentoo/linux/net/ipsec/des/asm/desboth.pl	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/desboth.pl
+--- openswan-2.4.2/linux/net/ipsec/des/asm/desboth.pl	2004-07-10 03:06:50.000000000 -0500
++++ openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/desboth.pl	2005-11-14 20:14:24.000000000 -0600
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  $L="edi";
  $R="esi";
-diff -Naupr openswan-2.3.1/programs/_include/_include.in openswan-2.3.1-gentoo/programs/_include/_include.in
---- openswan-2.3.1/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ openswan-2.3.1-gentoo/programs/_include/_include.in	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/_include/_include.in openswan-2.4.2-gentoo/programs/_include/_include.in
+--- openswan-2.4.2/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
++++ openswan-2.4.2-gentoo/programs/_include/_include.in	2005-11-14 20:14:24.000000000 -0600
 @@ -47,10 +47,10 @@ for f
  do
  	if test ! -r "$f"
@@ -177,9 +152,9 @@ diff -Naupr openswan-2.3.1/programs/_include/_include.in openswan-2.3.1-gentoo/p
  			then
  				echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
  			fi
-diff -Naupr openswan-2.3.1/programs/barf/barf.in openswan-2.3.1-gentoo/programs/barf/barf.in
---- openswan-2.3.1/programs/barf/barf.in	2004-12-29 02:31:52.000000000 -0600
-+++ openswan-2.3.1-gentoo/programs/barf/barf.in	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/barf/barf.in openswan-2.4.2-gentoo/programs/barf/barf.in
+--- openswan-2.4.2/programs/barf/barf.in	2005-07-15 11:39:25.000000000 -0500
++++ openswan-2.4.2-gentoo/programs/barf/barf.in	2005-11-14 20:14:24.000000000 -0600
 @@ -16,7 +16,7 @@
  
  LOGS=${LOGS-/var/log}
@@ -207,9 +182,9 @@ diff -Naupr openswan-2.3.1/programs/barf/barf.in openswan-2.3.1-gentoo/programs/
  done
  _________________________ /proc/net/dev
  cat /proc/net/dev
-diff -Naupr openswan-2.3.1/programs/eroute/eroute.5 openswan-2.3.1-gentoo/programs/eroute/eroute.5
---- openswan-2.3.1/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.3.1-gentoo/programs/eroute/eroute.5	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/eroute/eroute.5 openswan-2.4.2-gentoo/programs/eroute/eroute.5
+--- openswan-2.4.2/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
++++ openswan-2.4.2-gentoo/programs/eroute/eroute.5	2005-11-14 20:14:24.000000000 -0600
 @@ -223,7 +223,7 @@ Parameters Index of
  in hexadecimal using Authentication Header protocol (51,
  IPPROTO_AH) with no identies defined for either end.
@@ -219,9 +194,9 @@ diff -Naupr openswan-2.3.1/programs/eroute/eroute.5 openswan-2.3.1-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.3.1/programs/eroute/eroute.8 openswan-2.3.1-gentoo/programs/eroute/eroute.8
---- openswan-2.3.1/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.3.1-gentoo/programs/eroute/eroute.8	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/eroute/eroute.8 openswan-2.4.2-gentoo/programs/eroute/eroute.8
+--- openswan-2.4.2/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
++++ openswan-2.4.2-gentoo/programs/eroute/eroute.8	2005-11-14 20:14:24.000000000 -0600
 @@ -308,7 +308,7 @@ will be in clear text.
  .br
  .LP
@@ -231,9 +206,9 @@ diff -Naupr openswan-2.3.1/programs/eroute/eroute.8 openswan-2.3.1-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.3.1/programs/ipsec/ipsec.8 openswan-2.3.1-gentoo/programs/ipsec/ipsec.8
---- openswan-2.3.1/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ openswan-2.3.1-gentoo/programs/ipsec/ipsec.8	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/ipsec/ipsec.8 openswan-2.4.2-gentoo/programs/ipsec/ipsec.8
+--- openswan-2.4.2/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
++++ openswan-2.4.2-gentoo/programs/ipsec/ipsec.8	2005-11-14 20:14:24.000000000 -0600
 @@ -81,7 +81,7 @@ reports where
  .I ipsec
  thinks the IPsec configuration files are stored.
@@ -243,9 +218,9 @@ diff -Naupr openswan-2.3.1/programs/ipsec/ipsec.8 openswan-2.3.1-gentoo/programs
  .SH ENVIRONMENT
  .PP
  The following environment variables control where FreeS/WAN finds its
-diff -Naupr openswan-2.3.1/programs/klipsdebug/klipsdebug.5 openswan-2.3.1-gentoo/programs/klipsdebug/klipsdebug.5
---- openswan-2.3.1/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ openswan-2.3.1-gentoo/programs/klipsdebug/klipsdebug.5	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/klipsdebug/klipsdebug.5 openswan-2.4.2-gentoo/programs/klipsdebug/klipsdebug.5
+--- openswan-2.4.2/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
++++ openswan-2.4.2-gentoo/programs/klipsdebug/klipsdebug.5	2005-11-14 20:14:24.000000000 -0600
 @@ -103,7 +103,7 @@ full
  sockets debugging has been set and everything else is not set.
  .LP
@@ -255,9 +230,9 @@ diff -Naupr openswan-2.3.1/programs/klipsdebug/klipsdebug.5 openswan-2.3.1-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.3.1/programs/klipsdebug/klipsdebug.8 openswan-2.3.1-gentoo/programs/klipsdebug/klipsdebug.8
---- openswan-2.3.1/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.3.1-gentoo/programs/klipsdebug/klipsdebug.8	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/klipsdebug/klipsdebug.8 openswan-2.4.2-gentoo/programs/klipsdebug/klipsdebug.8
+--- openswan-2.4.2/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
++++ openswan-2.4.2-gentoo/programs/klipsdebug/klipsdebug.8	2005-11-14 20:14:24.000000000 -0600
 @@ -117,7 +117,7 @@ turns off only the
  debugging messages.
  .LP
@@ -267,9 +242,9 @@ diff -Naupr openswan-2.3.1/programs/klipsdebug/klipsdebug.8 openswan-2.3.1-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.3.1/programs/lwdnsq/lwdnsq.xml.in openswan-2.3.1-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- openswan-2.3.1/programs/lwdnsq/lwdnsq.xml.in	2004-04-03 19:50:56.000000000 -0600
-+++ openswan-2.3.1-gentoo/programs/lwdnsq/lwdnsq.xml.in	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/lwdnsq/lwdnsq.xml.in openswan-2.4.2-gentoo/programs/lwdnsq/lwdnsq.xml.in
+--- openswan-2.4.2/programs/lwdnsq/lwdnsq.xml.in	2004-04-03 19:50:56.000000000 -0600
++++ openswan-2.4.2-gentoo/programs/lwdnsq/lwdnsq.xml.in	2005-11-14 20:14:24.000000000 -0600
 @@ -430,7 +430,7 @@ information.
  <refsect1><title>Special IPSECKEY processing</title>
  
@@ -279,9 +254,9 @@ diff -Naupr openswan-2.3.1/programs/lwdnsq/lwdnsq.xml.in openswan-2.3.1-gentoo/p
  </programlisting>
  
  </refsect1>
-diff -Naupr openswan-2.3.1/programs/mailkey/mailkey.in openswan-2.3.1-gentoo/programs/mailkey/mailkey.in
---- openswan-2.3.1/programs/mailkey/mailkey.in	2005-01-30 13:07:15.000000000 -0600
-+++ openswan-2.3.1-gentoo/programs/mailkey/mailkey.in	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/mailkey/mailkey.in openswan-2.4.2-gentoo/programs/mailkey/mailkey.in
+--- openswan-2.4.2/programs/mailkey/mailkey.in	2005-01-30 13:07:15.000000000 -0600
++++ openswan-2.4.2-gentoo/programs/mailkey/mailkey.in	2005-11-14 20:14:24.000000000 -0600
 @@ -60,7 +60,7 @@ with the following error:
  
  "$test1st"
@@ -291,10 +266,10 @@ diff -Naupr openswan-2.3.1/programs/mailkey/mailkey.in openswan-2.3.1-gentoo/pro
  If you haven't generated your key yet, please run 'ipsec newhostkey'." 
  exit 0
  }
-diff -Naupr openswan-2.3.1/programs/pluto/Makefile openswan-2.3.1-gentoo/programs/pluto/Makefile
---- openswan-2.3.1/programs/pluto/Makefile	2005-03-27 14:21:41.000000000 -0600
-+++ openswan-2.3.1-gentoo/programs/pluto/Makefile	2005-04-12 16:33:00.000000000 -0500
-@@ -247,7 +247,7 @@ CPPFLAGS = $(HDRDIRS) $(DEFINES) \
+diff -Naupr openswan-2.4.2/programs/pluto/Makefile openswan-2.4.2-gentoo/programs/pluto/Makefile
+--- openswan-2.4.2/programs/pluto/Makefile	2005-08-11 20:12:38.000000000 -0500
++++ openswan-2.4.2-gentoo/programs/pluto/Makefile	2005-11-14 20:14:24.000000000 -0600
+@@ -262,7 +262,7 @@ CPPFLAGS = $(HDRDIRS) $(DEFINES) \
  	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
  	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
  
@@ -303,9 +278,9 @@ diff -Naupr openswan-2.3.1/programs/pluto/Makefile openswan-2.3.1-gentoo/program
  
  # libefence is a free memory allocation debugger
  # Solaris 2 needs -lsocket -lnsl
-diff -Naupr openswan-2.3.1/programs/setup/Makefile openswan-2.3.1-gentoo/programs/setup/Makefile
---- openswan-2.3.1/programs/setup/Makefile	2004-12-18 12:13:43.000000000 -0600
-+++ openswan-2.3.1-gentoo/programs/setup/Makefile	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/setup/Makefile openswan-2.4.2-gentoo/programs/setup/Makefile
+--- openswan-2.4.2/programs/setup/Makefile	2004-12-18 12:13:43.000000000 -0600
++++ openswan-2.4.2-gentoo/programs/setup/Makefile	2005-11-14 20:14:24.000000000 -0600
 @@ -33,25 +33,10 @@ install:: setup
  	@rm -f $(BINDIR)/setup
  	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
@@ -332,9 +307,9 @@ diff -Naupr openswan-2.3.1/programs/setup/Makefile openswan-2.3.1-gentoo/program
  
  clean::
  	@rm -f setup
-diff -Naupr openswan-2.3.1/programs/showhostkey/showhostkey.in openswan-2.3.1-gentoo/programs/showhostkey/showhostkey.in
---- openswan-2.3.1/programs/showhostkey/showhostkey.in	2004-11-14 07:40:41.000000000 -0600
-+++ openswan-2.3.1-gentoo/programs/showhostkey/showhostkey.in	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/showhostkey/showhostkey.in openswan-2.4.2-gentoo/programs/showhostkey/showhostkey.in
+--- openswan-2.4.2/programs/showhostkey/showhostkey.in	2004-11-14 07:40:41.000000000 -0600
++++ openswan-2.4.2-gentoo/programs/showhostkey/showhostkey.in	2005-11-14 20:14:24.000000000 -0600
 @@ -18,7 +18,7 @@ me="ipsec showhostkey"
  usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
                    [--dhclient] [--ipseckey]"
@@ -344,9 +319,9 @@ diff -Naupr openswan-2.3.1/programs/showhostkey/showhostkey.in openswan-2.3.1-ge
  fmt=""
  gw=
  id=
-diff -Naupr openswan-2.3.1/programs/spi/spi.5 openswan-2.3.1-gentoo/programs/spi/spi.5
---- openswan-2.3.1/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.3.1-gentoo/programs/spi/spi.5	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/spi/spi.5 openswan-2.4.2-gentoo/programs/spi/spi.5
+--- openswan-2.4.2/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
++++ openswan-2.4.2-gentoo/programs/spi/spi.5	2005-11-14 20:14:24.000000000 -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
@@ -356,9 +331,9 @@ diff -Naupr openswan-2.3.1/programs/spi/spi.5 openswan-2.3.1-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.3.1/programs/spi/spi.8 openswan-2.3.1-gentoo/programs/spi/spi.8
---- openswan-2.3.1/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.3.1-gentoo/programs/spi/spi.8	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/spi/spi.8 openswan-2.4.2-gentoo/programs/spi/spi.8
+--- openswan-2.4.2/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
++++ openswan-2.4.2-gentoo/programs/spi/spi.8	2005-11-14 20:14:24.000000000 -0600
 @@ -461,7 +461,7 @@ and protocol
  (4).
  .LP
@@ -368,9 +343,9 @@ diff -Naupr openswan-2.3.1/programs/spi/spi.8 openswan-2.3.1-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.3.1/programs/spigrp/spigrp.5 openswan-2.3.1-gentoo/programs/spigrp/spigrp.5
---- openswan-2.3.1/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.3.1-gentoo/programs/spigrp/spigrp.5	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/spigrp/spigrp.5 openswan-2.4.2-gentoo/programs/spigrp/spigrp.5
+--- openswan-2.4.2/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
++++ openswan-2.4.2-gentoo/programs/spigrp/spigrp.5	2005-11-14 20:14:24.000000000 -0600
 @@ -77,7 +77,7 @@ be an incoming or outgoing group, depend
  machine.
  .LP
@@ -380,9 +355,9 @@ diff -Naupr openswan-2.3.1/programs/spigrp/spigrp.5 openswan-2.3.1-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.3.1/programs/spigrp/spigrp.8 openswan-2.3.1-gentoo/programs/spigrp/spigrp.8
---- openswan-2.3.1/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.3.1-gentoo/programs/spigrp/spigrp.8	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/spigrp/spigrp.8 openswan-2.4.2-gentoo/programs/spigrp/spigrp.8
+--- openswan-2.4.2/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
++++ openswan-2.4.2-gentoo/programs/spigrp/spigrp.8	2005-11-14 20:14:24.000000000 -0600
 @@ -128,7 +128,7 @@ and finally an AH header to authenticate
  .BR 0x236 .
  .LP
@@ -392,9 +367,9 @@ diff -Naupr openswan-2.3.1/programs/spigrp/spigrp.8 openswan-2.3.1-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.3.1/programs/tncfg/tncfg.5 openswan-2.3.1-gentoo/programs/tncfg/tncfg.5
---- openswan-2.3.1/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.3.1-gentoo/programs/tncfg/tncfg.5	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/tncfg/tncfg.5 openswan-2.4.2-gentoo/programs/tncfg/tncfg.5
+--- openswan-2.4.2/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
++++ openswan-2.4.2-gentoo/programs/tncfg/tncfg.5	2005-11-14 20:14:24.000000000 -0600
 @@ -75,7 +75,7 @@ shows that virtual device
  is not connected to any physical device.
  .LP
@@ -404,9 +379,9 @@ diff -Naupr openswan-2.3.1/programs/tncfg/tncfg.5 openswan-2.3.1-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.3.1/programs/tncfg/tncfg.8 openswan-2.3.1-gentoo/programs/tncfg/tncfg.8
---- openswan-2.3.1/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.3.1-gentoo/programs/tncfg/tncfg.8	2005-04-12 16:33:00.000000000 -0500
+diff -Naupr openswan-2.4.2/programs/tncfg/tncfg.8 openswan-2.4.2-gentoo/programs/tncfg/tncfg.8
+--- openswan-2.4.2/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
++++ openswan-2.4.2-gentoo/programs/tncfg/tncfg.8	2005-11-14 20:14:24.000000000 -0600
 @@ -76,7 +76,7 @@ virtual device to the
  physical device.
  .LP
diff --git a/net-misc/openswan/openswan-1.0.6.ebuild b/net-misc/openswan/openswan-1.0.6.ebuild
deleted file mode 100644
index a00bc5c20f34..000000000000
--- a/net-misc/openswan/openswan-1.0.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-1.0.6.ebuild,v 1.6 2005/07/15 10:44:27 george Exp $
-
-inherit eutils
-
-MY_P=${P/_/}
-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"
-
-DEPEND="!net-misc/strongswan
-	virtual/libc
-	virtual/linux-sources
-	net-dns/host
-	>=dev-libs/gmp-3.1.1"
-LICENSE="GPL-2"
-RDEPEND=""
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-pkg_setup() {
-	[ -d /usr/src/linux/net/ipsec ] || {
-		echo You need to have the crypto-enabled version of Gentoo Sources
-		echo with a symlink to it in /usr/src/linux in order to have IPSec
-		echo kernel compatibility.  Please emerge sys-kernel/crypto-sources,
-		echo compile an IPSec-enabled kernel and attempt this ebuild again.
-		die
-	}
-}
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	cp ${S}/libdes/Makefile ${S}/libdes/Makefile.orig
-	sed s:/usr/local:/usr:g < ${S}/libdes/Makefile.orig \
-		> ${S}/libdes/Makefile
-	cp ${S}/libdes/Makefile ${S}/libdes/Makefile.orig
-	sed s:/usr/man:/usr/share/man:g < ${S}/libdes/Makefile.orig \
-		> ${S}/libdes/Makefile
-
-	make	 				   	\
-		DESTDIR=${D}				\
-		USERCOMPILE="${CFLAGS}"			\
-		FINALCONFDIR=/etc/ipsec			\
-		INC_RCDEFAULT=/etc/init.d		\
-		INC_USRLOCAL=/usr			\
-		INC_MANDIR=share/man			\
-		confcheck programs || die
-}
-
-src_install () {
-
-	# try make prefix=${D}/usr 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
-}
-
diff --git a/net-misc/openswan/openswan-2.1.4.ebuild b/net-misc/openswan/openswan-2.1.4.ebuild
deleted file mode 100644
index 8ab3583c7e93..000000000000
--- a/net-misc/openswan/openswan-2.1.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.1.4.ebuild,v 1.6 2005/07/15 10:44:27 george 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 ~ppc"
-IUSE=""
-
-DEPEND="!net-misc/strongswan
-	virtual/libc
-	virtual/linux-sources
-	>=dev-libs/gmp-3.1.1
-	net-dns/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.5.ebuild b/net-misc/openswan/openswan-2.1.5.ebuild
deleted file mode 100644
index 8dbbb37c5a9f..000000000000
--- a/net-misc/openswan/openswan-2.1.5.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.1.5.ebuild,v 1.6 2005/07/15 10:44:27 george 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 ~ppc"
-IUSE=""
-
-DEPEND="!net-misc/strongswan
-	virtual/libc
-	virtual/linux-sources
-	>=dev-libs/gmp-3.1.1
-	net-dns/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.2.0.ebuild b/net-misc/openswan/openswan-2.2.0.ebuild
index 49975eae9358..96253288612e 100644
--- a/net-misc/openswan/openswan-2.2.0.ebuild
+++ b/net-misc/openswan/openswan-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.2.0.ebuild,v 1.5 2005/07/15 10:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.2.0.ebuild,v 1.6 2005/11/15 03:07:16 pfeifer Exp $
 
 inherit eutils
 
@@ -29,7 +29,7 @@ check_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!"
+		die "/usr/src/linux symlink not setup or kernel tree has not been configured!"
 	fi
 }
 
diff --git a/net-misc/openswan/openswan-2.3.0.ebuild b/net-misc/openswan/openswan-2.3.0.ebuild
deleted file mode 100644
index b53f39a1800c..000000000000
--- a/net-misc/openswan/openswan-2.3.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.3.0.ebuild,v 1.2 2005/07/15 10:44:27 george 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 ~ppc"
-IUSE=""
-
-DEPEND="!net-misc/strongswan
-	virtual/libc
-	virtual/linux-sources
-	>=dev-libs/gmp-3.1.1
-	net-dns/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
-
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	exeinto /etc/init.d/
-	doexe ${FILESDIR}/ipsec
-}
diff --git a/net-misc/openswan/openswan-2.3.1.ebuild b/net-misc/openswan/openswan-2.4.2.ebuild
index 756545596df2..cdbb1a13e7f0 100644
--- a/net-misc/openswan/openswan-2.3.1.ebuild
+++ b/net-misc/openswan/openswan-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.3.1.ebuild,v 1.2 2005/07/15 10:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.2.ebuild,v 1.1 2005/11/15 03:07:16 pfeifer Exp $
 
 inherit eutils
 
@@ -29,7 +29,7 @@ check_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!"
+		die "/usr/src/linux symlink not setup or kernel tree has not been configured!"
 	fi
 }