From efdbbf4ea3e925c7f3f4e9730f43ec17e0da1f68 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Tue, 28 Apr 2015 20:33:08 +0200 Subject: main/pmacct: move to unmaintained deprecated ipt_ULOG.h header --- main/pmacct/APKBUILD | 82 ------------------------------- main/pmacct/nfacctd.conf | 11 ----- main/pmacct/pmacct.confd | 7 --- main/pmacct/pmacct.initd | 30 ----------- main/pmacct/pmacct.post-deinstall | 4 -- main/pmacct/pmacct.post-install | 4 -- main/pmacct/pmacctd.conf | 11 ----- main/pmacct/sfacctd.conf | 9 ---- main/pmacct/uacctd.conf | 9 ---- unmaintained/pmacct/APKBUILD | 82 +++++++++++++++++++++++++++++++ unmaintained/pmacct/nfacctd.conf | 11 +++++ unmaintained/pmacct/pmacct.confd | 7 +++ unmaintained/pmacct/pmacct.initd | 30 +++++++++++ unmaintained/pmacct/pmacct.post-deinstall | 4 ++ unmaintained/pmacct/pmacct.post-install | 4 ++ unmaintained/pmacct/pmacctd.conf | 11 +++++ unmaintained/pmacct/sfacctd.conf | 9 ++++ unmaintained/pmacct/uacctd.conf | 9 ++++ 18 files changed, 167 insertions(+), 167 deletions(-) delete mode 100644 main/pmacct/APKBUILD delete mode 100644 main/pmacct/nfacctd.conf delete mode 100644 main/pmacct/pmacct.confd delete mode 100644 main/pmacct/pmacct.initd delete mode 100755 main/pmacct/pmacct.post-deinstall delete mode 100644 main/pmacct/pmacct.post-install delete mode 100644 main/pmacct/pmacctd.conf delete mode 100644 main/pmacct/sfacctd.conf delete mode 100644 main/pmacct/uacctd.conf create mode 100644 unmaintained/pmacct/APKBUILD create mode 100644 unmaintained/pmacct/nfacctd.conf create mode 100644 unmaintained/pmacct/pmacct.confd create mode 100644 unmaintained/pmacct/pmacct.initd create mode 100755 unmaintained/pmacct/pmacct.post-deinstall create mode 100644 unmaintained/pmacct/pmacct.post-install create mode 100644 unmaintained/pmacct/pmacctd.conf create mode 100644 unmaintained/pmacct/sfacctd.conf create mode 100644 unmaintained/pmacct/uacctd.conf diff --git a/main/pmacct/APKBUILD b/main/pmacct/APKBUILD deleted file mode 100644 index f3a0623d8..000000000 --- a/main/pmacct/APKBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# Maintainer: Leonardo Arena -pkgname=pmacct -pkgver=0.14.1 -pkgrel=1 -pkgdesc="Measure, account, classify, aggregate and export IPv4 and IPv6 traffic" -url="http://www.pmacct.net/" -arch="all" -license="GPL" -depends= -makedepends="libpcap-dev libpq postgresql-dev zlib-dev" -install="$pkgname.post-install $pkgname.post-deinstall" -subpackages="$pkgname-doc" -source="http://www.pmacct.net/$pkgname-$pkgver.tar.gz - pmacct.initd - pmacct.confd - pmacctd.conf - sfacctd.conf - nfacctd.conf - uacctd.conf" - -_builddir="$srcdir"/$pkgname-$pkgver - -#prepare() { -# cd "$_builddir" -# apply patches here -#} - -build() { - cd "$_builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --enable-pgsql \ - --enable-64bit \ - --enable-threads \ - --enable-ulog \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install - - install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/pmacctd - install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/pmacctd - install -m644 -D "$srcdir"/pmacctd.conf "$pkgdir"/etc/pmacctd.conf - install -m644 -D "$srcdir"/nfacctd.conf "$pkgdir"/etc/nfacctd.conf - install -m644 -D "$srcdir"/sfacctd.conf "$pkgdir"/etc/sfacctd.conf - install -m644 -D "$srcdir"/uacctd.conf "$pkgdir"/etc/uacctd.conf - mkdir -p $pkgdir/usr/share/doc/pmacct/examples - mkdir -p $pkgdir/usr/share/doc/pmacct/sql - cp examples/* $pkgdir/usr/share/doc/pmacct/examples - cp sql/README.* $pkgdir/usr/share/doc/pmacct - cp sql/* $pkgdir/usr/share/doc/pmacct/sql -} - -md5sums="a1a9805af114df913470933873bba594 pmacct-0.14.1.tar.gz -48ca9df1fce583936fc1e6d80bd0f0c3 pmacct.initd -394bf0687572261e90eecd70c33c8ede pmacct.confd -ecb85e4f9bcb1f6ef0ee1426f979be2b pmacctd.conf -7a549e51959946805a0c1d094213f08c sfacctd.conf -a3b1c231911f9bab7bfa73dbbcb308eb nfacctd.conf -7a549e51959946805a0c1d094213f08c uacctd.conf" -sha256sums="048f5747c2caa1085f1cd9442668b9edc98a40688b7696d1ad6f1e16c5a6d206 pmacct-0.14.1.tar.gz -fe0ec3d26a0da0e07112e2dce85b921c188c974f5b4a22f623bdcf2f91fa3a0b pmacct.initd -02c3e0d5a19503d4be63244c77cbc47961d6f168026527ec2910c6c201a5d8fd pmacct.confd -616bf24f769a0d262a793adb4603e08fe2234f1cccc2bc0b7fabf565cf22e138 pmacctd.conf -3cbdea18c609bb4822992ec79b34987b6fc9044550823ebbb349c44af7d8503e sfacctd.conf -e21121a857bb16e76d8af087e5a2d2b1c555ac5f16808d8b7a01377f7d18accc nfacctd.conf -3cbdea18c609bb4822992ec79b34987b6fc9044550823ebbb349c44af7d8503e uacctd.conf" -sha512sums="0c13a2a2faab0fda1ba3b9218ea1f5d33de2581abb16916fa95ad80a05758e65b9bd2c19fa54bf1f59e62f8c769c9b0dedcbc505bcc4eb8fc79df12806b013a2 pmacct-0.14.1.tar.gz -b109f2d64c83d6749a8c81784204e54a68ec7bbc146242f02e1fa7061647acc887921cdbf90a5ecc81186a87a5b4a5175a3b5e25f92e51b5dd1426fb390ef754 pmacct.initd -6078607dde8619f8fa5698f217c40a7e46ed85843923abecc87652d2e9df6db677898ee1965367247e6ac838d907533a8b1c7ab0515f3f2dc6f3fd4eb14bd5be pmacct.confd -fa1ead3ee4374ad84cccc0e7043fc86e95da555e2bde3815f03953587f03a609ec3aea227ebf85c9636e071921c5b094359d71d15055f866c05e113cda3b347b pmacctd.conf -b0547fa413108087aacff490fa9f9aa5c9114acb82f40903a8150a47ffdb72765c52ce708c2feaa6fd225469ee8b7a4f1bfa3e48e512f6e8ffecb83d483cdec4 sfacctd.conf -acb3c869f3e553ba10ab76e302e37f47391b4ddf1b2531ca00017b843750d7224a67a85516acc94c1016759ecf0fb874103d913e599672a5c279345067f40d45 nfacctd.conf -b0547fa413108087aacff490fa9f9aa5c9114acb82f40903a8150a47ffdb72765c52ce708c2feaa6fd225469ee8b7a4f1bfa3e48e512f6e8ffecb83d483cdec4 uacctd.conf" diff --git a/main/pmacct/nfacctd.conf b/main/pmacct/nfacctd.conf deleted file mode 100644 index 47397d907..000000000 --- a/main/pmacct/nfacctd.conf +++ /dev/null @@ -1,11 +0,0 @@ -! Sample default config file - -daemonize: true -pidfile: /var/run/pmacctd.pid -syslog: daemon - -! sql_host: localhost -! sql_passwd:pmacct -! sql_table_version: 7 - -! plugins: pgsql diff --git a/main/pmacct/pmacct.confd b/main/pmacct/pmacct.confd deleted file mode 100644 index c6557c807..000000000 --- a/main/pmacct/pmacct.confd +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-analyzer/pmacct/files/pmacctd-conf.d,v 1.3 2007/03/28 21:17:57 cedk Exp $ - -# Other options to pass to pmacctd -#OPTS="" - diff --git a/main/pmacct/pmacct.initd b/main/pmacct/pmacct.initd deleted file mode 100644 index d7cf09210..000000000 --- a/main/pmacct/pmacct.initd +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-analyzer/pmacct/files/$SVCNAME-init.d,v 1.4 2009/06/01 09:48:41 pva Exp $ - -depend() { - need net - after firewall -} - -checkconfig() { - if [ ! -e /etc/$SVCNAME.conf ] ; then - eerror "You need an /etc/$SVCNAME.conf file to run $SVCNAME" - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting $SVCNAME" - start-stop-daemon --start --pidfile /var/run/$SVCNAME.pid --exec /usr/sbin/$SVCNAME \ - -- -D -f /etc/$SVCNAME.conf -F /var/run/$SVCNAME.pid ${OPTS} - eend $? -} - -stop() { - ebegin "Stopping $SVCNAME" - start-stop-daemon --stop --pidfile /var/run/$SVCNAME.pid --exec /usr/sbin/$SVCNAME - eend $? -} diff --git a/main/pmacct/pmacct.post-deinstall b/main/pmacct/pmacct.post-deinstall deleted file mode 100755 index 327b1ce74..000000000 --- a/main/pmacct/pmacct.post-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -rm /etc/init.d/nfacctd &>/dev/null -rm /etc/init.d/sfacctd &>/dev/null -rm /etc/init.d/uacctd &>/dev/null diff --git a/main/pmacct/pmacct.post-install b/main/pmacct/pmacct.post-install deleted file mode 100644 index 9fd02c4b1..000000000 --- a/main/pmacct/pmacct.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -ln -s /etc/init.d/pmacctd /etc/init.d/nfacctd &>/dev/null -ln -s /etc/init.d/pmacctd /etc/init.d/sfacctd &>/dev/null -ln -s /etc/init.d/pmacctd /etc/init.d/uacctd &>/dev/null diff --git a/main/pmacct/pmacctd.conf b/main/pmacct/pmacctd.conf deleted file mode 100644 index d64189ede..000000000 --- a/main/pmacct/pmacctd.conf +++ /dev/null @@ -1,11 +0,0 @@ -! Sample configuration file - -daemonize: true -pidfile: /var/run/pmacctd.pid -syslog: daemon - -! sql_host: localhost -! sql_passwd:pmacct -! sql_table_version: 7 - -! plugins: pgsql diff --git a/main/pmacct/sfacctd.conf b/main/pmacct/sfacctd.conf deleted file mode 100644 index d175e3113..000000000 --- a/main/pmacct/sfacctd.conf +++ /dev/null @@ -1,9 +0,0 @@ -daemonize: true -pidfile: /var/run/pmacctd.pid -syslog: daemon - -! sql_host: localhost -! sql_passwd:pmacct -! sql_table_version: 7 - -! plugins: pgsql diff --git a/main/pmacct/uacctd.conf b/main/pmacct/uacctd.conf deleted file mode 100644 index d175e3113..000000000 --- a/main/pmacct/uacctd.conf +++ /dev/null @@ -1,9 +0,0 @@ -daemonize: true -pidfile: /var/run/pmacctd.pid -syslog: daemon - -! sql_host: localhost -! sql_passwd:pmacct -! sql_table_version: 7 - -! plugins: pgsql diff --git a/unmaintained/pmacct/APKBUILD b/unmaintained/pmacct/APKBUILD new file mode 100644 index 000000000..f3a0623d8 --- /dev/null +++ b/unmaintained/pmacct/APKBUILD @@ -0,0 +1,82 @@ +# Maintainer: Leonardo Arena +pkgname=pmacct +pkgver=0.14.1 +pkgrel=1 +pkgdesc="Measure, account, classify, aggregate and export IPv4 and IPv6 traffic" +url="http://www.pmacct.net/" +arch="all" +license="GPL" +depends= +makedepends="libpcap-dev libpq postgresql-dev zlib-dev" +install="$pkgname.post-install $pkgname.post-deinstall" +subpackages="$pkgname-doc" +source="http://www.pmacct.net/$pkgname-$pkgver.tar.gz + pmacct.initd + pmacct.confd + pmacctd.conf + sfacctd.conf + nfacctd.conf + uacctd.conf" + +_builddir="$srcdir"/$pkgname-$pkgver + +#prepare() { +# cd "$_builddir" +# apply patches here +#} + +build() { + cd "$_builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-pgsql \ + --enable-64bit \ + --enable-threads \ + --enable-ulog \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make -j1 DESTDIR="$pkgdir" install + + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/pmacctd + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/pmacctd + install -m644 -D "$srcdir"/pmacctd.conf "$pkgdir"/etc/pmacctd.conf + install -m644 -D "$srcdir"/nfacctd.conf "$pkgdir"/etc/nfacctd.conf + install -m644 -D "$srcdir"/sfacctd.conf "$pkgdir"/etc/sfacctd.conf + install -m644 -D "$srcdir"/uacctd.conf "$pkgdir"/etc/uacctd.conf + mkdir -p $pkgdir/usr/share/doc/pmacct/examples + mkdir -p $pkgdir/usr/share/doc/pmacct/sql + cp examples/* $pkgdir/usr/share/doc/pmacct/examples + cp sql/README.* $pkgdir/usr/share/doc/pmacct + cp sql/* $pkgdir/usr/share/doc/pmacct/sql +} + +md5sums="a1a9805af114df913470933873bba594 pmacct-0.14.1.tar.gz +48ca9df1fce583936fc1e6d80bd0f0c3 pmacct.initd +394bf0687572261e90eecd70c33c8ede pmacct.confd +ecb85e4f9bcb1f6ef0ee1426f979be2b pmacctd.conf +7a549e51959946805a0c1d094213f08c sfacctd.conf +a3b1c231911f9bab7bfa73dbbcb308eb nfacctd.conf +7a549e51959946805a0c1d094213f08c uacctd.conf" +sha256sums="048f5747c2caa1085f1cd9442668b9edc98a40688b7696d1ad6f1e16c5a6d206 pmacct-0.14.1.tar.gz +fe0ec3d26a0da0e07112e2dce85b921c188c974f5b4a22f623bdcf2f91fa3a0b pmacct.initd +02c3e0d5a19503d4be63244c77cbc47961d6f168026527ec2910c6c201a5d8fd pmacct.confd +616bf24f769a0d262a793adb4603e08fe2234f1cccc2bc0b7fabf565cf22e138 pmacctd.conf +3cbdea18c609bb4822992ec79b34987b6fc9044550823ebbb349c44af7d8503e sfacctd.conf +e21121a857bb16e76d8af087e5a2d2b1c555ac5f16808d8b7a01377f7d18accc nfacctd.conf +3cbdea18c609bb4822992ec79b34987b6fc9044550823ebbb349c44af7d8503e uacctd.conf" +sha512sums="0c13a2a2faab0fda1ba3b9218ea1f5d33de2581abb16916fa95ad80a05758e65b9bd2c19fa54bf1f59e62f8c769c9b0dedcbc505bcc4eb8fc79df12806b013a2 pmacct-0.14.1.tar.gz +b109f2d64c83d6749a8c81784204e54a68ec7bbc146242f02e1fa7061647acc887921cdbf90a5ecc81186a87a5b4a5175a3b5e25f92e51b5dd1426fb390ef754 pmacct.initd +6078607dde8619f8fa5698f217c40a7e46ed85843923abecc87652d2e9df6db677898ee1965367247e6ac838d907533a8b1c7ab0515f3f2dc6f3fd4eb14bd5be pmacct.confd +fa1ead3ee4374ad84cccc0e7043fc86e95da555e2bde3815f03953587f03a609ec3aea227ebf85c9636e071921c5b094359d71d15055f866c05e113cda3b347b pmacctd.conf +b0547fa413108087aacff490fa9f9aa5c9114acb82f40903a8150a47ffdb72765c52ce708c2feaa6fd225469ee8b7a4f1bfa3e48e512f6e8ffecb83d483cdec4 sfacctd.conf +acb3c869f3e553ba10ab76e302e37f47391b4ddf1b2531ca00017b843750d7224a67a85516acc94c1016759ecf0fb874103d913e599672a5c279345067f40d45 nfacctd.conf +b0547fa413108087aacff490fa9f9aa5c9114acb82f40903a8150a47ffdb72765c52ce708c2feaa6fd225469ee8b7a4f1bfa3e48e512f6e8ffecb83d483cdec4 uacctd.conf" diff --git a/unmaintained/pmacct/nfacctd.conf b/unmaintained/pmacct/nfacctd.conf new file mode 100644 index 000000000..47397d907 --- /dev/null +++ b/unmaintained/pmacct/nfacctd.conf @@ -0,0 +1,11 @@ +! Sample default config file + +daemonize: true +pidfile: /var/run/pmacctd.pid +syslog: daemon + +! sql_host: localhost +! sql_passwd:pmacct +! sql_table_version: 7 + +! plugins: pgsql diff --git a/unmaintained/pmacct/pmacct.confd b/unmaintained/pmacct/pmacct.confd new file mode 100644 index 000000000..c6557c807 --- /dev/null +++ b/unmaintained/pmacct/pmacct.confd @@ -0,0 +1,7 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-analyzer/pmacct/files/pmacctd-conf.d,v 1.3 2007/03/28 21:17:57 cedk Exp $ + +# Other options to pass to pmacctd +#OPTS="" + diff --git a/unmaintained/pmacct/pmacct.initd b/unmaintained/pmacct/pmacct.initd new file mode 100644 index 000000000..d7cf09210 --- /dev/null +++ b/unmaintained/pmacct/pmacct.initd @@ -0,0 +1,30 @@ +#!/sbin/openrc-run +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-analyzer/pmacct/files/$SVCNAME-init.d,v 1.4 2009/06/01 09:48:41 pva Exp $ + +depend() { + need net + after firewall +} + +checkconfig() { + if [ ! -e /etc/$SVCNAME.conf ] ; then + eerror "You need an /etc/$SVCNAME.conf file to run $SVCNAME" + return 1 + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting $SVCNAME" + start-stop-daemon --start --pidfile /var/run/$SVCNAME.pid --exec /usr/sbin/$SVCNAME \ + -- -D -f /etc/$SVCNAME.conf -F /var/run/$SVCNAME.pid ${OPTS} + eend $? +} + +stop() { + ebegin "Stopping $SVCNAME" + start-stop-daemon --stop --pidfile /var/run/$SVCNAME.pid --exec /usr/sbin/$SVCNAME + eend $? +} diff --git a/unmaintained/pmacct/pmacct.post-deinstall b/unmaintained/pmacct/pmacct.post-deinstall new file mode 100755 index 000000000..327b1ce74 --- /dev/null +++ b/unmaintained/pmacct/pmacct.post-deinstall @@ -0,0 +1,4 @@ +#!/bin/sh +rm /etc/init.d/nfacctd &>/dev/null +rm /etc/init.d/sfacctd &>/dev/null +rm /etc/init.d/uacctd &>/dev/null diff --git a/unmaintained/pmacct/pmacct.post-install b/unmaintained/pmacct/pmacct.post-install new file mode 100644 index 000000000..9fd02c4b1 --- /dev/null +++ b/unmaintained/pmacct/pmacct.post-install @@ -0,0 +1,4 @@ +#!/bin/sh +ln -s /etc/init.d/pmacctd /etc/init.d/nfacctd &>/dev/null +ln -s /etc/init.d/pmacctd /etc/init.d/sfacctd &>/dev/null +ln -s /etc/init.d/pmacctd /etc/init.d/uacctd &>/dev/null diff --git a/unmaintained/pmacct/pmacctd.conf b/unmaintained/pmacct/pmacctd.conf new file mode 100644 index 000000000..d64189ede --- /dev/null +++ b/unmaintained/pmacct/pmacctd.conf @@ -0,0 +1,11 @@ +! Sample configuration file + +daemonize: true +pidfile: /var/run/pmacctd.pid +syslog: daemon + +! sql_host: localhost +! sql_passwd:pmacct +! sql_table_version: 7 + +! plugins: pgsql diff --git a/unmaintained/pmacct/sfacctd.conf b/unmaintained/pmacct/sfacctd.conf new file mode 100644 index 000000000..d175e3113 --- /dev/null +++ b/unmaintained/pmacct/sfacctd.conf @@ -0,0 +1,9 @@ +daemonize: true +pidfile: /var/run/pmacctd.pid +syslog: daemon + +! sql_host: localhost +! sql_passwd:pmacct +! sql_table_version: 7 + +! plugins: pgsql diff --git a/unmaintained/pmacct/uacctd.conf b/unmaintained/pmacct/uacctd.conf new file mode 100644 index 000000000..d175e3113 --- /dev/null +++ b/unmaintained/pmacct/uacctd.conf @@ -0,0 +1,9 @@ +daemonize: true +pidfile: /var/run/pmacctd.pid +syslog: daemon + +! sql_host: localhost +! sql_passwd:pmacct +! sql_table_version: 7 + +! plugins: pgsql -- cgit v1.2.3