Fix patch broken by the $Id cvs replacement (second try).

Package-Manager: portage-2.1.4.4

4 files changed, 13 insertions, 12 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 636de58c80b4..8860c8e2a821 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,9 +1,10 @@
 # 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.50 2008/08/16 10:14:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.51 2008/08/16 10:19:36 mrness Exp $
 
   16 Aug 2008; Alin Năstac <mrness@gentoo.org>
-  +files/openswan-2.4.13-gentoo.patch:
+  -files/openswan-2.4.13-gentoo.patch,
+  +files/openswan-2.4.13-gentoo-fixed.patch, openswan-2.4.13.ebuild:
   Fix patch broken by the $Id cvs replacement.
 
 *openswan-2.4.13 (15 Aug 2008)
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 7bd44d726ec6..20c47f5e8968 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 b4ce8805d258ded6b4c04f9f6ab391f93db95503 SHA1 c6e2e68c8475df3bb872b4e4c78207d5e85259fe SHA256 5b30201cefcf5bcb6d9858205baa478f34175099a164930119562062da5c42c8
+AUX openswan-2.4.13-gentoo-fixed.patch 6155 RMD160 0cb034afaab18fb45a2cf7bb553dbb1a7c5c77df SHA1 50337cdf3b6d197414d29229287963a9326c1993 SHA256 1f4cf5fd660d75d2aede283b2170b19905a39fc36cc22a81cf651f4a5e662c80
 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 8904 RMD160 3e094f1fe31468f9c2e258810a8899bc483fd729 SHA1 4468c73b4e86925c5b8b7501ad798c71087b771a SHA256 86d090fb957c747ecc1df44605456746a5d8b8812f1b3f19d68977f515b7b68a
+EBUILD openswan-2.4.13.ebuild 3536 RMD160 0d8462d97573af9b611e6b9ce9eaa24a61123822 SHA1 c472ee99fb3ab7164b58f1189048618729a051cc SHA256 f4cb2a6d33468e30cd39db560b506ae3b8cddb28b1e0d4353b07a61f98aa4fdc
+MISC ChangeLog 8973 RMD160 2460c5d42589feab844a2208a43b4748517545bd SHA1 4538df90c4028ed1cb2211b0006c4825c7f47a39 SHA256 be99097a29edd1861110610383d7fccd97e8476bc3a9de06e0d2030e0e2dac56
 MISC metadata.xml 840 RMD160 6bbfd2826acdb167847150124c32e10a331aea55 SHA1 cf58a1f4529d694566218381a82f82ffe8f8a810 SHA256 1398590b9727e99d153f117f6f99551a5843f58ba087308c775bef8bfc4ec142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkimqC8ACgkQPrHvTlXvhtt7EACeIHflkQVwTnc71AgEX4qX7h76
-hNwAoJ6eR7iAaYsJixYiJcn2/kcyErt1
-=RZr3
+iEYEARECAAYFAkimqSoACgkQPrHvTlXvhttIJQCeOK9qY1Dat4dz4yLc0C5kCumQ
+62UAn02n8DBsSVfgPgoSZ03UQPRqi5NH
+=mnWV
 -----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-fixed.patch
index ee19d0fb660d..1a4f9575ae4f 100644
--- a/net-misc/openswan/files/openswan-2.4.13-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.4.13-gentoo-fixed.patch
@@ -24,7 +24,7 @@ diff -ur openswan-2.4.13.orig/programs/_confread/_confread.in openswan-2.4.13/pr
 +++ openswan-2.4.13/programs/_confread/_confread.in	2008-08-16 09:56:57.000000000 +0000
 @@ -14,7 +14,7 @@
  #
- # RCSID $Id: openswan-2.4.13-gentoo.patch,v 1.3 2008/08/16 10:14:39 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
@@ -37,7 +37,7 @@ diff -ur openswan-2.4.13.orig/programs/_confread/ipsec.conf.in openswan-2.4.13/p
 @@ -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.3 2008/08/16 10:14:39 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 -ur openswan-2.4.13.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.13/programs/examples/l2tp-psk.conf.in
diff --git a/net-misc/openswan/openswan-2.4.13.ebuild b/net-misc/openswan/openswan-2.4.13.ebuild
index 7ebed4ebb06f..a0a002162124 100644
--- a/net-misc/openswan/openswan-2.4.13.ebuild
+++ b/net-misc/openswan/openswan-2.4.13.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.13.ebuild,v 1.1 2008/08/15 17:10:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.13.ebuild,v 1.2 2008/08/16 10:19:36 mrness Exp $
 
 inherit eutils linux-info
 
@@ -53,7 +53,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-gentoo-fixed.patch
 	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
 
 	find . -regex '.*[.][1-8]' -exec sed -i \