Fixup src_unpack, hand edit patch to apply with CVS keyword replacements, remove spurious backslash in find call.

Package-Manager: portage-2.1.5.4

4 files changed, 17 insertions, 17 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index af236059da6a..52ac6e0a6f35 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.45 2008/06/08 14:06:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.46 2008/06/08 20:08:38 swegener Exp $
+
+  08 Jun 2008; Sven Wegener <swegener@gentoo.org>
+  files/openswan-2.4.12-gentoo.patch, openswan-2.4.12.ebuild:
+  Fixup src_unpack, hand edit patch to apply with CVS keyword replacements,
+  remove spurious backslash in find call.
 
 *openswan-2.4.12 (08 Jun 2008)
 
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 5ffd4c908e9c..fd70b2c53c06 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -5,21 +5,21 @@ AUX ipsec 1551 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a SHA1 53c1826bea6a
 AUX openswan-2.4.11-gentoo.patch 16263 RMD160 39f72ab5edcc29a46de25398414f434814465fad SHA1 ce0e922722921315eb97acf650a5101b010e0e63 SHA256 1fa4f4323c40ca2d7f61abead7dd4c08ce2df9ed644df277c7b700825f7d9ec5
 AUX openswan-2.4.11-implicit-decl.patch 372 RMD160 b9f1ac0ba583d18ca029f4d990d8c2c697ede6c6 SHA1 c1864d0f9cc7d865fcc0df9c270962f4904724c6 SHA256 398ce3760280ec1db3c14a3e073d4a428453c44aaf2bd8de9567ad9ecaf3dc92
 AUX openswan-2.4.12-deprecated-ldap.patch 372 RMD160 3e39f78960828f8552c0e0d9a561a10846bb9f74 SHA1 e2171af09ccdedac0a4839f51bd0ab8215c9158c SHA256 c895706d3dd7f7bf679457c9769d3ca95f62b47a7a42ea943204e3a3db5864cd
-AUX openswan-2.4.12-gentoo.patch 6190 RMD160 87cf8d0458caa331b232faac2df339e7938fe035 SHA1 529943df26350751028375ed1e4624407c9bdc9c SHA256 bf39cadd74cea650776cd3bcdfd782405b53d54f5ff664da5e96ab1559ac84bc
+AUX openswan-2.4.12-gentoo.patch 5966 RMD160 0a64f2bccbf4d89cb96f1a1b39b23810a83d71d6 SHA1 24328b8815c524e049edd163f700f7a6b4bc315e SHA256 ab212078ffc1d6060fd51554a74ef6e9cac6b7f5f8f3e09710f7780364b588f6
 AUX openswan-2.4.9-gentoo.patch 16145 RMD160 19e8f10a334decad10d5e0bbb9a46c4d7cfbfdc0 SHA1 9294b0da2568bc154a3d8eecf7e29af36e0ed595 SHA256 9f7a970c90bf843360f8e6395279d3035336f1b94bec3c5ee6f9f22701de5182
 AUX openswan-2.4.9-mkdir.patch 628 RMD160 5f5ae3b61a89d997dafc26e3df4dd4b1c72979d9 SHA1 90ecce7382a8ea3339da5e23b7cdd05370adfe43 SHA256 2f635f184d0b9fe904a783b1052fb86a822ae52c62df273d4166269c66ae42f8
 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.9.tar.gz 3733727 RMD160 4cb6be6c03ffe6b9311554c0b2f2f1780989e151 SHA1 93d4ad5586c516c3310a059d35db5cb723b1b7c7 SHA256 847cec4af9afa5d975593f3310e50a6913e5a2502222ed4a6216424ab33bc8be
 EBUILD openswan-2.4.11.ebuild 3752 RMD160 228e226f384508d7ee699391ebff7b4cca9c315d SHA1 44740138c17d38dd884fc3705a18c8db880252bd SHA256 c22c7031d4a971f6d1d1032eb5c5e52e0fc1e77b5893c10c121d63e41d8d24ec
-EBUILD openswan-2.4.12.ebuild 3539 RMD160 e891d6fd2c170c4b3a21d4e814062f24e507f185 SHA1 403358de65993b6c23961d786ed34a7d0b8995fa SHA256 4155fa847953bc59aedcc1afb1d4076daea2e887587c9c8a813478106d26308b
+EBUILD openswan-2.4.12.ebuild 3540 RMD160 b90a1cb2a06baf62f0ca364b88d1e0e9c7c6d80b SHA1 9d5b08a4e0ed61295daab21f6534d98f00d7830d SHA256 02d65ea25fbaedb9a0ce2d2a548bd00b541a2064ab281301028d303534f034d5
 EBUILD openswan-2.4.9-r1.ebuild 3430 RMD160 f89e230fd80e1327faa10665c7d4cd5324475340 SHA1 36bb197dbbada5e36c6580cdbb170fcaebd85f0c SHA256 279eb6a66dec94bcbb85559bfc44c79b693e9c394ee6fe31aae71f51f520dbd3
-MISC ChangeLog 8010 RMD160 d402abe861111ae32f703ff03fa0cf404a0c8d39 SHA1 bff101408747cc3ca9eb06a6aa461412a614df1a SHA256 c2e15d020c796e1ad6cf597f1a843a0c273aa48c89b501a059e120ac12a29193
+MISC ChangeLog 8243 RMD160 046f56d49672af28b324ca54163261eac24d70cd SHA1 35c69e60cbea8f14711e295fdad1c51196e3289f SHA256 6174e3a952a172a0bf2125650cabc4508fa01b4cbf56c8939de1455100f79c94
 MISC metadata.xml 615 RMD160 b3d598429d92b809f96a81e5afee71da401805e6 SHA1 b42b5faa0351e1a13a85f169c2f9f571cf5a01c9 SHA256 ea4e1b6588339042b92326e43795dd53d95e3c22851c78184ea91c4c850296b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkhL54kACgkQ+fWpoTWIA9FqKQCeJhxMdBFE12Xytz6qPj/Z+zjc
-L5oAn2haa1lSL1yIxr9YwN+R4l9bZiXL
-=O4kM
+iD8DBQFITDxPI1lqEGTUzyQRAll7AJ416IZJEif2xdNpUU1+FcO0TksJiACdHMPX
+Hw9oMa2pqotA7km++U6UUFM=
+=/AmB
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/openswan-2.4.12-gentoo.patch b/net-misc/openswan/files/openswan-2.4.12-gentoo.patch
index 28b451660698..f77ce4304e93 100644
--- a/net-misc/openswan/files/openswan-2.4.12-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.4.12-gentoo.patch
@@ -22,9 +22,7 @@ diff -Nru openswan-2.4.12.orig/Makefile.inc openswan-2.4.12/Makefile.inc
 diff -Nru openswan-2.4.12.orig/programs/_confread/_confread.in openswan-2.4.12/programs/_confread/_confread.in
 --- openswan-2.4.12.orig/programs/_confread/_confread.in	2008-06-08 16:37:30.000000000 +0300
 +++ openswan-2.4.12/programs/_confread/_confread.in	2008-06-08 16:30:13.000000000 +0300
-@@ -14,7 +14,7 @@
- #
- # RCSID $Id: openswan-2.4.12-gentoo.patch,v 1.1 2008/06/08 14:06:56 mrness Exp $
+@@ -16,5 +16,5 @@
  #
 -# Extract configuration info from /etc/ipsec.conf, repackage as assignments
 +# Extract configuration info from /etc/ipsec/ipsec.conf, repackage as assignments
@@ -34,12 +32,9 @@ diff -Nru openswan-2.4.12.orig/programs/_confread/_confread.in openswan-2.4.12/p
 diff -Nru openswan-2.4.12.orig/programs/_confread/ipsec.conf.in openswan-2.4.12/programs/_confread/ipsec.conf.in
 --- openswan-2.4.12.orig/programs/_confread/ipsec.conf.in	2008-06-08 16:37:30.000000000 +0300
 +++ openswan-2.4.12/programs/_confread/ipsec.conf.in	2008-06-08 16:30:13.000000000 +0300
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -# /etc/ipsec.conf - Openswan IPsec configuration file
 +# /etc/ipsec/ipsec.conf - Openswan IPsec configuration file
- # RCSID $Id: openswan-2.4.12-gentoo.patch,v 1.1 2008/06/08 14:06:56 mrness Exp $
- 
- # This file:  @FINALEXAMPLECONFDIR@/ipsec.conf-sample
 diff -Nru openswan-2.4.12.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.12/programs/examples/l2tp-psk.conf.in
 --- openswan-2.4.12.orig/programs/examples/l2tp-psk.conf.in	2007-11-02 03:49:40.000000000 +0200
 +++ openswan-2.4.12/programs/examples/l2tp-psk.conf.in	2008-06-08 16:37:41.000000000 +0300
diff --git a/net-misc/openswan/openswan-2.4.12.ebuild b/net-misc/openswan/openswan-2.4.12.ebuild
index 055f2a9db288..8b590e8d0ce7 100644
--- a/net-misc/openswan/openswan-2.4.12.ebuild
+++ b/net-misc/openswan/openswan-2.4.12.ebuild
@@ -1,6 +1,6 @@
 # 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.12.ebuild,v 1.1 2008/06/08 14:06:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.12.ebuild,v 1.2 2008/06/08 20:08:38 swegener Exp $
 
 inherit eutils linux-info
 
@@ -56,7 +56,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
 
-	find . -regex '.*[.][1-8]\' -exec sed -i \
+	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 '{}' \; ||