Add a patch to make bmon work with newer sysfs that has symlinks for net devices.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 37 insertions, 8 deletions

diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index ef8e57944e89..e9030e48c774 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/bmon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.43 2010/01/25 12:54:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.44 2010/01/30 22:18:23 swegener Exp $
+
+  30 Jan 2010; Sven Wegener <swegener@gentoo.org> bmon-2.1.0-r3.ebuild,
+  +files/bmon-2.1.0-sysfs-symlink.patch, bmon-2.1.1_pre1.ebuild:
+  Add a patch to make bmon work with newer sysfs that has symlinks for net
+  devices.
 
   25 Jan 2010; Jeroen Roovers <jer@gentoo.org> bmon-2.1.0-r3.ebuild,
   bmon-2.1.1_pre1.ebuild:
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index 280e81948840..7ee3ddaeb68f 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bmon-2.1.0-gcc4.diff 1241 RMD160 e54ba1e1503b82655a65c65178fa5a85d56babc1 SHA1 ad83356830bdad59ee1ad352708c71e565476a7f SHA256 c26daa21662581f29ceb6ad5ba2274a26a6a80ac45557b2f441290e4b15a43fa
 AUX bmon-2.1.0-libnl-1.0.patch 486 RMD160 8496bc5e231dfa3c3892e10fcbfad33e2200d7d5 SHA1 4d56067e756d1943cef08d40ddddd0496cf17382 SHA256 19a042e7a28882ebaf66deca8bf71843a385df703076543b5fb11c3cf364d350
 AUX bmon-2.1.0-nostrip.patch 443 RMD160 0fbdbfaa613b41e817038aa51b1b26b13d5f58a3 SHA1 62382dc8a90c6ba4f797bda542c30a35bbf65d95 SHA256 32b10476f33109cc112c00be5e4396ed010e4a923c9c1537e94d5f7ed303e82a
+AUX bmon-2.1.0-sysfs-symlink.patch 382 RMD160 32a596a3492d8d3a4dd4e81f54d87b9ad6162619 SHA1 3d2cecc1363cab1e8bbfcdb7c10d804fdc589d93 SHA256 4877f4b2d0b7d847fde3efeb28b8c477673d8bf8484df44e7bc8ea0221a43646
 DIST bmon-2.1.0.tar.gz 270287 RMD160 7e0a5e0a82bfd3dc30fec899088f2206a75796a0 SHA1 969084269f155583063832751fff5a22a6ac77e3 SHA256 36a5772fc0241298b15db3dc4fb2552dcbb43edeffd6fcea4cd8818e97ec99fe
 DIST bmon-2.1.1-pre1.tar.gz 249796 RMD160 52996cdc2ae1ccfc689b65852e0d468f1d1fb4bb SHA1 d075dca44d7623b7d999f4c0160aa32284540703 SHA256 b60027e8a7c5a1db773a055ee6470e15e79265582b263f1f03bafd65edb5b434
-EBUILD bmon-2.1.0-r3.ebuild 1144 RMD160 4ed87155727d52628db50d3be77376b806538be9 SHA1 6c666919ea6a5c9e59280d0104cf7893c1aa5766 SHA256 f237e3b4a9382e4c86fb3953623084c03c5bc68c581ab8785df177cf2751a8a5
-EBUILD bmon-2.1.1_pre1.ebuild 1235 RMD160 a74b687d18abcede28f0e55a5d1250ab7737c352 SHA1 9759853c2b522fdac575ccbfd0f38b929a3e8448 SHA256 6a09e5de070fcbdafba7045fdff2cdaaaa63400c69fe47f339190edeac983fb0
-MISC ChangeLog 5613 RMD160 d46875a37fbb3304f639b7a55992c8fbeabcdd87 SHA1 f5f378afaf1a3172570843a0378d93b1a9d5431d SHA256 d1ca3cfcf8da17e9ab9e396218a538637d8d1936ebe14fc7c16f35cb1439ec62
+EBUILD bmon-2.1.0-r3.ebuild 1238 RMD160 4b1aca3cb328407852bfbe987104ac83980bbdbe SHA1 7eee22a84ce05d4776fe6bf307742b816811a78b SHA256 51db39e23bbedbc90eafae1bf36bf4b3e4fb3d14825417477ce20e9418d336e4
+EBUILD bmon-2.1.1_pre1.ebuild 1335 RMD160 3dffbd573e7830224d13d6822835143242ec162c SHA1 3f1385c606f4d5981fc2facfb219f8e2f01a00ef SHA256 df61008232c58a99b575b96589ab7d75465f3f67154756f91c172f2a21f73045
+MISC ChangeLog 5842 RMD160 5066b97af055b2a8b60142ba6584dc3247140a3c SHA1 4c24084487c0dfebfc4547cb42430934ac56eddf SHA256 a3a584186a7bd98293c9f605c05179aaf53d87e0969bb238e301368e25da2182
 MISC metadata.xml 322 RMD160 acef75fc6365dacab6f2d0e8b1aaf58b3bf81d4a SHA1 dc72f277c4d8d9be608f5291474ea86e8165e57e SHA256 b7fb7c6cfe1300d41f8357724e78e656c76a231e1ad41238ce1449dda76c3975
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktksDQACgkQI1lqEGTUzyTGKwCfSSh5jKfDWblgZKBlD1DK8aet
+zB4An32OgB3udVEopNk91n8sa+e7Y/Iq
+=+2Mh
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/bmon/bmon-2.1.0-r3.ebuild b/net-analyzer/bmon/bmon-2.1.0-r3.ebuild
index 20162a20e8b9..457c68b376fc 100644
--- a/net-analyzer/bmon/bmon-2.1.0-r3.ebuild
+++ b/net-analyzer/bmon/bmon-2.1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0-r3.ebuild,v 1.9 2010/01/25 12:54:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0-r3.ebuild,v 1.10 2010/01/30 22:18:23 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -27,7 +27,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-nostrip.patch
 	# libnl crap, bug 176378
 	epatch "${FILESDIR}"/${P}-libnl-1.0.patch
-
+	# newer sysfs has symlinks for net class
+	epatch "${FILESDIR}"/${P}-sysfs-symlink.patch
 }
 
 src_compile() {
diff --git a/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild b/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
index cc28746387a4..fb595cd4e584 100644
--- a/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
+++ b/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild,v 1.2 2010/01/25 12:54:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild,v 1.3 2010/01/30 22:18:23 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -30,7 +30,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.1.0-nostrip.patch
 	# libnl crap, bug 176378
 	epatch "${FILESDIR}"/${PN}-2.1.0-libnl-1.0.patch
-
+	# newer sysfs has symlinks for net class
+	epatch "${FILESDIR}"/${PN}-2.1.0-sysfs-symlink.patch
 }
 
 src_compile() {
diff --git a/net-analyzer/bmon/files/bmon-2.1.0-sysfs-symlink.patch b/net-analyzer/bmon/files/bmon-2.1.0-sysfs-symlink.patch
new file mode 100644
index 000000000000..08fd70dd60fe
--- /dev/null
+++ b/net-analyzer/bmon/files/bmon-2.1.0-sysfs-symlink.patch
@@ -0,0 +1,11 @@
+--- bmon/src/in_sysfs.c
++++ bmon/src/in_sysfs.c
+@@ -164,7 +164,7 @@
+ 		quit("Failed to open directory %s: %s\n", topdir, strerror(errno));
+ 
+ 	while ((de = readdir(d))) {
+-		if (de->d_type == DT_DIR && de->d_name[0] != '.') {
++		if ((de->d_type == DT_DIR || de->d_type == DT_LNK) && de->d_name[0] != '.') {
+ 			char p[FILENAME_MAX];
+ 
+ 			snprintf(p, sizeof(p), "%s/%s/statistics",