diff options
author | Alin Năstac <mrness@gentoo.org> | 2008-07-04 23:44:21 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2008-07-04 23:44:21 +0000 |
commit | ea811157e8d294097adc4253f3709b14a413f202 (patch) | |
tree | 41daaaae5548b547a8c69e4e886d1ace0c23eeaa /net-analyzer/ntop | |
parent | josm-plugins bump (diff) | |
download | historical-ea811157e8d294097adc4253f3709b14a413f202.tar.gz historical-ea811157e8d294097adc4253f3709b14a413f202.tar.bz2 historical-ea811157e8d294097adc4253f3709b14a413f202.zip |
Version bump.
Fix init script (#191576).
Fix broken ebuild when locales use other chars than ASCII (#205382).
Fix libtool dependency (#221623).
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-analyzer/ntop')
-rw-r--r-- | net-analyzer/ntop/ChangeLog | 10 | ||||
-rw-r--r-- | net-analyzer/ntop/Manifest | 21 | ||||
-rw-r--r-- | net-analyzer/ntop/files/ntop-3.3.6-gentoo.patch | 41 | ||||
-rw-r--r-- | net-analyzer/ntop/files/ntop-initd | 3 | ||||
-rw-r--r-- | net-analyzer/ntop/metadata.xml | 4 | ||||
-rw-r--r-- | net-analyzer/ntop/ntop-3.2-r3.ebuild | 11 | ||||
-rw-r--r-- | net-analyzer/ntop/ntop-3.3.6.ebuild | 116 | ||||
-rw-r--r-- | net-analyzer/ntop/ntop-3.3.ebuild | 9 |
8 files changed, 195 insertions, 20 deletions
diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog index 77db96bba131..51b03eec07f6 100644 --- a/net-analyzer/ntop/ChangeLog +++ b/net-analyzer/ntop/ChangeLog @@ -1,6 +1,14 @@ # 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.63 2008/06/09 08:41:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.64 2008/07/04 23:44:20 mrness Exp $ + +*ntop-3.3.6 (04 Jul 2008) + + 04 Jul 2008; Alin Năstac <mrness@gentoo.org> + +files/ntop-3.3.6-gentoo.patch, files/ntop-initd, metadata.xml, + ntop-3.2-r3.ebuild, ntop-3.3.ebuild, +ntop-3.3.6.ebuild: + Version bump. Fix init script (#191576). Fix broken ebuild when locales use + other chars than ASCII (#205382). Fix libtool dependency (#221623). 09 Jun 2008; Mike Frysinger <vapier@gentoo.org> ntop-3.3.ebuild: Remove stale libtool macros from local m4 files #220819 by Paul Hartman. diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest index bb200461991d..86d0d39dc611 100644 --- a/net-analyzer/ntop/Manifest +++ b/net-analyzer/ntop/Manifest @@ -5,18 +5,21 @@ AUX globals-core.c.diff 536 RMD160 33d049b6c5143f42294bce9a7bf366e69e98d329 SHA1 AUX ntop-3.2-build.patch 9369 RMD160 396ab052d11c21f5f33ea246c57aae8f1e4b2e35 SHA1 1dea08b5ad9652af5d6b9369bab9407a9a23ee39 SHA256 9df47e5c250f26c408ca8f35faa0e35166a3e1d2fe3924387bd9acb1907cd23d AUX ntop-3.2-snmp.patch 776 RMD160 22b4e288b88beaff7a855f18b9b9a1bec09d92da SHA1 a197e0887ea05bc223951d65c349382592bc3b4a SHA256 c2cb51b8adb0909f29580846ee58d07c105998b5675cebf97f1cfda36e20abef AUX ntop-3.3-build.patch 398 RMD160 ced7a3be50ff3587ed12ac495901e13213084d97 SHA1 011e9473ec7d1a5f483d08c2cd0bbfe3dc5a4be6 SHA256 e5d008350ebe48e7e4c9c2fdd45b81eb9ca3b5448b0268a1c2ef4cc2ba407a81 +AUX ntop-3.3.6-gentoo.patch 1602 RMD160 c2c328b3d00bfe59f82477c4f5c52875629731b8 SHA1 0878bba98e6e9d31dc2f56e66435e29a2f96f3d9 SHA256 8fdd082b6162221977c2fa5fd478109a7d222ea2174d60dbf06eb3596fe25f4e AUX ntop-confd 341 RMD160 40eb09215a1f50f86ae82ecd527198c2e7be17a3 SHA1 474aeb45826d71c28c5404add651f31be89b14d7 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d -AUX ntop-initd 574 RMD160 a8b929fa2a93a1e33e43547fc5c7bdad170411c4 SHA1 c3e872ed3462aef3500e9d58de0b5dffb2e0f478 SHA256 0f593a5ca5d56c4a4a12f1d5b2c34ba3a7672255db8509715bcc7190bf8bcf48 +AUX ntop-initd 646 RMD160 a8e06a02dc1f9d0ccd2f440102fe5982e99e2b18 SHA1 1e4630550c0ca5320af61b9509edaf08a64a412a SHA256 59cdedfbc3a9962a35544f2feb9fa2e267b45a666ad94633b3816d0908c34c05 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.tar.gz 3709605 RMD160 453842866189e7e8f63c68e70ea57800e41684b9 SHA1 4b56f15eb502ea853308433589820161ce82c8d8 SHA256 e849dabe0ac1ff006e487aef7b78fe06864b8d74a7b789fe6c7b8e258b7f361c -EBUILD ntop-3.2-r3.ebuild 2986 RMD160 490719bf45be85ed262a450cd649a1f1b4893105 SHA1 94a3caab264c1b76ae4710579eb1e62fff3b82f7 SHA256 e3800f1df6bd68903a67c297bfdb6b6a2f0124b3b0d95e26951be07e838cd1bf -EBUILD ntop-3.3.ebuild 3249 RMD160 7a689f23c16f1fa0cab736563c66537965a645fb SHA1 401a31e5284b06269f39fa60bb6194f2ff00e6d3 SHA256 b00f75bd5c57f13726ace0b8a8b07be5e5612fd9a66b04127d761f3241ab03f9 -MISC ChangeLog 8352 RMD160 d16886ee16b903ff6d221374f6bb6db30c422cea SHA1 ef1e6afe25dfed4ee44c9dcaf1ebc125056c7478 SHA256 15913409dbbd305f3e937d045b3a7defe1ffe7c99553f2364fc02bebe10f9f59 -MISC metadata.xml 233 RMD160 a40e5be287eb28adcd2008eb2de7a786bfd688c6 SHA1 4e1973fdf61e686516552955669fd6a845a66a27 SHA256 1cd97d0616d391c2639822aa603b9ae39e60796da9e21f498a8e856d317e0a0b +EBUILD ntop-3.2-r3.ebuild 3026 RMD160 1e6be221d06e34363204b46b66ef0e78d67084ea SHA1 7bb27f08e1e1cfa71adadc93eae6b40b4963726c SHA256 8213b04e0f8950fb1f096a3c1c5ff4523020d441b161618fa4a54d3389c3f4d3 +EBUILD ntop-3.3.6.ebuild 3235 RMD160 24b2577e34552764f281e9ab7a6a3c1b493a6ee0 SHA1 d1985ca77b2d9423b8a7354545d743bbb47e073e SHA256 769cc0c3b775f66f5cd6e6899f2f734789697148b86fa18af8596faf0fd5650d +EBUILD ntop-3.3.ebuild 3289 RMD160 bff5a23e750ce7bd4bbbe23f4495426a73445bad SHA1 4fa00672428699412710eb173fc1b8f9b6ab4e12 SHA256 08fa469f07734bb4ce8f9d572c22b745fb55729e142d188323ae006c65ecc722 +MISC ChangeLog 8701 RMD160 d97b1ea1dcef6bc6aecf624bdc84d8ba142b0af8 SHA1 eca502be477ee885f0013ac014ba1d9130c1abd2 SHA256 22fbb8301fde829be4b7e85bce2cc64db4246d5251123aab5bf9f863f60975ed +MISC metadata.xml 322 RMD160 b7f7af3a210902c2b2496ec63b09a3ba372b695b SHA1 b1066ca022ba3396c1964d517c366686339e3c82 SHA256 7ed574b22255d4bbc246459407865f6b9405e7ec7de95c08e16bbf3d2ba2134b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) +Version: GnuPG v2.0.9 (GNU/Linux) -iD8DBQFITOzdj9hvisErhMIRAmj3AJ0S+u7V6ySUHl5tbxOtbhIN98tkTgCdFEem -panpxUg3osYxKp2GOYqLMWE= -=Z25r +iEYEARECAAYFAkhuteMACgkQPrHvTlXvhtuHlACgnmrT0NuzICbWjtFk1kDP08xT +nb8AnRCmEA+w9MHHPjmTGhLfyT0ehMQN +=yiGs -----END PGP SIGNATURE----- diff --git a/net-analyzer/ntop/files/ntop-3.3.6-gentoo.patch b/net-analyzer/ntop/files/ntop-3.3.6-gentoo.patch new file mode 100644 index 000000000000..fa51578ff6ea --- /dev/null +++ b/net-analyzer/ntop/files/ntop-3.3.6-gentoo.patch @@ -0,0 +1,41 @@ +diff -Nru ntop.orig/configure.in ntop/configure.in +--- ntop.orig/configure.in 2008-06-04 09:29:06.000000000 +0200 ++++ ntop/configure.in 2008-07-05 00:40:53.000000000 +0200 +@@ -515,13 +515,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" +- +- +- + echo + echo "Test the compiler and setup CFLAGS..." + echo +diff -Nru ntop.orig/globals-core.c ntop/globals-core.c +--- ntop.orig/globals-core.c 2007-11-24 19:26:29.000000000 +0100 ++++ ntop/globals-core.c 2008-07-05 00:48:09.000000000 +0200 +@@ -427,7 +427,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.orig/report.c ntop/report.c +--- ntop.orig/report.c 2008-04-05 17:56:58.000000000 +0200 ++++ ntop/report.c 2008-07-05 01:09:36.000000000 +0200 +@@ -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/files/ntop-initd b/net-analyzer/ntop/files/ntop-initd index d2a66b1029dc..d0e2b0183454 100644 --- a/net-analyzer/ntop/files/ntop-initd +++ b/net-analyzer/ntop/files/ntop-initd @@ -17,12 +17,13 @@ checkconfig() { start() { checkconfig || return 1 ebegin "Starting ntop" + LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382) start-stop-daemon --start --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS} eend $? } stop() { ebegin "Stopping ntop" - start-stop-daemon --stop --retry 5 --pidfile /var/lib/ntop/ntop.pid + start-stop-daemon --stop --retry 30 --pidfile /var/run/ntop.pid eend $? } diff --git a/net-analyzer/ntop/metadata.xml b/net-analyzer/ntop/metadata.xml index 957191d63d3b..772232a17611 100644 --- a/net-analyzer/ntop/metadata.xml +++ b/net-analyzer/ntop/metadata.xml @@ -2,5 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>netmon</herd> +<maintainer> + <email>mrness@gentoo.org</email> + <name>Alin Nastac</name> +</maintainer> <longdescription>tool that shows network usage like top</longdescription> </pkgmetadata> diff --git a/net-analyzer/ntop/ntop-3.2-r3.ebuild b/net-analyzer/ntop/ntop-3.2-r3.ebuild index 62b9dd7327c4..77cd6f18ec28 100644 --- a/net-analyzer/ntop/ntop-3.2-r3.ebuild +++ b/net-analyzer/ntop/ntop-3.2-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.2-r3.ebuild,v 1.11 2007/07/28 09:46:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.2-r3.ebuild,v 1.12 2008/07/04 23:44:20 mrness Exp $ inherit eutils autotools @@ -13,8 +13,7 @@ SLOT="0" KEYWORDS="amd64 arm hppa ~ia64 ppc ~ppc64 sh sparc s390 x86" IUSE="ipv6 nls snmp ssl tcpd zlib" -DEPEND="sys-apps/gawk - >=sys-devel/libtool-1.4 +COMMON_DEPEND="sys-apps/gawk >=sys-libs/gdbm-1.8.0 net-libs/libpcap >=media-libs/gd-2.0.22 @@ -23,12 +22,14 @@ DEPEND="sys-apps/gawk ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 ) zlib? ( sys-libs/zlib )" +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="${DEPEND} +RDEPEND="${COMMON_DEPEND} media-gfx/graphviz" pkg_setup() { diff --git a/net-analyzer/ntop/ntop-3.3.6.ebuild b/net-analyzer/ntop/ntop-3.3.6.ebuild new file mode 100644 index 000000000000..de4ae89d0785 --- /dev/null +++ b/net-analyzer/ntop/ntop-3.3.6.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.6.ebuild,v 1.1 2008/07/04 23:44:20 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 zlib" +#IUSE="ipv6 nls snmp ssl tcpd zlib" + +#snmp? ( net-analyzer/net-snmp ) +COMMON_DEPEND="sys-apps/gawk + >=sys-libs/gdbm-1.8.0 + net-libs/libpcap + >=media-libs/gd-2.0.22 + >=media-libs/libpng-1.2.5 + net-analyzer/rrdtool + ssl? ( >=dev-libs/openssl-0.9.6 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 ) + zlib? ( sys-libs/zlib )" +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-gfx/graphviz" + +S="${WORKDIR}/${PN}" + +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 + + eautoreconf + cp /usr/share/aclocal/libtool.m4 libtool.m4.in || die "failed to copy libtool.m4" +} + +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 sslv3) $(use_enable ssl sslwatchdog) \ + $(use_with tcpd) \ + $(use_with zlib) \ + --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 + + 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() { + fowners ntop:ntop /var/lib/ntop + fperms 750 /var/lib/ntop + + elog "You need to set a password first by running" + elog "ntop --set-admin-password" +} diff --git a/net-analyzer/ntop/ntop-3.3.ebuild b/net-analyzer/ntop/ntop-3.3.ebuild index aa481af4e409..0cf545ce6b3b 100644 --- a/net-analyzer/ntop/ntop-3.3.ebuild +++ b/net-analyzer/ntop/ntop-3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.ebuild,v 1.6 2008/06/09 08:41:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.ebuild,v 1.7 2008/07/04 23:44:20 mrness Exp $ inherit eutils autotools @@ -15,8 +15,7 @@ IUSE="ipv6 nls ssl tcpd zlib" #IUSE="ipv6 nls snmp ssl tcpd zlib" #snmp? ( net-analyzer/net-snmp ) -DEPEND="sys-apps/gawk - >=sys-devel/libtool-1.4 +COMMON_DEPEND="sys-apps/gawk >=sys-libs/gdbm-1.8.0 net-libs/libpcap >=media-libs/gd-2.0.22 @@ -25,12 +24,14 @@ DEPEND="sys-apps/gawk ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 ) zlib? ( sys-libs/zlib )" +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="${DEPEND} +RDEPEND="${COMMON_DEPEND} media-gfx/graphviz" pkg_setup() { |