Fixing duplicate filename in automake.am include header, patch thanks to Martin Väth <vaeth@mathematik.uni-wuerzburg.de> , bug #300161

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 25 insertions, 6 deletions

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index 61e802987f7d..75d02338cafe 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ipsec-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.73 2009/09/11 17:18:45 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.74 2010/01/09 23:20:49 vostorga Exp $
+
+  09 Jan 2010; Víctor Ostorga <vostorga@gentoo.org>
+  ipsec-tools-0.7.3.ebuild, +files/ipsec-tools-duplicate-header.patch:
+  Fixing duplicate filename in automake.am include header, patch thanks to
+  Martin Väth <vaeth@mathematik.uni-wuerzburg.de> , bug #300161
 
 *ipsec-tools-0.7.3 (11 Sep 2009)
 
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 013e63f1aaaa..daf6fea7534f 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,8 +1,9 @@
+AUX ipsec-tools-duplicate-header.patch 440 RMD160 0a9f53ad68232b382388447c3c4aa7c81f5b6de1 SHA1 1d48f49fae5e7c5278d52a512e6b06998f24eacf SHA256 47d31a605a48fc7168cd579f62217316a12b153177bc6b16618d46c38e6936d1
 AUX racoon.conf.d 621 RMD160 773a21f70bd4786eb6758f052bb54cc40273c259 SHA1 1291dbe1639cbb72a161e3af727c9c65c6ae0132 SHA256 bc7cf9c0fe8bd5f99c9353aa3c19e3314b3da21a7a2138fc6e901375be21b109
 AUX racoon.init.d 1314 RMD160 14fd9ea02fdb20d13a0e3284e1f1e468117247f2 SHA1 41cb71c0354d632ad35565dbf98a26364b592d56 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75
 DIST ipsec-tools-0.7.2.tar.bz2 792731 RMD160 77dfa746efe69f956bd3a3369412edc06e6f2a3d SHA1 c9727d6bc99e4e1d390d3959b2712e6e92f29f81 SHA256 08722ff6c62de3e042fef337454f03622a79053108d6dcc686c9c854f9f9e031
 DIST ipsec-tools-0.7.3.tar.bz2 776096 RMD160 e0ff32f0daa845934ac868ad5f36d58b25919c30 SHA1 19dc160643547a0bfabf0fe0ad1a181d3c28f410 SHA256 e6131d010b71d984194eb28267e6c01b49784a17a077bbafae58063f10b33b67
 EBUILD ipsec-tools-0.7.2.ebuild 8262 RMD160 3974d9b62f76402c043ca4fe5e7ebeb48b7f8499 SHA1 b51ef1d6688d960108d7481292dbcd071a3f85d7 SHA256 e61aff73dba5dde6794a6f8e8bdcf0a227bab77337954a4bcce05445c0a12f68
-EBUILD ipsec-tools-0.7.3.ebuild 8267 RMD160 4366611d7db19f060c8701197e831e667f865d79 SHA1 5f7dc9def816cc2647c0823c6b5b4abede75f4bd SHA256 0e8828d7b6ddaf0dfd584cdee3213640ad26757140ce6b0823c08575f34244c6
-MISC ChangeLog 11615 RMD160 46471e8442572d456d31c74cdc67af3a0668bd83 SHA1 436eeeedace8c63456b2ebf6af50b5fa1fc21222 SHA256 ad233edf31230259d7b18990ee2fdbc323943806b2f9e8ef02951d7cca14c4b0
+EBUILD ipsec-tools-0.7.3.ebuild 8372 RMD160 1d15eb5b89b15fa4babf0519c5c0dd3f21ceddc3 SHA1 85b457cde5abb0f753e092bdfc4ad437744f2010 SHA256 377070e1b895a246a6d024ddba55d4527d5a56a6bcce800d327f079aa625bbd9
+MISC ChangeLog 11881 RMD160 3394fddfa78398015fa3839a090400adbcb7c203 SHA1 283a1645e0de1748a9ef9693b86b4d693fdde1cc SHA256 f633d48d7b0079f3d6e8b6df65cb973bb4f51e1deeb6ccec9de00a8bbea2371b
 MISC metadata.xml 524 RMD160 351bb5819013ef3b7ec49fe70d22f363490a5ba1 SHA1 681504ef57886ed098e7bd5b13363c31fc7ce750 SHA256 b6818c278dcc159f496cadff08d546d6971be255cb4353728a08e03f2fbc47ef
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-duplicate-header.patch b/net-firewall/ipsec-tools/files/ipsec-tools-duplicate-header.patch
new file mode 100644
index 000000000000..6e8480405851
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-duplicate-header.patch
@@ -0,0 +1,11 @@
+--- src/racoon/Makefile.am
++++ src/racoon/Makefile.am
+@@ -3,7 +3,7 @@
+ sbin_PROGRAMS = racoon racoonctl plainrsa-gen
+ noinst_PROGRAMS = eaytest
+ include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \
+-	schedule.h sockmisc.h vmbuf.h isakmp_var.h isakmp.h isakmp_xauth.h \
++	schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \
+ 	isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h
+ lib_LTLIBRARIES = libracoon.la
+ 
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild
index a5ebc6fa7c3f..f7be8420f389 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild,v 1.1 2009/09/11 17:18:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild,v 1.2 2010/01/09 23:20:49 vostorga Exp $
 
 inherit eutils flag-o-matic autotools linux-info
 
@@ -152,6 +152,8 @@ src_unpack() {
 	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c
 	# fix for bug #124813
 	sed -i 's:-Werror::g' "${S}"/configure.ac
+	# Fixing duplicate specification of vmbuf.h #300161
+	epatch "${FILESDIR}"/${PN}-duplicate-header.patch
 
 	AT_M4DIR="${S}" eautoreconf
 	epunt_cxx