diff options
author | Alin Năstac <mrness@gentoo.org> | 2009-02-16 22:17:29 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2009-02-16 22:17:29 +0000 |
commit | ae6706a43bd9d497f2256f1d4127a17e35adf2ff (patch) | |
tree | 678473429f36fbf65461136a1ce3ecc1a6d4f8b8 /net-analyzer/ntop | |
parent | whitespace (diff) | |
download | historical-ae6706a43bd9d497f2256f1d4127a17e35adf2ff.tar.gz historical-ae6706a43bd9d497f2256f1d4127a17e35adf2ff.tar.bz2 historical-ae6706a43bd9d497f2256f1d4127a17e35adf2ff.zip |
Version bump. Install /var/lib/ntop with the right owner (#254868).
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.25-gentoo-r6 x86_64
Diffstat (limited to 'net-analyzer/ntop')
-rw-r--r-- | net-analyzer/ntop/ChangeLog | 11 | ||||
-rw-r--r-- | net-analyzer/ntop/Manifest | 12 | ||||
-rw-r--r-- | net-analyzer/ntop/files/ntop-3.3.9-external-geoip.patch | 97 | ||||
-rw-r--r-- | net-analyzer/ntop/files/ntop-3.3.9-gentoo.patch | 47 | ||||
-rw-r--r-- | net-analyzer/ntop/ntop-3.3.9.ebuild | 119 |
5 files changed, 280 insertions, 6 deletions
diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog index a9e8738b49c4..6b63894b5a33 100644 --- a/net-analyzer/ntop/ChangeLog +++ b/net-analyzer/ntop/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/ntop -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.66 2008/10/05 13:08:44 mrness Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.67 2009/02/16 22:17:28 mrness Exp $ + +*ntop-3.3.9 (16 Feb 2009) + + 16 Feb 2009; Alin Năstac <mrness@gentoo.org> + +files/ntop-3.3.9-external-geoip.patch, +files/ntop-3.3.9-gentoo.patch, + +ntop-3.3.9.ebuild: + Version bump. Install /var/lib/ntop with the right owner (#254868). *ntop-3.3.8 (05 Oct 2008) diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest index f6bf8eb8163e..ca9f48b95985 100644 --- a/net-analyzer/ntop/Manifest +++ b/net-analyzer/ntop/Manifest @@ -6,20 +6,24 @@ AUX ntop-3.2-build.patch 9369 RMD160 396ab052d11c21f5f33ea246c57aae8f1e4b2e35 SH AUX ntop-3.2-snmp.patch 776 RMD160 22b4e288b88beaff7a855f18b9b9a1bec09d92da SHA1 a197e0887ea05bc223951d65c349382592bc3b4a SHA256 c2cb51b8adb0909f29580846ee58d07c105998b5675cebf97f1cfda36e20abef AUX ntop-3.3.6-gentoo.patch 1602 RMD160 c2c328b3d00bfe59f82477c4f5c52875629731b8 SHA1 0878bba98e6e9d31dc2f56e66435e29a2f96f3d9 SHA256 8fdd082b6162221977c2fa5fd478109a7d222ea2174d60dbf06eb3596fe25f4e AUX ntop-3.3.8-gentoo.patch 1671 RMD160 a07f271b511227f633e972199b9667889f68fa18 SHA1 c9ec1e99ffef9288f73e0e3ad2021972b078388b SHA256 3f9561fb8e7ee657d68d44840897fda1cc05b0dff884a3ae8358e1b7bfc89bc7 +AUX ntop-3.3.9-external-geoip.patch 2816 RMD160 a62b21b8e0a07e9655006368f0f50ade588d78fb SHA1 1f7515a30572996907636afdf0b1943c4af2095d SHA256 88d2c3705ba8f9e061f17a74200f875270c1dabff5f969903e64921b64483292 +AUX ntop-3.3.9-gentoo.patch 1742 RMD160 560fca4b581215cb288178bf7b6e6d3b5822c754 SHA1 734f7392b38fe243800bfb6887b673543f14387d SHA256 2013f7124c5bd9c3f13202ef46eb7b49f3f01257ad62e91239796ae2b6f37a75 AUX ntop-confd 341 RMD160 40eb09215a1f50f86ae82ecd527198c2e7be17a3 SHA1 474aeb45826d71c28c5404add651f31be89b14d7 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d AUX ntop-initd 747 RMD160 cc62a0f68e7c27e63acaf55283784ab581a79ab9 SHA1 bf1ea42aeab524edcbe37cfc708919aed965f7d8 SHA256 f583d6625690ee60744d407d149845db178f618f1239d962bfac14f39076dc7d DIST ntop-3.2.tgz 3910593 RMD160 18ea4b535826e6d7bdf56c071c271869653cba8d SHA1 ab17e871890bc490746fe03f171523073b54e1e8 SHA256 5b639dbcb3c8bf77824cf8aaed168864f69730b2ef41dc68d2db22b205c586d8 DIST ntop-3.3.6.tar.gz 3635457 RMD160 50f8c7743d36effdfe07037453fa24c8bb42062a SHA1 320ab9ccc0d71dedf0e200e283834eb684163ee3 SHA256 6a190d868805110336afabe078ab9cf0bc2b26e14810a5160fc9689d554df57d DIST ntop-3.3.8.tar.gz 5626313 RMD160 cd1b3e08f74d9231d56fc8b619ce5e85d3fabbd0 SHA1 6ef20a1c43ce560b81e6439dc7ad0f7b29edc2c0 SHA256 8e25f3c527493e1495030b1b8cfb09158c75829a740f55c6339674efcc504238 +DIST ntop-3.3.9.tar.gz 4955257 RMD160 3d7b14bff99a6652ae83fb86a2cda3206cc3392c SHA1 77c1976d096709c6e45dcfe4befc2045cf83774b SHA256 606c027d02cdaab7de87475bef8be168e9f18329c2215ac21a518766aa8a331f EBUILD ntop-3.2-r3.ebuild 3026 RMD160 1e6be221d06e34363204b46b66ef0e78d67084ea SHA1 7bb27f08e1e1cfa71adadc93eae6b40b4963726c SHA256 8213b04e0f8950fb1f096a3c1c5ff4523020d441b161618fa4a54d3389c3f4d3 EBUILD ntop-3.3.6.ebuild 3228 RMD160 91bf24321e591c99c1654c58e39b5db3b69cb6f1 SHA1 e757d1b4b07b5359daca77fc17f04d206097f88c SHA256 0a72f39b32658374f315e8ef5ccd642aed43aee801ee1a36760cfcd7a0263b03 EBUILD ntop-3.3.8.ebuild 3141 RMD160 03c722452d5af5ac49693430725ea03f00eb2226 SHA1 80b7347d8c1af69699ddd22c91d9055a607b6672 SHA256 31e79951ae18125012ff49f371f8f2e02bbc8dac00269b738fbfbec260fc729a -MISC ChangeLog 9097 RMD160 c7cf9b7669dc84bdaff5c33dcc90a36e12ec402a SHA1 cbd4a611cf44d1e86e8697a48afefdd77f65f3b1 SHA256 d2e84e67f03d063eb5c93208375f35a8999f54ce4b763fd78e51f859eda61877 +EBUILD ntop-3.3.9.ebuild 3343 RMD160 7a0396bf5df48dedad3447777066529cc93aaaa5 SHA1 0188f37f80013f9914ec00a7f81b4f41ba4658f6 SHA256 2e4b9f8a37ac3f8cad92855b7415afb28baed59eb45c5187263142db4a94df6a +MISC ChangeLog 9339 RMD160 7ad9c3ed08501fdb1af8cf1849fed035bb4bd9f3 SHA1 69ef7b900984a72df3d641fca0d801c7d84c583b SHA256 4cb110cad47569d3d5bf48a14d51bd8a4091d7038d1b3635bbc6b06d5d264652 MISC metadata.xml 322 RMD160 b7f7af3a210902c2b2496ec63b09a3ba372b695b SHA1 b1066ca022ba3396c1964d517c366686339e3c82 SHA256 7ed574b22255d4bbc246459407865f6b9405e7ec7de95c08e16bbf3d2ba2134b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkjovGkACgkQPrHvTlXvhtsHeACfZmKlPFbZoOn1OqVFkb1wT+Sx -QW0AoKa6oRq7qFDuTd/MWIb1nxjt9yHt -=nEEK +iEYEARECAAYFAkmZ5gkACgkQts85UDFmaOVZVgCbB2Akvk6SaLYXvGG56kkxyQW9 +aDMAni87VJ6XDW9PM1oXbBgkK8EUOPMN +=O6gE -----END PGP SIGNATURE----- diff --git a/net-analyzer/ntop/files/ntop-3.3.9-external-geoip.patch b/net-analyzer/ntop/files/ntop-3.3.9-external-geoip.patch new file mode 100644 index 000000000000..99efd615c171 --- /dev/null +++ b/net-analyzer/ntop/files/ntop-3.3.9-external-geoip.patch @@ -0,0 +1,97 @@ +diff -Nru ntop-3.3.9.orig/configure.in ntop-3.3.9/configure.in +--- ntop-3.3.9.orig/configure.in 2009-02-16 19:43:57.000000000 +0000 ++++ ntop-3.3.9/configure.in 2009-02-16 19:47:10.000000000 +0000 +@@ -1882,20 +1882,6 @@ + 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 +- tar xvfz GeoIP.tar.gz +- GEO_DIR=`find $PWD -type d -name "GeoIP-*"` +- cd $GEO_DIR; ./configure; make; cd .. +- # OSX Fix +- GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib" +- if test -f $GEO_DYLIB; then +- ln -s $GEO_DYLIB . +- fi +-fi +- + if test -f "GeoLiteCity.dat"; then + echo "GeoLiteCity.dat already present" + else +@@ -1911,10 +1897,7 @@ + fi + + +-GEO_DIR=`find $PWD -type d -name "GeoIP-*"` +-GEO_IP="$GEO_DIR/libGeoIP/" +-CFLAGS="$CFLAGS -I$GEO_IP" +-LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP" ++LDFLAGS="$LDFLAGS -lGeoIP" + + dnl> NTOPCONFIGDEBUG_SETTINGS([precet]) + +@@ -2079,7 +2062,6 @@ + AC_SUBST(SO_VERSION_PATCH) + AC_SUBST(RRD_LIB) + AC_SUBST(RRD_INC) +-AC_SUBST(GEO_DIR) + + AC_CONFIG_FILES([Makefile]) + +diff -Nru ntop-3.3.9.orig/initialize.c ntop-3.3.9/initialize.c +--- ntop-3.3.9.orig/initialize.c 2008-12-03 22:00:22.000000000 +0000 ++++ ntop-3.3.9/initialize.c 2009-02-16 22:04:34.000000000 +0000 +@@ -467,16 +467,15 @@ + #endif + + /* 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], CONST_PATH_SEP, GEO_IP_FILE); ++ myGlobals.dbPath, CONST_PATH_SEP, GEO_IP_FILE); + revertSlashIfWIN32(path, 0); + if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) { + traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path); +- break; + } + } + +@@ -485,16 +484,15 @@ + + /* *************************** */ + +- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) { ++ { + char path[256]; + + safe_snprintf(__FILE__, __LINE__, path, sizeof(path), + "%s%c%s", +- myGlobals.configFileDirs[i], CONST_PATH_SEP, GEO_IP_ASN_FILE); ++ myGlobals.dbPath, CONST_PATH_SEP, GEO_IP_ASN_FILE); + revertSlashIfWIN32(path, 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.9.orig/Makefile.am ntop-3.3.9/Makefile.am +--- ntop-3.3.9.orig/Makefile.am 2008-12-03 22:00:22.000000000 +0000 ++++ ntop-3.3.9/Makefile.am 2009-02-16 19:47:25.000000000 +0000 +@@ -270,8 +270,6 @@ + + install: install-recursive + +- cd @GEO_DIR@; make install +- + @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR) + + @echo "" diff --git a/net-analyzer/ntop/files/ntop-3.3.9-gentoo.patch b/net-analyzer/ntop/files/ntop-3.3.9-gentoo.patch new file mode 100644 index 000000000000..fb0268fed30a --- /dev/null +++ b/net-analyzer/ntop/files/ntop-3.3.9-gentoo.patch @@ -0,0 +1,47 @@ +diff -Nru ntop-3.3.9.orig/configure.in ntop-3.3.9/configure.in +--- ntop-3.3.9.orig/configure.in 2008-12-03 22:00:22.000000000 +0000 ++++ ntop-3.3.9/configure.in 2009-02-15 18:19:26.000000000 +0000 +@@ -57,6 +57,7 @@ + dnl> + umask 002 + AM_CONFIG_HEADER(config.h) ++AM_MAINTAINER_MODE + + HAS_ERROR= + HAS_WARNING= +@@ -504,11 +504,6 @@ + LOCALEDIR="/usr/lib/locale" + fi + +-dnl> Add /usr/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 +diff -Nru ntop-3.3.9.orig/globals-core.c ntop-3.3.9/globals-core.c +--- ntop-3.3.9.orig/globals-core.c 2008-12-03 22:00:22.000000000 +0000 ++++ ntop-3.3.9/globals-core.c 2009-02-15 18:18:55.000000000 +0000 +@@ -424,7 +424,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 -Nru ntop-3.3.9.orig/report.c ntop-3.3.9/report.c +--- ntop-3.3.9.orig/report.c 2008-12-09 11:41:47.000000000 +0000 ++++ ntop-3.3.9/report.c 2009-02-15 18:18:55.000000000 +0000 +@@ -2301,7 +2301,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.9.ebuild b/net-analyzer/ntop/ntop-3.3.9.ebuild new file mode 100644 index 000000000000..e82a9412890d --- /dev/null +++ b/net-analyzer/ntop/ntop-3.3.9.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.9.ebuild,v 1.1 2009/02/16 22:17:28 mrness Exp $ + +inherit eutils autotools + +DESCRIPTION="tool that shows network usage like top" +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 nls ssl tcpd" +#snmp support is disabled + +#snmp? ( net-analyzer/net-snmp ) +COMMON_DEPEND="sys-apps/gawk + dev-lang/perl + sys-libs/gdbm + 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" +DEPEND="${COMMON_DEPEND} + >=sys-devel/libtool-1.4 + net-misc/wget" # needed for downloading GeoIP data + +# 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" + +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_unpack() { + unpack ${A} + + cd "${S}" + + epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-external-geoip.patch + cat acinclude.m4.in acinclude.m4.ntop > acinclude.m4 + eautoreconf +} + +src_compile() { + # 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_enable nls i18n) \ + $(use_with ssl) $(use_enable ssl sslwatchdog) \ + $(use_with tcpd tcpwrapper) \ + --with-rrd-home=/usr/lib \ + --disable-snmp \ + || die "configure problem" + # $(use_enable snmp) + emake || die "compile problem" +} + +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 && + mv "${D}"/etc/ntop/Geo*.dat "${D}"/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 +} + +pkg_postinst() { + elog "You need to set a password first by running" + elog "ntop --set-admin-password" +} |