Replace gentoo patches with with gentoo-fixed patches, added to cvs using -kb flag (#264346).

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

6 files changed, 26 insertions, 17 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 1f7fc0329552..75d418b76bb5 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.60 2009/04/10 21:41:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.61 2009/04/15 21:02:17 mrness Exp $
+
+  15 Apr 2009; Alin Năstac <mrness@gentoo.org>
+  -files/openswan-2.4.14-gentoo.patch,
+  +files/openswan-2.4.14-gentoo-fixed.patch,
+  -files/openswan-2.6.21-gentoo.patch,
+  +files/openswan-2.6.21-gentoo-fixed.patch, openswan-2.4.14.ebuild,
+  openswan-2.6.21.ebuild:
+  Replace gentoo patches with with gentoo-fixed patches, added to cvs using
+  -kb flag (#264346).
 
   10 Apr 2009; Alin Năstac <mrness@gentoo.org>
   metadata.xml:
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 842c573bf6c8..f04c8b95d575 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -6,24 +6,24 @@ AUX ipsec-initd 487 RMD160 23d9d7be6000fb95fdb142bc948964d6050b7864 SHA1 55a4c3a
 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.patch 7770 RMD160 37fbaa4cb4d292fa6e94cc1075284a1d673e34b5 SHA1 4d7896a40c3dac75c7730c8b6b8e1a1e8662c7de SHA256 0074b7c8fbd21d6ca5ff98cd5253253bf607949644f13a003fbdb59036fa934a
+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.6.21-gentoo.patch 5128 RMD160 946e5d8fdbf72a6399e7cf49fd0a99d0bab32c9f SHA1 937bb885a32b3b11aea0f2ff30f30f7ac5e0dd62 SHA256 d25dd014b22fc48f2e89d9b2036b72f0b8cec2d9e8b874d2584af27f51d3357c
+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 3518 RMD160 8d807ec196801ba086ec25fba17bf7bc1fd3c605 SHA1 d3cd2ad92f7afd6e74a2af6fa404dca7d815fc5e SHA256 f743a45ec82642510e3e38c826102ef29e19933dcbe9998fecf583f3c13e61b2
+EBUILD openswan-2.4.14.ebuild 3524 RMD160 9a364512805b64d2beb83fd21b111e669e3de112 SHA1 fa32939bccb61ee8330aae73720fc4ad50818b70 SHA256 39df60a6a32b9b1abb1f41fa651fa9239b0244e52280b800b5ac1de46b58ca66
 EBUILD openswan-2.6.19.ebuild 4588 RMD160 309ccb8e1d73a32941e7e490efffe894e615a135 SHA1 7cdfa5b2b6f8df31e2ce31cb55819c6a4f04cd92 SHA256 e5cedd98dabc8dc3d9b5453629828b0822598f4baea64ea4ae96d0da274d8d57
-EBUILD openswan-2.6.21.ebuild 4524 RMD160 18b47f36e2cbf19d96c71c0ce1b31b1878fb2cf8 SHA1 a87161d7099aaea0b5eaa9968d34df40a5fd3ca3 SHA256 d7b7c9295d41f279c863b7283129889741f89b932c1cf1903193e6c557706bfb
-MISC ChangeLog 11448 RMD160 6d22cde6498b9c031aaa8aef9780afb92815c117 SHA1 fd78e1195c26cf3bddcb609752886d0aaaeea1d5 SHA256 d349cc73cce346d488b6d0c97b47bc5ea10beea6bac2aaf1ef4eae261285c90f
+EBUILD openswan-2.6.21.ebuild 4530 RMD160 73110832a157567fa866d9bdbc387d79eacded1c SHA1 83e83bbd4ce899e307c33292bc6a1a43bb341215 SHA256 133787849bfb63f7899a09e38070ecea9b8c67cae6f255f4f9d7982106297d61
+MISC ChangeLog 11813 RMD160 c926bd30765f7469ca67e9204b65778b031433cc SHA1 b94ea7f594d9557dc8396b0c134897f50cd4dba9 SHA256 eec5dfa0340063fa30f80b1b61afc96aa69c580e7267c1c73bd094c42362f8a9
 MISC metadata.xml 1052 RMD160 714461d3b0b057e2859462b89308234ff326aa35 SHA1 fe024e83c6632467d13b7d80c57ec94fda1137de SHA256 2fc6636bb523697c3e909cd6e4106402978f9a51435ae4c0ec9e27767b41ad16
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkngBTYACgkQ/ejvha5XGaO4zgCg5UFoFj8EVzkkF1DJZS2j9cla
-hW0AoMxkTdRzMIkMx5PaHcZadCFJ41hU
-=xsK7
+iEYEARECAAYFAknmS2oACgkQts85UDFmaOVNkgCbBhcADbvo0yBhG2VATvoZSxXb
+MCAAn1eS5soHyPd3ZICG2SleZuGv8ka2
+=rjKn
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/openswan-2.4.14-gentoo.patch b/net-misc/openswan/files/openswan-2.4.14-gentoo-fixed.patch
index 63c310fd9513..2e9d041c8e10 100644
--- a/net-misc/openswan/files/openswan-2.4.14-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.4.14-gentoo-fixed.patch
@@ -38,7 +38,7 @@ diff -Nru openswan-2.4.14.orig/programs/_confread/_confread.in openswan-2.4.14/p
 +++ openswan-2.4.14/programs/_confread/_confread.in	2009-04-08 23:06:04.000000000 +0000
 @@ -14,7 +14,7 @@
  #
- # RCSID $Id: openswan-2.4.14-gentoo.patch,v 1.1 2009/04/08 23:30:45 mrness Exp $
+ # 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
@@ -51,7 +51,7 @@ diff -Nru openswan-2.4.14.orig/programs/_confread/ipsec.conf.in openswan-2.4.14/
 @@ -1,4 +1,4 @@
 -# /etc/ipsec.conf - Openswan IPsec configuration file
 +# /etc/ipsec/ipsec.conf - Openswan IPsec configuration file
- # RCSID $Id: openswan-2.4.14-gentoo.patch,v 1.1 2009/04/08 23:30:45 mrness Exp $
+ # 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
diff --git a/net-misc/openswan/files/openswan-2.6.21-gentoo.patch b/net-misc/openswan/files/openswan-2.6.21-gentoo-fixed.patch
index 36fef3c6b200..a9439f43843a 100644
--- a/net-misc/openswan/files/openswan-2.6.21-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.6.21-gentoo-fixed.patch
@@ -115,7 +115,7 @@ diff -Nru openswan-2.6.21.orig/programs/setup/Makefile openswan-2.6.21/programs/
 -	@rm -f setup
  
  #
- # $Log: not supported by cvs2svn $
+ # $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
diff --git a/net-misc/openswan/openswan-2.4.14.ebuild b/net-misc/openswan/openswan-2.4.14.ebuild
index 816964d021a8..9683b2634935 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.1 2009/04/08 23:30:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.14.ebuild,v 1.2 2009/04/15 21:02:17 mrness Exp $
 
 EAPI="2"
 
@@ -52,7 +52,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-gentoo-fixed.patch
 	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
 
 	find . -regex '.*[.][1-8]' -exec sed -i \
diff --git a/net-misc/openswan/openswan-2.6.21.ebuild b/net-misc/openswan/openswan-2.6.21.ebuild
index 35387e073328..333c72dc452a 100644
--- a/net-misc/openswan/openswan-2.6.21.ebuild
+++ b/net-misc/openswan/openswan-2.6.21.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.6.21.ebuild,v 1.1 2009/04/08 23:30:46 mrness Exp $
+# $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"
 
@@ -59,7 +59,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-gentoo-fixed.patch
 
 	find . -regex '.*[.][1-8]' -exec sed -i \
 	    -e s:/usr/local:/usr:g '{}' \; ||