Updates to x509 for some security fixes. Preparation for move to open/strongswan.

13 files changed, 62 insertions, 1167 deletions

diff --git a/net-misc/freeswan/ChangeLog b/net-misc/freeswan/ChangeLog
index a2e2112933e6..7c4053bc03b2 100644
--- a/net-misc/freeswan/ChangeLog
+++ b/net-misc/freeswan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/freeswan
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freeswan/ChangeLog,v 1.20 2004/06/08 21:04:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freeswan/ChangeLog,v 1.21 2004/06/24 01:43:11 pfeifer Exp $
+
+  23 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> freeswan-1.99-r1.ebuild,
+  freeswan2.04-r1.ebuild:
+  Added x509 updates to fix security issues. Cleaned out older ebuilds.
+  Next step is to migrate users off freeswan and on to open/strongswan.
 
   08 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> freeswan-1.97.ebuild,
   freeswan-1.98b-r1.ebuild, freeswan-1.98b-r2.ebuild, freeswan-1.98b.ebuild,
diff --git a/net-misc/freeswan/Manifest b/net-misc/freeswan/Manifest
index 421ddadfafc3..a6397c8ecb56 100644
--- a/net-misc/freeswan/Manifest
+++ b/net-misc/freeswan/Manifest
@@ -1,12 +1,10 @@
-MD5 2c3ea349b33ee1794c117475161aa132 ChangeLog 3751
-MD5 b3ca0a49c33eda6354eda52657b09759 freeswan-1.99.ebuild 1996
-MD5 02b4d46201fa9da26553f710781f6c95 freeswan-2.04.ebuild 2144
-MD5 6393b250adb782eeefb96259cc97e7fc files/digest-freeswan-1.99 148
-MD5 8c88161ddee7e0ae7cbb22226dd31e32 files/freeswan-2.01-gentoo.patch 16637
-MD5 299c8d6afb74061e8e8e002eb976ac9b files/freeswan-2.02-gentoo.patch 16814
-MD5 a6f751bad152788dfa4d33fab7fa1bb6 files/freeswan-gentoo-cflags.patch 2168
+MD5 6da686485c4dc8aa981d666e327afa08 freeswan-1.99-r1.ebuild 2004
+MD5 4b0e019fe2b3b0c65eab1112432d99c7 freeswan-2.04-r1.ebuild 2147
+MD5 d44966f693626e9e321322d60e003fe5 ChangeLog 3993
+MD5 c9d291df91d4b9f030745974c8dee122 metadata.xml 1949
 MD5 1ae4ab90e64587c2055c9b9389f868be files/ipsec 1533
-MD5 8ed7dfb53e412cadc0f332c2143e06a8 files/freeswan-2.03-gentoo.patch 16814
-MD5 b89bbe7024ffcd92ac0152c194250fa2 files/digest-freeswan-2.04 142
-MD5 39de621be455fbe10a4822b217946419 files/freeswan-2.04-gentoo.patch 16814
 MD5 c744919016d382410c67a7e832720ac1 files/freeswan-1.99-spi.c.patch 356
+MD5 a6f751bad152788dfa4d33fab7fa1bb6 files/freeswan-gentoo-cflags.patch 2168
+MD5 d6148f9ab8bf549044beb2322ec64d1a files/digest-freeswan-1.99-r1 148
+MD5 6593745db1854b5a1fe8f043c951d402 files/freeswan-2.04-gentoo.patch 16820
+MD5 0ba9c9ac85a5211c4052ace018930a29 files/digest-freeswan-2.04-r1 142
diff --git a/net-misc/freeswan/files/digest-freeswan-1.99 b/net-misc/freeswan/files/digest-freeswan-1.99
deleted file mode 100644
index 6a38df6cc340..000000000000
--- a/net-misc/freeswan/files/digest-freeswan-1.99
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cb905b7f95dcf3e60aad6bddffe3be4f freeswan-1.99.tar.gz 2276925
-MD5 ee446c68c8150f87dc23ede3a6574393 x509patch-0.9.34-freeswan-1.99.tar.gz 124114
diff --git a/net-misc/freeswan/files/digest-freeswan-1.99-r1 b/net-misc/freeswan/files/digest-freeswan-1.99-r1
new file mode 100644
index 000000000000..4cf4358b2463
--- /dev/null
+++ b/net-misc/freeswan/files/digest-freeswan-1.99-r1
@@ -0,0 +1,2 @@
+MD5 cb905b7f95dcf3e60aad6bddffe3be4f freeswan-1.99.tar.gz 2276925
+MD5 1b1b7783c26f18699f2ec830f69ed55f x509patch-0.9.41-freeswan-1.99.tar.gz 126659
diff --git a/net-misc/freeswan/files/digest-freeswan-2.04 b/net-misc/freeswan/files/digest-freeswan-2.04
deleted file mode 100644
index db274a007580..000000000000
--- a/net-misc/freeswan/files/digest-freeswan-2.04
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 37a15f760ca43317fe7c5d6e6859689c freeswan-2.04.tar.gz 3273964
-MD5 d5ff93ed3dc33afcc3ab5d00ca11008b x509-1.4.8-freeswan-2.04.tar.gz 171437
diff --git a/net-misc/freeswan/files/digest-freeswan-2.04-r1 b/net-misc/freeswan/files/digest-freeswan-2.04-r1
new file mode 100644
index 000000000000..831e9322764a
--- /dev/null
+++ b/net-misc/freeswan/files/digest-freeswan-2.04-r1
@@ -0,0 +1,2 @@
+MD5 37a15f760ca43317fe7c5d6e6859689c freeswan-2.04.tar.gz 3273964
+MD5 e0657b19acaaef3d4f49864974f85e5a x509-1.6.1-freeswan-2.04.tar.gz 213502
diff --git a/net-misc/freeswan/files/freeswan-2.01-gentoo.patch b/net-misc/freeswan/files/freeswan-2.01-gentoo.patch
deleted file mode 100644
index 1b012118338c..000000000000
--- a/net-misc/freeswan/files/freeswan-2.01-gentoo.patch
+++ /dev/null
@@ -1,380 +0,0 @@
-diff -ru freeswan-2.01/Makefile.inc freeswan-2.01-gentoo/Makefile.inc
---- freeswan-2.01/Makefile.inc	2003-06-05 11:40:42.000000000 -0500
-+++ freeswan-2.01-gentoo/Makefile.inc	2003-08-17 11:40:43.000000000 -0500
-@@ -59,7 +59,7 @@
- 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*
-@@ -93,7 +93,7 @@
- MANPLACES=man3 man5 man8
- 
- # where configuration files go
--FINALCONFFILE?=/etc/ipsec.conf
-+FINALCONFFILE?=/etc/ipsec/ipsec.conf
- CONFFILE=$(DESTDIR)$(FINALCONFFILE)
- 
- FINALCONFDIR?=/etc
-@@ -104,10 +104,10 @@
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
--FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan-2.01
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan-2.01
- DOCDIR=${DESTDIR}${FINALDOCDIR}
- 
- 
-@@ -231,7 +231,7 @@
- # installed one in RH 7.2, won't work - you wind up depending upon
- # openssl.
- 
--BIND9STATICLIBDIR?=/usr/local/lib
-+BIND9STATICLIBDIR?=/usr/lib
- 
- # set this to space where a linked/configured tree can be created by 
- # preprhkern4module. Only needed if you are going to be created RPMs
-diff -ru freeswan-2.01/lib/libdes/Makefile freeswan-2.01-gentoo/lib/libdes/Makefile
---- freeswan-2.01/lib/libdes/Makefile	2003-02-20 19:32:12.000000000 -0600
-+++ freeswan-2.01-gentoo/lib/libdes/Makefile	2003-08-17 11:16:26.000000000 -0500
-@@ -60,7 +60,7 @@
- # 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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/crypt586.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2003-08-17 11:14:45.000000000 -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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/des-586.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2003-08-17 11:14:45.000000000 -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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/des686.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/desboth.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/cbc.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2003-08-17 11:14:45.000000000 -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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # require 'x86asm.pl';
- # &asm_init("cpp","des-586.pl");
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -ru freeswan-2.01/programs/_include/_include.in freeswan-2.01-gentoo/programs/_include/_include.in
---- freeswan-2.01/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/_include/_include.in	2003-08-17 11:23:15.000000000 -0500
-@@ -47,10 +47,10 @@
- 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 -ru freeswan-2.01/programs/barf/barf.in freeswan-2.01-gentoo/programs/barf/barf.in
---- freeswan-2.01/programs/barf/barf.in	2003-02-03 22:59:22.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/barf/barf.in	2003-08-17 11:23:35.000000000 -0500
-@@ -17,7 +17,7 @@
- KERNSRC=${KERNSRC-/usr/src/linux}
- LOGS=${LOGS-/var/log}
- CONFS=${IPSEC_CONFS-/etc}
--CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
-+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
- me="ipsec barf"
- 
- # kludge to produce no barf output mentioning policygroups if none are present.
-@@ -205,11 +205,11 @@
- 	done
- fi
- _________________________ ipsec/ls-dir
--ls -l ${IPSEC_DIR-/usr/local/lib/ipsec}
-+ls -l ${IPSEC_DIR-/usr/lib/ipsec}
- _________________________ ipsec/updowns
--for f in `ls ${IPSEC_DIR-/usr/local/lib/ipsec} | egrep updown`
-+for f in `ls ${IPSEC_DIR-/usr/lib/ipsec} | egrep updown`
- do
--	cat ${IPSEC_DIR-/usr/local/lib/ipsec}/$f
-+	cat ${IPSEC_DIR-/usr/lib/ipsec}/$f
- done
- _________________________ proc/net/dev
- cat /proc/net/dev
-diff -ru freeswan-2.01/programs/eroute/eroute.5 freeswan-2.01-gentoo/programs/eroute/eroute.5
---- freeswan-2.01/programs/eroute/eroute.5	2002-04-24 02:35:38.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/eroute/eroute.5	2003-08-17 11:14:45.000000000 -0500
-@@ -203,7 +203,7 @@
- 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 -ru freeswan-2.01/programs/eroute/eroute.8 freeswan-2.01-gentoo/programs/eroute/eroute.8
---- freeswan-2.01/programs/eroute/eroute.8	2002-04-24 02:35:38.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/eroute/eroute.8	2003-08-17 11:14:45.000000000 -0500
-@@ -225,7 +225,7 @@
- .BR www.ietf.org
- to pass in the clear, unprocessed.
- .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 -ru freeswan-2.01/programs/ipsec/ipsec.8 freeswan-2.01-gentoo/programs/ipsec/ipsec.8
---- freeswan-2.01/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/ipsec/ipsec.8	2003-08-17 11:14:45.000000000 -0500
-@@ -81,7 +81,7 @@
- .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 -ru freeswan-2.01/programs/klipsdebug/klipsdebug.5 freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.5
---- freeswan-2.01/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.5	2003-08-17 11:14:45.000000000 -0500
-@@ -103,7 +103,7 @@
- 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 -ru freeswan-2.01/programs/klipsdebug/klipsdebug.8 freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.8
---- freeswan-2.01/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.8	2003-08-17 11:14:45.000000000 -0500
-@@ -117,7 +117,7 @@
- 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 -ru freeswan-2.01/programs/lwdnsq/lwdnsq.xml.in freeswan-2.01-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- freeswan-2.01/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/lwdnsq/lwdnsq.xml.in	2003-08-17 11:24:01.000000000 -0500
-@@ -430,7 +430,7 @@
- <refsect1><title>Special IPSECKEY processing</title>
- 
- <programlisting>
--/etc/ipsec.d/lwdnsq.conf
-+/etc/ipsec/ipsec.d/lwdnsq.conf
- </programlisting>
- 
- </refsect1>
-diff -ru freeswan-2.01/programs/mailkey/mailkey.in freeswan-2.01-gentoo/programs/mailkey/mailkey.in
---- freeswan-2.01/programs/mailkey/mailkey.in	2003-06-07 14:16:33.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/mailkey/mailkey.in	2003-08-17 11:24:35.000000000 -0500
-@@ -60,7 +60,7 @@
- 
- "$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 -ru freeswan-2.01/programs/pluto/Makefile freeswan-2.01-gentoo/programs/pluto/Makefile
---- freeswan-2.01/programs/pluto/Makefile	2003-06-19 13:08:30.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/pluto/Makefile	2003-08-17 11:17:32.000000000 -0500
-@@ -94,7 +94,7 @@
- 	-DSHARED_SECRETS_FILE=\"${FINALCONFDIR}/ipsec.secrets\" \
- 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\"
- 
--ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
-+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
- 
- # libefence is a free memory allocation debugger
- # Solaris 2 needs -lsocket -lnsl
-Only in freeswan-2.01-gentoo/programs/setup: #Makefile#
-diff -ru freeswan-2.01/programs/setup/Makefile freeswan-2.01-gentoo/programs/setup/Makefile
---- freeswan-2.01/programs/setup/Makefile	2002-08-10 14:47:06.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/setup/Makefile	2003-08-17 11:31:56.000000000 -0500
-@@ -33,25 +33,10 @@
- 	@rm -f $(BINDIR)/setup
- 	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
- 	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
--	-@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
--	-@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K68ipsec
--	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K68ipsec
--	-@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K68ipsec
- 
- install_file_list::
- 	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
--	@echo $(RCDIR)/../rc0.d/K68ipsec
--	@echo $(RCDIR)/../rc1.d/K68ipsec
--	@echo $(RCDIR)/../rc2.d/S47ipsec
--	@echo $(RCDIR)/../rc3.d/S47ipsec
--	@echo $(RCDIR)/../rc4.d/S47ipsec
--	@echo $(RCDIR)/../rc5.d/S47ipsec
--	@echo $(RCDIR)/../rc6.d/K68ipsec
- 
- clean::
- 	@rm -f setup
-diff -ru freeswan-2.01/programs/showhostkey/showhostkey.in freeswan-2.01-gentoo/programs/showhostkey/showhostkey.in
---- freeswan-2.01/programs/showhostkey/showhostkey.in	2003-06-07 14:15:25.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/showhostkey/showhostkey.in	2003-08-17 11:18:33.000000000 -0500
-@@ -17,7 +17,7 @@
- me="ipsec showhostkey"
- usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]"
- 
--file=/etc/ipsec.secrets
-+file=/etc/ipsec/ipsec.secrets
- fmt=""
- gw=
- id=
-diff -ru freeswan-2.01/programs/spi/spi.5 freeswan-2.01-gentoo/programs/spi/spi.5
---- freeswan-2.01/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spi/spi.5	2003-08-17 11:14:45.000000000 -0500
-@@ -162,7 +162,7 @@
- 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 -ru freeswan-2.01/programs/spi/spi.8 freeswan-2.01-gentoo/programs/spi/spi.8
---- freeswan-2.01/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spi/spi.8	2003-08-17 11:14:45.000000000 -0500
-@@ -461,7 +461,7 @@
- (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 -ru freeswan-2.01/programs/spigrp/spigrp.5 freeswan-2.01-gentoo/programs/spigrp/spigrp.5
---- freeswan-2.01/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spigrp/spigrp.5	2003-08-17 11:14:45.000000000 -0500
-@@ -77,7 +77,7 @@
- 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 -ru freeswan-2.01/programs/spigrp/spigrp.8 freeswan-2.01-gentoo/programs/spigrp/spigrp.8
---- freeswan-2.01/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spigrp/spigrp.8	2003-08-17 11:14:45.000000000 -0500
-@@ -128,7 +128,7 @@
- .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 -ru freeswan-2.01/programs/tncfg/tncfg.5 freeswan-2.01-gentoo/programs/tncfg/tncfg.5
---- freeswan-2.01/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/tncfg/tncfg.5	2003-08-17 11:14:45.000000000 -0500
-@@ -75,7 +75,7 @@
- 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 -ru freeswan-2.01/programs/tncfg/tncfg.8 freeswan-2.01-gentoo/programs/tncfg/tncfg.8
---- freeswan-2.01/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/tncfg/tncfg.8	2003-08-17 11:14:45.000000000 -0500
-@@ -76,7 +76,7 @@
- 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/freeswan/files/freeswan-2.02-gentoo.patch b/net-misc/freeswan/files/freeswan-2.02-gentoo.patch
deleted file mode 100644
index 44461173ffe7..000000000000
--- a/net-misc/freeswan/files/freeswan-2.02-gentoo.patch
+++ /dev/null
@@ -1,383 +0,0 @@
-diff -ru freeswan-2.01/Makefile.inc freeswan-2.01-gentoo/Makefile.inc
---- freeswan-2.01/Makefile.inc	2003-06-05 11:40:42.000000000 -0500
-+++ freeswan-2.01-gentoo/Makefile.inc	2003-08-17 11:40:43.000000000 -0500
-@@ -59,7 +59,7 @@
- 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*
-@@ -93,7 +93,7 @@
- MANPLACES=man3 man5 man8
- 
- # where configuration files go
--FINALCONFFILE?=/etc/ipsec.conf
-+FINALCONFFILE?=/etc/ipsec/ipsec.conf
- CONFFILE=$(DESTDIR)$(FINALCONFFILE)
- 
- FINALCONFDIR?=/etc
-@@ -104,10 +104,10 @@
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
--FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan-2.02
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan-2.02
- DOCDIR=${DESTDIR}${FINALDOCDIR}
- 
- 
-@@ -231,7 +231,7 @@
- # installed one in RH 7.2, won't work - you wind up depending upon
- # openssl.
- 
--BIND9STATICLIBDIR?=/usr/local/lib
-+BIND9STATICLIBDIR?=/usr/lib
- 
- # set this to space where a linked/configured tree can be created by 
- # preprhkern4module. Only needed if you are going to be created RPMs
-diff -ru freeswan-2.01/lib/libdes/Makefile freeswan-2.01-gentoo/lib/libdes/Makefile
---- freeswan-2.01/lib/libdes/Makefile	2003-02-20 19:32:12.000000000 -0600
-+++ freeswan-2.01-gentoo/lib/libdes/Makefile	2003-08-17 11:16:26.000000000 -0500
-@@ -60,7 +60,7 @@
- # 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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/crypt586.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2003-08-17 11:14:45.000000000 -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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/des-586.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2003-08-17 11:14:45.000000000 -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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/des686.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/desboth.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/cbc.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2003-08-17 11:14:45.000000000 -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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # require 'x86asm.pl';
- # &asm_init("cpp","des-586.pl");
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -ru freeswan-2.01/programs/_include/_include.in freeswan-2.01-gentoo/programs/_include/_include.in
---- freeswan-2.01/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/_include/_include.in	2003-08-17 11:23:15.000000000 -0500
-@@ -47,10 +47,10 @@
- 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 -ru freeswan-2.01/programs/eroute/eroute.5 freeswan-2.01-gentoo/programs/eroute/eroute.5
---- freeswan-2.01/programs/eroute/eroute.5	2002-04-24 02:35:38.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/eroute/eroute.5	2003-08-17 11:14:45.000000000 -0500
-@@ -203,7 +203,7 @@
- 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 -ru freeswan-2.01/programs/eroute/eroute.8 freeswan-2.01-gentoo/programs/eroute/eroute.8
---- freeswan-2.01/programs/eroute/eroute.8	2002-04-24 02:35:38.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/eroute/eroute.8	2003-08-17 11:14:45.000000000 -0500
-@@ -225,7 +225,7 @@
- .BR www.ietf.org
- to pass in the clear, unprocessed.
- .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 -ru freeswan-2.01/programs/ipsec/ipsec.8 freeswan-2.01-gentoo/programs/ipsec/ipsec.8
---- freeswan-2.01/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/ipsec/ipsec.8	2003-08-17 11:14:45.000000000 -0500
-@@ -81,7 +81,7 @@
- .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 -ru freeswan-2.01/programs/klipsdebug/klipsdebug.5 freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.5
---- freeswan-2.01/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.5	2003-08-17 11:14:45.000000000 -0500
-@@ -103,7 +103,7 @@
- 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 -ru freeswan-2.01/programs/klipsdebug/klipsdebug.8 freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.8
---- freeswan-2.01/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.8	2003-08-17 11:14:45.000000000 -0500
-@@ -117,7 +117,7 @@
- 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 -ru freeswan-2.01/programs/lwdnsq/lwdnsq.xml.in freeswan-2.01-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- freeswan-2.01/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/lwdnsq/lwdnsq.xml.in	2003-08-17 11:24:01.000000000 -0500
-@@ -430,7 +430,7 @@
- <refsect1><title>Special IPSECKEY processing</title>
- 
- <programlisting>
--/etc/ipsec.d/lwdnsq.conf
-+/etc/ipsec/ipsec.d/lwdnsq.conf
- </programlisting>
- 
- </refsect1>
-diff -ru freeswan-2.01/programs/mailkey/mailkey.in freeswan-2.01-gentoo/programs/mailkey/mailkey.in
---- freeswan-2.01/programs/mailkey/mailkey.in	2003-06-07 14:16:33.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/mailkey/mailkey.in	2003-08-17 11:24:35.000000000 -0500
-@@ -60,7 +60,7 @@
- 
- "$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 -ru freeswan-2.01/programs/pluto/Makefile freeswan-2.01-gentoo/programs/pluto/Makefile
---- freeswan-2.01/programs/pluto/Makefile	2003-06-19 13:08:30.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/pluto/Makefile	2003-08-17 11:17:32.000000000 -0500
-@@ -94,7 +94,7 @@
- 	-DSHARED_SECRETS_FILE=\"${FINALCONFDIR}/ipsec.secrets\" \
- 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\"
- 
--ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
-+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
- 
- # libefence is a free memory allocation debugger
- # Solaris 2 needs -lsocket -lnsl
-Only in freeswan-2.01-gentoo/programs/setup: #Makefile#
-diff -ru freeswan-2.01/programs/setup/Makefile freeswan-2.01-gentoo/programs/setup/Makefile
---- freeswan-2.01/programs/setup/Makefile	2002-08-10 14:47:06.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/setup/Makefile	2003-08-17 11:31:56.000000000 -0500
-@@ -33,25 +33,10 @@
- 	@rm -f $(BINDIR)/setup
- 	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
- 	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
--	-@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
--	-@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K68ipsec
--	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K68ipsec
--	-@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K68ipsec
- 
- install_file_list::
- 	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
--	@echo $(RCDIR)/../rc0.d/K68ipsec
--	@echo $(RCDIR)/../rc1.d/K68ipsec
--	@echo $(RCDIR)/../rc2.d/S47ipsec
--	@echo $(RCDIR)/../rc3.d/S47ipsec
--	@echo $(RCDIR)/../rc4.d/S47ipsec
--	@echo $(RCDIR)/../rc5.d/S47ipsec
--	@echo $(RCDIR)/../rc6.d/K68ipsec
- 
- clean::
- 	@rm -f setup
-diff -ru freeswan-2.01/programs/showhostkey/showhostkey.in freeswan-2.01-gentoo/programs/showhostkey/showhostkey.in
---- freeswan-2.01/programs/showhostkey/showhostkey.in	2003-06-07 14:15:25.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/showhostkey/showhostkey.in	2003-08-17 11:18:33.000000000 -0500
-@@ -17,7 +17,7 @@
- me="ipsec showhostkey"
- usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]"
- 
--file=/etc/ipsec.secrets
-+file=/etc/ipsec/ipsec.secrets
- fmt=""
- gw=
- id=
-diff -ru freeswan-2.01/programs/spi/spi.5 freeswan-2.01-gentoo/programs/spi/spi.5
---- freeswan-2.01/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spi/spi.5	2003-08-17 11:14:45.000000000 -0500
-@@ -162,7 +162,7 @@
- 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 -ru freeswan-2.01/programs/spi/spi.8 freeswan-2.01-gentoo/programs/spi/spi.8
---- freeswan-2.01/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spi/spi.8	2003-08-17 11:14:45.000000000 -0500
-@@ -461,7 +461,7 @@
- (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 -ru freeswan-2.01/programs/spigrp/spigrp.5 freeswan-2.01-gentoo/programs/spigrp/spigrp.5
---- freeswan-2.01/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spigrp/spigrp.5	2003-08-17 11:14:45.000000000 -0500
-@@ -77,7 +77,7 @@
- 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 -ru freeswan-2.01/programs/spigrp/spigrp.8 freeswan-2.01-gentoo/programs/spigrp/spigrp.8
---- freeswan-2.01/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spigrp/spigrp.8	2003-08-17 11:14:45.000000000 -0500
-@@ -128,7 +128,7 @@
- .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 -ru freeswan-2.01/programs/tncfg/tncfg.5 freeswan-2.01-gentoo/programs/tncfg/tncfg.5
---- freeswan-2.01/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/tncfg/tncfg.5	2003-08-17 11:14:45.000000000 -0500
-@@ -75,7 +75,7 @@
- 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 -ru freeswan-2.01/programs/tncfg/tncfg.8 freeswan-2.01-gentoo/programs/tncfg/tncfg.8
---- freeswan-2.01/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/tncfg/tncfg.8	2003-08-17 11:14:45.000000000 -0500
-@@ -76,7 +76,7 @@
- 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 -ru freeswan-2.01/programs/barf/barf.in freeswan-2.01-gentoo/programs/barf/barf.in
---- freeswan-2.01/programs/barf/barf.in	2003-02-03 22:59:22.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/barf/barf.in	2003-08-17 11:23:35.000000000 -0500
-@@ -17,7 +17,7 @@
- KERNSRC=${KERNSRC-/usr/src/linux}
- LOGS=${LOGS-/var/log}
- CONFS=${IPSEC_CONFS-/etc}
--CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
-+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
- me="ipsec barf"
- 
- # kludge to produce no barf output mentioning policygroups if none are present.
-@@ -205,13 +205,13 @@
- 	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 --git a/net-misc/freeswan/files/freeswan-2.03-gentoo.patch b/net-misc/freeswan/files/freeswan-2.03-gentoo.patch
deleted file mode 100644
index 907983d7d418..000000000000
--- a/net-misc/freeswan/files/freeswan-2.03-gentoo.patch
+++ /dev/null
@@ -1,383 +0,0 @@
-diff -ru freeswan-2.01/Makefile.inc freeswan-2.01-gentoo/Makefile.inc
---- freeswan-2.01/Makefile.inc	2003-06-05 11:40:42.000000000 -0500
-+++ freeswan-2.01-gentoo/Makefile.inc	2003-08-17 11:40:43.000000000 -0500
-@@ -59,7 +59,7 @@
- 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*
-@@ -93,7 +93,7 @@
- MANPLACES=man3 man5 man8
- 
- # where configuration files go
--FINALCONFFILE?=/etc/ipsec.conf
-+FINALCONFFILE?=/etc/ipsec/ipsec.conf
- CONFFILE=$(DESTDIR)$(FINALCONFFILE)
- 
- FINALCONFDIR?=/etc
-@@ -104,10 +104,10 @@
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
--FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan-2.03
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan-2.03
- DOCDIR=${DESTDIR}${FINALDOCDIR}
- 
- 
-@@ -231,7 +231,7 @@
- # installed one in RH 7.2, won't work - you wind up depending upon
- # openssl.
- 
--BIND9STATICLIBDIR?=/usr/local/lib
-+BIND9STATICLIBDIR?=/usr/lib
- 
- # set this to space where a linked/configured tree can be created by 
- # preprhkern4module. Only needed if you are going to be created RPMs
-diff -ru freeswan-2.01/lib/libdes/Makefile freeswan-2.01-gentoo/lib/libdes/Makefile
---- freeswan-2.01/lib/libdes/Makefile	2003-02-20 19:32:12.000000000 -0600
-+++ freeswan-2.01-gentoo/lib/libdes/Makefile	2003-08-17 11:16:26.000000000 -0500
-@@ -60,7 +60,7 @@
- # 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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/crypt586.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2003-08-17 11:14:45.000000000 -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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/des-586.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2003-08-17 11:14:45.000000000 -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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/des686.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/desboth.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/cbc.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2003-08-17 11:14:45.000000000 -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 -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # require 'x86asm.pl';
- # &asm_init("cpp","des-586.pl");
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -ru freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- freeswan-2.01/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
-+++ freeswan-2.01-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2003-08-17 11:14:45.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -ru freeswan-2.01/programs/_include/_include.in freeswan-2.01-gentoo/programs/_include/_include.in
---- freeswan-2.01/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/_include/_include.in	2003-08-17 11:23:15.000000000 -0500
-@@ -47,10 +47,10 @@
- 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 -ru freeswan-2.01/programs/eroute/eroute.5 freeswan-2.01-gentoo/programs/eroute/eroute.5
---- freeswan-2.01/programs/eroute/eroute.5	2002-04-24 02:35:38.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/eroute/eroute.5	2003-08-17 11:14:45.000000000 -0500
-@@ -203,7 +203,7 @@
- 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 -ru freeswan-2.01/programs/eroute/eroute.8 freeswan-2.01-gentoo/programs/eroute/eroute.8
---- freeswan-2.01/programs/eroute/eroute.8	2002-04-24 02:35:38.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/eroute/eroute.8	2003-08-17 11:14:45.000000000 -0500
-@@ -225,7 +225,7 @@
- .BR www.ietf.org
- to pass in the clear, unprocessed.
- .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 -ru freeswan-2.01/programs/ipsec/ipsec.8 freeswan-2.01-gentoo/programs/ipsec/ipsec.8
---- freeswan-2.01/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/ipsec/ipsec.8	2003-08-17 11:14:45.000000000 -0500
-@@ -81,7 +81,7 @@
- .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 -ru freeswan-2.01/programs/klipsdebug/klipsdebug.5 freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.5
---- freeswan-2.01/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.5	2003-08-17 11:14:45.000000000 -0500
-@@ -103,7 +103,7 @@
- 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 -ru freeswan-2.01/programs/klipsdebug/klipsdebug.8 freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.8
---- freeswan-2.01/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/klipsdebug/klipsdebug.8	2003-08-17 11:14:45.000000000 -0500
-@@ -117,7 +117,7 @@
- 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 -ru freeswan-2.01/programs/lwdnsq/lwdnsq.xml.in freeswan-2.01-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- freeswan-2.01/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/lwdnsq/lwdnsq.xml.in	2003-08-17 11:24:01.000000000 -0500
-@@ -430,7 +430,7 @@
- <refsect1><title>Special IPSECKEY processing</title>
- 
- <programlisting>
--/etc/ipsec.d/lwdnsq.conf
-+/etc/ipsec/ipsec.d/lwdnsq.conf
- </programlisting>
- 
- </refsect1>
-diff -ru freeswan-2.01/programs/mailkey/mailkey.in freeswan-2.01-gentoo/programs/mailkey/mailkey.in
---- freeswan-2.01/programs/mailkey/mailkey.in	2003-06-07 14:16:33.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/mailkey/mailkey.in	2003-08-17 11:24:35.000000000 -0500
-@@ -60,7 +60,7 @@
- 
- "$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 -ru freeswan-2.01/programs/pluto/Makefile freeswan-2.01-gentoo/programs/pluto/Makefile
---- freeswan-2.01/programs/pluto/Makefile	2003-06-19 13:08:30.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/pluto/Makefile	2003-08-17 11:17:32.000000000 -0500
-@@ -94,7 +94,7 @@
- 	-DSHARED_SECRETS_FILE=\"${FINALCONFDIR}/ipsec.secrets\" \
- 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\"
- 
--ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
-+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
- 
- # libefence is a free memory allocation debugger
- # Solaris 2 needs -lsocket -lnsl
-Only in freeswan-2.01-gentoo/programs/setup: #Makefile#
-diff -ru freeswan-2.01/programs/setup/Makefile freeswan-2.01-gentoo/programs/setup/Makefile
---- freeswan-2.01/programs/setup/Makefile	2002-08-10 14:47:06.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/setup/Makefile	2003-08-17 11:31:56.000000000 -0500
-@@ -33,25 +33,10 @@
- 	@rm -f $(BINDIR)/setup
- 	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
- 	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
--	-@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
--	-@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K68ipsec
--	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K68ipsec
--	-@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K68ipsec
- 
- install_file_list::
- 	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
--	@echo $(RCDIR)/../rc0.d/K68ipsec
--	@echo $(RCDIR)/../rc1.d/K68ipsec
--	@echo $(RCDIR)/../rc2.d/S47ipsec
--	@echo $(RCDIR)/../rc3.d/S47ipsec
--	@echo $(RCDIR)/../rc4.d/S47ipsec
--	@echo $(RCDIR)/../rc5.d/S47ipsec
--	@echo $(RCDIR)/../rc6.d/K68ipsec
- 
- clean::
- 	@rm -f setup
-diff -ru freeswan-2.01/programs/showhostkey/showhostkey.in freeswan-2.01-gentoo/programs/showhostkey/showhostkey.in
---- freeswan-2.01/programs/showhostkey/showhostkey.in	2003-06-07 14:15:25.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/showhostkey/showhostkey.in	2003-08-17 11:18:33.000000000 -0500
-@@ -17,7 +17,7 @@
- me="ipsec showhostkey"
- usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]"
- 
--file=/etc/ipsec.secrets
-+file=/etc/ipsec/ipsec.secrets
- fmt=""
- gw=
- id=
-diff -ru freeswan-2.01/programs/spi/spi.5 freeswan-2.01-gentoo/programs/spi/spi.5
---- freeswan-2.01/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spi/spi.5	2003-08-17 11:14:45.000000000 -0500
-@@ -162,7 +162,7 @@
- 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 -ru freeswan-2.01/programs/spi/spi.8 freeswan-2.01-gentoo/programs/spi/spi.8
---- freeswan-2.01/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spi/spi.8	2003-08-17 11:14:45.000000000 -0500
-@@ -461,7 +461,7 @@
- (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 -ru freeswan-2.01/programs/spigrp/spigrp.5 freeswan-2.01-gentoo/programs/spigrp/spigrp.5
---- freeswan-2.01/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spigrp/spigrp.5	2003-08-17 11:14:45.000000000 -0500
-@@ -77,7 +77,7 @@
- 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 -ru freeswan-2.01/programs/spigrp/spigrp.8 freeswan-2.01-gentoo/programs/spigrp/spigrp.8
---- freeswan-2.01/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/spigrp/spigrp.8	2003-08-17 11:14:45.000000000 -0500
-@@ -128,7 +128,7 @@
- .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 -ru freeswan-2.01/programs/tncfg/tncfg.5 freeswan-2.01-gentoo/programs/tncfg/tncfg.5
---- freeswan-2.01/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/tncfg/tncfg.5	2003-08-17 11:14:45.000000000 -0500
-@@ -75,7 +75,7 @@
- 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 -ru freeswan-2.01/programs/tncfg/tncfg.8 freeswan-2.01-gentoo/programs/tncfg/tncfg.8
---- freeswan-2.01/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ freeswan-2.01-gentoo/programs/tncfg/tncfg.8	2003-08-17 11:14:45.000000000 -0500
-@@ -76,7 +76,7 @@
- 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 -ru freeswan-2.01/programs/barf/barf.in freeswan-2.01-gentoo/programs/barf/barf.in
---- freeswan-2.01/programs/barf/barf.in	2003-02-03 22:59:22.000000000 -0600
-+++ freeswan-2.01-gentoo/programs/barf/barf.in	2003-08-17 11:23:35.000000000 -0500
-@@ -17,7 +17,7 @@
- KERNSRC=${KERNSRC-/usr/src/linux}
- LOGS=${LOGS-/var/log}
- CONFS=${IPSEC_CONFS-/etc}
--CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
-+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
- me="ipsec barf"
- 
- # kludge to produce no barf output mentioning policygroups if none are present.
-@@ -205,13 +205,13 @@
- 	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 --git a/net-misc/freeswan/files/freeswan-2.04-gentoo.patch b/net-misc/freeswan/files/freeswan-2.04-gentoo.patch
index 0a72454c7a8f..402518488f5e 100644
--- a/net-misc/freeswan/files/freeswan-2.04-gentoo.patch
+++ b/net-misc/freeswan/files/freeswan-2.04-gentoo.patch
@@ -24,11 +24,11 @@ diff -ru freeswan-2.01/Makefile.inc freeswan-2.01-gentoo/Makefile.inc
  # sample configuration files go into
  INC_DOCDIR?=share/doc
 -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan-2.04
++FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan-2.04-r1
  EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
  
 -FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan-2.04
++FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan-2.04-r1
  DOCDIR=${DESTDIR}${FINALDOCDIR}
  
  
diff --git a/net-misc/freeswan/freeswan-1.99.ebuild b/net-misc/freeswan/freeswan-1.99-r1.ebuild
index 1343ef144599..e6cb5d7023b7 100644
--- a/net-misc/freeswan/freeswan-1.99.ebuild
+++ b/net-misc/freeswan/freeswan-1.99-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freeswan/freeswan-1.99.ebuild,v 1.12 2004/04/27 21:34:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freeswan/freeswan-1.99-r1.ebuild,v 1.1 2004/06/24 01:43:11 pfeifer Exp $
 
 inherit eutils
 
-X509_PATCH=0.9.34
+X509_PATCH=0.9.41
 S=${WORKDIR}/${P}
 DESCRIPTION="FreeS/WAN IPSec Userspace Utilities with X.509 Patches"
 SRC_URI="ftp://ftp.xs4all.nl/pub/crypto/freeswan/${P}.tar.gz
@@ -19,6 +19,7 @@ LICENSE="GPL-2"
 RDEPEND=""
 SLOT="0"
 KEYWORDS="x86 -sparc"
+IUSE=""
 
 pkg_setup() {
 	[ -d /usr/src/linux/net/ipsec ] || {
diff --git a/net-misc/freeswan/freeswan-2.04.ebuild b/net-misc/freeswan/freeswan-2.04-r1.ebuild
index 297582a00755..2d20be73bd1a 100644
--- a/net-misc/freeswan/freeswan-2.04.ebuild
+++ b/net-misc/freeswan/freeswan-2.04-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freeswan/freeswan-2.04.ebuild,v 1.4 2004/04/21 16:22:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freeswan/freeswan-2.04-r1.ebuild,v 1.1 2004/06/24 01:43:11 pfeifer Exp $
 
 inherit eutils
 
-X509_PATCH=1.4.8
+X509_PATCH=1.6.1
 DESCRIPTION="FreeS/WAN IPSec Userspace Utilities with X.509 Patches"
 HOMEPAGE="http://www.freeswan.org"
 SRC_URI="ftp://ftp.xs4all.nl/pub/crypto/freeswan/${P}.tar.gz
diff --git a/net-misc/freeswan/metadata.xml b/net-misc/freeswan/metadata.xml
new file mode 100644
index 000000000000..35d5865fb29e
--- /dev/null
+++ b/net-misc/freeswan/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>secure-tunneling</herd>
+<maintainer>
+  <email>pfeifer@gentoo.org</email>
+  <name>Jay Pfeifer</name>
+<!--  <description>Description of the maintainership</description> -->
+</maintainer>
+<longdescription>Linux FreeS/WAN is an implementation of IPSEC & IKE for Linux.
+
+IPSEC is Internet Protocol SECurity. It uses strong cryptography to provide both
+authentication and encryption services. Authentication ensures that packets are
+from the right sender and have not been altered in transit. Encryption prevents
+unauthorised reading of packet contents.
+
+These services allow you to build secure tunnels through untrusted networks.
+Everything passing through the untrusted net is encrypted by the IPSEC gateway
+machine and decrypted by the gateway at the other end. The result is Virtual
+Private Network or VPN. This is a network which is effectively private even
+though it includes machines at several different sites connected by the insecure
+Internet.
+
+The IPSEC protocols were developed by the IETF (Internet Engineering Task Force)
+and will be required as part of IP Version Six, the next generation. They are
+also being widely implemented for IP V4. In particular, nearly all vendors of
+any type of firewall or security software have IPSEC support either shipping or
+in development. There are also several open source IPSEC projects. Several
+companies are co-operating in the Secure Wide Area Network (S/WAN) project to
+ensure that products will interoperate. There is also a VPN Consortium fostering
+cooperation among companies in this area.
+
+Our project's primary objective is to help make IPSEC widespread by providing
+source code which is freely available, runs on a range of machines including
+ubiquitous cheap PCs, and is not subject to US or other nations' export restrictions.
+</longdescription>
+</pkgmetadata>