aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@gmail.com>2009-06-09 06:25:43 +0000
committerLeonardo Arena <rnalrd@gmail.com>2009-06-09 06:25:43 +0000
commitd5b08cc24bef5dfbbd16a2149c4e517db874be01 (patch)
treea8ff6d9319d422e86836bd88eded0339ecdfd093
parent0eabaf34a77fdd06dbcda6b3792b1f914970653c (diff)
downloadaports-d5b08cc24bef5dfbbd16a2149c4e517db874be01.tar.bz2
aports-d5b08cc24bef5dfbbd16a2149c4e517db874be01.tar.xz
testing/amavisd-new: post-install fixed
-rw-r--r--testing/amavisd-new/APKBUILD8
-rw-r--r--testing/amavisd-new/common_vars8
-rwxr-xr-xtesting/amavisd-new/post-install7
3 files changed, 13 insertions, 10 deletions
diff --git a/testing/amavisd-new/APKBUILD b/testing/amavisd-new/APKBUILD
index 312edfb5ff..3b9562528e 100644
--- a/testing/amavisd-new/APKBUILD
+++ b/testing/amavisd-new/APKBUILD
@@ -17,7 +17,12 @@ source="http://www.ijs.si/software/amavisd/$pkgname-$pkgver.tar.gz"
build() {
cd "$srcdir/$pkgname-$pkgver"
- . ../../common_vars
+ HOME=/var/amavis
+ QUARANTINE=$HOME/quarantine
+ USER=amavis
+ GROUP=amavis
+ DIRS="$HOME $HOME/tmp $HOME/var $HOME/db $HOME/home $QUARANTINE"
+ CONFIG=/etc/amavisd.conf
for dir in $DIRS
do
@@ -36,3 +41,4 @@ build() {
}
md5sums="02b0bd38b40258841c60479603dc6842 amavisd-new-2.6.3.tar.gz"
+
diff --git a/testing/amavisd-new/common_vars b/testing/amavisd-new/common_vars
deleted file mode 100644
index cb52b4351a..0000000000
--- a/testing/amavisd-new/common_vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-HOME=/var/amavis
-QUARANTINE=$HOME/quarantine
-USER=amavis
-GROUP=amavis
-DIRS="$HOME $HOME/tmp $HOME/var $HOME/db $HOME/home $QUARANTINE"
-CONFIG=/etc/amavisd.conf
diff --git a/testing/amavisd-new/post-install b/testing/amavisd-new/post-install
index 310ead353a..56cad39f52 100755
--- a/testing/amavisd-new/post-install
+++ b/testing/amavisd-new/post-install
@@ -1,6 +1,11 @@
#!/bin/sh
-. ../../common_vars
+HOME=/var/amavis
+QUARANTINE=$HOME/quarantine
+USER=amavis
+GROUP=amavis
+DIRS="$HOME $HOME/tmp $HOME/var $HOME/db $HOME/home $QUARANTINE"
+CONFIG=/etc/amavisd.conf
addgroup $USER
adduser -h $HOME -s /bin/false -G $GROUP -D $USER