remove patch broken by $Id replacement

2 files changed, 5 insertions, 140 deletions

diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 1c27b34615c0..7bd44d726ec6 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -7,19 +7,19 @@ AUX openswan-2.4.11-implicit-decl.patch 372 RMD160 b9f1ac0ba583d18ca029f4d990d8c
 AUX openswan-2.4.12-deprecated-ldap.patch 372 RMD160 3e39f78960828f8552c0e0d9a561a10846bb9f74 SHA1 e2171af09ccdedac0a4839f51bd0ab8215c9158c SHA256 c895706d3dd7f7bf679457c9769d3ca95f62b47a7a42ea943204e3a3db5864cd
 AUX openswan-2.4.12-gentoo.patch 5966 RMD160 0a64f2bccbf4d89cb96f1a1b39b23810a83d71d6 SHA1 24328b8815c524e049edd163f700f7a6b4bc315e SHA256 ab212078ffc1d6060fd51554a74ef6e9cac6b7f5f8f3e09710f7780364b588f6
 AUX openswan-2.4.13-deprecated-ldap.patch 371 RMD160 4fb852b20240b9c2b22db5d2ca5b75ac7c4ca2f0 SHA1 8d70c48e525467e26cdf5f1f6fb36d49a03d8a20 SHA256 9d406ba127eca56ba5e64517fe107e1785c07cad9e7a770d8481d7998c4e1709
-AUX openswan-2.4.13-gentoo.patch 6181 RMD160 b1f48f96df2c5ad5d4ed51418ce8e6f00f81a41a SHA1 7c928ca5f58624d7f5c9a0b7c777660693e2be1d SHA256 c78cd6ec2d8e079caa8c9720e5a33ea9713852e9434a5d39876b27a9546b2353
+AUX openswan-2.4.13-gentoo.patch 6181 RMD160 b4ce8805d258ded6b4c04f9f6ab391f93db95503 SHA1 c6e2e68c8475df3bb872b4e4c78207d5e85259fe SHA256 5b30201cefcf5bcb6d9858205baa478f34175099a164930119562062da5c42c8
 DIST openswan-2.4.11.tar.gz 3759918 RMD160 c77777aaeba65e92196aad9e7c32ffd7c2e4a49d SHA1 532bf898872ced97888be95adc5814b6155a9574 SHA256 4adea45d7cc413b558f15e4528de4486b62a07cfd2af2bf592b09cea3f16ecae
 DIST openswan-2.4.12.tar.gz 3764063 RMD160 09f4454399651d369961aa678205b90e13a124c0 SHA1 225ab28ca970a062160b026570597588883b71d8 SHA256 4024e9a6b6e7171fb195a4228043142dd5e92035325b6cd18deb338f77ca494b
 DIST openswan-2.4.13.tar.gz 3761840 RMD160 cc22c2d838d33fe2a08173aa1602ec39cfde3a80 SHA1 ad314d22f08c8de08624b1a7f69120eae23fad4b SHA256 1dcf1ebcc8b974def51b09e791de267ec9813b6af086337aa06909e27ccff5f6
 EBUILD openswan-2.4.11.ebuild 3755 RMD160 f132d77d7879c2e63a2b29aebb4a1ffe9ab7381e SHA1 70ab5a61c5b556dc1b97796d2a142e72d56d7c28 SHA256 c425cc7a7133b9286e7cd4a43de218ababc4f5a1433dda49e2b57e75388a6105
 EBUILD openswan-2.4.12.ebuild 3540 RMD160 b90a1cb2a06baf62f0ca364b88d1e0e9c7c6d80b SHA1 9d5b08a4e0ed61295daab21f6534d98f00d7830d SHA256 02d65ea25fbaedb9a0ce2d2a548bd00b541a2064ab281301028d303534f034d5
 EBUILD openswan-2.4.13.ebuild 3530 RMD160 4216db6efdac3d9a297d2f1fc3c69e6a7deb5812 SHA1 6d5bcddbe683114ab8ddbb01e71b1dfa4450a9f6 SHA256 b2a2939c0273746688dcc78d675b32cb4d8b29b4b75c9f5b87bf3920e0c39519
-MISC ChangeLog 8769 RMD160 3c65e1dcab6506838bced76b0ef9308cd6151b9a SHA1 fff57e6ba5016d858724c07562835fc8e5026b8c SHA256 155fd1ffc75b4121fc43115acd0583ab706e89d1af682332f93fbe697dfe93dd
+MISC ChangeLog 8904 RMD160 3e094f1fe31468f9c2e258810a8899bc483fd729 SHA1 4468c73b4e86925c5b8b7501ad798c71087b771a SHA256 86d090fb957c747ecc1df44605456746a5d8b8812f1b3f19d68977f515b7b68a
 MISC metadata.xml 840 RMD160 6bbfd2826acdb167847150124c32e10a331aea55 SHA1 cf58a1f4529d694566218381a82f82ffe8f8a810 SHA256 1398590b9727e99d153f117f6f99551a5843f58ba087308c775bef8bfc4ec142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiluI4ACgkQPrHvTlXvhtsp+ACdGrIgFx4GTTxSItoVj8ikPLpL
-7t8An2vtDGY950isvek4Ix9EyNHcQCbb
-=zb89
+iEYEARECAAYFAkimqC8ACgkQPrHvTlXvhtt7EACeIHflkQVwTnc71AgEX4qX7h76
+hNwAoJ6eR7iAaYsJixYiJcn2/kcyErt1
+=RZr3
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/openswan-2.4.13-gentoo.patch b/net-misc/openswan/files/openswan-2.4.13-gentoo.patch
deleted file mode 100644
index a56343ec82f2..000000000000
--- a/net-misc/openswan/files/openswan-2.4.13-gentoo.patch
+++ /dev/null
@@ -1,135 +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-15 17:03:34.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 -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-15 17:03:34.000000000 +0000
-@@ -14,7 +14,7 @@
- #
- # RCSID $Id: openswan-2.4.13-gentoo.patch,v 1.1 2008/08/15 17:10:22 mrness 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-15 17:03:34.000000000 +0000
-@@ -1,4 +1,4 @@
--# /etc/ipsec.conf - Openswan IPsec configuration file
-+# /etc/ipsec/ipsec.conf - Openswan IPsec configuration file
- # RCSID $Id: openswan-2.4.13-gentoo.patch,v 1.1 2008/08/15 17:10:22 mrness 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-15 17:03:34.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-15 17:03:34.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-15 17:03:34.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-15 17:03:34.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-15 17:03:34.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-15 17:03:34.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=