From 1dd67d649663e5c9d9a9de405f4fb66d49b1ff61 Mon Sep 17 00:00:00 2001 From: Victor Ostorga Date: Sat, 9 Jan 2010 23:20:49 +0000 Subject: Fixing duplicate filename in automake.am include header, patch thanks to Martin Väth , bug #300161 (Portage version: 2.1.6.13/cvs/Linux i686) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net-firewall/ipsec-tools/ChangeLog | 9 +++++++-- .../ipsec-tools/files/ipsec-tools-duplicate-header.patch | 11 +++++++++++ net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild | 6 ++++-- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 net-firewall/ipsec-tools/files/ipsec-tools-duplicate-header.patch 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 + 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 , bug #300161 *ipsec-tools-0.7.3 (11 Sep 2009) 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 ::' 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 -- cgit v1.2.3-65-gdbad