Expunge exploitable versions from the tree (#275233).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

8 files changed, 13 insertions, 659 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index c274b382b1fe..9cc771d87d95 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/openswan
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.67 2009/06/29 20:49:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.68 2009/08/30 07:35:29 mrness Exp $
+
+  30 Aug 2009; Alin Năstac <mrness@gentoo.org>
+  -files/openswan-2.4.14-deprecated-ldap.patch,
+  -files/openswan-2.4.14-gentoo-fixed.patch,
+  -files/openswan-2.4.14-getline.patch,
+  -files/openswan-2.6.21-gentoo-fixed.patch, -openswan-2.4.14.ebuild,
+  -openswan-2.6.21.ebuild:
+  Expunge exploitable versions from the tree (#275233).
 
   29 Jun 2009; Markus Meier <maekke@gentoo.org> openswan-2.4.15.ebuild:
   amd64 stable, bug #275233
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 55c9f4f7d7fd..7f89798455db 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -3,27 +3,19 @@ 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.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.4.14-getline.patch 1559 RMD160 56da53a0ec2685ad60c5e4109867e7e2398c75f2 SHA1 bbdcda81dfa52581c8efc15d9fc88249a45113bd SHA256 c8c8fcaffcdc694df3152f5b581b31ff3dc3ae7ad3a131392e5ee082756e33d2
 AUX openswan-2.4.15-deprecated-ldap.patch 372 RMD160 434d98f24c6b0066be3ce6d50e679b67edc22791 SHA1 95b8aec3807d953d9af3ca7ddc67b6aa08d340db SHA256 e891c8daa25dd8a06b6cc070cdc9913f260c375cf7a794b496a430e029e660bc
 AUX openswan-2.4.15-gentoo.patch 7744 RMD160 fb3d0f745ddf93f11fbeeee98d709c46455c248d SHA1 14dc6577ddb6e52a7356407512725a23865d02b8 SHA256 792055fe57e1a7756d5e804bdbbdf76e009b9b4e60141125bd92c464ec46d946
-AUX openswan-2.6.21-gentoo-fixed.patch 4930 RMD160 ee9dbfed38c81da04254ecd4695193f8f2660459 SHA1 9591a633b545db49560953dd11b9ee55c99ba167 SHA256 943a3eb1a3c42ab3024e3015a8e4b5586aa65e348fac01f2d2600d7fca59fe5b
 AUX openswan-2.6.22-gentoo.patch 5088 RMD160 e61921ae0c795e38c44e38f5a22f0881aaf4d893 SHA1 783cee333a0fa0f820c76d7bda808404c650aa39 SHA256 e95a2cd4fa2aff4c1d75951c27595045602180a6865920594b318ec6cd576db8
-DIST openswan-2.4.14.tar.gz 3762031 RMD160 c3165fa58d540d30a5adfbc1070a21ca6762c17b SHA1 6f79c969164f80ae7d2b5a436bd798c428615687 SHA256 5c5886c026f79a85bee0ac2888fc3c7da87b8f8c493f02a51a5ce6b8675a4ddf
 DIST openswan-2.4.15.tar.gz 3938290 RMD160 be0c9bec423f5df5815d6a773ed79c4d832b94a9 SHA1 b9b76c81fae2ff1f202c362fc67518a7acd1e99e SHA256 cf85bf896dd2b0b0818d2851f4d8ec61f816f777d47cbfed7065a682ffd47293
-DIST openswan-2.6.21.tar.gz 6201306 RMD160 d94fcd50a55ae6bb28787b2fc1966c9c43927fbe SHA1 b43fd73e8a10b00b08a4b1784730f2656430f977 SHA256 e773aa22f86ef12999f9a78c98ad5ba09980ccd1d14ab16361e9f21e40742fe7
 DIST openswan-2.6.22.tar.gz 8152865 RMD160 dd06dbf7147407c9dc31efa29253d4c06ef5f0b1 SHA1 44cc5d6dd850b926f9addfd88ec2540984b08563 SHA256 05f4db569206b2bb31d99a322eb75a4830567e2859f485a12fdbaee37d91704b
-EBUILD openswan-2.4.14.ebuild 3563 RMD160 0ac58588efb85c67fd861a1be1bb5d1990e51fdf SHA1 ed96d4397f72e2f1495cf182e8b36b97bcf59088 SHA256 734e7605f5d6caa4063e4d30a83be1d87975a1f02a4f31d702496d965c473a2c
 EBUILD openswan-2.4.15.ebuild 3524 RMD160 846041fd08d5f29d85ae4721ec8941cb32662d5e SHA1 b51b0f8072555e2c4216751625d8d690251d74a4 SHA256 da2aab48d0493e800a4ad6d0bdd913a736e7e0aa8035b7ec2f06e33539568cb7
-EBUILD openswan-2.6.21.ebuild 4530 RMD160 73110832a157567fa866d9bdbc387d79eacded1c SHA1 83e83bbd4ce899e307c33292bc6a1a43bb341215 SHA256 133787849bfb63f7899a09e38070ecea9b8c67cae6f255f4f9d7982106297d61
 EBUILD openswan-2.6.22.ebuild 4532 RMD160 bf55872849421ca354554c99f1cb5be66dee203e SHA1 d0ca8b86fc9b92d26ecc9b8e704bf855f994f969 SHA256 71a90ba5379c7dd3892a00759552c6e02e39fe2b03f9ab27aafa408df980e1ba
-MISC ChangeLog 13027 RMD160 f4117a0a775e394a40e6e6583f55d3c2914d9731 SHA1 5a221ab89049ca6445db659abc9be185ca9cc90d SHA256 a6b999516b54b2ac28242197514b31ace29316f1d7b6f87017074021f69cb077
+MISC ChangeLog 13362 RMD160 5291e03ea655d9d12ec8e0b8c064d36522467cd7 SHA1 2696bd92f6ceced027731ee1737a0ec51d010fdf SHA256 6d6302792d2c84464e0c02129300ab9c5682cb731e93d46b94935f70112b0bd1
 MISC metadata.xml 1052 RMD160 714461d3b0b057e2859462b89308234ff326aa35 SHA1 fe024e83c6632467d13b7d80c57ec94fda1137de SHA256 2fc6636bb523697c3e909cd6e4106402978f9a51435ae4c0ec9e27767b41ad16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpJKQMACgkQkKaRLQcq0GK4JwCaAmiDfwwbozRoJZQkZJ86eD7E
-dAYAoJc7y5BsBF10142yUsth6QkTr6Gk
-=vnUt
+iEYEARECAAYFAkqaK8oACgkQ9A5kJBGSrsuKpgCglzW5vVeD5Hx+JOtW2q5uqGfG
+teMAniTdoRKWSkDeVAITv6RAQAsFt4Mf
+=2b7C
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/openswan-2.4.14-deprecated-ldap.patch b/net-misc/openswan/files/openswan-2.4.14-deprecated-ldap.patch
deleted file mode 100644
index 8ec0d38d4872..000000000000
--- a/net-misc/openswan/files/openswan-2.4.14-deprecated-ldap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru openswan-2.4.14.orig/programs/pluto/fetch.c openswan-2.4.14/programs/pluto/fetch.c
---- openswan-2.4.14.orig/programs/pluto/fetch.c	2004-06-14 02:01:32.000000000 +0000
-+++ openswan-2.4.14/programs/pluto/fetch.c	2009-04-08 23:14:29.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.14-gentoo-fixed.patch b/net-misc/openswan/files/openswan-2.4.14-gentoo-fixed.patch
deleted file mode 100644
index 2e9d041c8e10..000000000000
--- a/net-misc/openswan/files/openswan-2.4.14-gentoo-fixed.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -Nru openswan-2.4.14.orig/lib/liblwres/Makefile openswan-2.4.14/lib/liblwres/Makefile
---- openswan-2.4.14.orig/lib/liblwres/Makefile	2007-10-22 14:33:11.000000000 +0000
-+++ openswan-2.4.14/lib/liblwres/Makefile	2009-04-08 23:07:06.000000000 +0000
-@@ -17,8 +17,8 @@
- 
- CINCLUDES =	-I${srcdir}/unix/include \
- 		-I. -I./include -I${srcdir}/include 
--CDEFINES = -g
--CWARNINGS = -Werror
-+CDEFINES =
-+CWARNINGS =
- 
- CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
- 
-diff -Nru openswan-2.4.14.orig/Makefile.inc openswan-2.4.14/Makefile.inc
---- openswan-2.4.14.orig/Makefile.inc	2009-03-30 13:55:24.000000000 +0000
-+++ openswan-2.4.14/Makefile.inc	2009-04-08 23:06:04.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.14.orig/programs/_confread/_confread.in openswan-2.4.14/programs/_confread/_confread.in
---- openswan-2.4.14.orig/programs/_confread/_confread.in	2006-04-12 19:55:42.000000000 +0000
-+++ openswan-2.4.14/programs/_confread/_confread.in	2009-04-08 23:06:04.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 -Nru openswan-2.4.14.orig/programs/_confread/ipsec.conf.in openswan-2.4.14/programs/_confread/ipsec.conf.in
---- openswan-2.4.14.orig/programs/_confread/ipsec.conf.in	2006-10-19 03:49:46.000000000 +0000
-+++ openswan-2.4.14/programs/_confread/ipsec.conf.in	2009-04-08 23:06:04.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 -Nru openswan-2.4.14.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.14/programs/examples/l2tp-psk.conf.in
---- openswan-2.4.14.orig/programs/examples/l2tp-psk.conf.in	2007-11-02 01:49:40.000000000 +0000
-+++ openswan-2.4.14/programs/examples/l2tp-psk.conf.in	2009-04-08 23:06:04.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 -Nru openswan-2.4.14.orig/programs/_include/_include.in openswan-2.4.14/programs/_include/_include.in
---- openswan-2.4.14.orig/programs/_include/_include.in	2003-01-06 21:44:04.000000000 +0000
-+++ openswan-2.4.14/programs/_include/_include.in	2009-04-08 23:06:04.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 -Nru openswan-2.4.14.orig/programs/mailkey/mailkey.in openswan-2.4.14/programs/mailkey/mailkey.in
---- openswan-2.4.14.orig/programs/mailkey/mailkey.in	2006-10-28 23:49:23.000000000 +0000
-+++ openswan-2.4.14/programs/mailkey/mailkey.in	2009-04-08 23:06:04.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 -Nru openswan-2.4.14.orig/programs/Makefile.program openswan-2.4.14/programs/Makefile.program
---- openswan-2.4.14.orig/programs/Makefile.program	2007-06-19 14:49:19.000000000 +0000
-+++ openswan-2.4.14/programs/Makefile.program	2009-04-08 23:08:31.000000000 +0000
-@@ -34,7 +34,6 @@
- WERROR:= -Werror
- endif
- 
--CFLAGS+= ${WERROR}
- 
- ifneq ($(LD_LIBRARY_PATH),)
- LDFLAGS=-L$(LD_LIBRARY_PATH)
-diff -Nru openswan-2.4.14.orig/programs/pluto/Makefile openswan-2.4.14/programs/pluto/Makefile
---- openswan-2.4.14.orig/programs/pluto/Makefile	2007-11-06 18:56:26.000000000 +0000
-+++ openswan-2.4.14/programs/pluto/Makefile	2009-04-08 23:06:04.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 -Nru openswan-2.4.14.orig/programs/setup/Makefile openswan-2.4.14/programs/setup/Makefile
---- openswan-2.4.14.orig/programs/setup/Makefile	2004-12-18 18:13:43.000000000 +0000
-+++ openswan-2.4.14/programs/setup/Makefile	2009-04-08 23:06:04.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 -Nru openswan-2.4.14.orig/programs/showhostkey/showhostkey.in openswan-2.4.14/programs/showhostkey/showhostkey.in
---- openswan-2.4.14.orig/programs/showhostkey/showhostkey.in	2007-06-19 15:27:27.000000000 +0000
-+++ openswan-2.4.14/programs/showhostkey/showhostkey.in	2009-04-08 23:06:04.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 -Nru openswan-2.4.14.orig/testing/utils/ikeping/Makefile openswan-2.4.14/testing/utils/ikeping/Makefile
---- openswan-2.4.14.orig/testing/utils/ikeping/Makefile	2004-04-03 19:44:52.000000000 +0000
-+++ openswan-2.4.14/testing/utils/ikeping/Makefile	2009-04-08 23:09:18.000000000 +0000
-@@ -27,10 +27,9 @@
- FREESWANINCLS= -I$(FREESWANLIBDIR) -I${OPENSWANSRCDIR}
- FREESWANLIB=$(FREESWANLIBDIR)/libfreeswan.a
- 
--CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
-+CFLAGS = -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
- 	-Wcast-qual -Wmissing-declarations -Wwrite-strings 
- CFLAGS+= -Wstrict-prototypes 
--CFLAGS+= -Werror
- #CFLAGS+= -Wundef
- 
- HDRDIRS =  $(FREESWANINCLS)
diff --git a/net-misc/openswan/files/openswan-2.4.14-getline.patch b/net-misc/openswan/files/openswan-2.4.14-getline.patch
deleted file mode 100644
index 0d35437fb466..000000000000
--- a/net-misc/openswan/files/openswan-2.4.14-getline.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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.21-gentoo-fixed.patch b/net-misc/openswan/files/openswan-2.6.21-gentoo-fixed.patch
deleted file mode 100644
index a9439f43843a..000000000000
--- a/net-misc/openswan/files/openswan-2.6.21-gentoo-fixed.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Nru openswan-2.6.21.orig/lib/libdns/Makefile openswan-2.6.21/lib/libdns/Makefile
---- openswan-2.6.21.orig/lib/libdns/Makefile	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/lib/libdns/Makefile	2009-04-10 21:20:46.000000000 +0000
-@@ -30,8 +30,8 @@
- 		-I${srcdir}../libisc/nothreads/include \
- 		-I. -I./include -I${srcdir}include \
- 		-I${srcdir}../libisc/include
--CDEFINES = -g ${USERCOMPILE} ${PORTINCLUDE}
--CWARNINGS = -Werror
-+CDEFINES = ${USERCOMPILE} ${PORTINCLUDE}
-+CWARNINGS = 
- 
- CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
- 
-diff -Nru openswan-2.6.21.orig/lib/libisc/Makefile openswan-2.6.21/lib/libisc/Makefile
---- openswan-2.6.21.orig/lib/libisc/Makefile	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/lib/libisc/Makefile	2009-04-10 21:20:46.000000000 +0000
-@@ -22,8 +22,8 @@
- 		-I${srcdir}nothreads/include \
- 		-I. -I./include -I${srcdir}include \
- 		$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include
--CDEFINES = -g -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
--# CWARNINGS = -Werror
-+CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
-+# CWARNINGS = 
- 
- CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
- 
-diff -Nru openswan-2.6.21.orig/lib/liblwres/Makefile openswan-2.6.21/lib/liblwres/Makefile
---- openswan-2.6.21.orig/lib/liblwres/Makefile	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/lib/liblwres/Makefile	2009-04-10 21:20:46.000000000 +0000
-@@ -22,8 +22,8 @@
- 		-I${srcdir}../libisc/${ISCARCH}/include \
- 		-I${srcdir}../libisc/include \
- 		-I. -I./include -I${srcdir}include 
--CDEFINES = -g
--CWARNINGS = -Werror
-+CDEFINES = 
-+CWARNINGS = 
- 
- CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} 
- 
-diff -Nru openswan-2.6.21.orig/Makefile.inc openswan-2.6.21/Makefile.inc
---- openswan-2.6.21.orig/Makefile.inc	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/Makefile.inc	2009-04-10 21:20:46.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.21.orig/programs/Makefile.program openswan-2.6.21/programs/Makefile.program
---- openswan-2.6.21.orig/programs/Makefile.program	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/programs/Makefile.program	2009-04-10 21:20:46.000000000 +0000
-@@ -53,7 +53,6 @@
- WERROR:= -Werror
- endif
- 
--CFLAGS+= ${WERROR}
- 
- ifneq ($(LD_LIBRARY_PATH),)
- LDFLAGS=-L$(LD_LIBRARY_PATH)
-diff -Nru openswan-2.6.21.orig/programs/setup/Makefile openswan-2.6.21/programs/setup/Makefile
---- openswan-2.6.21.orig/programs/setup/Makefile	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/programs/setup/Makefile	2009-04-10 21:20:47.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: Makefile,v $
-diff -Nru openswan-2.6.21.orig/testing/utils/make-uml.sh openswan-2.6.21/testing/utils/make-uml.sh
---- openswan-2.6.21.orig/testing/utils/make-uml.sh	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/testing/utils/make-uml.sh	2009-04-10 21:20:47.000000000 +0000
-@@ -262,7 +262,7 @@
- 
- cd $OPENSWANSRCDIR || exit 1
- 
--make WERROR=-Werror USE_OBJDIR=true programs
-+make USE_OBJDIR=true programs
- 
- # now, execute the Makefile that we have created!
- cd $POOLSPACE && make $OPENSWANHOSTS 
diff --git a/net-misc/openswan/openswan-2.4.14.ebuild b/net-misc/openswan/openswan-2.4.14.ebuild
deleted file mode 100644
index 408e986f5bcc..000000000000
--- a/net-misc/openswan/openswan-2.4.14.ebuild
+++ /dev/null
@@ -1,126 +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.4.14.ebuild,v 1.4 2009/06/14 10:25:30 mrness Exp $
-
-EAPI="2"
-
-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_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 \
-	    -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.6.21.ebuild b/net-misc/openswan/openswan-2.6.21.ebuild
deleted file mode 100644
index 333c72dc452a..000000000000
--- a/net-misc/openswan/openswan-2.6.21.ebuild
+++ /dev/null
@@ -1,161 +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.21.ebuild,v 1.2 2009/04/15 21:02:17 mrness Exp $
-
-EAPI="2"
-
-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_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo-fixed.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
-}