summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2013-10-31 07:41:26 +0000
committerSergey Popov <pinkbyte@gentoo.org>2013-10-31 07:41:26 +0000
commitae909f1ba543ea5e532d489f67c2d90ff7188243 (patch)
treecb4cba41e85da4c612fd7fac5316a1e19c42283e /net-misc/quagga
parentLaunch nautilus-classic, upstream bug #709016 (diff)
downloadgentoo-2-ae909f1ba543ea5e532d489f67c2d90ff7188243.tar.gz
gentoo-2-ae909f1ba543ea5e532d489f67c2d90ff7188243.tar.bz2
gentoo-2-ae909f1ba543ea5e532d489f67c2d90ff7188243.zip
Fix for missing definitions on some hardened configuration, bug #437292. Thanks to Graham Murray <gmurray AT webwayone.co.uk> for pointing on reasons of this issue
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'net-misc/quagga')
-rw-r--r--net-misc/quagga/ChangeLog8
-rw-r--r--net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch22
-rw-r--r--net-misc/quagga/quagga-0.99.22.4.ebuild4
3 files changed, 32 insertions, 2 deletions
diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index c8013f1e8512..31d9c5bd0119 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/quagga
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.164 2013/10/10 06:30:42 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.165 2013/10/31 07:41:25 pinkbyte Exp $
+
+ 31 Oct 2013; Sergey Popov <pinkbyte@gentoo.org> quagga-0.99.22.4.ebuild,
+ +files/quagga-0.99.22.4-ipctl-forwarding.patch:
+ Fix for missing definitions on some hardened configuration, bug #437292.
+ Thanks to Graham Murray <gmurray AT webwayone.co.uk> for pointing on reasons
+ of this issue
10 Oct 2013; Sergey Popov <pinkbyte@gentoo.org> -quagga-0.99.20.ebuild,
-quagga-0.99.20-r1.ebuild, -quagga-0.99.21.ebuild,
diff --git a/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch b/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch
new file mode 100644
index 000000000000..f6b726b591f7
--- /dev/null
+++ b/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch
@@ -0,0 +1,22 @@
+Fix for missing definitions on some Hardened configurations
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=437292
+
+diff -Naur quagga-0.99.16.orig/zebra/ipforward_sysctl.c quagga-0.99.16/zebra/ipforward_sysctl.c
+--- quagga-0.99.16.orig/zebra/ipforward_sysctl.c 2010-03-11 12:11:32.000000000 -0500
++++ quagga-0.99.16/zebra/ipforward_sysctl.c 2010-03-11 12:11:39.000000000 -0500
+@@ -31,6 +31,15 @@
+
+ #define MIB_SIZ 4
+
++/* Fix for recent (2.6.14) kernel headers */
++#ifndef IPCTL_FORWARDING
++ #define IPCTL_FORWARDING NET_IPV4_FORWARD
++#endif
++
++#ifndef IP6CTL_FORWARDING
++ #define IP6CTL_FORWARDING NET_IPV6_FORWARDING
++#endif
++
+ extern struct zebra_privs_t zserv_privs;
+
+ /* IPv4 forwarding control MIB. */
diff --git a/net-misc/quagga/quagga-0.99.22.4.ebuild b/net-misc/quagga/quagga-0.99.22.4.ebuild
index 6830b1f0cec0..71216a549c51 100644
--- a/net-misc/quagga/quagga-0.99.22.4.ebuild
+++ b/net-misc/quagga/quagga-0.99.22.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.22.4.ebuild,v 1.8 2013/10/09 17:10:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.22.4.ebuild,v 1.9 2013/10/31 07:41:25 pinkbyte Exp $
EAPI="5"
@@ -34,6 +34,8 @@ RDEPEND="${COMMON_DEPEND}
sys-apps/openrc
sys-apps/iproute2"
+PATCHES=( "${FILESDIR}/${P}-ipctl-forwarding.patch" )
+
DISABLE_AUTOFORMATTING=1
DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
You have to create config files in /etc/quagga before