From e48358a4fd2e16f6264e600337fd319c2a6cf699 Mon Sep 17 00:00:00 2001 From: Markus Ullmann Date: Tue, 27 Mar 2007 20:55:11 +0000 Subject: [PATCH] Add fixes from bug #136983, look at the confd file in case you experience lockups Package-Manager: portage-2.1.2.2 --- net-analyzer/ntop/ChangeLog | 9 +- net-analyzer/ntop/Manifest | 14 +-- net-analyzer/ntop/files/digest-ntop-3.2-r3 | 3 + net-analyzer/ntop/files/ntop-confd-2 | 9 ++ net-analyzer/ntop/files/ntop-init-2 | 26 +++++ net-analyzer/ntop/ntop-3.2-r3.ebuild | 109 +++++++++++++++++++++ 6 files changed, 162 insertions(+), 8 deletions(-) create mode 100644 net-analyzer/ntop/files/digest-ntop-3.2-r3 create mode 100644 net-analyzer/ntop/files/ntop-confd-2 create mode 100644 net-analyzer/ntop/files/ntop-init-2 create mode 100644 net-analyzer/ntop/ntop-3.2-r3.ebuild diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog index 25e37818cff6..0473ed3a6298 100644 --- a/net-analyzer/ntop/ChangeLog +++ b/net-analyzer/ntop/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/ntop # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.49 2007/01/05 08:39:00 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.50 2007/03/27 20:55:11 jokey Exp $ + +*ntop-3.2-r3 (27 Mar 2007) + + 27 Mar 2007; Markus Ullmann +files/ntop-confd-2, + +files/ntop-init-2, +ntop-3.2-r3.ebuild: + Add fixes from bug #136983, look at the confd file in case you experience + lockups 05 Jan 2007; Diego Pettenò ntop-3.0.ebuild, ntop-3.1.ebuild: diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest index 247702c0aa9b..2093aa2742fb 100644 --- a/net-analyzer/ntop/Manifest +++ b/net-analyzer/ntop/Manifest @@ -48,10 +48,10 @@ EBUILD ntop-3.2-r2.ebuild 2987 RMD160 20007e29e35ac9dbb8cb273f162783ffc1c2f484 S MD5 294ae93b1a5f7179aad37a592f271ee0 ntop-3.2-r2.ebuild 2987 RMD160 20007e29e35ac9dbb8cb273f162783ffc1c2f484 ntop-3.2-r2.ebuild 2987 SHA256 0d187e9da135e0ab456fe8c825460f0ac876153ed983969509399b6cdf4cbfa7 ntop-3.2-r2.ebuild 2987 -EBUILD ntop-3.2-r3.ebuild 3002 RMD160 82c1ec28d78d672a8a90fb8c2daa352cca4186a2 SHA1 8eb9577db750853ff86154ec973afc139eeeb176 SHA256 34d7bab1d171a97e1297dd53aa2eb539b61f0e6314993436480f5c27e592d610 -MD5 1fe74a3d4e519a253c428c8150c29210 ntop-3.2-r3.ebuild 3002 -RMD160 82c1ec28d78d672a8a90fb8c2daa352cca4186a2 ntop-3.2-r3.ebuild 3002 -SHA256 34d7bab1d171a97e1297dd53aa2eb539b61f0e6314993436480f5c27e592d610 ntop-3.2-r3.ebuild 3002 +EBUILD ntop-3.2-r3.ebuild 2990 RMD160 0d9027da5581efa4b6ec0c659bc9920571cf5960 SHA1 d5c6fd82c701d900b8e6931b93fe64d36678fa9d SHA256 e036d5668eda988ff107be2eae17182ef3dd509759e4c5b75e15fa2980986507 +MD5 133f848b8aa72b083493df7d29dd6817 ntop-3.2-r3.ebuild 2990 +RMD160 0d9027da5581efa4b6ec0c659bc9920571cf5960 ntop-3.2-r3.ebuild 2990 +SHA256 e036d5668eda988ff107be2eae17182ef3dd509759e4c5b75e15fa2980986507 ntop-3.2-r3.ebuild 2990 MISC ChangeLog 6683 RMD160 fd34785a63ed7f938d0361f54db5471255eceb74 SHA1 7228d2aa8fd3dbeca4a05d5f1c588e0ce94c7a25 SHA256 dcb5734cea1c68be036225d967352f897467f38afe37052cdc6c939bbaa5922b MD5 a2f70c46cbcd9710df493ff74a7e2a28 ChangeLog 6683 RMD160 fd34785a63ed7f938d0361f54db5471255eceb74 ChangeLog 6683 @@ -78,7 +78,7 @@ SHA256 fec72a84051cd908bd49dab5802bd22225c8a697f8ef28bcb8d65c2832396b36 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGCYS2z974XjDVpbkRAmxrAKCixVls62bvG4v3WRF4DOEDIgtk0ACgxB0o -eBrMoOAOOgQpAhGdWXOkh8Y= -=D7QH +iD8DBQFGCYUFz974XjDVpbkRAi2PAJoDSxRFxNrOLJJRzXStzf89MO9wbACgkNeG +uYa1HEu9NLzJzpU74oxIGlc= +=uhjC -----END PGP SIGNATURE----- diff --git a/net-analyzer/ntop/files/digest-ntop-3.2-r3 b/net-analyzer/ntop/files/digest-ntop-3.2-r3 new file mode 100644 index 000000000000..cca3145681a3 --- /dev/null +++ b/net-analyzer/ntop/files/digest-ntop-3.2-r3 @@ -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-confd-2 b/net-analyzer/ntop/files/ntop-confd-2 new file mode 100644 index 000000000000..352a26fa9b1c --- /dev/null +++ b/net-analyzer/ntop/files/ntop-confd-2 @@ -0,0 +1,9 @@ +# Config file for /etc/init.d/ntop + +# Set preferred options here +#NTOP_OPTS="--http-server 3000 --https-server 0 --interface eth0" + +# suggestions from bug #136983 (use it in case you experience ntop hangs) +#NTOP_OPTS="u ntop -P /var/lib/ntop --disable-schedyield --http-server 3000 --https-server 3001" + +NTOP_OPTS="-u ntop -P /var/lib/ntop" diff --git a/net-analyzer/ntop/files/ntop-init-2 b/net-analyzer/ntop/files/ntop-init-2 new file mode 100644 index 000000000000..6de2b775d248 --- /dev/null +++ b/net-analyzer/ntop/files/ntop-init-2 @@ -0,0 +1,26 @@ +#!/sbin/runscript + +depend() { + need net +} + +checkconfig() { + if [ ! -e /var/lib/ntop/ntop_pw.db ]; then + eerror "You need to set a password first by running" + eerror "ntop --set-admin-password" + return 1 + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting ntop" + start-stop-daemon --start --quiet --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS} >/dev/null + eend $? +} + +stop() { + ebegin "Stopping ntop" + start-stop-daemon --stop --quiet --retry 5 --pidfile /var/lib/ntop/ntop.pid + eend $? +} diff --git a/net-analyzer/ntop/ntop-3.2-r3.ebuild b/net-analyzer/ntop/ntop-3.2-r3.ebuild new file mode 100644 index 000000000000..bdc3c0b2e847 --- /dev/null +++ b/net-analyzer/ntop/ntop-3.2-r3.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2007 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.1 2007/03/27 20:55:11 jokey 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}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="ipv6 nls snmp ssl sslwatchdog tcpd zlib" + +DEPEND="sys-apps/gawk + >=sys-devel/libtool-1.4 + >=sys-libs/gdbm-1.8.0 + net-libs/libpcap + >=media-libs/gd-2.0.22 + >=media-libs/libpng-1.2.5 + snmp? ( net-analyzer/net-snmp ) + ssl? ( >=dev-libs/openssl-0.9.6 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 ) + zlib? ( sys-libs/zlib )" + +# Needed by xmldumpPlugin - couldn't get it to work +# dev-libs/gdome2 +# >=dev-libs/glib-2" + +RDEPEND="${DEPEND} + media-gfx/graphviz" + +pkg_setup() { + 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, reemrege 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}"/globals-core.c.diff + epatch "${FILESDIR}"/${P}-build.patch + epatch "${FILESDIR}"/${P}-snmp.patch + eautoreconf + + sed -i \ + -e "s@/usr/local/bin/dot@/usr/bin/dot@" report.c || die "sed failed" +} + +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_enable snmp) \ + $(use_with ssl) $(use_enable ssl sslv3) $(use_enable ssl sslwatchdog) \ + $(use_with tcpd) \ + $(use_with zlib) \ + || die "configure problem" + emake || die "compile problem" +} + +src_install() { + 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-init-2 ntop + newconfd "${FILESDIR}"/ntop-confd-2 ntop +} + +pkg_postinst() { + fowners ntop:ntop /var/lib/ntop + fperms 750 /var/lib/ntop + + einfo "You need to set a password first by running" + einfo "ntop --set-admin-password" +} -- 2.26.2