summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@gmail.com>2010-10-26 09:13:13 +0000
committerLeonardo Arena <rnalrd@gmail.com>2010-10-26 09:13:28 +0000
commitdc87044005735101346b0403639e36ff605e56ea (patch)
tree4dabadbe9a76f52ddba33548ea52b9cf46f6535a
parent0fd58f14fe348e7bc85dc268899b86e116b9c2dd (diff)
downloadaports-dc87044005735101346b0403639e36ff605e56ea.tar.bz2
aports-dc87044005735101346b0403639e36ff605e56ea.tar.xz
testing/pmacct: post-deinstall added. Default configs fixed
-rw-r--r--testing/pmacct/APKBUILD6
-rwxr-xr-xtesting/pmacct/pmacct.post-deinstall4
-rw-r--r--testing/pmacct/pmacctd.conf2
-rw-r--r--testing/pmacct/sfacctd.conf2
-rw-r--r--testing/pmacct/uacctd.conf2
5 files changed, 7 insertions, 9 deletions
diff --git a/testing/pmacct/APKBUILD b/testing/pmacct/APKBUILD
index 8451198d8..5d86fcee5 100644
--- a/testing/pmacct/APKBUILD
+++ b/testing/pmacct/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Leonardo Arena <rnalrd@gmail.com>
pkgname=pmacct
pkgver=0.12.4
-pkgrel=5
+pkgrel=6
pkgdesc="Measure, account, classify, aggregate and export IPv4 and IPv6 traffic"
url="http://www.pmacct.net/"
license="GPL"
depends=
makedepends="libpcap-dev libpq postgresql-dev"
-install="$pkgname.post-install"
+install="$pkgname.post-install $pkgname.post-deinstall"
subpackages="$pkgname-doc"
source="http://www.pmacct.net/$pkgname-$pkgver.tar.gz
pmacct.initd
@@ -54,4 +54,4 @@ package() {
md5sums="72098ff945e1ddaa77d7f0b3531fa765 pmacct-0.12.4.tar.gz
8ebf022a90bb795e6726fee4065bd386 pmacct.initd
394bf0687572261e90eecd70c33c8ede pmacct.confd
-6ea97965b3fdfceb6b5c0ce2cbf01a92 pmacctd.conf"
+f338fae810340a2df0edae3e7ce800df pmacctd.conf"
diff --git a/testing/pmacct/pmacct.post-deinstall b/testing/pmacct/pmacct.post-deinstall
new file mode 100755
index 000000000..327b1ce74
--- /dev/null
+++ b/testing/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/testing/pmacct/pmacctd.conf b/testing/pmacct/pmacctd.conf
index fe9a64ef0..2d43f75c1 100644
--- a/testing/pmacct/pmacctd.conf
+++ b/testing/pmacct/pmacctd.conf
@@ -1,5 +1,3 @@
-# Sample default config file
-
daemonize: true
pidfile: /var/run/pmacctd.pid
syslog: daemon
diff --git a/testing/pmacct/sfacctd.conf b/testing/pmacct/sfacctd.conf
index fe9a64ef0..2d43f75c1 100644
--- a/testing/pmacct/sfacctd.conf
+++ b/testing/pmacct/sfacctd.conf
@@ -1,5 +1,3 @@
-# Sample default config file
-
daemonize: true
pidfile: /var/run/pmacctd.pid
syslog: daemon
diff --git a/testing/pmacct/uacctd.conf b/testing/pmacct/uacctd.conf
index fe9a64ef0..2d43f75c1 100644
--- a/testing/pmacct/uacctd.conf
+++ b/testing/pmacct/uacctd.conf
@@ -1,5 +1,3 @@
-# Sample default config file
-
daemonize: true
pidfile: /var/run/pmacctd.pid
syslog: daemon