Mark strongswan-2.2.1 stable on x86. Version bump to strongswan-2.2.2. Move forward ~amd64 from version 2.1.3 to 2.2.2 since opensc/openct are now available for ~amd64. Tested on opeteron and nocona systems.

7 files changed, 462 insertions, 14 deletions

diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 0a06f6c6a73c..2a27bbfa5aba 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,16 +1,16 @@
-MD5 6f84fcb73580280a86c34af07a7c2d5d ChangeLog 3099
-MD5 5d96d9e4b6f6b113db0983e211adf85a metadata.xml 639
-MD5 ae997bca1ced2191e39625501480f95b openswan-2.1.4.ebuild 3122
-MD5 c46a67b9295b521816d933ab5c0d3601 openswan-1.0.6.ebuild 1887
 MD5 bb89ef02ed491be05e7c7aa090a88263 openswan-1.0.7.ebuild 1887
 MD5 0b4846a1ec1c676f6085fdec6be40522 openswan-2.1.5.ebuild 3123
-MD5 bbe53a70bdc15e5b3dc4182a96f9598c openswan-2.2.0.ebuild 3124
-MD5 a89d62cdc2c6087f9828b1586b0a78ec files/digest-openswan-2.1.4 67
+MD5 c46a67b9295b521816d933ab5c0d3601 openswan-1.0.6.ebuild 1887
+MD5 9bde29a2af4f8037cf8a4e672b012c74 openswan-2.2.0.ebuild 3122
+MD5 ae997bca1ced2191e39625501480f95b openswan-2.1.4.ebuild 3122
+MD5 65cadc6532a4933958c94b2756be6d79 ChangeLog 3187
+MD5 5d96d9e4b6f6b113db0983e211adf85a metadata.xml 639
 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
-MD5 8e740d4b962bb189f52cf890e2c98c8f files/openswan-2.1.4-gentoo.patch 17438
+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 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 c455249e331da80c3619b2e474e2af67 files/openswan-2.1.5-gentoo.patch 17438
 MD5 0ddd2a0be9ddea1e37f659f9d529ee19 files/digest-openswan-2.2.0 67
-MD5 9b866b02f096fc3ce577165fd17a82ec files/openswan-2.2.0-gentoo.patch 17438
+MD5 8e740d4b962bb189f52cf890e2c98c8f files/openswan-2.1.4-gentoo.patch 17438
diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index ccf617d3fb28..6d8bf1d8b3b9 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.16 2004/09/18 02:24:56 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.17 2004/10/25 17:01:46 pfeifer Exp $
+
+*strongswan-2.2.2 (25 Oct 2004)
+
+  25 Oct 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.2.2.ebuild:
+  Version bump to strongswan-2.2.2.
+  Move forward ~amd64 from version 2.1.3 to 2.2.2 since opensc/openct are now available for ~amd64.
+  Tested on opeteron and nocona systems.
+
+  25 Oct 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.2.1.ebuild:
+  Mark stable on x86.
 
 *strongswan-2.2.1 (17 Sep 2004)
 
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 22a6d5795f73..7bad0be25a72 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1,10 +1,12 @@
+MD5 ddc64e39ae089be13125227481b9be94 strongswan-2.2.2.ebuild 3668
 MD5 41f2633de5a666520e14de69729994bf strongswan-2.1.3.ebuild 3101
-MD5 1c214bb052f10648bd51ccff3fdf7f7d strongswan-2.2.1.ebuild 3661
+MD5 6ee0efeaa838562515b6519c5e58ecca strongswan-2.2.1.ebuild 3660
 MD5 9a5225212d9eb761a4f03718be03247e strongswan-2.1.5.ebuild 3660
-MD5 c7704bfd7f20a92b58ae765355773481 ChangeLog 2382
+MD5 e2f8a311ee9bd4317ba9b5108cdc2fc1 ChangeLog 2762
 MD5 2a3e2aab9fc91dd58f91f7796d28bd8e strongswan-2.2.0.ebuild 3660
 MD5 a64b79eda14e03e130f7dde467dfa860 metadata.xml 706
 MD5 98cbee623e8b61da488c286699bd184c files/strongswan-2.1.3-gentoo.patch 17672
+MD5 e5c314dfa834ee14593f4b779f539ed1 files/strongswan-2.2.2-gentoo.patch 12859
 MD5 c75b166cb55a2bcbd020f38f0d3e6671 files/strongswan-2.1.3-gcc34.patch 600
 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
 MD5 4b0049a6ec44eed18d06a2a06c67cdef files/strongswan-2.2.1-gentoo.patch 15278
@@ -14,3 +16,4 @@ MD5 056cc14af9a978c9b1bbe57bdb6ccf3f files/digest-strongswan-2.1.3 69
 MD5 cd600bde91d911f84530dbd4146edebf files/digest-strongswan-2.1.5 69
 MD5 9a29fb994889b751fbc635cf737dc461 files/digest-strongswan-2.2.0 69
 MD5 f114c8c4d9bea79db167485981f469ae files/digest-strongswan-2.2.1 69
+MD5 c538ae5513e73c1ab298f18b7482cbcc files/digest-strongswan-2.2.2 69
diff --git a/net-misc/strongswan/files/digest-strongswan-2.2.2 b/net-misc/strongswan/files/digest-strongswan-2.2.2
new file mode 100644
index 000000000000..975328fe037e
--- /dev/null
+++ b/net-misc/strongswan/files/digest-strongswan-2.2.2
@@ -0,0 +1 @@
+MD5 f3f1c7a2391b9ccfa6f6b728e2c5f280 strongswan-2.2.2.tar.gz 3579080
diff --git a/net-misc/strongswan/files/strongswan-2.2.2-gentoo.patch b/net-misc/strongswan/files/strongswan-2.2.2-gentoo.patch
new file mode 100644
index 000000000000..f61dc11c46b4
--- /dev/null
+++ b/net-misc/strongswan/files/strongswan-2.2.2-gentoo.patch
@@ -0,0 +1,287 @@
+diff -Naupr strongswan-2.2.2/Makefile.inc strongswan-2.2.2-gentoo/Makefile.inc
+--- strongswan-2.2.2/Makefile.inc	2004-09-17 12:15:20.000000000 -0500
++++ strongswan-2.2.2-gentoo/Makefile.inc	2004-10-25 11:30:20.653934061 -0500
+@@ -62,7 +62,7 @@ POLICYLIB=${FREESWANSRCDIR}/lib/libipsec
+ DESTDIR?=
+ 
+ # "local" part of tree, used in building other pathnames
+-INC_USRLOCAL=/usr/local
++INC_USRLOCAL=/usr
+ 
+ # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
+ # settings which are assumed to include it (or at least, to include *some*
+@@ -96,7 +96,7 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_
+ MANPLACES=man3 man5 man8
+ 
+ # where configuration files go
+-FINALCONFFILE?=/etc/ipsec.conf
++FINALCONFFILE?=/etc/ipsec/ipsec.conf
+ CONFFILE=$(DESTDIR)$(FINALCONFFILE)
+ 
+ FINALCONFDIR?=/etc
+@@ -107,10 +107,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR)
+ 
+ # sample configuration files go into
+ INC_DOCDIR?=share/doc
+-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan
++FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.2.2
+ EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
+ 
+-FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan
++FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.2.2
+ DOCDIR=${DESTDIR}${FINALDOCDIR}
+ 
+ # where per-conn pluto logs go
+@@ -239,7 +239,7 @@ RH_KERNELSRC?=/usr/src/linux-2.4
+ # installed one in RH 7.2, won't work - you wind up depending upon
+ # openssl.
+ 
+-BIND9STATICLIBDIR?=/usr/local/lib
++BIND9STATICLIBDIR?=/usr/lib
+ 
+ # FreeSWAN 3.x will require bind9. 
+ USE_LWRES?=false
+diff -Naupr strongswan-2.2.2/programs/_include/_include.in strongswan-2.2.2-gentoo/programs/_include/_include.in
+--- strongswan-2.2.2/programs/_include/_include.in	2004-03-15 15:03:06.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/_include/_include.in	2004-10-25 11:30:20.653934061 -0500
+@@ -49,10 +49,10 @@ for f
+ do
+ 	if test ! -r "$f"
+ 	then
+-		if test ! "$f" = "/etc/ipsec.conf"
++		if test ! "$f" = "/etc/ipsec/ipsec.conf"
+ 		then
+ 			echo "#:cannot open configuration file \'$f\'"
+-			if test "$f" = "/etc/ipsec.secrets"
++			if test "$f" = "/etc/ipsec/ipsec.secrets"
+ 			then
+ 				echo "#:Your secrets file will be created when you start $IPSEC_NAME for the first time."
+ 			fi
+diff -Naupr strongswan-2.2.2/programs/barf/barf.in strongswan-2.2.2-gentoo/programs/barf/barf.in
+--- strongswan-2.2.2/programs/barf/barf.in	2004-09-23 16:08:23.000000000 -0500
++++ strongswan-2.2.2-gentoo/programs/barf/barf.in	2004-10-25 11:30:20.654933887 -0500
+@@ -19,7 +19,7 @@ IPSEC_NAME="strongSwan"
+ KERNSRC=${KERNSRC-/usr/src/linux}
+ LOGS=${LOGS-/var/log}
+ CONFS=${IPSEC_CONFS-/etc}
+-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
++CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
+ me="ipsec barf"
+ 
+ # kludge to produce no barf output mentioning policygroups if none are present.
+@@ -207,13 +207,13 @@ then
+ 	done
+ fi
+ _________________________ ipsec/ls-libdir
+-ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec}
++ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec}
+ _________________________ ipsec/ls-execdir
+-ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}
++ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec}
+ _________________________ ipsec/updowns
+-for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown`
++for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown`
+ do
+-	cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f
++	cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f
+ done
+ _________________________ proc/net/dev
+ cat /proc/net/dev
+diff -Naupr strongswan-2.2.2/programs/eroute/eroute.5 strongswan-2.2.2-gentoo/programs/eroute/eroute.5
+--- strongswan-2.2.2/programs/eroute/eroute.5	2004-03-15 14:35:27.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/eroute/eroute.5	2004-10-25 11:30:20.654933887 -0500
+@@ -223,7 +223,7 @@ Parameters Index of
+ in hexadecimal using Authentication Header protocol (51,
+ IPPROTO_AH) with no identies defined for either end.
+ .SH FILES
+-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
++/proc/net/ipsec_eroute, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_spi(5),
+ ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_eroute(8), ipsec_version(5),
+diff -Naupr strongswan-2.2.2/programs/eroute/eroute.8 strongswan-2.2.2-gentoo/programs/eroute/eroute.8
+--- strongswan-2.2.2/programs/eroute/eroute.8	2004-03-15 14:35:27.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/eroute/eroute.8	2004-10-25 11:30:20.655933713 -0500
+@@ -308,7 +308,7 @@ will be in clear text.
+ .br
+ .LP
+ .SH FILES
+-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
++/proc/net/ipsec_eroute, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8),
+ ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5)
+diff -Naupr strongswan-2.2.2/programs/ipsec/ipsec.8 strongswan-2.2.2-gentoo/programs/ipsec/ipsec.8
+--- strongswan-2.2.2/programs/ipsec/ipsec.8	2004-03-15 14:35:27.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/ipsec/ipsec.8	2004-10-25 11:30:20.655933713 -0500
+@@ -81,7 +81,7 @@ reports where
+ .I ipsec
+ thinks the IPsec configuration files are stored.
+ .SH FILES
+-/usr/local/lib/ipsec	usual utilities directory
++/usr/lib/ipsec	usual utilities directory
+ .SH ENVIRONMENT
+ .PP
+ The following environment variables control where FreeS/WAN finds its
+diff -Naupr strongswan-2.2.2/programs/klipsdebug/klipsdebug.5 strongswan-2.2.2-gentoo/programs/klipsdebug/klipsdebug.5
+--- strongswan-2.2.2/programs/klipsdebug/klipsdebug.5	2004-03-15 14:35:28.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/klipsdebug/klipsdebug.5	2004-10-25 11:30:20.655933713 -0500
+@@ -103,7 +103,7 @@ full
+ sockets debugging has been set and everything else is not set.
+ .LP
+ .SH FILES
+-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
+ ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5), ipsec_version(5),
+diff -Naupr strongswan-2.2.2/programs/klipsdebug/klipsdebug.8 strongswan-2.2.2-gentoo/programs/klipsdebug/klipsdebug.8
+--- strongswan-2.2.2/programs/klipsdebug/klipsdebug.8	2004-03-15 14:35:28.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/klipsdebug/klipsdebug.8	2004-10-25 11:30:20.656933540 -0500
+@@ -117,7 +117,7 @@ turns off only the
+ debugging messages.
+ .LP
+ .SH FILES
+-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
+ ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5)
+diff -Naupr strongswan-2.2.2/programs/lwdnsq/lwdnsq.xml.in strongswan-2.2.2-gentoo/programs/lwdnsq/lwdnsq.xml.in
+--- strongswan-2.2.2/programs/lwdnsq/lwdnsq.xml.in	2004-03-15 14:35:28.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-10-25 11:30:20.656933540 -0500
+@@ -430,7 +430,7 @@ information.
+ <refsect1><title>Special IPSECKEY processing</title>
+ 
+ <programlisting>
+-/etc/ipsec.d/lwdnsq.conf
++/etc/ipsec/ipsec.d/lwdnsq.conf
+ </programlisting>
+ 
+ </refsect1>
+diff -Naupr strongswan-2.2.2/programs/mailkey/mailkey.in strongswan-2.2.2-gentoo/programs/mailkey/mailkey.in
+--- strongswan-2.2.2/programs/mailkey/mailkey.in	2004-03-15 14:35:28.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/mailkey/mailkey.in	2004-10-25 11:30:20.656933540 -0500
+@@ -60,7 +60,7 @@ with the following error:
+ 
+ "$test1st"
+ 
+-Common concerns: This account must be able to read /etc/ipsec.secrets. 
++Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. 
+ If you haven't generated your key yet, please run 'ipsec newhostkey'." 
+ exit 0
+ }
+diff -Naupr strongswan-2.2.2/programs/showhostkey/showhostkey.in strongswan-2.2.2-gentoo/programs/showhostkey/showhostkey.in
+--- strongswan-2.2.2/programs/showhostkey/showhostkey.in	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/showhostkey/showhostkey.in	2004-10-25 11:30:20.657933366 -0500
+@@ -18,7 +18,7 @@ me="ipsec showhostkey"
+ usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
+                   [--dhclient]"
+ 
+-file=/etc/ipsec.secrets
++file=/etc/ipsec/ipsec.secrets
+ fmt=""
+ gw=
+ id=
+diff -Naupr strongswan-2.2.2/programs/spi/spi.5 strongswan-2.2.2-gentoo/programs/spi/spi.5
+--- strongswan-2.2.2/programs/spi/spi.5	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/spi/spi.5	2004-10-25 11:30:20.657933366 -0500
+@@ -162,7 +162,7 @@ since 1 of 8 bits is a parity bit), has 
+ 3858 seconds ago and has been idle for 23 seconds.
+ .LP
+ .SH FILES
+-/proc/net/ipsec_spi, /usr/local/bin/ipsec
++/proc/net/ipsec_spi, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5),
+ ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_spi(8), ipsec_version(5),
+diff -Naupr strongswan-2.2.2/programs/spi/spi.8 strongswan-2.2.2-gentoo/programs/spi/spi.8
+--- strongswan-2.2.2/programs/spi/spi.8	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/spi/spi.8	2004-10-25 11:30:20.658933193 -0500
+@@ -461,7 +461,7 @@ and protocol
+ (4).
+ .LP
+ .SH FILES
+-/proc/net/ipsec_spi, /usr/local/bin/ipsec
++/proc/net/ipsec_spi, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
+ ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5)
+diff -Naupr strongswan-2.2.2/programs/spi/spi.c strongswan-2.2.2-gentoo/programs/spi/spi.c
+--- strongswan-2.2.2/programs/spi/spi.c	2004-09-29 17:28:49.000000000 -0500
++++ strongswan-2.2.2-gentoo/programs/spi/spi.c	2004-10-25 11:31:16.695203902 -0500
+@@ -981,7 +981,7 @@ main(int argc, char *argv[])
+ 			       fprintf(stderr, "%s: invalid encryption keylen=%d, "
+ 					       "required %d by encrypt algo string=\"%s\"\n",
+ 				       program_name, 
+-				       keylen,
++				       (int)keylen,
+ 				       (int)esp_info->esp_ealg_keylen,
+ 				       alg_string);
+ 			       exit(1);
+@@ -993,7 +993,7 @@ main(int argc, char *argv[])
+ 			       fprintf(stderr, "%s: invalid encryption keylen=%d, "
+ 					       "must be between %d and %d bits\n",
+ 					       program_name, 
+-					       keylen, minbits, maxbits);
++					       (int)keylen, (int)minbits, (int)maxbits);
+ 			       exit(1);
+ 		       }
+ 		       alg_p=kernel_alg_sadb_alg_get(SADB_SATYPE_ESP,SADB_EXT_SUPPORTED_AUTH, 
+@@ -1006,7 +1006,7 @@ main(int argc, char *argv[])
+ 			       fprintf(stderr, "%s: invalid auth keylen=%d, "
+ 					       "must be between %d and %d bits\n",
+ 					       program_name, 
+-					       keylen, minbits, maxbits);
++					       (int)keylen, (int)minbits, (int)maxbits);
+ 			       exit(1);
+ 		       }
+ 
+diff -Naupr strongswan-2.2.2/programs/spigrp/spigrp.5 strongswan-2.2.2-gentoo/programs/spigrp/spigrp.5
+--- strongswan-2.2.2/programs/spigrp/spigrp.5	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/spigrp/spigrp.5	2004-10-25 11:30:20.658933193 -0500
+@@ -77,7 +77,7 @@ be an incoming or outgoing group, depend
+ machine.
+ .LP
+ .SH FILES
+-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
++/proc/net/ipsec_spigrp, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5),
+ ipsec_spi(5), ipsec_klipsdebug(5), ipsec_spigrp(8), ipsec_version(5),
+diff -Naupr strongswan-2.2.2/programs/spigrp/spigrp.8 strongswan-2.2.2-gentoo/programs/spigrp/spigrp.8
+--- strongswan-2.2.2/programs/spigrp/spigrp.8	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/spigrp/spigrp.8	2004-10-25 11:30:20.658933193 -0500
+@@ -128,7 +128,7 @@ and finally an AH header to authenticate
+ .BR 0x236 .
+ .LP
+ .SH FILES
+-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
++/proc/net/ipsec_spigrp, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
+ ipsec_spi(8), ipsec_klipsdebug(8), ipsec_spigrp(5)
+diff -Naupr strongswan-2.2.2/programs/tncfg/tncfg.5 strongswan-2.2.2-gentoo/programs/tncfg/tncfg.5
+--- strongswan-2.2.2/programs/tncfg/tncfg.5	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/tncfg/tncfg.5	2004-10-25 11:30:20.659933019 -0500
+@@ -75,7 +75,7 @@ shows that virtual device
+ is not connected to any physical device.
+ .LP
+ .SH "FILES"
+-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
++/proc/net/ipsec_tncfg, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5),
+ ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5),
+diff -Naupr strongswan-2.2.2/programs/tncfg/tncfg.8 strongswan-2.2.2-gentoo/programs/tncfg/tncfg.8
+--- strongswan-2.2.2/programs/tncfg/tncfg.8	2004-03-15 14:35:31.000000000 -0600
++++ strongswan-2.2.2-gentoo/programs/tncfg/tncfg.8	2004-10-25 11:30:20.659933019 -0500
+@@ -76,7 +76,7 @@ virtual device to the
+ physical device.
+ .LP
+ .SH "FILES"
+-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
++/proc/net/ipsec_tncfg, /usr/bin/ipsec
+ .SH "SEE ALSO"
+ ipsec(8), ipsec_manual(8), ipsec_eroute(8), ipsec_spi(8),
+ ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_tncfg(5)
diff --git a/net-misc/strongswan/strongswan-2.2.1.ebuild b/net-misc/strongswan/strongswan-2.2.1.ebuild
index 18f9cd5430cf..6112077d7f93 100644
--- a/net-misc/strongswan/strongswan-2.2.1.ebuild
+++ b/net-misc/strongswan/strongswan-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.2.1.ebuild,v 1.1 2004/09/18 02:24:56 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.2.1.ebuild,v 1.2 2004/10/25 17:01:46 pfeifer Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~ppc"
+KEYWORDS="-* x86 ~ppc"
 IUSE="curl ldap smartcard"
 
 DEPEND="!net-misc/openswan
diff --git a/net-misc/strongswan/strongswan-2.2.2.ebuild b/net-misc/strongswan/strongswan-2.2.2.ebuild
new file mode 100644
index 000000000000..94963ecd2023
--- /dev/null
+++ b/net-misc/strongswan/strongswan-2.2.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.2.2.ebuild,v 1.1 2004/10/25 17:01:46 pfeifer Exp $
+
+inherit eutils
+
+DESCRIPTION="Open Source implementation of IPsec for the Linux operating system."
+HOMEPAGE="http://www.strongswan.org/"
+SRC_URI="http://download.strongswan.org/${P}.tar.gz
+	mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86 ~ppc ~amd64"
+IUSE="curl ldap smartcard"
+
+DEPEND="!net-misc/openswan
+	virtual/libc
+	virtual/linux-sources
+	curl? ( net-misc/curl )
+	ldap? ( =net-nds/openldap-2* )
+	smartcard? ( dev-libs/opensc )
+	>=dev-libs/gmp-3.1.1
+	net-misc/host
+	sys-apps/iproute2"
+RDEPEND=""
+
+check_version_h() {
+	if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ]
+	then
+		eerror "Please verify that your /usr/src/linux symlink is pointing"
+		eerror "to your current kernel sources, and that you have a running kernel"
+		die "/usr/src/linux symlink not setup!"
+	fi
+}
+
+get_KV_info() {
+	check_version_h
+
+	# Get the kernel version of sources in /usr/src/linux ...
+	export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \
+		"${ROOT}/usr/src/linux/include/linux/version.h")"
+	export KV_major="$(echo "${KV_full}" | cut -d. -f1)"
+	export KV_minor="$(echo "${KV_full}" | cut -d. -f2)"
+	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
+}
+
+is_kernel() {
+	[ -z "$1" -o -z "$2" ] && return 1
+
+	get_KV_info
+
+	if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ]
+	then
+		return 0
+	else
+		return 1
+	fi
+}
+
+pkg_setup() {
+	get_KV_info
+
+	einfo "Linux kernel is version ${KV_major}.${KV_minor}.${KV_micro}"
+
+	if is_kernel 2 5
+	then
+	eerror "Kernel version ${KV_major}.${KV_minor}.${KV_micro} will not work with this ebuild."
+	die "Please install a 2.6.x version of the Linux kernel."
+	fi
+
+	if is_kernel 2 6
+	then
+	einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
+	einfo "KLIPS will not be compiled/installed."
+	export MYMAKE="programs"
+
+	elif is_kernel 2 4
+	then
+		[ -d /usr/src/linux/net/ipsec ] || {
+		eerror "You need to have an IPsec enabled 2.4.x kernel."
+		eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
+		}
+	einfo "Using patched-in IPsec code for kernel 2.4"
+	einfo "Your kernel only supports KLIPS for kernel level IPsec."
+	export MYMAKE="confcheck programs"
+
+	else
+	eerror "Sorry, no support for your kernel version ${KV_major}.${KV_minor}.${KV_micro}."
+	die "Install an IPsec enabled 2.4 or 2.6 kernel."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	cd programs/pluto
+
+	if use curl ; then
+		ebegin "Curl support requested. Enabling curl support"
+		sed -i -e 's:#LIBCURL=1:LIBCURL=1:g' Makefile || die
+		eend $?
+	fi
+
+	if use ldap ; then
+		ebegin "LDAP support requested. Enabling LDAPv3 support"
+		sed -i -e 's:#LDAP_VERSION=3:LDAP_VERSION=3:g' Makefile || die
+		eend $?
+	fi
+
+	if  use smartcard ; then
+		ebegin "Smartcard support requested. Enabling opensc support"
+		sed -i -e 's:#SMARTCARD=1:SMARTCARD=1:g' Makefile || die
+		eend $?
+	fi
+}
+
+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 CHANGES* CREDITS INSTALL LICENSE README* doc/*
+	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
+
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/ipsec
+}