From d42daffe5676ab927e72a49bbe950ce511f711ef Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 11 Sep 2015 06:59:07 +0200 Subject: net-analyzer/pmacct: Version bump. Package-Manager: portage-2.2.20.1 --- net-analyzer/pmacct/Manifest | 3 +- .../pmacct/files/pmacct-0.12.0-gentoo.patch | 20 ------ net-analyzer/pmacct/files/pmacctd-init.d | 10 ++- net-analyzer/pmacct/pmacct-0.14.3.ebuild | 68 -------------------- net-analyzer/pmacct/pmacct-1.5.0.ebuild | 70 --------------------- net-analyzer/pmacct/pmacct-1.5.2.ebuild | 72 ++++++++++++++++++++++ 6 files changed, 80 insertions(+), 163 deletions(-) delete mode 100644 net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch delete mode 100644 net-analyzer/pmacct/pmacct-0.14.3.ebuild delete mode 100644 net-analyzer/pmacct/pmacct-1.5.0.ebuild create mode 100644 net-analyzer/pmacct/pmacct-1.5.2.ebuild (limited to 'net-analyzer/pmacct') diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index c7603289cdcd..73544d32b364 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -1,3 +1,2 @@ -DIST pmacct-0.14.3.tar.gz 746387 SHA256 c3197dcb21b131da82eaaecc9dccbff894c35bf1cb74214e93ae1e7c1bdef50e SHA512 310cee3f74d41befd74f981aff6c1a33a2db14c7010e8d1283374d8f6be49fb825a768f992c7b24acca74710413148fd61006ae7e87ad566b7193d575fa6df36 WHIRLPOOL bd7b8560ed5e30ff6342920ec04cca1795bf675dc90db7abf31c8d105f733109950ca28ac9c57d80cb2b6aef24f3db6259a71b170a032b1a77cdb98f5b7bcbe9 -DIST pmacct-1.5.0.tar.gz 843881 SHA256 28edc18aec67c2157c599dcf095dd9f26a4c06ca4dfe7da79390011b3fd432fc SHA512 e1ff47f6a987e76c5e5ac92896f9dac3722c681a5a85835dbf8bffba68dc5794c63f06c9576d1b8f667fb4fe2f9b17d8e0dd1d3a4a96673c43378d2aba3329a1 WHIRLPOOL e886a73e732b7e63f5453710913372dfab671d33bbbc85dc4f10daab89173cdf5579ddfd2ad4019855d67705b52bafd1b31d1e2d14da34dfc00877db444e1419 DIST pmacct-1.5.1.tar.gz 874563 SHA256 96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 SHA512 c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7 WHIRLPOOL bd071ac30493f5ee2e0393eb9277dfae2d2fdd6283293aee589ae41ab326b0aaef0ec9b70a421eeca4df857a0046ca7b196e0692ffdd2ea12d9a7c66a74e9a32 +DIST pmacct-1.5.2.tar.gz 897530 SHA256 c12e3897e2f9aa89333968da46eb46855f357750ac1e06e36e72f374e2b54df9 SHA512 3705432cc2a28e179de637b8fc11becd2022b36191a13d440d5bec7d7e594d0936773f202f3d82e983a83695176380aa6a7c27748b632b180000590be0ead599 WHIRLPOOL e7bb1fa1b7372af7d932e19da1d14f3922d8a8ebda245fa03e2a5f283c66141a9299cc9dfa6f32e9384c7d2c9a2d2ef35ef62d7b9910e4f76cacc132231420e5 diff --git a/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch b/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch deleted file mode 100644 index 34efc1eda34d..000000000000 --- a/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure -+++ b/configure -@@ -1103,7 +1103,7 @@ - echo $ac_n "checking whether to enable debugging compiler options""... $ac_c" 1>&6 - echo "configure:1105: checking whether to enable debugging compiler options" >&5 - # Check whether --enable-debug or --disable-debug was given. --if test "${enable_debug+set}" = set; then -+if test "${enable_debug+set}" = TODO_THIS_WILL_NEVER_BE_TRUE; then - enableval="$enable_debug" - echo "$ac_t""yes" 1>&6 - tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'` -@@ -1114,7 +1114,7 @@ - #CFLAGS="$CFLAGS -Wcast-align -Wcast-qual -Wnested-externs" - #CFLAGS="$CFLAGS -Wshadow -Wbad-function-cast -Wwrite-strings" - echo "$ac_t""no" 1>&6 -- -+ CFLAGS="$ac_save_CFLAGS" - fi - - diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d index 3a0cc734991c..0c3fb905bd94 100644 --- a/net-analyzer/pmacct/files/pmacctd-init.d +++ b/net-analyzer/pmacct/files/pmacctd-init.d @@ -25,13 +25,17 @@ checkconfig() { start() { checkconfig || return 1 ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --pidfile "${PMACCTDPID}" --exec /usr/sbin/"${SVCNAME}" \ - -- -D -f "${PMACCTDCONF}" -F "${PMACCTDPID}" ${OPTS} + start-stop-daemon --start \ + --pidfile "${PMACCTDPID}" \ + --exec /usr/sbin/"${SVCNAME}" \ + -- -D -f "${PMACCTDCONF}" \ -F "${PMACCTDPID}" ${OPTS} eend $? } stop() { ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --pidfile "${PMACCTDPID}" --exec /usr/sbin/"${SVCNAME}" + start-stop-daemon --stop \ + --pidfile "${PMACCTDPID}" \ + --exec /usr/sbin/"${SVCNAME}" eend $? } diff --git a/net-analyzer/pmacct/pmacct-0.14.3.ebuild b/net-analyzer/pmacct/pmacct-0.14.3.ebuild deleted file mode 100644 index c01735b38e04..000000000000 --- a/net-analyzer/pmacct/pmacct-0.14.3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -SRC_URI="http://www.pmacct.net/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog" - -DEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql ) - sqlite? ( =dev-db/sqlite-3* ) -" -RDEPEND="${DEPEND}" - -DOCS=( - CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch - sed -i \ - -e '/[[:space:]]ar /s|ar |$(AR) |g' \ - $(find . -name Makefile.in) || die -} - -src_configure() { - tc-export CC AR RANLIB - - econf \ - $(use_enable 64bit) \ - $(use_enable debug) \ - $(use_enable geoip) \ - $(use_enable ipv6) \ - $(use_enable mongodb) \ - $(use_enable mysql) \ - $(use_enable postgres pgsql) \ - $(use_enable sqlite sqlite3) \ - $(use_enable threads) \ - $(use_enable ulog) -} - -src_install() { - default - - for dirname in examples sql; do - docinto ${dirname} - dodoc ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pmacct/pmacct-1.5.0.ebuild b/net-analyzer/pmacct/pmacct-1.5.0.ebuild deleted file mode 100644 index 6baf16fc70f1..000000000000 --- a/net-analyzer/pmacct/pmacct-1.5.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -SRC_URI="http://www.pmacct.net/${P/_}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - mongodb? ( - >=dev-libs/mongo-c-driver-0.8.1-r1 -