[ENH] Added systemd, install and tmp files

8 files changed, 115 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac96c34fe710..b4f6bb95bc76 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = kannel
-	pkgdesc = Kannel is a compact and very powerful open source WAP and SMS gateway
+	pkgdesc = Kannel is a compact and very powerful open source WAP and SMS gateway, it comes with extras!
 	pkgver = 1.4.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.kannel.org/
+	install = kannel.install
 	arch = any
 	groups = base-devel
 	license = custom
@@ -12,11 +13,19 @@ pkgbase = kannel
 	source = http://www.kannel.org/download/1.4.4/gateway-1.4.4.tar.gz
 	source = kannel.conf
 	source = modems.conf
-	source = default
+	source = kannel.default
+	source = kannel.tmpfiles
+	source = kannel-bearerbox.service
+	source = kannel-smsbox.service
+	source = kannel-wapbox.service
 	md5sums = 0048dab467931eb8472c31d5e1257401
 	md5sums = 7090740f6f82d8973bf07ba538a3dd80
 	md5sums = 24ae1183521fe871e39f499eed27b93a
 	md5sums = 7575cd21bcd397bcc02a01b57fb4d429
+	md5sums = ed309e56b6fa05e65d8eb70f15bbfee6
+	md5sums = 43c8248224a130e27ca2bad84eca9e42
+	md5sums = 7aedab47cc36958e2848c5c357ffb34b
+	md5sums = e4bac33d1ff8dc6947f5850c6fe3d6b0
 
 pkgname = kannel
 
diff --git a/PKGBUILD b/PKGBUILD
index 3159d5f15805..7e57d19974f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,36 @@
 pkgname=kannel
 PACKAGE=gateway
 pkgver=1.4.4
-pkgrel=1
-pkgdesc="Kannel is a compact and very powerful open source WAP and SMS gateway"
+pkgrel=2
+pkgdesc="Kannel is a compact and very powerful open source WAP and SMS gateway, it comes with extras!"
 arch=('any')
 license=('custom')
 url="https://www.kannel.org/"
+install=kannel.install
 depends=('bison2' 'libxml2')
 conflicts=('bison')
 groups=('base-devel')
-source=(http://www.kannel.org/download/${pkgver}/${PACKAGE}-${pkgver}.tar.gz kannel.conf modems.conf default)
-md5sums=('0048dab467931eb8472c31d5e1257401' '7090740f6f82d8973bf07ba538a3dd80' '24ae1183521fe871e39f499eed27b93a' '7575cd21bcd397bcc02a01b57fb4d429')
+source=(http://www.kannel.org/download/${pkgver}/${PACKAGE}-${pkgver}.tar.gz
+        kannel.conf
+        modems.conf
+        kannel.default
+        kannel.tmpfiles
+        kannel-bearerbox.service
+        kannel-smsbox.service
+        kannel-wapbox.service)
+md5sums=('0048dab467931eb8472c31d5e1257401'
+         '7090740f6f82d8973bf07ba538a3dd80'
+         '24ae1183521fe871e39f499eed27b93a'
+         '7575cd21bcd397bcc02a01b57fb4d429'
+         'ed309e56b6fa05e65d8eb70f15bbfee6'
+         '43c8248224a130e27ca2bad84eca9e42'
+         '7aedab47cc36958e2848c5c357ffb34b'
+         'e4bac33d1ff8dc6947f5850c6fe3d6b0')
 
 build() {
   cd ${srcdir}/${PACKAGE}-${pkgver}  
   ./configure --prefix=/usr/local --mandir=/usr/local/man --enable-start-stop-daemon
-  make all
+  make || return 1
 }
 
 check() {
@@ -28,12 +43,18 @@ check() {
 
 package() {
   cd ${srcdir}
+  install -dm755 $pkgdir/var/log/kannel
+
   install -Dm644 kannel.conf "$pkgdir/etc/kannel/kannel.conf"
   install -Dm644 modems.conf "$pkgdir/etc/kannel/modems.conf"
-  install -Dm644 default "$pkgdir/etc/default/kannel"
+  install -Dm644 kannel.default "$pkgdir/etc/default/kannel"
+  install -Dm644 kannel-bearerbox.service "$pkgdir/usr/lib/systemd/system/kannel-bearerbox.service"
+  install -Dm644 kannel-smsbox.service "$pkgdir/usr/lib/systemd/system/kannel-smsbox.service"
+  install -Dm644 kannel-wapbox.service "$pkgdir/usr/lib/systemd/system/kannel-wapbox.service"
+  install -Dm644 kannel.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/kannel.conf"
 
   cd ${PACKAGE}-${pkgver}
-  make DESTDIR=${pkgdir} install install-test install-checks install-contrib
+  make DESTDIR=${pkgdir} install install-test install-checks install-contrib || return 1
 
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/kannel-bearerbox.service b/kannel-bearerbox.service
new file mode 100644
index 000000000000..1cf106e75f1b
--- /dev/null
+++ b/kannel-bearerbox.service
@@ -0,0 +1,14 @@
+[Unit]
+Description = Kannel Bearerbox
+After = network.target
+
+[Service]
+User = kannel
+PIDFile = /run/kannel/bearerbox.pid
+ExecStart = /usr/local/sbin/start-stop-daemon --start \
+              --pidfile /run/kannel/bearerbox.pid \
+              --exec /usr/local/sbin/bearerbox /etc/kannel/kannel.conf
+
+[Install]
+WantedBy = multi-user.target
+
diff --git a/kannel-smsbox.service b/kannel-smsbox.service
new file mode 100644
index 000000000000..2b4a82a77bdb
--- /dev/null
+++ b/kannel-smsbox.service
@@ -0,0 +1,15 @@
+[Unit]
+Description = Kannel Bearerbox
+Requires=kannel-bearerbox.service
+After = kannel-bearerbox.service
+
+[Service]
+User = kannel
+PIDFile = /run/kannel/smsbox.pid
+ExecStart = /usr/local/sbin/start-stop-daemon --start \
+              --pidfile /run/kannel/smsbox.pid \
+              --exec /usr/local/sbin/smsbox /etc/kannel/kannel.conf
+
+[Install]
+WantedBy = multi-user.target
+
diff --git a/kannel-wapbox.service b/kannel-wapbox.service
new file mode 100644
index 000000000000..16d08f5e892d
--- /dev/null
+++ b/kannel-wapbox.service
@@ -0,0 +1,15 @@
+[Unit]
+Description = Kannel Bearerbox
+Requires=kannel-bearerbox.service
+After = kannel-bearerbox.service
+
+[Service]
+User = kannel
+PIDFile = /run/kannel/wapbox.pid
+ExecStart = /usr/local/sbin/start-stop-daemon --start \
+              --pidfile /run/kannel/wapbox.pid \
+              --exec /usr/local/sbin/wapbox /etc/kannel/kannel.conf
+
+[Install]
+WantedBy = multi-user.target
+
diff --git a/default b/kannel.default
index 87259408a278..87259408a278 100644
--- a/default
+++ b/kannel.default
diff --git a/kannel.install b/kannel.install
new file mode 100644
index 000000000000..caa1be96bd60
--- /dev/null
+++ b/kannel.install
@@ -0,0 +1,30 @@
+# arg 1:  the new package version
+post_install() {
+	getent group kannel >/dev/null 2>&1 || groupadd -r kannel
+	if getent passwd kannel >/dev/null 2>&1; then
+		usermod -d /run/kannel -c 'Kannel Daemon' \
+			-s /sbin/nologin kannel >/dev/null 2>&1
+	else
+		useradd -r -c 'Kannel Daemon' -g kannel \
+			-d /run/kannel -s /sbin/nologin kannel >/dev/null 2>&1
+	fi
+	groupmems -g uucp -a kannel >/dev/null 2>&1
+	passwd -l kannel >/dev/null 2>&1
+	chown root:kannel $pkgdir/var/log/kannel
+	systemd-tmpfiles --create /usr/lib/tmpfiles.d/kannel.conf >/dev/null 2>&1
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+	post_install $1
+	systemctl --system daemon-reload >/dev/null 2>&1
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  killall -q kannel
+	getent passwd kannel >/dev/null 2>&1 && userdel kannel
+	getent group kannel >/dev/null 2>&1 && groupdel kannel
+}
+
diff --git a/kannel.tmpfiles b/kannel.tmpfiles
new file mode 100644
index 000000000000..377bc61d77f7
--- /dev/null
+++ b/kannel.tmpfiles
@@ -0,0 +1 @@
+d /run/kannel 0755 kannel kannel -