Make USE=snmp fatal when net-snmp is not installed, and make an unreadable /proc/net/dev non-fatal in any case (bug #425608).

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 117 insertions, 10 deletions

diff --git a/net-analyzer/ifstat/ChangeLog b/net-analyzer/ifstat/ChangeLog
index bc6d0eebaed3..73b1f0659826 100644
--- a/net-analyzer/ifstat/ChangeLog
+++ b/net-analyzer/ifstat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ifstat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ChangeLog,v 1.24 2012/07/10 16:26:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ChangeLog,v 1.25 2012/07/11 01:50:49 jer Exp $
+
+*ifstat-1.1-r2 (11 Jul 2012)
+
+  11 Jul 2012; Jeroen Roovers <jer@gentoo.org> -ifstat-1.1-r1.ebuild,
+  +ifstat-1.1-r2.ebuild, files/ifstat-1.1-make.patch:
+  Make USE=snmp fatal when net-snmp is not installed, and make an unreadable
+  /proc/net/dev non-fatal in any case (bug #425608).
 
 *ifstat-1.1-r1 (10 Jul 2012)
 
diff --git a/net-analyzer/ifstat/Manifest b/net-analyzer/ifstat/Manifest
index 7801ff822a5e..03ecb2cb2bf5 100644
--- a/net-analyzer/ifstat/Manifest
+++ b/net-analyzer/ifstat/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ifstat-1.1-make.patch 924 SHA256 83a60dafae3436a7c7a29368c833bcf3763fe1c687894177535cd7c94d760738 SHA512 c38618c54f556b92f2f5362416aabfc53f2f39949ce307b9abb19c3ba70b08308365731de86079c044dd0f0e580ba1532f95bf838b58f2ca266e10f0052ec541 WHIRLPOOL e59b0d9a02f7b0934ef65915273de5dc71054f11337b60112fb7dd9ea40d3b8afa18d7405f12d041acf38903474fed54b036dc0145d9a7c640c93bba76eba9e9
+AUX ifstat-1.1-make.patch 4110 SHA256 39f9ed8be68feb08c62ca9f8aa435db1fa464b769b527f55b7d038cea4779cee SHA512 28b292b00b465a44344556c8f96bb237a0185ac176f0bea2374a0d6c03bc834997450c0c152a00a469f2a6837c3f60aa66cc85615d50cb5aeec1a379e155775a WHIRLPOOL 095572614e353fa647cf2f532f7c784f4241e2c307f3852e6ee7d443b79e06f56f2c619d67f68d0b2d2bc21a25a1121e26741529649b4bdb81d74ed2805dce23
 AUX ifstat-1.1-strip_and_cflags.patch 415 SHA256 1e3cbd49a796802a3a19ce940173c894646eb1129144c8453c33a34b6f896d26 SHA512 422e58e916efb4e943a88e116eade117746d12be9071a5fd65a8da496234257f9faf43cec6807282fbdd38c97bd045a60916d0d94387f81343e901d9c827199b WHIRLPOOL 0ef5963b1683c5fc1f6c3e73fd53bafa6de5510275d7f6796edf4bb0e619fcb0aad27be274b7668b1c32b06b02afc7adff4cfd92dc5d0dc41b90de69a3e75438
 DIST ifstat-1.1.tar.gz 67920 SHA256 8599063b7c398f9cfef7a9ec699659b25b1c14d2bc0f535aed05ce32b7d9f507 SHA512 b1aef8e7b14cbf265e2d42277478fd12a565287f90f37b0a826ba3e7d29640df757c7d56f149e406bf5890663ed734b2c658c4f1e2b258ded3649f2fc3e9ac64 WHIRLPOOL 9db65eafd8306e0059dd08c34db4eb17dfcef1b32dd7b3bbad21501afc8aedf40a694367fde98d5204d4dcae4f915bb1f2f4301bc3eec3326c80e031097492ba
-EBUILD ifstat-1.1-r1.ebuild 727 SHA256 406ddceb0c59c3726d703fc0f52ac7ca881bca27ca655cade5f7a18dc7025321 SHA512 f3d33bfa181195393a18ba429c9995cafa64f8b6f19965a9eee928c9a15463fe9f930a0e3ddcc67126e1d1d4a98b07c1bd06350fc9feb75524f14b2f4c3ef7f0 WHIRLPOOL e5bf6a4b6ca2d26fc3d9ea2aac0d9bfccc4e71c9b87a5ef45d6af41cd32060169ae8e12f923fe963bfdcb2b8ec00a4bb3abf0bbba00a0a426830317e74f70e84
+EBUILD ifstat-1.1-r2.ebuild 748 SHA256 e8a3ecb5965d30f339c27938581283d0a1f1fc56b5c5a5e00c04a679ec482ed9 SHA512 a7e0bf059178e0b83e844a6c6e183c5e7d8a0c75f4f04d00ad8f0bb47f3be694f4439a47b963b88d4a039e3b2f01777dc256579ea81f00aaa847f1f0bbe51c28 WHIRLPOOL f27f0edb49abd0779460c86f7b246dfaf5d5e616b87236c773264fe3c88cbcfc9ba9f2d7d53c60ba0579346e2b78050bcd0896d037b902d24769ef3513a8d69c
 EBUILD ifstat-1.1.ebuild 727 SHA256 f57d8ad1f888917aa9afb4dc26e6be37734c1dd7d4ba287f66f2f465a68f6959 SHA512 9a40795c3f2ebc63d112bfd27303f764076feb23a606a069c8a61cb11785185d43dd93afe7ea69c92b5f5db65e56838c538c17691b9f52202b13dd7478a5782c WHIRLPOOL 65e026318c15bb2047c90c53275b5d473d4f50e682e1d20340c6abce77c313a782157bc8155007ec750b27b2696cb3231cf70d41c52934dccaf0cd66ad9ac793
-MISC ChangeLog 2761 SHA256 7d09c26d844985fc59b7c2cceb52d6760b4b2e5910911f2af32b4a067a26d5d6 SHA512 ba9ab49439048618aef9908e63c24169640dbb6b35d3b418b73e8dd10dd26df661825cce4f68ed672feb1eb33d954a590331d6d45f5843bd37ba47d175df1d3a WHIRLPOOL 40474ad71eefd3a3b1252703b6eeef8fb6e71dfd48cb671ebd52f0a923797becb5f3d974b1ce1caffe3a72584d55e211050fd983b40cdc02a17cd85a71cef726
+MISC ChangeLog 3046 SHA256 93239e4dac7e2d5cbc984eb306766da378be552001919d8b76ea453ce2725ca5 SHA512 4d7c74d057bdb7745a877b514a4659b649d082fdb0a58798a696ab70a1cbf0004af79f4973c98abe2be443a9d497026f76d9e7740a2be123fb9cba729d58e4a7 WHIRLPOOL 347610968479c16d7c9e4ccf19f0df514e11211d39c275597236362850385689db63a98fd78f3cd52fcdc6f743d492faab5336e70350e38b9aef52293647d658
 MISC metadata.xml 357 SHA256 2afc3299bb2497d6a4da60fc72da0ecaa750aeb0a011430f04f1e82ebada9d21 SHA512 21170e5cbc785e885a7df5369ab919729e4d331aaceb57cdd44a7e7b771b9db8f18f8b4f33a6cc39c8e9fd7f4391ec43cb4daa748ee79b24f6bac729b5c60cdd WHIRLPOOL ddbbcb74a22a8910478b50bc9273482f0f7276fbaf4e850d19138ee1c73b9d02cb2bf8101e5ff36e098c203dadd42c73f90e9fc8810b38f30cfe993c6acea59b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/8WFgACgkQVWmRsqeSphOsHgCfdGEcHWqsfmQDuIMZAw/bB2Iw
-RqEAn14/wG7b3AqSsUi3b+2owwZBnSgm
-=n3Lf
+iEYEARECAAYFAk/82/4ACgkQVWmRsqeSphOoRgCcCaGyeB4Sp/2HOm6Ud/8RZl7m
+uKIAn3FH4aHsMlXsPL1bjIYCRGW8MOQw
+=kKns
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ifstat/files/ifstat-1.1-make.patch b/net-analyzer/ifstat/files/ifstat-1.1-make.patch
index 166e5739684d..62feb8b0005a 100644
--- a/net-analyzer/ifstat/files/ifstat-1.1-make.patch
+++ b/net-analyzer/ifstat/files/ifstat-1.1-make.patch
@@ -21,3 +21,102 @@
  	$(INSTALL) -d -m 755 $(includedir)
  	$(INSTALL) -m 644 ifstat.h $(includedir)/ifstat.h
  	$(INSTALL) -d -m 755 $(libdir)
+--- a/configure.in
++++ b/configure.in
+@@ -55,9 +55,8 @@
+ # checking for proc (Linux)
+ if test "x$with_proc" != "xno"; then
+   case "$with_proc" in
+-     /*) file=$with_proc ;;
+-     *) file=/proc/net/dev ;;
+-  esac
++     /*) 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
+     AC_DEFINE([USE_PROC], 1, [Define if you want to use /proc to get stats])
+@@ -69,6 +68,8 @@
+     with_proc=no
+   fi
+   AC_MSG_RESULT([$with_proc])
++        ;;
++  esac
+ fi
+ 
+ # checking for kstat (Solaris)
+@@ -393,7 +394,7 @@
+                 [snmp_ok=yes], [snmp_ok=no])
+     AC_MSG_RESULT([$snmp_ok])
+     if test "x$snmp_ok" = "xyes"; then
+-      with_snmp=yes
++      use_snmp=yes
+       snmp_type=net
+     else
+       CPPFLAGS="$OCPPFLAGS"
+@@ -402,22 +403,22 @@
+   fi
+ 
+   if test "x$snmp_ok" != "xyes"; then
+-    if test "x$with_snmp" != "xyes" ; then
++    if test "x$use_snmp" != "xyes" ; then
+       CPPFLAGS="$CPPFLAGS -I$with_snmp/include"
+       LDFLAGS="$LDFLAGS -L$with_snmp/lib"
+     fi
+     AC_CHECK_HEADER(net-snmp/net-snmp-config.h, snmp_type=net,
+ 	  	    [AC_CHECK_HEADER(ucd-snmp/ucd-snmp-config.h,
+-                                     snmp_type=ucd, with_snmp=no)])
++                                     snmp_type=ucd, use_snmp=no)])
+ 
+-    if test "x$with_snmp" != "xno"; then
++    if test "x$use_snmp" != "xno"; then
+       if test "x$snmp_type" = "xnet"; then
+          libsnmp="-lnetsnmp"
+       else
+          libsnmp="-lsnmp"
+       fi
+ 
+-      with_snmp=no
++      use_snmp=no
+       SNMPLIBALONE="$libsnmp"
+       # Setting to be able to force linking with -lcrypto....
+       # This is needed on OpenBSD (at least) where the snmplib port links without -lcrypto,
+@@ -429,18 +430,18 @@
+         SNMPLIBALONE=""
+       fi
+       for lib in $SNMPLIBALONE "$libsnmp -lcrypto" ; do
+-        if test "x$with_snmp" != "xyes" ; then
++        if test "x$use_snmp" != "xyes" ; then
+           AC_MSG_CHECKING([for snmp support in $lib])
+           OLIBS="$LIBS"
+           LIBS="$LIBS $lib"
+           AC_TRY_LINK([], [snmp_sess_init();],
+-                      [with_snmp=yes], [LIBS="$OLIBS"])
+-          AC_MSG_RESULT([$with_snmp])
++                      [use_snmp=yes], [LIBS="$OLIBS"])
++          AC_MSG_RESULT([$use_snmp])
+         fi
+       done
+     fi
+   fi
+-  if test "x$with_snmp" = "xyes" ; then
++  if test "x$use_snmp" = "xyes" ; then
+     AC_DEFINE([USE_SNMP], 1, [Define if you have SNMP support])
+     if test "x$snmp_type" = "xnet"; then
+        AC_DEFINE([HAVE_NET_SNMP], 1,
+@@ -464,10 +465,13 @@
+ 
+ # checking that we do have at least one driver
+ if test "x$local" != "xyes"; then
++  AC_MSG_WARN([no native stats gathering mechanism found; will use SNMP.])
+   if test "x$with_snmp" = "xyes"; then
+-    AC_MSG_WARN([no native stats gathering mechanism found; will use SNMP.])
+-  else
+-    AC_MSG_ERROR([no statistics gathering methods found, porting needed.])
++    if test "x$use_snmp" = "xno"; then
++      AC_MSG_ERROR([net-snmp requested but not found.])
++    else
++      AC_MSG_ERROR([no statistics gathering methods found, porting needed.])
++    fi
+   fi
+ fi
+ 
diff --git a/net-analyzer/ifstat/ifstat-1.1-r1.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
index c0494802071d..479ed410ee51 100644
--- a/net-analyzer/ifstat/ifstat-1.1-r1.ebuild
+++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ifstat-1.1-r1.ebuild,v 1.1 2012/07/10 16:26:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ifstat-1.1-r2.ebuild,v 1.1 2012/07/11 01:50:49 jer Exp $
 
 EAPI=4
-inherit eutils
+inherit autotools eutils
 
 IUSE="snmp"
 
@@ -22,8 +22,9 @@ DOCS=( HISTORY README TODO )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-make.patch
+	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable snmp)
+	econf $(use_with snmp)
 }