From cafd5ca6dd4491ae8387e5da0754526dfad30e44 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 21 Jul 2010 11:11:59 +0000
Subject: main/kamailio: fix the pre-install/pre-upgrade to create the kamailio
 group

fixes #388
---
 main/kamailio/APKBUILD              | 8 ++------
 main/kamailio/kamailio.post-install | 5 -----
 main/kamailio/kamailio.pre-install  | 3 ++-
 main/kamailio/kamailio.pre-upgrade  | 1 +
 4 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 main/kamailio/kamailio.post-install
 create mode 120000 main/kamailio/kamailio.pre-upgrade

(limited to 'main/kamailio')

diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 123de89b76..df3fc74ea4 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
 pkgver=3.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -11,14 +11,12 @@ license="GPL"
 depends=
 makedepends="bison flex expat-dev postgresql-dev pcre-dev mysql-dev
 	libxml2-dev curl-dev unixodbc-dev confuse-dev"
-install=
+install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-doc $pkgname-postgres $pkgname-presence $pkgname-pcre
 	$pkgname-mediaproxy $pkgname-unixodbc $pkgname-mysql"
 source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz
 	kamailio.cfg
 	kamailio.initd
-	kamailio.pre-install
-	kamailio.post-install
 	kamailio-3-backslash.patch
 	"
 
@@ -169,6 +167,4 @@ unixodbc() {
 md5sums="dd039e078a77032a423fb15f9685ad31  kamailio-3.0.2_src.tar.gz
 a3c959ec568c43a905710e7d25cd8c25  kamailio.cfg
 81100c479890a2a8c2628db22fdd1a0c  kamailio.initd
-c646af2dd31f5c4289a2f802c873d98f  kamailio.pre-install
-3fbaf633ff1620d0d526fc4047c7bed9  kamailio.post-install
 36f81be3a082a81497e261ac8e6c5414  kamailio-3-backslash.patch"
diff --git a/main/kamailio/kamailio.post-install b/main/kamailio/kamailio.post-install
deleted file mode 100644
index 19fc932dd6..0000000000
--- a/main/kamailio/kamailio.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-chown -R kamailio:kamailio /var/run/kamailio
-chgrp kamailio /etc/kamailio/kamailio.cfg
-exit 0
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index 78dfa38bf3..84b28849aa 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -H -h /var/empty -s /bin/false -D kamailio  2>/dev/null
+addgroup kamailio 2>/dev/null
+adduser -H -h /var/empty -s /bin/false -D -G kamailio kamailio  2>/dev/null
 
 exit 0
diff --git a/main/kamailio/kamailio.pre-upgrade b/main/kamailio/kamailio.pre-upgrade
new file mode 120000
index 0000000000..d7cdaa807a
--- /dev/null
+++ b/main/kamailio/kamailio.pre-upgrade
@@ -0,0 +1 @@
+kamailio.pre-install
\ No newline at end of file
-- 
cgit v1.2.3