Added fix for snmp compile issue, thanks to Jan Boysen (trekkie@media-mission.de) bug #120954

(Portage version: 2.1_pre4-r1)

6 files changed, 78 insertions, 17 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 75cb6e452dcc..03a0aed0f059 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.43 2006/01/27 05:21:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.44 2006/02/01 14:11:05 jokey Exp $
+
+*ntop-3.2-r1 (01 Feb 2006)
+
+  01 Feb 2006; Markus Ullmann <jokey@gentoo.org> +files/ntop-3.2-snmp.patch,
+  -ntop-3.2.ebuild, +ntop-3.2-r1.ebuild:
+  Added fix for snmp compile issue, thanks to Jan Boysen
+  (trekkie@media-mission.de) bug #120954
 
   27 Jan 2006; Mike Frysinger <vapier@gentoo.org>
   files/ntop-3.2-build.patch:
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index e34e2758d21d..2610929ed9a3 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,22 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a2b7895db61397ef0d63613bd44e0f17 ChangeLog 5574
+MD5 eb4c7b4f5bc83af721f98d359c25c4ac ChangeLog 5819
+RMD160 fd390e19527c70ca75b1296bef0521096ebebe78 ChangeLog 5819
+SHA256 df3b2f03bea112c78faf07a384185b3a214d914a147cf1737d27119a1230f0ea ChangeLog 5819
 MD5 35c576fac5bd8cbf0da850ccc00dd924 files/digest-ntop-3.0 58
+RMD160 d8dfb8a8692af63ac71589caf25f2da6ea6b415b files/digest-ntop-3.0 58
+SHA256 6835bc892d7b44490957ae5530cca3254671d722ad82df741452adfb90c49fe5 files/digest-ntop-3.0 58
 MD5 bb970d07a76d2b939ec08c2796519021 files/digest-ntop-3.1 58
-MD5 7a846588a225f1493025737d4bbfb844 files/digest-ntop-3.2 58
+RMD160 7b992bd4ebf332cd41493d281947977788a49300 files/digest-ntop-3.1 58
+SHA256 d0146fac16615144631ae38c443835059eb84848ff8624dadcb9ab399ca6cd8c files/digest-ntop-3.1 58
+MD5 c9b1d854b1ac5779d7f28125bd89d238 files/digest-ntop-3.2-r1 220
+RMD160 d5ca25fd1bd9eec83de29bd893369b8a000fed6d files/digest-ntop-3.2-r1 220
+SHA256 fec72a84051cd908bd49dab5802bd22225c8a697f8ef28bcb8d65c2832396b36 files/digest-ntop-3.2-r1 220
 MD5 d1e896708a98eaca02f55c44ae517768 files/globals-core.c.diff 536
+RMD160 33d049b6c5143f42294bce9a7bf366e69e98d329 files/globals-core.c.diff 536
+SHA256 47077ead74ec2f10d9b65ee26ff3ea6f2c2d30908a151e1417e797a9c780d828 files/globals-core.c.diff 536
 MD5 21f35f61ff1c20d194e7f4c246c2b002 files/ntop-3.2-build.patch 9369
+RMD160 396ab052d11c21f5f33ea246c57aae8f1e4b2e35 files/ntop-3.2-build.patch 9369
+SHA256 9df47e5c250f26c408ca8f35faa0e35166a3e1d2fe3924387bd9acb1907cd23d files/ntop-3.2-build.patch 9369
+MD5 c88f7f9b27aeb11a93cd1cfb78a1def1 files/ntop-3.2-snmp.patch 776
+RMD160 22b4e288b88beaff7a855f18b9b9a1bec09d92da files/ntop-3.2-snmp.patch 776
+SHA256 c2cb51b8adb0909f29580846ee58d07c105998b5675cebf97f1cfda36e20abef files/ntop-3.2-snmp.patch 776
 MD5 43a9167b2aa1fc1db92721d7e4bfeb09 files/ntop-confd 168
+RMD160 a271189f232a95cf436b811521d3746d223733ad files/ntop-confd 168
+SHA256 611946b6e9218171cedf0a91a8e7c1cb897fd2325dafae88a6837a7582bfe88f files/ntop-confd 168
 MD5 9e6b1e20779d7fb6699c956adf6b8b05 files/ntop-init 294
+RMD160 3f64de5bad3c851c491f286f95bab5d906e6f6db files/ntop-init 294
+SHA256 697e5f6dc4d267ef0c703a8185f7402fc9af777be9d2786a41234db760c839fb files/ntop-init 294
 MD5 846e7479e3e9df4363f2721b7fb47320 metadata.xml 233
+RMD160 a40e5be287eb28adcd2008eb2de7a786bfd688c6 metadata.xml 233
+SHA256 1cd97d0616d391c2639822aa603b9ae39e60796da9e21f498a8e856d317e0a0b metadata.xml 233
 MD5 b924509c0c1399888a43c3a5d3ccc55d ntop-3.0.ebuild 1598
+RMD160 8cb7160a5db7d3862cbfaefc2fb83f8e091de347 ntop-3.0.ebuild 1598
+SHA256 a50c8bb34cca849ee9486b5c454486ad8bea1ba7ecd6f640875ae1bc95f16654 ntop-3.0.ebuild 1598
 MD5 4ab5248f4a98565130768d8ba364e49f ntop-3.1.ebuild 2398
-MD5 01c250e02b69cd8bccde11382d0ef74e ntop-3.2.ebuild 1983
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD2a3h2+ySkm8kpY0RAja2AKCCRAnNLGXraOZq0MemhTc2KFv1GQCdF/+5
-Vm3vVqn/ZNEx5TE8pQlpnfg=
-=OUPK
------END PGP SIGNATURE-----
+RMD160 2eb0fde5abd06ba79d2c8ccd99cad4a611d3e6cf ntop-3.1.ebuild 2398
+SHA256 9a8d104a5e9700378eee10c223d0fa1e9ced9a936387beab62e3f40dfb433526 ntop-3.1.ebuild 2398
+MD5 1646da60f26fe777b2ff3ce7ed373b80 ntop-3.2-r1.ebuild 2021
+RMD160 9909fb6d493ea2ee7cfb3562d8b6877622250c12 ntop-3.2-r1.ebuild 2021
+SHA256 2af46c7467435b7ef1d21952d8b16449c6708557e242357cb6a5686d6db1c720 ntop-3.2-r1.ebuild 2021
diff --git a/net-analyzer/ntop/files/digest-ntop-3.2 b/net-analyzer/ntop/files/digest-ntop-3.2
deleted file mode 100644
index 8d0407f10052..000000000000
--- a/net-analyzer/ntop/files/digest-ntop-3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd29a876b34a7dd76555e9acd8f160bb ntop-3.2.tgz 3910593
diff --git a/net-analyzer/ntop/files/digest-ntop-3.2-r1 b/net-analyzer/ntop/files/digest-ntop-3.2-r1
new file mode 100644
index 000000000000..cca3145681a3
--- /dev/null
+++ b/net-analyzer/ntop/files/digest-ntop-3.2-r1
@@ -0,0 +1,3 @@
+MD5 cd29a876b34a7dd76555e9acd8f160bb ntop-3.2.tgz 3910593
+RMD160 18ea4b535826e6d7bdf56c071c271869653cba8d ntop-3.2.tgz 3910593
+SHA256 5b639dbcb3c8bf77824cf8aaed168864f69730b2ef41dc68d2db22b205c586d8 ntop-3.2.tgz 3910593
diff --git a/net-analyzer/ntop/files/ntop-3.2-snmp.patch b/net-analyzer/ntop/files/ntop-3.2-snmp.patch
new file mode 100644
index 000000000000..a5b60f71d347
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-3.2-snmp.patch
@@ -0,0 +1,34 @@
+--- plugins.orig/snmpPlugin.c	2005-05-28 13:15:02.000000000 +0000
++++ plugins/snmpPlugin.c	2006-02-01 13:41:13.000000000 +0000
+@@ -46,6 +46,9 @@
+ #include "ntop.h"
+ #include "globals-report.h"
+ 
++// undefine free() wrapper Macro so net-snmp library uses the original free() and not the
++// ntop_safefree() one.
++#undef free
+ 
+ #ifdef HAVE_SNMP
+ 
+@@ -58,11 +61,21 @@
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
+ 
++#endif
++
++// redefine the Macro so the rest of the file uses it //
++#define free(a)       ntop_safefree((void**)&(a), __FILE__, __LINE__)
++
++#ifdef HAVE_SNMP
++
++
+ // #ifndef NTOP_H
+ #define NTOP_H
+ // #ifndef NTOP_COLUMNS_H
+ #define NTOP_COLUMNS_H
+ 
++
++
+ /*
+  * column number definitions for table ntopTable
+  */
diff --git a/net-analyzer/ntop/ntop-3.2.ebuild b/net-analyzer/ntop/ntop-3.2-r1.ebuild
index d8d089021cfa..1705c944c06e 100644
--- a/net-analyzer/ntop/ntop-3.2.ebuild
+++ b/net-analyzer/ntop/ntop-3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.2.ebuild,v 1.1 2005/12/30 03:56:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.2-r1.ebuild,v 1.1 2006/02/01 14:11:05 jokey Exp $
 
 inherit eutils autotools
 
@@ -38,6 +38,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/globals-core.c.diff
 	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-snmp.patch
 	eautoreconf
 }