diff options
author | 2012-09-25 01:12:33 +0000 | |
---|---|---|
committer | 2012-09-25 01:12:33 +0000 | |
commit | ef04f4c62ca45b1e28f88ff2fee294fe9eb3d638 (patch) | |
tree | 2c8a2483da936d3b7ba09a7a959e7736410f0d36 /net-firewall | |
parent | Add fix from upstream for x32 malloc failures #394175. (diff) | |
download | gentoo-2-ef04f4c62ca45b1e28f88ff2fee294fe9eb3d638.tar.gz gentoo-2-ef04f4c62ca45b1e28f88ff2fee294fe9eb3d638.tar.bz2 gentoo-2-ef04f4c62ca45b1e28f88ff2fee294fe9eb3d638.zip |
Drop useless sysctl.h includes #425770 by devsk.
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)
Diffstat (limited to 'net-firewall')
-rw-r--r-- | net-firewall/ipsec-tools/ChangeLog | 7 | ||||
-rw-r--r-- | net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch | 22 | ||||
-rw-r--r-- | net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild | 3 |
3 files changed, 29 insertions, 3 deletions
diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog index 742dc7ffac2f..dfa2a4d7ceaf 100644 --- a/net-firewall/ipsec-tools/ChangeLog +++ b/net-firewall/ipsec-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/ipsec-tools # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.102 2012/09/16 17:57:53 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.103 2012/09/25 01:12:33 vapier Exp $ + + 25 Sep 2012; Mike Frysinger <vapier@gentoo.org> + +files/ipsec-tools-0.8.0-sysctl.patch, ipsec-tools-0.8.0-r4.ebuild: + Drop useless sysctl.h includes #425770 by devsk. 16 Sep 2012; Anthony G. Basile <blueness@gentoo.org> ipsec-tools-0.8.0-r3.ebuild: @@ -456,4 +460,3 @@ This is the initial commit of ipsec-tools. Thanks for this ebuild go to all those involved in testing and developing it, please see Gentoo bug #26796 for details. - diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch b/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch new file mode 100644 index 000000000000..5c69bbb2fa61 --- /dev/null +++ b/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/425770 + +--- a/src/racoon/pfkey.c ++++ b/src/racoon/pfkey.c +@@ -59,7 +59,6 @@ + #include <sys/param.h> + #include <sys/socket.h> + #include <sys/queue.h> +-#include <sys/sysctl.h> + + #include <net/route.h> + #include <net/pfkeyv2.h> +--- a/src/setkey/setkey.c ++++ b/src/setkey/setkey.c +@@ -40,7 +40,6 @@ + #include <sys/socket.h> + #include <sys/time.h> + #include <sys/stat.h> +-#include <sys/sysctl.h> + #include <err.h> + #include <netinet/in.h> + #include <net/pfkeyv2.h> diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild index 6b3143d25013..2633e35c8e41 100644 --- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild +++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.8.0-r4.ebuild,v 1.1 2012/09/16 17:54:50 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild,v 1.2 2012/09/25 01:12:33 vapier Exp $ EAPI="4" @@ -145,6 +145,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-def-psk.patch" epatch "${FILESDIR}/${PN}-include-vendoridh.patch" + epatch "${FILESDIR}"/${P}-sysctl.patch #425770 AT_M4DIR="${S}" eautoreconf epunt_cxx |