summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-01-19 12:27:32 +0000
committerJeroen Roovers <jer@gentoo.org>2014-01-19 12:27:32 +0000
commitc84aa43eb5843a0f2bb62571b17487553e6e7506 (patch)
tree3dccc6b31660348752f84561da86a225680bb2d5 /net-analyzer
parentppc stable wrt bug #491930; Drop old. (diff)
downloadgentoo-2-c84aa43eb5843a0f2bb62571b17487553e6e7506.tar.gz
gentoo-2-c84aa43eb5843a0f2bb62571b17487553e6e7506.tar.bz2
gentoo-2-c84aa43eb5843a0f2bb62571b17487553e6e7506.zip
Fix building on hardened (bug #498074 by John Default).
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/ifstat/ChangeLog8
-rw-r--r--net-analyzer/ifstat/files/ifstat-1.1-hardened.patch11
-rw-r--r--net-analyzer/ifstat/ifstat-1.1-r2.ebuild6
3 files changed, 21 insertions, 4 deletions
diff --git a/net-analyzer/ifstat/ChangeLog b/net-analyzer/ifstat/ChangeLog
index 35b3e0264566..fcdb37a6e1b6 100644
--- a/net-analyzer/ifstat/ChangeLog
+++ b/net-analyzer/ifstat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/ifstat
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ChangeLog,v 1.33 2013/12/22 14:19:54 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ChangeLog,v 1.34 2014/01/19 12:27:32 jer Exp $
+
+ 19 Jan 2014; Jeroen Roovers <jer@gentoo.org> ifstat-1.1-r2.ebuild,
+ +files/ifstat-1.1-hardened.patch:
+ Fix building on hardened (bug #498074 by John Default).
22 Dec 2013; Jeroen Roovers <jer@gentoo.org> -ifstat-1.1.ebuild,
-files/ifstat-1.1-strip_and_cflags.patch:
diff --git a/net-analyzer/ifstat/files/ifstat-1.1-hardened.patch b/net-analyzer/ifstat/files/ifstat-1.1-hardened.patch
new file mode 100644
index 000000000000..10c377ac7678
--- /dev/null
+++ b/net-analyzer/ifstat/files/ifstat-1.1-hardened.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -58,7 +58,7 @@
+ /*) file=$with_proc; with_proc=yes ;;
+ *) file=/proc/net/dev
+ AC_MSG_CHECKING([for proc interface in $file])
+- if grep -q Inter- $file 2>/dev/null; then
++ if true; then
+ AC_DEFINE([USE_PROC], 1, [Define if you want to use /proc to get stats])
+ AC_DEFINE_UNQUOTED([PROC_FILE], ["$file"], [Proc file to poll for stats])
+ with_proc=yes
diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
index 6e10923b6dae..c983888f3f78 100644
--- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
+++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ifstat-1.1-r2.ebuild,v 1.8 2013/12/22 12:05:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ifstat-1.1-r2.ebuild,v 1.9 2014/01/19 12:27:32 jer Exp $
EAPI=4
inherit autotools eutils
@@ -22,6 +22,8 @@ DOCS=( HISTORY README TODO )
src_prepare() {
epatch "${FILESDIR}"/${P}-make.patch
+ epatch "${FILESDIR}"/${P}-hardened.patch
+
eautoreconf
}