Fix compile error when built against glibc-2.10 (#271987).

Remove obsolete versions.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

10 files changed, 61 insertions, 546 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index cf52d527ce23..f1a8c3cb3b20 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.62 2009/04/23 18:43:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.63 2009/06/14 10:25:30 mrness Exp $
+
+  14 Jun 2009; Alin Năstac <mrness@gentoo.org>
+  -files/openswan-2.4.13-deprecated-ldap.patch,
+  -files/openswan-2.4.13-gentoo-fixed.patch,
+  +files/openswan-2.4.14-getline.patch, -files/openswan-2.6.19-gentoo.patch,
+  -files/openswan-2.6.19-qa-fixes.patch, -openswan-2.4.13-r2.ebuild,
+  openswan-2.4.14.ebuild, -openswan-2.6.19.ebuild:
+  Fix compile error when built against glibc-2.10 (#271987). Remove obsolete
+  versions.
 
   23 Apr 2009; Markus Meier <maekke@gentoo.org> openswan-2.4.14:
   amd64/x86 stable, bug #264346
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 8c4443fb8b63..3ff5681fec71 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -3,27 +3,20 @@ Hash: SHA1
 
 AUX ipsec 1551 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a SHA1 53c1826bea6a613a025d34ea3b68e95c2b13e62c SHA256 926aedf5585626202b9817e0d37ef40c4a07ef1f75b77de228eb7f5f8b8e6f21
 AUX ipsec-initd 487 RMD160 23d9d7be6000fb95fdb142bc948964d6050b7864 SHA1 55a4c3ab2523f265e314c9048c0552699564fc4d SHA256 e86140b6e596a0b0d6e52ca521adb891eb3b9cc4ad8e6f28041fb773f9f60347
-AUX openswan-2.4.13-deprecated-ldap.patch 371 RMD160 4fb852b20240b9c2b22db5d2ca5b75ac7c4ca2f0 SHA1 8d70c48e525467e26cdf5f1f6fb36d49a03d8a20 SHA256 9d406ba127eca56ba5e64517fe107e1785c07cad9e7a770d8481d7998c4e1709
-AUX openswan-2.4.13-gentoo-fixed.patch 6724 RMD160 5714afc4819bf8be7929601d8702e8d7099e81ad SHA1 6ff4183bda05b3cd2e94b8ca9214cfa3be9ea130 SHA256 866ec2c50c050c34425d12f7f12d12b9fe9ccdd1f5ca8ce6a0a76bec0002bf58
 AUX openswan-2.4.14-deprecated-ldap.patch 372 RMD160 7ec7ef91ad9712026be01e5f896f829c6d9bd179 SHA1 1904c14f089ad92ab57e5ac1c0abdc89413280a0 SHA256 ad71a9bf6692f7fe7252cbd8642176fe1b14234944cd5a8a5916f61926519c53
 AUX openswan-2.4.14-gentoo-fixed.patch 7744 RMD160 23cd42532116253854ed1526f464d411c710d3ba SHA1 425c282ce312518828936d764b7a707148ff0557 SHA256 849193e8b2107a8f4f6a7d91b447ab4f628760b4117f0b1cdc3ded8b2f4d98c5
-AUX openswan-2.6.19-gentoo.patch 2761 RMD160 f34ce06ee3ef5a01dfe16ae040c84299c9cd5b9b SHA1 9af75e2d2f3c4667627daf6ada5d4be84c9f14d1 SHA256 b6bb07509a154811602c710a577eb3238fb7c6d2c4ecfc3ed20ce26dcfccbad6
-AUX openswan-2.6.19-qa-fixes.patch 408 RMD160 89bbae8456a33fb7297c9d242f24ca13de1512f9 SHA1 d6d215e5429a0ded2b0aee49e4ea2e2b6846fdcc SHA256 bad4f78c2c55e3cb815d0fd241e59adf9725875b0ed989722e2756af0155e8c9
+AUX openswan-2.4.14-getline.patch 1559 RMD160 56da53a0ec2685ad60c5e4109867e7e2398c75f2 SHA1 bbdcda81dfa52581c8efc15d9fc88249a45113bd SHA256 c8c8fcaffcdc694df3152f5b581b31ff3dc3ae7ad3a131392e5ee082756e33d2
 AUX openswan-2.6.21-gentoo-fixed.patch 4930 RMD160 ee9dbfed38c81da04254ecd4695193f8f2660459 SHA1 9591a633b545db49560953dd11b9ee55c99ba167 SHA256 943a3eb1a3c42ab3024e3015a8e4b5586aa65e348fac01f2d2600d7fca59fe5b
-DIST openswan-2.4.13.tar.gz 3761840 RMD160 cc22c2d838d33fe2a08173aa1602ec39cfde3a80 SHA1 ad314d22f08c8de08624b1a7f69120eae23fad4b SHA256 1dcf1ebcc8b974def51b09e791de267ec9813b6af086337aa06909e27ccff5f6
 DIST openswan-2.4.14.tar.gz 3762031 RMD160 c3165fa58d540d30a5adfbc1070a21ca6762c17b SHA1 6f79c969164f80ae7d2b5a436bd798c428615687 SHA256 5c5886c026f79a85bee0ac2888fc3c7da87b8f8c493f02a51a5ce6b8675a4ddf
-DIST openswan-2.6.19.tar.gz 6547468 RMD160 844d4f0eaf8a3165c4a1195fb7f874f384c46424 SHA1 532df8f907d89637a83b8bc1cb5032f929209ed0 SHA256 44547bde3cb603e31b7aa251bcbfb02c1fecbaa73acada6f95f38f99e7b7d7a2
 DIST openswan-2.6.21.tar.gz 6201306 RMD160 d94fcd50a55ae6bb28787b2fc1966c9c43927fbe SHA1 b43fd73e8a10b00b08a4b1784730f2656430f977 SHA256 e773aa22f86ef12999f9a78c98ad5ba09980ccd1d14ab16361e9f21e40742fe7
-EBUILD openswan-2.4.13-r2.ebuild 3539 RMD160 da78299a3284f09f52b12dabab71d1b562062caf SHA1 6ac95439aca2c0043a9ede05d4d8ed6a7052602c SHA256 e4df8b3da5a63524f5d8ff92057e1fbbcec7e3f8e93c4853f81ceacfa22f6c4c
-EBUILD openswan-2.4.14.ebuild 3522 RMD160 8ecaca4c579e5a00639fbd9ee4b65ec3c89b7fda SHA1 730cc8db88cc37428ccf5933e519ab919d34306d SHA256 722177ad13b9a0280dde631117e05a8a4acc5b37020a75742794c1b2a66eb39a
-EBUILD openswan-2.6.19.ebuild 4588 RMD160 309ccb8e1d73a32941e7e490efffe894e615a135 SHA1 7cdfa5b2b6f8df31e2ce31cb55819c6a4f04cd92 SHA256 e5cedd98dabc8dc3d9b5453629828b0822598f4baea64ea4ae96d0da274d8d57
+EBUILD openswan-2.4.14.ebuild 3563 RMD160 0ac58588efb85c67fd861a1be1bb5d1990e51fdf SHA1 ed96d4397f72e2f1495cf182e8b36b97bcf59088 SHA256 734e7605f5d6caa4063e4d30a83be1d87975a1f02a4f31d702496d965c473a2c
 EBUILD openswan-2.6.21.ebuild 4530 RMD160 73110832a157567fa866d9bdbc387d79eacded1c SHA1 83e83bbd4ce899e307c33292bc6a1a43bb341215 SHA256 133787849bfb63f7899a09e38070ecea9b8c67cae6f255f4f9d7982106297d61
-MISC ChangeLog 11911 RMD160 1bc4a88cc0ce6c90e8ee6a7ade6ac635408cd2cb SHA1 0c80bf12513425ae10185beeffe2c3f26fee5278 SHA256 3ed6566a7c4f33da3bb996964dd78b03b7e3ff13977a0089d3fcaa05f8dd49e9
+MISC ChangeLog 12339 RMD160 d71ce2c94b7e925da624f92575fa05006d1ede93 SHA1 bd74f77fdf6c0f3306a385651e3d86df66956777 SHA256 d6e33a2efa1dbcc5b65f453415eb2d7f61437a68c98d756ec1c960455303b584
 MISC metadata.xml 1052 RMD160 714461d3b0b057e2859462b89308234ff326aa35 SHA1 fe024e83c6632467d13b7d80c57ec94fda1137de SHA256 2fc6636bb523697c3e909cd6e4106402978f9a51435ae4c0ec9e27767b41ad16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknwtucACgkQkKaRLQcq0GLzjwCgo+kPo+bmSE4uRFh7hKE71eVL
-K7QAn0MojCFoBP8ucOlDRBJjPEjCHzHv
-=7L2B
+iEYEARECAAYFAko07FEACgkQts85UDFmaOWB+ACbBxuJA60T60tWt5yWdl8PaEK8
+DkUAn2n+yZ7vvFXAhYjZ6mVTCji83g0a
+=Tx93
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/openswan-2.4.13-deprecated-ldap.patch b/net-misc/openswan/files/openswan-2.4.13-deprecated-ldap.patch
deleted file mode 100644
index dc4fe4dde7dd..000000000000
--- a/net-misc/openswan/files/openswan-2.4.13-deprecated-ldap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur openswan-2.4.13.orig/programs/pluto/fetch.c openswan-2.4.13/programs/pluto/fetch.c
---- openswan-2.4.13.orig/programs/pluto/fetch.c	2004-06-14 02:01:32.000000000 +0000
-+++ openswan-2.4.13/programs/pluto/fetch.c	2008-08-15 17:04:35.000000000 +0000
-@@ -28,6 +28,7 @@
- #include <openswan.h>
- 
- #ifdef LDAP_VER
-+#define LDAP_DEPRECATED 1
- #include <ldap.h>
- #endif
- 
diff --git a/net-misc/openswan/files/openswan-2.4.13-gentoo-fixed.patch b/net-misc/openswan/files/openswan-2.4.13-gentoo-fixed.patch
deleted file mode 100644
index 0be5a8d38ef6..000000000000
--- a/net-misc/openswan/files/openswan-2.4.13-gentoo-fixed.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -ur openswan-2.4.13.orig/Makefile.inc openswan-2.4.13/Makefile.inc
---- openswan-2.4.13.orig/Makefile.inc	2008-06-26 21:03:04.000000000 +0000
-+++ openswan-2.4.13/Makefile.inc	2008-08-16 09:56:57.000000000 +0000
-@@ -46,7 +46,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*
-@@ -91,7 +91,7 @@
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
--FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
- FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-diff -Nru openswan-2.4.13.orig/programs/Makefile openswan-2.4.13/programs/Makefile
---- openswan-2.4.13.orig/programs/Makefile	2006-10-27 14:47:07.000000000 +0000
-+++ openswan-2.4.13/programs/Makefile	2008-10-12 16:12:31.000000000 +0000
-@@ -24,7 +24,7 @@
- SUBDIRS+=_realsetup _secretcensor _startklips _updown _updown_x509
- SUBDIRS+=auto barf verify ipsec look manual newhostkey ranbits secrets
- SUBDIRS+=rsasigkey setup showdefaults showhostkey calcgoo mailkey
--SUBDIRS+=ikeping examples livetest
-+SUBDIRS+=ikeping examples
- 
- ifeq ($(USE_LWRES),true)
- SUBDIRS+=lwdnsq
-diff -ur openswan-2.4.13.orig/programs/_confread/_confread.in openswan-2.4.13/programs/_confread/_confread.in
---- openswan-2.4.13.orig/programs/_confread/_confread.in	2006-04-12 19:55:42.000000000 +0000
-+++ openswan-2.4.13/programs/_confread/_confread.in	2008-08-16 09:56:57.000000000 +0000
-@@ -14,7 +14,7 @@
- #
- # RCSID $Id: _confread.in,v 1.81.2.5 2006-04-12 19:55:42 mcr Exp $
- #
--# Extract configuration info from /etc/ipsec.conf, repackage as assignments
-+# Extract configuration info from /etc/ipsec/ipsec.conf, repackage as assignments
- # to shell variables or tab-delimited fields.  Success or failure is reported
- # inline, as extra data, due to the vagaries of shell backquote handling.
- # In the absence of --varprefix, output is tab-separated fields, like:
-diff -ur openswan-2.4.13.orig/programs/_confread/ipsec.conf.in openswan-2.4.13/programs/_confread/ipsec.conf.in
---- openswan-2.4.13.orig/programs/_confread/ipsec.conf.in	2006-10-19 03:49:46.000000000 +0000
-+++ openswan-2.4.13/programs/_confread/ipsec.conf.in	2008-08-16 09:56:57.000000000 +0000
-@@ -1,4 +1,4 @@
--# /etc/ipsec.conf - Openswan IPsec configuration file
-+# /etc/ipsec/ipsec.conf - Openswan IPsec configuration file
- # RCSID $Id: ipsec.conf.in,v 1.15.2.6 2006-10-19 03:49:46 paul Exp $
- 
- # This file:  @FINALEXAMPLECONFDIR@/ipsec.conf-sample
-diff -ur openswan-2.4.13.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.13/programs/examples/l2tp-psk.conf.in
---- openswan-2.4.13.orig/programs/examples/l2tp-psk.conf.in	2007-11-02 01:49:40.000000000 +0000
-+++ openswan-2.4.13/programs/examples/l2tp-psk.conf.in	2008-08-16 09:56:57.000000000 +0000
-@@ -11,7 +11,7 @@
- 	#
- 	# Use a Preshared Key. Disable Perfect Forward Secrecy.
- 	#
--	# PreSharedSecret needs to be specified in /etc/ipsec.secrets as
-+	# PreSharedSecret needs to be specified in /etc/ipsec/ipsec.secrets as
- 	# YourIPAddress  %any: "sharedsecret"
- 	authby=secret
- 	pfs=no
-diff -ur openswan-2.4.13.orig/programs/_include/_include.in openswan-2.4.13/programs/_include/_include.in
---- openswan-2.4.13.orig/programs/_include/_include.in	2003-01-06 21:44:04.000000000 +0000
-+++ openswan-2.4.13/programs/_include/_include.in	2008-08-16 09:56:57.000000000 +0000
-@@ -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 -ur openswan-2.4.13.orig/programs/mailkey/mailkey.in openswan-2.4.13/programs/mailkey/mailkey.in
---- openswan-2.4.13.orig/programs/mailkey/mailkey.in	2006-10-28 23:49:23.000000000 +0000
-+++ openswan-2.4.13/programs/mailkey/mailkey.in	2008-08-16 09:56:57.000000000 +0000
-@@ -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 -ur openswan-2.4.13.orig/programs/pluto/Makefile openswan-2.4.13/programs/pluto/Makefile
---- openswan-2.4.13.orig/programs/pluto/Makefile	2007-11-06 18:56:26.000000000 +0000
-+++ openswan-2.4.13/programs/pluto/Makefile	2008-08-16 09:56:57.000000000 +0000
-@@ -210,7 +210,7 @@
- endif
- 
- ifeq ($(USE_WEAKSTUFF),true)
--WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 #-DUSE_1DES
-+WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 -DUSE_1DES
- endif
- 
- ifeq ($(USE_EXTRACRYPTO),true)
-diff -ur openswan-2.4.13.orig/programs/setup/Makefile openswan-2.4.13/programs/setup/Makefile
---- openswan-2.4.13.orig/programs/setup/Makefile	2004-12-18 18:13:43.000000000 +0000
-+++ openswan-2.4.13/programs/setup/Makefile	2008-08-16 09:56:57.000000000 +0000
-@@ -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 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 -ur openswan-2.4.13.orig/programs/showhostkey/showhostkey.in openswan-2.4.13/programs/showhostkey/showhostkey.in
---- openswan-2.4.13.orig/programs/showhostkey/showhostkey.in	2007-06-19 15:27:27.000000000 +0000
-+++ openswan-2.4.13/programs/showhostkey/showhostkey.in	2008-08-16 09:56:57.000000000 +0000
-@@ -18,7 +18,7 @@
- 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 --git a/net-misc/openswan/files/openswan-2.4.14-getline.patch b/net-misc/openswan/files/openswan-2.4.14-getline.patch
new file mode 100644
index 000000000000..0d35437fb466
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.4.14-getline.patch
@@ -0,0 +1,43 @@
+diff -Nru openswan-2.4.14.orig/lib/libopenswan/optionsfrom.c openswan-2.4.14/lib/libopenswan/optionsfrom.c
+--- openswan-2.4.14.orig/lib/libopenswan/optionsfrom.c	2004-04-09 21:00:38.000000000 +0300
++++ openswan-2.4.14/lib/libopenswan/optionsfrom.c	2009-06-01 22:21:56.000000000 +0300
+@@ -31,7 +31,7 @@
+ 
+ static const char *dowork(const char *, int *, char ***, int);
+ static const char *getanarg(FILE *, struct work *, char **);
+-static char *getline(FILE *, char *, size_t);
++static char *of_getline(FILE *, char *, size_t);
+ 
+ /*
+  - optionsfrom - add some options, taken from a file, to argc/argv
+@@ -149,7 +149,7 @@
+ 	char *endp;
+ 
+ 	while (w->pending == NULL) {	/* no pending line */
+-		if ((w->line = getline(f, w->buf, sizeof(w->buf))) == NULL)
++		if ((w->line = of_getline(f, w->buf, sizeof(w->buf))) == NULL)
+ 			return "error in line read";	/* caller checks EOF */
+ 		if (w->line[0] != '#' &&
+ 				*(w->line + strspn(w->line, " \t")) != '\0')
+@@ -171,7 +171,7 @@
+ 			if (*linep == NULL)
+ 				return "out of memory for new line";
+ 			strcpy(*linep, p);
+-		} else			/* getline already malloced it */
++		} else			/* of_getline already malloced it */
+ 			*linep = p;
+ 		return NULL;
+ 	}
+@@ -203,10 +203,10 @@
+ }
+ 
+ /*
+- - getline - read a line from the file, trim newline off
++ - of_getline - read a line from the file, trim newline off
+  */
+ static char *			/* pointer to line, NULL for eof/error */
+-getline(f, buf, bufsize)
++of_getline(f, buf, bufsize)
+ FILE *f;
+ char *buf;			/* buffer to use, if convenient */
+ size_t bufsize;			/* size of buf */
diff --git a/net-misc/openswan/files/openswan-2.6.19-gentoo.patch b/net-misc/openswan/files/openswan-2.6.19-gentoo.patch
deleted file mode 100644
index b35bf4975961..000000000000
--- a/net-misc/openswan/files/openswan-2.6.19-gentoo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Nru openswan-2.6.19.orig/Makefile.inc openswan-2.6.19/Makefile.inc
---- openswan-2.6.19.orig/Makefile.inc	2008-11-25 01:24:56.000000000 +0000
-+++ openswan-2.6.19/Makefile.inc	2008-12-03 23:06:52.000000000 +0000
-@@ -49,7 +49,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*
-@@ -94,7 +94,7 @@
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
--FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
- FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-diff -Nru openswan-2.6.19.orig/programs/setup/Makefile openswan-2.6.19/programs/setup/Makefile
---- openswan-2.6.19.orig/programs/setup/Makefile	2008-11-25 01:24:56.000000000 +0000
-+++ openswan-2.6.19/programs/setup/Makefile	2008-12-03 23:06:52.000000000 +0000
-@@ -18,7 +18,6 @@
- 
- # this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
- # not as /etc/rc.d/init.d/setup.
--PROGRAMDIR=$(RCDIR)
- PROGRAM=setup
- EXTRA8MAN=setup.8
- 
-@@ -29,32 +28,6 @@
- # into the $BINDIR.
- #
- # the priorities match those in setup's chkconfig line
--doinstall:: 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
--
--cleanall::
--	@rm -f setup
- 
- #
- # $Log: not supported by cvs2svn $
- # Revision 1.1  2008/12/03 23:30:28  mrness
- # Remove obsolete versions.
- # Correct doc install path (#241976).
- # Version bump.
- # (Portage version: 2.1.4.4, RepoMan options: --force)
- #
diff --git a/net-misc/openswan/files/openswan-2.6.19-qa-fixes.patch b/net-misc/openswan/files/openswan-2.6.19-qa-fixes.patch
deleted file mode 100644
index 00c19b1fae2d..000000000000
--- a/net-misc/openswan/files/openswan-2.6.19-qa-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru openswan-2.6.19.orig/programs/pluto/log.c openswan-2.6.19/programs/pluto/log.c
---- openswan-2.6.19.orig/programs/pluto/log.c	2008-11-25 01:24:56.000000000 +0000
-+++ openswan-2.6.19/programs/pluto/log.c	2008-12-03 23:16:18.000000000 +0000
-@@ -55,6 +55,7 @@
- #include "kernel_alg.h"
- #include "ike_alg.h"
- #include "plutoalg.h"
-+#include "virtual.h"
- 
- #ifndef NO_DB_OPS_STATS
- #define NO_DB_CONTEXT
diff --git a/net-misc/openswan/openswan-2.4.13-r2.ebuild b/net-misc/openswan/openswan-2.4.13-r2.ebuild
deleted file mode 100644
index 04a54b38ae80..000000000000
--- a/net-misc/openswan/openswan-2.4.13-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.13-r2.ebuild,v 1.1 2008/12/03 23:30:28 mrness Exp $
-
-inherit eutils linux-info
-
-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/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="curl ldap smartcard extra-algorithms weak-algorithms"
-
-COMMON_DEPEND="!net-misc/strongswan
-	dev-libs/gmp
-	dev-lang/perl
-	smartcard? ( dev-libs/opensc )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is 2 6; then
-		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-		einfo "KLIPS will not be compiled/installed."
-		MYMAKE="programs"
-
-	elif kernel_is 2 4; then
-		if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then
-			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"
-			die
-		fi
-
-		einfo "Using patched-in IPsec code for kernel 2.4"
-		einfo "Your kernel only supports KLIPS for kernel level IPsec."
-		MYMAKE="confcheck programs"
-
-	else
-		die "Unsupported kernel version"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo-fixed.patch
-	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
-
-	find . -regex '.*[.][1-8]' -exec sed -i \
-	    -e s:/usr/local:/usr:g \
-	    -e s:/etc/ipsec[.]conf:/etc/ipsec/ipsec.conf:g \
-	    -e s:/etc/ipsec[.]secrets:/etc/ipsec/ipsec.secrets:g '{}' \; ||
-	    die "failed to replace text in xml docs"
-}
-
-get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALCONFDIR=/etc/ipsec \
-		FINALCONFFILE=/etc/ipsec/ipsec.conf \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${PF} \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\"
-	if use smartcard ; then
-		echo USE_SMARTCARD=true
-	fi
-	if use extra-algorithms ; then
-		echo USE_EXTRACRYPTO=true
-	fi
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-	fi
-	echo USE_OE=false # by default, turn off Opportunistic Encryption
-	echo USE_LWRES=false # needs bind9 with lwres support
-	local USETHREADS=false
-	if use curl; then
-		echo USE_LIBCURL=true
-		USETHREADS=true
-	fi
-	if use ldap; then
-		echo USE_LDAP=true
-		USETHREADS=true
-	fi
-	echo HAVE_THREADS=${USETHREADS}
-}
-
-src_compile() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		${MYMAKE} || die "emake failed"
-}
-
-src_install() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		install || die "emake install failed"
-
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	doinitd "${FILESDIR}"/ipsec || die "failed to install init script"
-
-	dodir /var/run/pluto || die "failed to create /var/run/pluto"
-}
-
-pkg_postinst() {
-	if kernel_is 2 6; then
-		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
-		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
-		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
-		WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
-		check_extra_config
-	fi
-}
diff --git a/net-misc/openswan/openswan-2.4.14.ebuild b/net-misc/openswan/openswan-2.4.14.ebuild
index 14010ec1c172..408e986f5bcc 100644
--- a/net-misc/openswan/openswan-2.4.14.ebuild
+++ b/net-misc/openswan/openswan-2.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.14.ebuild,v 1.3 2009/04/23 18:43:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.14.ebuild,v 1.4 2009/06/14 10:25:30 mrness Exp $
 
 EAPI="2"
 
@@ -54,6 +54,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo-fixed.patch
 	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
+	epatch "${FILESDIR}"/${P}-getline.patch
 
 	find . -regex '.*[.][1-8]' -exec sed -i \
 	    -e s:/usr/local:/usr:g \
diff --git a/net-misc/openswan/openswan-2.6.19.ebuild b/net-misc/openswan/openswan-2.6.19.ebuild
deleted file mode 100644
index 084fbf29938d..000000000000
--- a/net-misc/openswan/openswan-2.6.19.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.19.ebuild,v 1.2 2009/01/11 11:01:51 mrness Exp $
-
-EAPI=1
-
-inherit eutils linux-info
-
-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/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="curl ldap smartcard extra-algorithms weak-algorithms nocrypto-algorithms"
-
-COMMON_DEPEND="!net-misc/strongswan
-	dev-libs/gmp
-	dev-lang/perl
-	smartcard? ( dev-libs/opensc )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.1.2" # see bug 237132
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-pkg_setup() {
-	if use nocrypto-algorithms && ! use weak-algorithms; then
-		ewarn "Enabling nocrypto-algorithms USE flag has no effect when"
-		ewarn "weak-algorithms USE flag is disabled"
-	fi
-
-	linux-info_pkg_setup
-
-	if kernel_is 2 6; then
-		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-		einfo "KLIPS will not be compiled/installed."
-		MYMAKE="programs"
-
-	elif kernel_is 2 4; then
-		if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then
-			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"
-			die
-		fi
-
-		einfo "Using patched-in IPsec code for kernel 2.4"
-		einfo "Your kernel only supports KLIPS for kernel level IPsec."
-		MYMAKE="confcheck programs"
-
-	else
-		die "Unsupported kernel version"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-qa-fixes.patch
-
-	find . -regex '.*[.][1-8]' -exec sed -i \
-	    -e s:/usr/local:/usr:g '{}' \; ||
-	    die "failed to replace text in xml docs"
-}
-
-get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${PF}/html \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\"
-	if use smartcard ; then
-		echo USE_SMARTCARD=true
-	fi
-	if use extra-algorithms ; then
-		echo USE_EXTRACRYPTO=true
-	else
-		echo USE_EXTRACRYPTO=false
-	fi
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-		if use nocrypto-algorithms; then
-			echo USE_NOCRYPTO=true
-		fi
-	fi
-	echo USE_LWRES=false # needs bind9 with lwres support
-	local USETHREADS=false
-	if use curl; then
-		echo USE_LIBCURL=true
-		USETHREADS=true
-	fi
-	if use ldap; then
-		echo USE_LDAP=true
-		USETHREADS=true
-	fi
-	echo HAVE_THREADS=${USETHREADS}
-}
-
-src_compile() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		${MYMAKE} || die "emake failed"
-}
-
-src_install() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
-
-	dodir /var/run/pluto || die "failed to create /var/run/pluto"
-}
-
-pkg_preinst() {
-	if has_version "<net-misc/openswan-2.6.14" && pushd "${ROOT}etc/ipsec"; then
-		ewarn "Following files and directories were moved from '${ROOT}etc/ipsec' to '${ROOT}etc':"
-		local i err=0
-		if [ -h "../ipsec.d" ]; then
-			rm "../ipsec.d" || die "failed to remove ../ipsec.d symlink"
-		fi
-		for i in *; do
-			if [ -e "../$i" ]; then
-				eerror "  $i NOT MOVED, ../$i already exists!"
-				err=1
-			elif [ -d "$i" ]; then
-				mv "$i" .. || die "failed to move $i directory"
-				ewarn "  directory $i"
-			elif [ -f "$i" ]; then
-				sed -i -e 's:/etc/ipsec/:/etc/:g' "$i" && \
-					mv "$i" .. && ewarn "  file $i" || \
-					die "failed to move $i file"
-			else
-				eerror "  $i NOT MOVED, it is not a file nor a directory!"
-				err=1
-			fi
-		done
-		popd
-		if [ $err -eq 0 ]; then
-			rmdir "${ROOT}etc/ipsec" || eerror "Failed to remove ${ROOT}etc/ipsec"
-		else
-			ewarn "${ROOT}etc/ipsec is not empty, you will have to remove it yourself"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if kernel_is 2 6; then
-		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
-		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
-		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
-		WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
-		check_extra_config
-	fi
-}