Old.

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

5 files changed, 9 insertions, 339 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 07e82c336f5f..c2420e96ce3b 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.100 2011/08/07 16:53:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.101 2011/08/07 17:13:26 jer Exp $
+
+  07 Aug 2011; Jeroen Roovers <jer@gentoo.org> -ntop-3.3.10-r2.ebuild,
+  -files/ntop-3.3.10-CVE-2009-2732.patch, -files/ntop-3.3.10-gentoo.patch:
+  ^
 
   07 Aug 2011; Raúl Porcel <armin76@gentoo.org> ntop-4.0.1.ebuild:
   ia64/s390/sh/sparc stable wrt #376057
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index 36b75e2cb682..459071dd260f 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,25 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ntop-3.3.10-CVE-2009-2732.patch 365 RMD160 586d8951420ae8161e0e12a767cf29621c04b3d9 SHA1 16a9b4baf44a56d78a5ec689b203e632d95021cc SHA256 0c4caa99bd08a8c1655c1304244be3e5efbe0a770980d31c653716a10c808703
-AUX ntop-3.3.10-gentoo.patch 5717 RMD160 c3f7479b28ed42f0790f268b0edec048fef8ab1f SHA1 80dff7120c17388d775d6bd95f952996bc2f70ac SHA256 e271b8f6db43809d24785fadddb3bf8fa30de140df618b78d461e071608b900a
 AUX ntop-4.0.1-gentoo.patch 6996 RMD160 783a8d03343ddb2a2740d82bd720c62061dd7f4d SHA1 e2d2f57beb5a5ec5c077adbbccb9f9fe783f71ba SHA256 896d844bfcfb05030aa307152abcd9c177f058ee9f7db2fb3a01e15dbda43204
 AUX ntop-4.0.3-gentoo.patch 6977 RMD160 3aa832273f6ce89ff43a907585da9fdb04fdaca0 SHA1 da4ff0f51db4e4c6eaf69be01edfc4129da5d7fd SHA256 c6d88aaa411bf01f30450138370db6b33db0c3a1f694176e14d0ce460eee6d70
 AUX ntop-confd 341 RMD160 40eb09215a1f50f86ae82ecd527198c2e7be17a3 SHA1 474aeb45826d71c28c5404add651f31be89b14d7 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d
 AUX ntop-initd 747 RMD160 cc62a0f68e7c27e63acaf55283784ab581a79ab9 SHA1 bf1ea42aeab524edcbe37cfc708919aed965f7d8 SHA256 f583d6625690ee60744d407d149845db178f618f1239d962bfac14f39076dc7d
 AUX ntop-update-geoip-db 492 RMD160 5999a24fb5868593d37746fc46f3536e727e7645 SHA1 c321c65338b764657f03c657487c66bf869f3f62 SHA256 3604d0a728b203211fab05eca829a7e93bc05c04f252937ffbf630813420eef6
-DIST ntop-3.3.10.tar.gz 3235500 RMD160 85e73de0d7db041d12ae8d77a832b6ed199b6f4b SHA1 8c6b5024a99e73241abd1c831f5ea241b67d0dbf SHA256 aa18ba3acb564d707521deaa2655f61f5b617d98d4fb5a014553f3fa123f123a
 DIST ntop-4.0.1.tar.gz 39184538 RMD160 f2c72578df5fff2e64278003a0754f67afe56e15 SHA1 515fbb66f224d0b8292f3299723965f49325dd91 SHA256 5b8d393246e423e434532a4de79fe4f08191b98c451d76a4ede251302fd4f56d
 DIST ntop-4.0.3.tgz 39191671 RMD160 a7b0f15409fee6b53b7c10d8b397fe0ade13120f SHA1 e7c31eabf31f61758e97d69398176520c1cb5613 SHA256 5b34b64fa4aebaeb365b2f255b2bbeb0a487686f49e85680789070d1c2404dc0
-EBUILD ntop-3.3.10-r2.ebuild 3433 RMD160 9ffaab74af8a9dd1aecbb941a60913cd2258cc30 SHA1 3f5e50e37ac399871adbc0d3e549e64bf8f7c8db SHA256 d1eb9eed1e903e78bc7d87ee82e53937067bb452ed153b4490a914cd1f22f787
 EBUILD ntop-4.0.1.ebuild 3490 RMD160 c34bd4ef62cdbebf2185d3539df4d8d46d0f7b80 SHA1 b7ecb02559439505485d51594c3e2274e6540125 SHA256 a897183b453a8f1dcc18a3d20c1df60f2de55c5f2b792d2e0927e173d88cf0ce
 EBUILD ntop-4.0.3.ebuild 3498 RMD160 8f61b7b668eaa6a7fc27ea9fff5517e9a2fa15d5 SHA1 27a32aa787b26a85e9f3458f2bee6fbbb4340b0b SHA256 eff247f58484b049f0f077b3a7b130cbdaf7d10f5af8a37d40cf1f16c98a0e5a
-MISC ChangeLog 13772 RMD160 97e54839616ce25c5b61d3ddf3ae4e4b133a202e SHA1 a9fe35b5bcbaeda45e6e2697a4f16b239cabbdf8 SHA256 6b35a59da99921c1358a9fb104962ea9374cf206e0d39b740f962d7d786791e8
+MISC ChangeLog 13919 RMD160 af2c8e70b62c3e1c50f44dd6d5532de0982de3c2 SHA1 9f5a0e655aafb1a8a201e9610cbc05df6731fd4d SHA256 7005a4c9cc0c28df2edf97406e90e6c086076292dfb68c45c65f439eb129e419
 MISC metadata.xml 824 RMD160 a154081a070f768b186bfb77031dd77b1cf5aaea SHA1 bb97f483589129a9ed66374359cf367e266d1d5d SHA256 b256de7da036de4fe73823e20e25da4bac70c9f50f58a326dad39f6619f7a624
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4+wvgACgkQuQc30/atMkBCAQCeIoWfDy23x8hzinr/0FHa1Gok
-x6sAoLD/uqwnGChvxla0tatQHNooxxU3
-=NvoM
+iEYEARECAAYFAk4+x78ACgkQVWmRsqeSphNh7wCeIkiNjjDAsqIc8urcX0SFAtaw
+Sb0AniEVLmmkijl37Bug+2NPeYNrNfkJ
+=jHx7
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ntop/files/ntop-3.3.10-CVE-2009-2732.patch b/net-analyzer/ntop/files/ntop-3.3.10-CVE-2009-2732.patch
deleted file mode 100644
index c8a74a58e444..000000000000
--- a/net-analyzer/ntop/files/ntop-3.3.10-CVE-2009-2732.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- http.c~	2007-06-09 16:33:45.000000000 +0200
-+++ http.c	2009-09-27 09:50:56.420394637 +0200
-@@ -3377,8 +3377,8 @@ static int checkHTTPpassword(char *theRe
- 
-   i = decodeString(thePw, (unsigned char*)outBuffer, sizeof(outBuffer));
- 
--  if(i == 0) {
-     user = "", thePw[0] = '\0';
-+  if(i == 0) {
-     outBuffer[0] = '\0';
-   } else {
-     outBuffer[i] = '\0';
diff --git a/net-analyzer/ntop/files/ntop-3.3.10-gentoo.patch b/net-analyzer/ntop/files/ntop-3.3.10-gentoo.patch
deleted file mode 100644
index bca3d6ca9b23..000000000000
--- a/net-analyzer/ntop/files/ntop-3.3.10-gentoo.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff -Nru ntop-3.3.10.orig/configure.in ntop-3.3.10/configure.in
---- ntop-3.3.10.orig/configure.in	2009-05-06 16:55:22.000000000 +0200
-+++ ntop-3.3.10/configure.in	2009-06-18 02:08:28.000000000 +0200
-@@ -57,6 +57,7 @@
- dnl>
- umask 002
- AM_CONFIG_HEADER(config.h)
-+AM_MAINTAINER_MODE
- 
- HAS_ERROR=
- HAS_WARNING=
-@@ -507,11 +508,6 @@
-     LOCALEDIR="/usr/lib/locale"
- fi
- 
--dnl> Add /usr/local/ /opt/local
--CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
--CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
--LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
--
- PWD=`pwd`
- 
- echo
-@@ -1652,22 +1648,7 @@
- dnl>
- dnl> Lua - http://www.lua.org
- dnl>
--LUA_VERSION=lua-5.1.4
--if test -f "$LUA_VERSION.tar.gz"; then
--   echo "Lua already present on this machine"
--else
--   wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
--fi
--
--tar xvfz $LUA_VERSION.tar.gz
--cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
--cat /tmp/lua.temp >  $LUA_VERSION/src/Makefile
--#rm -f /tmp/lua.temp
--cd $LUA_VERSION; make posix; cd ..
--
--LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
--LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
--INCS="${INCS} -I${LUA_LIB_DIR}"
-+LIBS="-llua ${LIBS} "
- AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
- 
- dnl>
-@@ -1963,39 +1944,7 @@
- fi
- 
- dnl> GeoIP (http://www.maxmind.com/)
--if test -f "GeoIP.tar.gz"; then
--   echo "GeoIP already present on this machine"
--else
--   wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
--fi
--tar xvfz GeoIP.tar.gz
--GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
--# OSX Fix
--GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
--if test -f $GEO_DYLIB; then
--   ln -s $GEO_DYLIB .
--fi
--
--if test -f "GeoLiteCity.dat"; then
--   echo "GeoLiteCity.dat already present"
--else
--   wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
--   gunzip GeoLiteCity.dat.gz
--fi
--
--if test -f "GeoIPASNum.dat"; then
--   echo "GeoIPASNum.dat already present"
--else
--   wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
--   gunzip GeoIPASNum.dat.gz
--fi
--
--
--GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--GEO_IP="$GEO_DIR/libGeoIP/"
--CFLAGS="$CFLAGS -I$GEO_IP"
--LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS"
-+LDFLAGS="$LDFLAGS -lGeoIP"
- 
- dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
- 
-@@ -2161,7 +2110,6 @@
- AC_SUBST(SO_VERSION_PATCH)
- AC_SUBST(RRD_LIB)
- AC_SUBST(RRD_INC)
--AC_SUBST(GEO_DIR)
- AC_SUBST(GETOPT_H)
- AC_SUBST(GETOPT_C)
- 
-diff -Nru ntop-3.3.10.orig/globals-core.c ntop-3.3.10/globals-core.c
---- ntop-3.3.10.orig/globals-core.c	2009-04-17 22:27:57.000000000 +0200
-+++ ntop-3.3.10/globals-core.c	2009-06-18 02:08:04.000000000 +0200
-@@ -386,7 +386,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
-@@ -503,19 +503,18 @@
-   struct stat statbuf;
- 
-   /* Initialize GeoIP databases */
--  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
-+  {
-     char path[256];
-     
-     safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
- 		  "%s%c%s",
--		  myGlobals.configFileDirs[i], 
-+		  myGlobals.dbPath, 
- 		  CONST_PATH_SEP, GEO_IP_FILE);
-     revertSlashIfWIN32(path, 0);
- 
-     if(stat(path, &statbuf) == 0) {
-       if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
- 	traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path);
--	break;
-       }
-     }
-   }
-@@ -525,19 +524,18 @@
-   
-   /* *************************** */
- 
--  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
-+  {
-     char path[256];
-     
-     safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
- 		  "%s%c%s",
--		  myGlobals.configFileDirs[i], 
-+		  myGlobals.dbPath, 
- 		  CONST_PATH_SEP, GEO_IP_ASN_FILE);
-     revertSlashIfWIN32(path, 0);
- 
-     if(stat(path, &statbuf) == 0) {
-       if((myGlobals.geo_ip_asn_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
- 	traceEvent(CONST_TRACE_INFO, "GeoIP: loaded ASN config file %s", path);
--	break;
-       }
-     }
-   }
-diff -Nru ntop-3.3.10.orig/Makefile.am ntop-3.3.10/Makefile.am
---- ntop-3.3.10.orig/Makefile.am	2009-04-17 22:27:57.000000000 +0200
-+++ ntop-3.3.10/Makefile.am	2009-06-18 02:08:04.000000000 +0200
-@@ -45,7 +45,6 @@
- 
- #AM_CFLAGS =
- #AM_LDFLAGS= 
--ACLOCAL_AMFLAGS=-l m4
- 
- DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
- CLEANFILES     = $(DISTCLEANFILES) stamp-h1
-@@ -76,9 +75,7 @@
- NTOPDATA = ntop-cert.pem \
-            $(ETTER_PASSIVE) \
-            oui.txt.gz \
--           specialMAC.txt.gz \
--	   GeoIPASNum.dat \
--	   GeoLiteCity.dat
-+           specialMAC.txt.gz
- 
- NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
-            html/*.css html/*.dtd \
-@@ -270,8 +267,6 @@
- 
- install: install-recursive
- 
--	cd @GEO_DIR@; make install
--
- 	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
- 
- 	@echo ""
-diff -Nru ntop-3.3.10.orig/report.c ntop-3.3.10/report.c
---- ntop-3.3.10.orig/report.c	2009-05-21 23:55:11.000000000 +0200
-+++ ntop-3.3.10/report.c	2009-06-18 02:08:04.000000000 +0200
-@@ -2305,7 +2305,7 @@
-   if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
-     snprintf(dotPath, sizeof(dotPath), "%s", buf);
-   } else {
--    snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
-+    snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
-     storePrefsValue("dot.path", dotPath); /* Set the default */
-   }
- 
diff --git a/net-analyzer/ntop/ntop-3.3.10-r2.ebuild b/net-analyzer/ntop/ntop-3.3.10-r2.ebuild
deleted file mode 100644
index a68c746e7543..000000000000
--- a/net-analyzer/ntop/ntop-3.3.10-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.10-r2.ebuild,v 1.6 2010/01/31 13:37:03 rich0 Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/ntop.html"
-SRC_URI="mirror://sourceforge/ntop/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6 ssl tcpd"
-#snmp support is disabled
-
-#snmp? ( net-analyzer/net-snmp )
-COMMON_DEPEND="sys-apps/gawk
-	dev-lang/perl
-	sys-libs/gdbm
-	dev-libs/libevent
-	net-libs/libpcap
-	media-libs/gd
-	media-libs/libpng
-	net-analyzer/rrdtool
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	sys-libs/zlib
-	>=dev-libs/geoip-1.4.5
-	>=dev-lang/lua-5.1.4"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/libtool-1.4"
-
-# Needed by xmldumpPlugin - couldn't get it to work
-#	dev-libs/gdome2
-#	>=dev-libs/glib-2"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/corefonts
-	media-gfx/graphviz
-	net-misc/wget
-	app-arch/gzip"
-
-pkg_setup() {
-	# snmp doesn't compile in this release, disabled for now
-	#if use snmp ; then
-	#	ewarn "snmp plugin is under development and upstream does not recommend"
-	#	ewarn "it for usage in production environment."
-	#	if ! use ipv6 ; then
-	#		echo
-	#		eerror "snmp plugin has compilation problems without ipv6 support."
-	#		eerror "For additional information see bug #121497."
-	#		die "snmp without ipv6 is broken"
-	#	else
-	#		if ! built_with_use net-analyzer/net-snmp ipv6 ; then
-	#			echo
-	#			eerror "You have both ipv6 and snmp enabled."
-	#			eerror "This require ipv6 support in net-analyzer/net-snmp."
-	#			eerror "However, net-analyzer/net-snmp was compiled with ipv6 flag disabled."
-	#			eerror "Please, re-emerge net-analyzer/net-snmp with USE=\"ipv6\"."
-	#			die "net-analyzer/net-snmp was build without ipv6."
-	#		fi
-	#	fi
-	#fi
-
-	enewgroup ntop
-	enewuser ntop -1 -1 /var/lib/ntop ntop
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	cat acinclude.m4.in acinclude.m4.ntop > acinclude.m4
-	eautoreconf
-
-	epatch "${FILESDIR}"/${P}-CVE-2009-2732.patch
-}
-
-src_configure() {
-	# force disable xmldumpPlugin
-	export \
-		ac_cv_header_glib_h=no \
-		ac_cv_header_glibconfig_h=no \
-		ac_cv_header_gdome_h=no \
-		ac_cv_lib_glib_g_date_julian=no \
-		ac_cv_lib_xml2_xmlCheckVersion=no \
-		ac_cv_lib_gdome_gdome_di_saveDocToFile=no
-
-	econf \
-		$(use_enable ipv6) \
-		$(use_with ssl) $(use_enable ssl sslwatchdog) \
-		$(use_with tcpd tcpwrap) \
-		--with-rrd-home=/usr/lib \
-		--disable-snmp \
-		|| die "configure problem"
-		# $(use_enable snmp)
-}
-
-src_install() {
-	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
-	emake DESTDIR="${D}" install || die "install problem"
-
-	keepdir /var/lib/ntop &&
-		fowners ntop:ntop /var/lib/ntop &&
-		fperms 750 /var/lib/ntop ||
-		die "failed to prepare /var/lib/ntop dir"
-
-	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
-	dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
-
-	newinitd "${FILESDIR}"/ntop-initd ntop
-	newconfd "${FILESDIR}"/ntop-confd ntop
-
-	exeinto /etc/cron.monthly
-	doexe "${FILESDIR}"/ntop-update-geoip-db
-}
-
-pkg_postinst() {
-	elog "If this is the first time you install ntop, you need to run"
-	elog "following commands before starting ntop service:"
-	elog "   ntop --set-admin-password"
-	elog "   /etc/cron.monthly/ntop-update-geoip-db"
-}