Cleanout and Version bump as per bug #75812

Package-Manager: portage-2.0.51-r13

16 files changed, 127 insertions, 701 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 06a62d7c94d0..731c6ca6df4d 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/ntop
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.31 2004/10/27 08:41:14 eldad Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.32 2005/01/16 04:23:21 dragonheart Exp $
+
+*ntop-3.1 (16 Jan 2005)
+
+  16 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/gd-1.8.3-fpic.patch, -files/gdchart0.94c-fpic.patch,
+  +files/globals-core.c.diff, -files/libpng-1.2.4-fpic.patch,
+  -files/tcpwrap.patch, -files/zlib-1.1.4-build-fPIC.patch,
+  -files/zlib-1.1.4-build-static-with-fpic.patch,
+  -files/zlib-1.1.4-glibc.patch, -files/zlib-1.1.4-gzprintf.patch,
+  -files/zlib-1.1.4-mapfile.patch, -ntop-2.2c.ebuild, +ntop-3.1.ebuild:
+  Cleanout and Version bump as per bug #75812
 
   27 Oct 2004; Eldad Zack <eldad@gentoo.org> ntop-3.0.ebuild:
   Removed dep on ncurses since intop was removed at 3.0.
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index 1150d01a4a3d..0c629a340b3f 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b2252d7686d4b31006c573908d459e77 ntop-3.0.ebuild 1607
-MD5 385476405a0caa006be5c0f2240b036d ChangeLog 3491
+MD5 b85db4d0ddd0f5ab29f9906025173d54 ChangeLog 3995
+MD5 fa14dfb945369a389b4b6595e17f5517 ntop-3.1.ebuild 2436
 MD5 846e7479e3e9df4363f2721b7fb47320 metadata.xml 233
-MD5 d8a7fc02aed44266a97a55331fa74ecd ntop-2.2c.ebuild 2893
-MD5 a99957dc7ed74f72f833af10fd786352 files/zlib-1.1.4-build-fPIC.patch 2157
-MD5 c616d28ca5e20b41ef7696379d6bc8ad files/zlib-1.1.4-build-static-with-fpic.patch 346
-MD5 35c576fac5bd8cbf0da850ccc00dd924 files/digest-ntop-3.0 58
-MD5 d11cf0bd8fc84eb7a006583ade1ce3c4 files/zlib-1.1.4-gzprintf.patch 7436
-MD5 88d37ec04dd4a3e9e9f8bf41f2034a59 files/gd-1.8.3-fpic.patch 2063
-MD5 f70a4a4b75bf37b837a19f376222ecb6 files/libpng-1.2.4-fpic.patch 335
+MD5 b2252d7686d4b31006c573908d459e77 ntop-3.0.ebuild 1607
+MD5 bb970d07a76d2b939ec08c2796519021 files/digest-ntop-3.1 58
+MD5 d1e896708a98eaca02f55c44ae517768 files/globals-core.c.diff 536
 MD5 a9cad5851ac81cbd8589f60287f3e497 files/ntop-confd 131
-MD5 58b797a8da0e12e6cebaa0140f6493df files/zlib-1.1.4-mapfile.patch 1876
-MD5 c4aa8efff06387c497036191b144f9b4 files/digest-ntop-2.2c 59
-MD5 72490e2d8f00f11cd3d70f8352b2c9ad files/zlib-1.1.4-glibc.patch 323
 MD5 9e6b1e20779d7fb6699c956adf6b8b05 files/ntop-init 294
-MD5 a54569fa0dac85ba1b47df0f3963bed2 files/tcpwrap.patch 407
-MD5 5003d9e995282d95b49774ace14b5768 files/gdchart0.94c-fpic.patch 913
+MD5 35c576fac5bd8cbf0da850ccc00dd924 files/digest-ntop-3.0 58
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBjNDoT+MN7JbqCpMRAp1AAJwPhseUw/L3/QM2PejoPhYhYXaaMgCgg+oj
-LBgCUEVWvgCI09xK+6++cas=
-=vpku
+iD8DBQFB6ew/mdTrptrqvGERAieMAJ9iWrDU8jOS5MDNE3wTK/0rHspSlQCfYf+o
+7v9r7Ae9KTwqRNYhqjJQqz8=
+=dQeJ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ntop/files/digest-ntop-2.2c b/net-analyzer/ntop/files/digest-ntop-2.2c
deleted file mode 100644
index 3b805d30b627..000000000000
--- a/net-analyzer/ntop/files/digest-ntop-2.2c
+++ /dev/null
@@ -1 +0,0 @@
-MD5 473c6a6c81fb03b3e28556043ab2543d ntop-2.2c.tgz 2509588
diff --git a/net-analyzer/ntop/files/digest-ntop-3.1 b/net-analyzer/ntop/files/digest-ntop-3.1
new file mode 100644
index 000000000000..bec8aaa18b63
--- /dev/null
+++ b/net-analyzer/ntop/files/digest-ntop-3.1
@@ -0,0 +1 @@
+MD5 1c9b4097c2e464b84f2fe8f6626d2b06 ntop-3.1.tgz 3286596
diff --git a/net-analyzer/ntop/files/gd-1.8.3-fpic.patch b/net-analyzer/ntop/files/gd-1.8.3-fpic.patch
deleted file mode 100644
index 0f50dc8fd2ed..000000000000
--- a/net-analyzer/ntop/files/gd-1.8.3-fpic.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- Makefile	2004-02-05 14:24:07.339051848 +0000
-+++ Makefile	2004-02-05 14:39:37.227687288 +0000
-@@ -96,38 +96,41 @@
- 	sh ./install-item 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
- 	sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
- 
-+%.o: %.c
-+	$(CC) $(CFLAGS) -fPIC -c $< -o $@
-+
- gddemo: gddemo.o libgd.a
--	$(CC) gddemo.o -o gddemo	$(LIBDIRS) $(LIBS)
-+	$(CC) $(CFLAGS) -fPIC gddemo.o -o gddemo	$(LIBDIRS) $(LIBS)
- 
- pngtogd: pngtogd.o libgd.a
--	$(CC) pngtogd.o -o pngtogd	$(LIBDIRS) $(LIBS) 
-+	$(CC) $(CFLAGS) -fPIC pngtogd.o -o pngtogd	$(LIBDIRS) $(LIBS) 
- 
- webpng: webpng.o libgd.a
--	$(CC) webpng.o -o webpng	$(LIBDIRS) $(LIBS)
-+	$(CC) $(CFLAGS) -fPIC webpng.o -o webpng	$(LIBDIRS) $(LIBS)
- 
- pngtogd2: pngtogd2.o libgd.a
--	$(CC) pngtogd2.o -o pngtogd2	$(LIBDIRS) $(LIBS)
-+	$(CC) $(CFLAGS) -fPIC pngtogd2.o -o pngtogd2	$(LIBDIRS) $(LIBS)
- 
- gdtopng: gdtopng.o libgd.a
--	$(CC) gdtopng.o -o gdtopng	$(LIBDIRS) $(LIBS)
-+	$(CC) $(CFLAGS) -fPIC gdtopng.o -o gdtopng	$(LIBDIRS) $(LIBS)
- 
- gd2topng: gd2topng.o libgd.a
--	$(CC) gd2topng.o -o gd2topng	$(LIBDIRS) $(LIBS)
-+	$(CC) $(CFLAGS) -fPIC gd2topng.o -o gd2topng	$(LIBDIRS) $(LIBS)
- 
- gd2copypal: gd2copypal.o libgd.a
--	$(CC) gd2copypal.o -o gd2copypal	$(LIBDIRS) $(LIBS)
-+	$(CC) $(CFLAGS) -fPIC gd2copypal.o -o gd2copypal	$(LIBDIRS) $(LIBS)
- 
- gdparttopng: gdparttopng.o libgd.a
--	$(CC) gdparttopng.o -o gdparttopng	$(LIBDIRS) $(LIBS)
-+	$(CC) $(CFLAGS) -fPIC gdparttopng.o -o gdparttopng	$(LIBDIRS) $(LIBS)
- 
- gdtest: gdtest.o libgd.a
--	$(CC) gdtest.o -o gdtest	$(LIBDIRS) $(LIBS)
-+	$(CC) $(CFLAGS) -fPIC gdtest.o -o gdtest	$(LIBDIRS) $(LIBS)
- 
- gd2time: gd2time.o libgd.a
--	$(CC) gd2time.o -o gd2time	$(LIBDIRS) $(LIBS)
-+	$(CC) $(CFLAGS) -fPIC gd2time.o -o gd2time	$(LIBDIRS) $(LIBS)
- 
- gdtestttf: gdtestttf.o libgd.a
--	$(CC) gdtestttf.o -o gdtestttf	$(LIBDIRS) $(LIBS)
-+	$(CC) $(CFLAGS) -fPIC gdtestttf.o -o gdtestttf	$(LIBDIRS) $(LIBS)
- 
- libgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
- 	gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
diff --git a/net-analyzer/ntop/files/gdchart0.94c-fpic.patch b/net-analyzer/ntop/files/gdchart0.94c-fpic.patch
deleted file mode 100644
index b566edfb3bba..000000000000
--- a/net-analyzer/ntop/files/gdchart0.94c-fpic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in	2004-02-05 15:11:29.652954456 +0000
-+++ Makefile.in	2004-02-05 15:12:11.349615600 +0000
-@@ -1,4 +1,4 @@
--CC = @CC@ -fPIC
-+CC = @CC@
- GDC_INCL = .
- GD_INCL  = gd-1.8.3
- GD_LIB   = gd-1.8.3
-@@ -12,16 +12,16 @@
- 
- # --- compile the lib ---
- price_conv.o: price_conv.c
--	$(CC) -g -c price_conv.c
-+	$(CC) $(CFLAGS) -fPIC -g -c price_conv.c
- 
- gdc.o: gdc.c gdc.h
--	$(CC) -I$(GD_INCL) -I$(GDC_INCL) -g -c gdc.c
-+	$(CC) $(CFLAGS) -fPIC -I$(GD_INCL) -I$(GDC_INCL) -g -c gdc.c
- 
- gdc_pie.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie.c
--	$(CC) -I$(GD_INCL) -I$(GDC_INCL) -g -c gdc_pie.c
-+	$(CC) $(CFLAGS) -fPIC -I$(GD_INCL) -I$(GDC_INCL) -g -c gdc_pie.c
- 
- gdchart.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdchart.c
--	$(CC) -I$(GD_INCL) -I$(GDC_INCL) -g -c gdchart.c
-+	$(CC) $(CFLAGS) -fPIC -I$(GD_INCL) -I$(GDC_INCL) -g -c gdchart.c
- 
- $(GD_LIB)/libgd.a:
- 	cd $(GD_LIB) ; $(MAKE) -f Makefile libgd.a
diff --git a/net-analyzer/ntop/files/globals-core.c.diff b/net-analyzer/ntop/files/globals-core.c.diff
new file mode 100644
index 000000000000..778c4bbc57c2
--- /dev/null
+++ b/net-analyzer/ntop/files/globals-core.c.diff
@@ -0,0 +1,11 @@
+--- globals-core.c.old	2004-12-13 19:05:33.000000000 +0100
++++ globals-core.c	2005-01-14 13:21:41.133917120 +0100
+@@ -473,7 +473,7 @@
+   _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
+   _headerSize[DLT_ATM_RFC1483] = 0;
+ 
+-  /* _mtuSize[DLT_RAW] = ?                                        raw IP */
++  _mtuSize[DLT_RAW] = 1500;                                    /* raw IP */
+   _headerSize[DLT_RAW] = 0;
+ 
+   /* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
diff --git a/net-analyzer/ntop/files/libpng-1.2.4-fpic.patch b/net-analyzer/ntop/files/libpng-1.2.4-fpic.patch
deleted file mode 100644
index 2e0294e78397..000000000000
--- a/net-analyzer/ntop/files/libpng-1.2.4-fpic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- scripts/makefile.linux	2004-02-05 13:47:03.155179192 +0000
-+++ scripts/makefile.linux	2004-02-05 13:48:45.163671544 +0000
-@@ -73,8 +73,8 @@
- 
- all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config
- 
--libpng.a: $(OBJS)
--	ar rc $@ $(OBJS)
-+libpng.a: $(OBJSDLL)
-+	ar rc $@ $(OBJSDLL)
- 	$(RANLIB) $@
- 
- libpng.pc:
diff --git a/net-analyzer/ntop/files/tcpwrap.patch b/net-analyzer/ntop/files/tcpwrap.patch
deleted file mode 100644
index 12fe063d6400..000000000000
--- a/net-analyzer/ntop/files/tcpwrap.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** webInterface.c.p	Tue May 28 20:05:08 2002
---- webInterface.c	Thu Jul 11 05:32:35 2002
-***************
-*** 23,28 ****
---- 23,36 ----
-  #include "ntop.h"
-  #include "globals-report.h"
-  
-+ #ifndef ALLOW_SEVERITY
-+ #define ALLOW_SEVERITY LOG_INFO
-+ #define DENY_SEVERITY LOG_WARNING
-+ #endif
-+ 
-+ int allow_severity=LOG_INFO;
-+ int deny_severity=LOG_WARNING;
-+ 
-  #ifndef WIN32
-  #include <pwd.h>
-  #endif
diff --git a/net-analyzer/ntop/files/zlib-1.1.4-build-fPIC.patch b/net-analyzer/ntop/files/zlib-1.1.4-build-fPIC.patch
deleted file mode 100644
index a29bee225acc..000000000000
--- a/net-analyzer/ntop/files/zlib-1.1.4-build-fPIC.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- zlib-1.1.4/Makefile.in.build-fPIC	2003-01-30 01:35:18.000000000 -0500
-+++ zlib-1.1.4/Makefile.in	2003-01-30 01:40:49.000000000 -0500
-@@ -41,6 +41,8 @@ includedir = ${prefix}/include
- OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-        zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
- 
-+PIC_OBJS = $(OBJS:%.o=%.lo)
-+
- OBJA =
- # to use the asm code: make OBJA=match.o
- 
-@@ -80,8 +82,11 @@ match.o: match.S
- 	mv _match.o match.o
- 	rm -f _match.s
- 
--$(SHAREDLIB).$(VER): $(OBJS)
--	$(LDSHARED) -o $@ $(OBJS) -lc
-+%.lo: %.c
-+	$(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@
-+
-+$(SHAREDLIB).$(VER): $(PIC_OBJS)
-+	$(LDSHARED) -o $@ $(PIC_OBJS) -lc
- 	rm -f $(SHAREDLIB) $(SHAREDLIB).1
- 	ln -s $@ $(SHAREDLIB)
- 	ln -s $@ $(SHAREDLIB).1
-@@ -92,11 +97,8 @@ example: example.o $(LIBS)
- minigzip: minigzip.o $(LIBS)
- 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
- 
--install: $(LIBS)
--	-@if [ ! -d $(includedir)  ]; then mkdir $(includedir); fi
-+install-libs: $(LIBS)
- 	-@if [ ! -d $(libdir) ]; then mkdir $(libdir); fi
--	cp zlib.h zconf.h $(includedir)
--	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
- 	cp $(LIBS) $(libdir)
- 	cd $(libdir); chmod 755 $(LIBS)
- 	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-@@ -109,6 +111,11 @@ install: $(LIBS)
- # The ranlib in install is needed on NeXTSTEP which checks file times
- # ldconfig is for Linux
- 
-+install: install-libs
-+	-@if [ ! -d $(includedir)  ]; then mkdir $(includedir); fi
-+	cp zlib.h zconf.h $(includedir)
-+	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
-+
- uninstall:
- 	cd $(includedir); \
- 	v=$(VER); \
---- zlib-1.1.4/configure.build-fPIC	2003-01-30 01:35:18.000000000 -0500
-+++ zlib-1.1.4/configure	2003-01-30 01:39:59.000000000 -0500
-@@ -130,7 +130,7 @@ if test $shared -eq 1; then
-   if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
-      test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
-     CFLAGS="$SFLAGS"
--    LIBS="$SHAREDLIB.$VER"
-+    LIBS="$LIBS $SHAREDLIB.$VER"
-     echo Building shared library $SHAREDLIB.$VER with $CC.
-   elif test -z "$old_cc" -a -z "$old_cflags"; then
-     echo No shared library suppport.
diff --git a/net-analyzer/ntop/files/zlib-1.1.4-build-static-with-fpic.patch b/net-analyzer/ntop/files/zlib-1.1.4-build-static-with-fpic.patch
deleted file mode 100644
index de9aa583a1e6..000000000000
--- a/net-analyzer/ntop/files/zlib-1.1.4-build-static-with-fpic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in	2004-02-05 13:35:09.214714640 +0000
-+++ Makefile.in	2004-02-05 13:40:16.145054136 +0000
-@@ -72,8 +72,8 @@
- 	  echo '		*** zlib test FAILED ***'; \
- 	fi
- 
--libz.a: $(OBJS) $(OBJA)
--	$(AR) $@ $(OBJS) $(OBJA)
-+libz.a: $(PIC_OBJS) $(OBJA)
-+	$(AR) $@ $(PIC_OBJS) $(OBJA)
- 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
- 
- match.o: match.S
diff --git a/net-analyzer/ntop/files/zlib-1.1.4-glibc.patch b/net-analyzer/ntop/files/zlib-1.1.4-glibc.patch
deleted file mode 100644
index 49ded8639f8e..000000000000
--- a/net-analyzer/ntop/files/zlib-1.1.4-glibc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zlib-1.1.3/Makefile.in.glibc	Wed Sep  9 11:48:46 1998
-+++ zlib-1.1.3/Makefile.in	Wed Sep  9 11:49:04 1998
-@@ -80,7 +80,7 @@
- 	rm -f _match.s
- 
- $(SHAREDLIB).$(VER): $(OBJS)
--	$(LDSHARED) -o $@ $(OBJS)
-+	$(LDSHARED) -o $@ $(OBJS) -lc
- 	rm -f $(SHAREDLIB) $(SHAREDLIB).1
- 	ln -s $@ $(SHAREDLIB)
- 	ln -s $@ $(SHAREDLIB).1
diff --git a/net-analyzer/ntop/files/zlib-1.1.4-gzprintf.patch b/net-analyzer/ntop/files/zlib-1.1.4-gzprintf.patch
deleted file mode 100644
index 28b610f57a79..000000000000
--- a/net-analyzer/ntop/files/zlib-1.1.4-gzprintf.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-This patch fixes security holes caused by potential buffer overflows
-in the implementation of the gzprintf() function in zlib 1.1.4. The
-security holes are fixed for platforms providing vsnprintf(3) and
-snprintf(3) only. This patch is derived from a prepared security patch,
-originally created by Kelledin <kelledin@users.sourceforge.net>. The
-OpenPKG project reduced the patch in size and fixed the configuration
-checks.
-
-diff -ru3 zlib-1.1.4.orig/configure zlib-1.1.4/configure
---- zlib-1.1.4.orig/configure	Wed Jul  8 20:19:35 1998
-+++ zlib-1.1.4/configure	Thu Feb 27 15:14:54 2003
-@@ -155,7 +155,212 @@
-   echo "Checking for unistd.h... No."
- fi
- 
--cat > $test.c <<EOF
-+cat >$test.c <<EOF
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#if (defined(__MSDOS__) || defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)) && !defined(STDC)
-+#  define STDC
-+#endif
-+
-+int main() 
-+{
-+#ifndef STDC
-+  choke me
-+#endif
-+
-+  return 0;
-+}
-+EOF
-+
-+if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+  echo "Checking whether to use vsnprintf() or snprintf()... using vsnprintf()"
-+
-+  cat >$test.c <<EOF
-+#include <stdio.h>
-+#include <stdarg.h>
-+
-+int mytest(char *fmt, ...)
-+{
-+  char buf[20];
-+  va_list ap;
-+
-+  va_start(ap, fmt);
-+  vsnprintf(buf, sizeof(buf), fmt, ap);
-+  va_end(ap);
-+  return 0;
-+}
-+
-+int main()
-+{
-+  return (mytest("Hello%d\n", 1));
-+}
-+EOF
-+  
-+  if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+    CFLAGS="$CFLAGS -DHAS_vsnprintf"
-+    echo "Checking for vsnprintf() in stdio.h... Yes."
-+
-+    cat >$test.c <<EOF
-+#include <stdio.h>
-+#include <stdarg.h>
-+
-+int mytest(char *fmt, ...)
-+{
-+  int i;
-+  char buf[20];
-+  va_list ap;
-+
-+  va_start(ap, fmt);
-+  i = vsnprintf(buf, sizeof(buf), fmt, ap);
-+  va_end(ap);
-+  return 0;
-+}
-+
-+int main()
-+{
-+  return (mytest("Hello%d\n", 1));
-+}
-+EOF
-+
-+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+      CFLAGS="$CFLAGS -DHAS_vsnprintf_return"
-+      echo "Checking for return value of vsnprintf()... Yes."
-+    else
-+      echo "Checking for return value of vsnprintf()... No."
-+      echo "  WARNING: apparently vsnprintf() does not return a value. zlib"
-+      echo "  can build but will be open to possible string-format security"
-+      echo "  vulnerabilities."
-+    fi
-+  else
-+    echo "Checking for vsnprintf() in stdio.h... No."
-+    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib"
-+    echo "  can build but will be open to possible buffer-overflow security"
-+    echo "  vulnerabilities."
-+
-+    cat >$test.c <<EOF
-+#include <stdio.h>
-+#include <stdarg.h>
-+
-+int mytest(char *fmt, ...)
-+{
-+  int i;
-+  char buf[20];
-+  va_list ap;
-+
-+  va_start(ap, fmt);
-+  i = vsprintf(buf, fmt, ap);
-+  va_end(ap);
-+  return 0;
-+}
-+
-+int main() 
-+{
-+  return (mytest("Hello%d\n", 1));
-+}
-+EOF
-+
-+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+      CFLAGS="$CFLAGS -DHAS_vsprintf_return"
-+      echo "Checking for return value of vsprintf()... Yes."
-+    else
-+      echo "Checking for return value of vsprintf()... No."
-+      echo "  WARNING: apparently vsprintf() does not return a value. zlib"
-+      echo "  can build but will be open to possible string-format security"
-+      echo "  vulnerabilities."
-+    fi
-+  fi
-+else
-+  echo "Checking whether to use vsnprintf() or snprintf()... using snprintf()"
-+
-+  cat >$test.c <<EOF
-+#include <stdio.h>
-+#include <stdarg.h>
-+
-+int mytest() 
-+{
-+  char buf[20];
-+
-+  snprintf(buf, sizeof(buf), "%s", "foo");
-+  return 0;
-+}
-+
-+int main() 
-+{
-+  return (mytest());
-+}
-+EOF
-+
-+  if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+    CFLAGS="$CFLAGS -DHAS_snprintf"
-+    echo "Checking for snprintf() in stdio.h... Yes."
-+
-+    cat >$test.c <<EOF
-+#include <stdio.h>
-+#include <stdarg.h>
-+
-+int mytest(char *fmt, ...)
-+{
-+  int i;
-+  char buf[20];
-+
-+  i = snprintf(buf, sizeof(buf), "%s", "foo");
-+  return 0;
-+}
-+
-+int main() 
-+{
-+  return (mytest());
-+}
-+EOF
-+
-+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+      CFLAGS="$CFLAGS -DHAS_snprintf_return"
-+      echo "Checking for return value of snprintf()... Yes."
-+    else
-+      echo "Checking for return value of snprintf()... No."
-+      echo "  WARNING: apparently snprintf() does not return a value. zlib"
-+      echo "  can build but will be open to possible string-format security"
-+      echo "  vulnerabilities."
-+    fi
-+  else
-+    echo "Checking for snprintf() in stdio.h... No."
-+    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib"
-+    echo "  can build but will be open to possible buffer-overflow security"
-+    echo "  vulnerabilities."
-+
-+    cat >$test.c <<EOF
-+#include <stdio.h>
-+#include <stdarg.h>
-+
-+int mytest(char *fmt, ...) 
-+{
-+  int i;
-+  char buf[20];
-+
-+  i = sprintf(buf, "%s", "foo");
-+  return 0;
-+}
-+
-+int main() 
-+{
-+  return (mytest());
-+}
-+EOF
-+
-+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+      CFLAGS="$CFLAGS -DHAS_sprintf_return"
-+      echo "Checking for return value of sprintf()... Yes."
-+    else
-+      echo "Checking for return value of sprintf()... No."
-+      echo "  WARNING: apparently sprintf() does not return a value. zlib"
-+      echo "  can build but will be open to possible string-format security"
-+      echo "  vulnerabilities."
-+    fi
-+  fi
-+fi
-+
-+cat >$test.c <<EOF
- #include <errno.h>
- int main() { return 0; }
- EOF
-diff -ru3 zlib-1.1.4.orig/gzio.c zlib-1.1.4/gzio.c
---- zlib-1.1.4.orig/gzio.c	Mon Mar 11 14:16:01 2002
-+++ zlib-1.1.4/gzio.c	Thu Feb 27 14:29:26 2003
-@@ -530,13 +530,31 @@
- 
-     va_start(va, format);
- #ifdef HAS_vsnprintf
-+#  ifdef HAS_vsnprintf_return
-+    len = vsnprintf(buf, sizeof(buf), format, va);
-+    va_end(va);
-+    if (len <= 0 || len >= sizeof(buf))
-+        return 0;
-+#  else
-     (void)vsnprintf(buf, sizeof(buf), format, va);
-+    va_end(va);
-+    len = strlen(buf);
-+    if (len <= 0)
-+        return 0;
-+#  endif
- #else
-+#  ifdef HAS_vsprintf_return
-+    len = vsprintf(buf, format, va);
-+    va_end(va);
-+    if (len <= 0 || len >= sizeof(buf))
-+        return 0;
-+#  else
-     (void)vsprintf(buf, format, va);
--#endif
-     va_end(va);
-     len = strlen(buf); /* some *sprintf don't return the nb of bytes written */
-     if (len <= 0) return 0;
-+#  endif
-+#endif
- 
-     return gzwrite(file, buf, (unsigned)len);
- }
-@@ -553,14 +571,31 @@
-     int len;
- 
- #ifdef HAS_snprintf
-+#  ifdef HAS_snprintf_return
-+    len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-+	         a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-+    if (len <= 0 || len >= sizeof(buf))
-+        return 0;
-+#  else
-     snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
- 	     a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-+    len = strlen(buf);
-+    if (len <= 0)
-+        return 0;
-+#  endif
- #else
-+#  ifdef HAS_sprintf_return
-+    len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-+	        a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-+    if (len <= 0 || len >= sizeof(buf))
-+        return 0;
-+#  else
-     sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
- 	    a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
--#endif
-     len = strlen(buf); /* old sprintf doesn't return the nb of bytes written */
-     if (len <= 0) return 0;
-+#  endif
-+#endif
- 
-     return gzwrite(file, buf, len);
- }
diff --git a/net-analyzer/ntop/files/zlib-1.1.4-mapfile.patch b/net-analyzer/ntop/files/zlib-1.1.4-mapfile.patch
deleted file mode 100644
index 8b6d13a91269..000000000000
--- a/net-analyzer/ntop/files/zlib-1.1.4-mapfile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- configure.orig	2003-11-04 20:00:19.192057400 -0800
-+++ configure	2003-11-04 20:00:22.524327784 -0800
-@@ -72,7 +72,8 @@
-   SFLAGS=${CFLAGS-"-fPIC -O3"}
-   CFLAGS="$cflags"
-   case `(uname -s || echo unknown) 2>/dev/null` in
--  Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};;
-+  Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"}
-+		 MAPFILE=${MAPFILE-"-Wl,--version-script,mapfile"};;
-   *)             LDSHARED=${LDSHARED-"gcc -shared"};;
-   esac
- else
-@@ -104,7 +105,8 @@
- 	     LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
-   SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
-              CFLAGS=${CFLAGS-"-fast -xcg89"}
--	     LDSHARED=${LDSHARED-"cc -G"};;
-+	     MAPFILE=${MAPFILE-"-M mapfile"}
-+	     LDSHARED=${LDSHARED-"cc -G"};;
-   SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
- 	     CFLAGS=${CFLAGS-"-O2"}
- 	     LDSHARED=${LDSHARED-"ld"};;
-@@ -138,6 +140,7 @@
-     echo 'No shared library suppport; try without defining CC and CFLAGS'
-     shared=0;
-   fi
-+  LDSHARED="${LDSHARED} ${MAPFILE}"
- fi
- if test $shared -eq 0; then
-   LDSHARED="$CC"
---- /dev/null	2003-10-15 22:31:52.000000000 -0700
-+++ mapfile	2003-11-04 19:44:59.742269984 -0800
-@@ -0,0 +1,46 @@
-+{
-+	global:
-+		zlibVersion ;
-+		deflateInit_ ;
-+		deflateInit2_ ;
-+		deflate ;
-+		deflateSetDictionary ;
-+		deflateCopy ;
-+		deflateReset ;
-+		deflateParams ;
-+		deflateEnd ;
-+		inflateInit_ ;
-+		inflateInit2_ ;
-+		inflate ;
-+		inflateSetDictionary ;
-+		inflateSync ;
-+		inflateReset ;
-+		inflateEnd ;
-+		compress ;
-+		compress2 ;
-+		uncompress ;
-+		gzopen ;
-+		gzdopen ;
-+		gzsetparams ;
-+		gzread ;
-+		gzwrite ;
-+		gzprintf ;
-+		gzputs ;
-+		gzgets ;
-+		gzputc ;
-+		gzgetc ;
-+		gzflush ;
-+		gzseek ;
-+		gzrewind ;
-+		gztell ;
-+		gzeof ;
-+		gzclose ;
-+		gzerror ;
-+		adler32 ;
-+		crc32 ;
-+		zError ;
-+		inflateSyncPoint ;
-+		get_crc_table ;
-+	local:
-+		*;
-+};
diff --git a/net-analyzer/ntop/ntop-2.2c.ebuild b/net-analyzer/ntop/ntop-2.2c.ebuild
deleted file mode 100644
index a79969c5b0f9..000000000000
--- a/net-analyzer/ntop/ntop-2.2c.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-2.2c.ebuild,v 1.10 2004/10/04 22:57:27 pvdabeel Exp $
-
-inherit eutils
-
-IUSE="ssl readline tcpd ncurses"
-
-S=${WORKDIR}/${PN}/${PN}
-DESCRIPTION="ntop is a unix tool that shows network usage like top"
-SRC_URI="mirror://sourceforge/ntop/${P}.tgz"
-HOMEPAGE="http://www.ntop.org/ntop.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc hppa ~amd64"
-
-DEPEND=">=sys-libs/gdbm-1.8.0
-	>=net-libs/libpcap-0.5.2
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	ncurses? ( sys-libs/ncurses )"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/../gdchart0.94c/zlib-1.1.4/
-	        epatch ${FILESDIR}/zlib-1.1.4-gzprintf.patch
-	        epatch ${FILESDIR}/zlib-1.1.4-glibc.patch
-	        epatch ${FILESDIR}/zlib-1.1.4-build-fPIC.patch
-	        epatch ${FILESDIR}/zlib-1.1.4-mapfile.patch
-		epatch ${FILESDIR}/zlib-1.1.4-build-static-with-fpic.patch
-
-	cd ${S}/../gdchart0.94c/
-		epatch ${FILESDIR}/gdchart0.94c-fpic.patch
-
-	cd ${S}/../gdchart0.94c/gd-1.8.3/
-		epatch ${FILESDIR}/gd-1.8.3-fpic.patch
-
-	cd ${S}/../gdchart0.94c/gd-1.8.3/libpng-1.2.4/
-		epatch ${FILESDIR}/libpng-1.2.4-fpic.patch
-
-}
-
-src_compile() {
-	cd ${S}
-
-	local myconf
-
-	use readline	|| myconf="${myconf} --without-readline"
-	use tcpd	|| myconf="${myconf} --with-tcpwrap"
-	use ssl		|| myconf="${myconf} --without-ssl"
-	use ncurses	|| myconf="${myconf} --without-curses"
-
-	# ntop 2.0 ships with its own version of gdchart... gdchart should
-	# get its own package but ntop should be built with the version it
-	# shipped with just in case future versions are incompatible -- blocke
-
-	# compile gdchart
-	einfo "Configure gdchart"
-	cd ../gdchart0.94c
-	./configure || die "gdchart configure problem"
-
-	# subtree #1
-	einfo "Compiling libpng"
-	cd gd-1.8.3/libpng-1.2.4
-	make -f scripts/makefile.linux CFLAGS="${CFLAGS}" || die "libpng compile problem"
-
-	# subtree #2
-	einfo "Compiling zlib"
-	cd ../../zlib-1.1.4/
-	./configure || die "zlib configure problem"
-	make || die "zlib compile problem"
-
-	# gdchart make
-	einfo "Compiling gdchart"
-	cd ../
-	make CFLAGS="${CFLAGS}" || die "gdchart compile problem"
-
-	# now ntop itself...
-	einfo "Compiling ntop"
-	cd ../ntop
-	econf ${myconf} || die "configure problem"
-	make || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install problem"
-
-	# fixme: bad handling of plugins (in /usr/lib with unsuggestive names)
-	# (don't know if there is a clean way to handle it)
-
-	doman ntop.8
-
-	dodoc AUTHORS CONTENTS COPYING ChangeLog MANIFESTO NEWS
-	dodoc PORTING README SUPPORT_NTOP.txt THANKS docs/*
-
-	dohtml ntop.html
-
-	keepdir /var/lib/ntop
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/ntop-init ntop
-	insinto /etc/conf.d ; newins ${FILESDIR}/ntop-confd ntop
-}
diff --git a/net-analyzer/ntop/ntop-3.1.ebuild b/net-analyzer/ntop/ntop-3.1.ebuild
new file mode 100644
index 000000000000..e4a058db1d82
--- /dev/null
+++ b/net-analyzer/ntop/ntop-3.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.1.ebuild,v 1.1 2005/01/16 04:23:21 dragonheart Exp $
+
+inherit gnuconfig eutils
+
+DESCRIPTION="tool that shows network usage like top"
+HOMEPAGE="http://www.ntop.org/ntop.html"
+SRC_URI="mirror://sourceforge/ntop/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~ppc64"
+IUSE="ssl readline tcpd nls"
+
+DEPEND="virtual/libc
+	sys-apps/gawk
+	>=sys-devel/libtool-1.4
+	>=sys-libs/gdbm-1.8.0
+	>=net-libs/libpcap-0.5.2
+	>=media-libs/gd-2.0.22
+	>=media-libs/libpng-1.2.5
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	readline? ( >=sys-libs/readline-4.1 )"
+
+# Needed by xmldumpPlugin - couldn't get it to work
+#	dev-libs/gdome2
+#	>=dev-libs/glib-2"
+
+pkg_setup() {
+	enewgroup ntop
+	enewuser ntop -1 /bin/false /var/lib/ntop ntop
+}
+
+src_unpack() {
+	unpack ${A}
+	mv ${WORKDIR}/ntop ${WORKDIR}/ntop-3.1
+	cd ${S}
+	gnuconfig_update
+	epatch ${FILESDIR}/globals-core.c.diff || die "patch failed"
+}
+
+src_compile() {
+	local myconf
+
+	# Dodge include paths for glib.h, gdome.h and xmlversion.h
+	sed -i -e "s:/usr/local/include:/usr/include/libxml2/libxml -I/usr/include/glib-1.2 -I/usr/include/libgdome:g" \
+		configure
+
+	use readline || myconf="${myconf} --without-readline"
+	use tcpd || myconf="${myconf} --with-tcpwrap"
+	if use ssl
+	then
+		myconf="${myconf} --enable-sslv3 --enable-sslwatchdog"
+
+	else
+		myconf="${myconf} --without-ssl"
+	fi
+
+	econf ${myconf} `use_enable nls i18n` || die "configure problem"
+	emake CPPFLAGS="${CXXFLAGS}" || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install problem"
+
+	# fixme: bad handling of plugins (in /usr/lib with unsuggestive names)
+	# (don't know if there is a clean way to handle it)
+
+	doman ntop.8
+
+	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
+	dodoc PORTING README SUPPORT_NTOP.txt THANKS docs/*
+
+	mv ${D}/usr/share/ntop/html ${D}/usr/share/doc/${PF}
+	rmdir ${D}/usr/share/ntop
+	chown -R root:root ${D}/etc/ntop ${D}/usr/share/doc/${PF}/html \
+		${D}/usr/lib/ntop
+
+	dohtml ntop.html
+
+	keepdir /var/lib/ntop
+	fowner ntop:ntop /var/lib/ntop
+	fperms 750 /var/lib/ntop
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/ntop-init ntop
+	insinto /etc/conf.d ; newins ${FILESDIR}/ntop-confd ntop
+
+	echo NTOP_OPTS="-u ntop -P /var/lib/ntop" >> ${D}/etc/conf.d/ntop
+}
+