diff options
author | Peter Volkov <pva@gentoo.org> | 2009-06-01 09:48:41 +0000 |
---|---|---|
committer | Peter Volkov <pva@gentoo.org> | 2009-06-01 09:48:41 +0000 |
commit | 86549b3561b84f83c788b636b1a6ec924dc4b297 (patch) | |
tree | cb0ca720aaed8c08ef80584f68499652fc347425 /net-analyzer | |
parent | Block zodb wrt #190882, don't remove it unless you fix it. (diff) | |
download | historical-86549b3561b84f83c788b636b1a6ec924dc4b297.tar.gz historical-86549b3561b84f83c788b636b1a6ec924dc4b297.tar.bz2 historical-86549b3561b84f83c788b636b1a6ec924dc4b297.zip |
Remove old. Renamed pmacctd-init.d.1 into pmacctd-init.d
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/pmacct/ChangeLog | 7 | ||||
-rw-r--r-- | net-analyzer/pmacct/Manifest | 11 | ||||
-rw-r--r-- | net-analyzer/pmacct/files/pmacctd-init.d | 13 | ||||
-rw-r--r-- | net-analyzer/pmacct/files/pmacctd-init.d.1 | 29 | ||||
-rw-r--r-- | net-analyzer/pmacct/pmacct-0.11.3.ebuild | 56 | ||||
-rw-r--r-- | net-analyzer/pmacct/pmacct-0.11.4.ebuild | 56 | ||||
-rw-r--r-- | net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild | 4 |
7 files changed, 17 insertions, 159 deletions
diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog index 655f6aaa3221..a62215f71fb3 100644 --- a/net-analyzer/pmacct/ChangeLog +++ b/net-analyzer/pmacct/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/pmacct # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.60 2009/05/30 18:20:13 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.61 2009/06/01 09:48:36 pva Exp $ + + 01 Jun 2009; Peter Volkov <pva@gentoo.org> -pmacct-0.11.3.ebuild, + -pmacct-0.11.4.ebuild, pmacct-0.11.5-r1.ebuild, files/pmacctd-init.d, + -files/pmacctd-init.d.1: + Remove old. Renamed pmacctd-init.d.1 into pmacctd-init.d 30 May 2009; nixnut <nixnut@gentoo.org> pmacct-0.11.5-r1.ebuild: ppc stable #271104 diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index c3dffcac674e..9b496df2f969 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -1,11 +1,6 @@ AUX pmacctd-conf.d 266 RMD160 00d82dca28a19b81653208976df68f69b5609a80 SHA1 7f1dc7f56dc3c5cd143c8120d8f919a5616605a7 SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34 -AUX pmacctd-init.d 658 RMD160 acaae5e5c05408dc49f8f431789c9be9c4b967f8 SHA1 feeaa43694afe3ab6ce10f196892cba822826882 SHA256 41f32bded026e204040a4ba8bf75ed30c564821c67697d6a46a35863fbfbb69b -AUX pmacctd-init.d.1 746 RMD160 5fa0cfaca75a4a5c158dff886e3de7ac6c784882 SHA1 a6ff4af1fb8551a042ff97038f57395412efb825 SHA256 8612da190655a67e385676e38124ef58c6623b446d41beea4f7b2d211c63f2f9 -DIST pmacct-0.11.3.tar.gz 417160 RMD160 b8192ece79b0a1697237700843972bd44f728be0 SHA1 9811465d7820127911df345a94bd7c934d6dad0e SHA256 ff591cb5e1b17ab6f148d10534164307c8f6309b46067bc9be8a32f086a8388d -DIST pmacct-0.11.4.tar.gz 422189 RMD160 ad8aa10f44ade158435ce81e89e57463b8142bb0 SHA1 c74e4db567e87f845f2118e67b189687bd3544c8 SHA256 34c3870eb2acc63173b95c9a08128592b1ee850dd88e0cbdf2f9e0b9fa3f87c9 +AUX pmacctd-init.d 744 RMD160 7c8fb28b0c7cc86c293991e8ec1829e445308bcf SHA1 ce129b23c4c29142bfc699bac8215928e930d096 SHA256 a22eeebab95ea1fea2c518a0d8835894487bf6b80c20d4613688bc8e3958dec8 DIST pmacct-0.11.5.tar.gz 423251 RMD160 4f54c8102bc1a759beddf749667839d420783767 SHA1 f4ca3086153094a1335d059b0aee9015f0079bf9 SHA256 d26b98e8a8cb670222983df46746d860e27beca032b5feff6439c3f3c0aad752 -EBUILD pmacct-0.11.3.ebuild 1579 RMD160 f24d66e42ec0cce5782965972970ac42ffa89839 SHA1 13416e961378a1940abf2eff94457ec440112688 SHA256 960ef9be189063603b2860a6e6af25bb1f7f52c3e5b61482707ee541bdc2f764 -EBUILD pmacct-0.11.4.ebuild 1580 RMD160 121ced8bac939bc6a1efa32139841b660ffb3dd3 SHA1 3659cc59a6bae4bb22aa47a69c7fa3ea5693213c SHA256 481a591acdfcc9e6b580ee90a37314d5385c62ca6e3ff4541de02e86c4e15c5d -EBUILD pmacct-0.11.5-r1.ebuild 1552 RMD160 a846f4f446b0ba1552a0e48ac3db67ecdd7c731f SHA1 3b8b7b7e48945833b014778e7c7ab3ef4e3e05a4 SHA256 2e8e22fa3896cbb286880c80ade5691070bbc959cd24beec994273606c3be770 -MISC ChangeLog 9306 RMD160 0275aefb58fb42c90ebf4c4a2154b6fe61ba6452 SHA1 1cfb2de1bcb11041f6e7fc14303ab14dffb1b801 SHA256 70c9a6e64fbf947fefe7a3fde94573193eb3b7cd2ee7cd774e060ab8512f0430 +EBUILD pmacct-0.11.5-r1.ebuild 1547 RMD160 39f7b97b46a50725f38600d63250082c9d067b9f SHA1 12708e1c5d270049d80bc0de20c3b3545d414b3c SHA256 40b28c62955a0582564e843cbbc6df5f61e2c8d37a8c815cfc8e7f21ee0a28bb +MISC ChangeLog 9530 RMD160 d9a45564a1350282a1db788a6a95884ca76721b7 SHA1 78e4ca175f0a4410c6babd734095a4cd357fd27d SHA256 3af3db5b4fa13a6071b5c4b184b12a74460a2ff2dc7ba272ae22913fdc858146 MISC metadata.xml 321 RMD160 db50b95ceeb1cf11fb46bc79f4088b8a1b114eb3 SHA1 6d3bf2118fc41e53f45dfb5d4d6e09ce4f1e1dee SHA256 082a069e7b8707764fd7e8bd5e42efcc20c88b471d4cdf7ac3aec87d7ecb766a diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d index e24b097c1767..987e9c603a2a 100644 --- a/net-analyzer/pmacct/files/pmacctd-init.d +++ b/net-analyzer/pmacct/files/pmacctd-init.d @@ -1,13 +1,13 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.3 2007/03/28 21:17:57 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.4 2009/06/01 09:48:41 pva Exp $ depend() { need net } -chekconfig() { +checkconfig() { if [ ! -e /etc/pmacctd.conf ] ; then eerror "You need an /etc/pmacctd.conf file to run pmacctd" return 1 @@ -15,16 +15,15 @@ chekconfig() { } start() { - chekconfig || return 1 + checkconfig || return 1 ebegin "Starting pmacctd" - start-stop-daemon --start --exec /usr/sbin/pmacctd \ - -- -D -f /etc/pmacctd.conf ${OPTS} + start-stop-daemon --start --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd \ + -- -D -f /etc/pmacctd.conf -F /var/run/pmacctd.pid ${OPTS} eend $? } stop() { ebegin "Stopping pmacctd" - start-stop-daemon --stop --exec /usr/sbin/pmacctd + start-stop-daemon --stop --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd eend $? } - diff --git a/net-analyzer/pmacct/files/pmacctd-init.d.1 b/net-analyzer/pmacct/files/pmacctd-init.d.1 deleted file mode 100644 index fc75c64a8e9d..000000000000 --- a/net-analyzer/pmacct/files/pmacctd-init.d.1 +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d.1,v 1.1 2008/11/16 16:00:25 pva Exp $ - -depend() { - need net -} - -checkconfig() { - if [ ! -e /etc/pmacctd.conf ] ; then - eerror "You need an /etc/pmacctd.conf file to run pmacctd" - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting pmacctd" - start-stop-daemon --start --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd \ - -- -D -f /etc/pmacctd.conf -F /var/run/pmacctd.pid ${OPTS} - eend $? -} - -stop() { - ebegin "Stopping pmacctd" - start-stop-daemon --stop --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd - eend $? -} diff --git a/net-analyzer/pmacct/pmacct-0.11.3.ebuild b/net-analyzer/pmacct/pmacct-0.11.3.ebuild deleted file mode 100644 index f7d83240c4f4..000000000000 --- a/net-analyzer/pmacct/pmacct-0.11.3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.3.ebuild,v 1.6 2009/05/24 19:11:20 pva Exp $ - -DESCRIPTION="A network tool to gather ip traffic informations" -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 ipv6 mmap mysql postgres sqlite" - -RDEPEND="net-libs/libpcap - mysql? ( virtual/mysql ) - postgres? ( virtual/postgresql-base ) - sqlite? ( =dev-db/sqlite-3* )" -DEPEND="${RDEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i "s|\(CFLAGS=\).*$|\1\"${CFLAGS}\"|g" configure || die "sed failed" -} - -src_compile() { - econf \ - $(use_enable mysql) \ - $(use_enable postgres pgsql) \ - $(use_enable mmap) \ - $(use_enable ipv6) \ - $(use_enable debug) \ - $(use_enable 64bit) \ - $(use_enable sqlite sqlite3) \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc README EXAMPLES KNOWN-BUGS CONFIG-KEYS FAQS ChangeLog docs/SIGNALS \ - docs/PLUGINS docs/INTERNALS TODO TOOLS || die "dodoc failed" - - for dirname in examples sql; do - docinto ${dirname} - dodoc ${dirname}/* || die "dodoc ${dirname} failed" - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd || die "newinitd failed" - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd || die "newconfd failed" - - insinto /etc - newins "${S}"/examples/pmacctd-imt.conf.example pmacctd.conf.example || \ - die "newins failed" -} diff --git a/net-analyzer/pmacct/pmacct-0.11.4.ebuild b/net-analyzer/pmacct/pmacct-0.11.4.ebuild deleted file mode 100644 index 605436ae7e6d..000000000000 --- a/net-analyzer/pmacct/pmacct-0.11.4.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.4.ebuild,v 1.5 2009/05/24 19:11:20 pva Exp $ - -DESCRIPTION="A network tool to gather ip traffic informations" -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 ipv6 mmap mysql postgres sqlite" - -RDEPEND="net-libs/libpcap - mysql? ( virtual/mysql ) - postgres? ( virtual/postgresql-base ) - sqlite? ( =dev-db/sqlite-3* )" -DEPEND="${RDEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i "s|\(CFLAGS=\).*$|\1\"${CFLAGS}\"|g" configure || die "sed failed" -} - -src_compile() { - econf \ - $(use_enable mysql) \ - $(use_enable postgres pgsql) \ - $(use_enable mmap) \ - $(use_enable ipv6) \ - $(use_enable debug) \ - $(use_enable 64bit) \ - $(use_enable sqlite sqlite3) \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc README EXAMPLES KNOWN-BUGS CONFIG-KEYS FAQS ChangeLog docs/SIGNALS \ - docs/PLUGINS docs/INTERNALS TODO TOOLS || die "dodoc failed" - - for dirname in examples sql; do - docinto ${dirname} - dodoc ${dirname}/* || die "dodoc ${dirname} failed" - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd || die "newinitd failed" - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd || die "newconfd failed" - - insinto /etc - newins "${S}"/examples/pmacctd-imt.conf.example pmacctd.conf.example || \ - die "newins failed" -} diff --git a/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild b/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild index 972abd2d9eff..02112eb66528 100644 --- a/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild +++ b/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild,v 1.5 2009/05/30 18:20:13 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild,v 1.6 2009/06/01 09:48:36 pva Exp $ DESCRIPTION="A network tool to gather ip traffic informations" HOMEPAGE="http://www.pmacct.net/" @@ -46,7 +46,7 @@ src_install() { dodoc ${dirname}/* || die "dodoc ${dirname} failed" done - newinitd "${FILESDIR}"/pmacctd-init.d.1 pmacctd || die "newinitd failed" + newinitd "${FILESDIR}"/pmacctd-init.d pmacctd || die "newinitd failed" newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd || die "newconfd failed" insinto /etc |