Add -kb flag to gentoo patch (#265612). Remove secure-tunneling herd (#265655).

(Portage version: 2.1.6.7/cvs/Linux x86_64)

3 files changed, 14 insertions, 11 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index ba0f4432a444..0a682f1e0e4e 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,10 @@
 # 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.58 2009/04/08 23:30:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.59 2009/04/10 21:36:21 mrness Exp $
+
+  10 Apr 2009; Alin Năstac <mrness@gentoo.org>
+  files/openswan-2.6.21-gentoo.patch, metadata.xml:
+  Add -kb flag to gentoo patch (#265612). Remove secure-tunneling herd (#265655).
 
 *openswan-2.6.21 (08 Apr 2009)
 *openswan-2.4.14 (08 Apr 2009)
diff --git a/net-misc/openswan/files/openswan-2.6.21-gentoo.patch b/net-misc/openswan/files/openswan-2.6.21-gentoo.patch
index a6aa25caee10..b75fb0e7216b 100644
--- a/net-misc/openswan/files/openswan-2.6.21-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.6.21-gentoo.patch
@@ -1,6 +1,6 @@
 diff -Nru openswan-2.6.21.orig/lib/libdns/Makefile openswan-2.6.21/lib/libdns/Makefile
 --- openswan-2.6.21.orig/lib/libdns/Makefile	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/lib/libdns/Makefile	2009-04-08 23:23:13.000000000 +0000
++++ openswan-2.6.21/lib/libdns/Makefile	2009-04-10 21:20:46.000000000 +0000
 @@ -30,8 +30,8 @@
  		-I${srcdir}../libisc/nothreads/include \
  		-I. -I./include -I${srcdir}include \
@@ -14,7 +14,7 @@ diff -Nru openswan-2.6.21.orig/lib/libdns/Makefile openswan-2.6.21/lib/libdns/Ma
  
 diff -Nru openswan-2.6.21.orig/lib/libisc/Makefile openswan-2.6.21/lib/libisc/Makefile
 --- openswan-2.6.21.orig/lib/libisc/Makefile	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/lib/libisc/Makefile	2009-04-08 23:23:01.000000000 +0000
++++ openswan-2.6.21/lib/libisc/Makefile	2009-04-10 21:20:46.000000000 +0000
 @@ -22,8 +22,8 @@
  		-I${srcdir}nothreads/include \
  		-I. -I./include -I${srcdir}include \
@@ -28,7 +28,7 @@ diff -Nru openswan-2.6.21.orig/lib/libisc/Makefile openswan-2.6.21/lib/libisc/Ma
  
 diff -Nru openswan-2.6.21.orig/lib/liblwres/Makefile openswan-2.6.21/lib/liblwres/Makefile
 --- openswan-2.6.21.orig/lib/liblwres/Makefile	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/lib/liblwres/Makefile	2009-04-08 23:22:53.000000000 +0000
++++ openswan-2.6.21/lib/liblwres/Makefile	2009-04-10 21:20:46.000000000 +0000
 @@ -22,8 +22,8 @@
  		-I${srcdir}../libisc/${ISCARCH}/include \
  		-I${srcdir}../libisc/include \
@@ -42,7 +42,7 @@ diff -Nru openswan-2.6.21.orig/lib/liblwres/Makefile openswan-2.6.21/lib/liblwre
  
 diff -Nru openswan-2.6.21.orig/Makefile.inc openswan-2.6.21/Makefile.inc
 --- openswan-2.6.21.orig/Makefile.inc	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/Makefile.inc	2009-04-08 23:21:42.000000000 +0000
++++ openswan-2.6.21/Makefile.inc	2009-04-10 21:20:46.000000000 +0000
 @@ -49,7 +49,7 @@
  DESTDIR?=
  
@@ -63,7 +63,7 @@ diff -Nru openswan-2.6.21.orig/Makefile.inc openswan-2.6.21/Makefile.inc
  FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
 diff -Nru openswan-2.6.21.orig/programs/Makefile.program openswan-2.6.21/programs/Makefile.program
 --- openswan-2.6.21.orig/programs/Makefile.program	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/programs/Makefile.program	2009-04-08 23:23:28.000000000 +0000
++++ openswan-2.6.21/programs/Makefile.program	2009-04-10 21:20:46.000000000 +0000
 @@ -53,7 +53,6 @@
  WERROR:= -Werror
  endif
@@ -74,7 +74,7 @@ diff -Nru openswan-2.6.21.orig/programs/Makefile.program openswan-2.6.21/program
  LDFLAGS=-L$(LD_LIBRARY_PATH)
 diff -Nru openswan-2.6.21.orig/programs/setup/Makefile openswan-2.6.21/programs/setup/Makefile
 --- openswan-2.6.21.orig/programs/setup/Makefile	2009-03-30 13:11:28.000000000 +0000
-+++ openswan-2.6.21/programs/setup/Makefile	2009-04-08 23:21:42.000000000 +0000
++++ openswan-2.6.21/programs/setup/Makefile	2009-04-10 21:20:47.000000000 +0000
 @@ -18,7 +18,6 @@
  
  # this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
@@ -116,13 +116,13 @@ diff -Nru openswan-2.6.21.orig/programs/setup/Makefile openswan-2.6.21/programs/
  
  #
  # $Log: openswan-2.6.21-gentoo.patch,v $
- # Revision 1.1  2009/04/08 23:30:45  mrness
- # Version bumps wrt to security bug #264346. Remove -Werror from compiler options (#260927).
+ # 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)
  #
 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-08 23:23:48.000000000 +0000
++++ openswan-2.6.21/testing/utils/make-uml.sh	2009-04-10 21:20:47.000000000 +0000
 @@ -262,7 +262,7 @@
  
  cd $OPENSWANSRCDIR || exit 1
diff --git a/net-misc/openswan/metadata.xml b/net-misc/openswan/metadata.xml
index cfc10f55d824..159b1bae02a0 100644
--- a/net-misc/openswan/metadata.xml
+++ b/net-misc/openswan/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>secure-tunneling</herd>
   <maintainer>
     <email>mrness@gentoo.org</email>
     <name>Alin Năstac</name>