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

(Portage version: 2.1.6.7/cvs/Linux x86_64)

5 files changed, 17 insertions, 12 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/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 b75fb0e7216b..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,11 +115,7 @@ diff -Nru openswan-2.6.21.orig/programs/setup/Makefile openswan-2.6.21/programs/
 -	@rm -f setup
  
  #
- # $Log: openswan-2.6.21-gentoo.patch,v $
- # Revision 1.2  2009/04/10 21:36:21  mrness
- # Add -kb flag to gentoo patch (#265612). Remove secure-tunneling herd (#265655).
- # (Portage version: 2.1.6.7/cvs/Linux x86_64)
- #
+ # $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 '{}' \; ||