pkgrel v5: new revision

* $backup: list config files
* $groups: remove from base-devel
* build(): change --prefix to '/usr'
* build(): change --sbindir to '/usr/bin'
* kannel.conf: add wapbox related params

6 files changed, 38 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0bfabc4484c6..c57ee72bf7fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = kannel
 	pkgdesc = Kannel is a compact and very powerful open source WAP and SMS gateway, it comes with extras!
 	pkgver = 1.4.5
-	pkgrel = 4
+	pkgrel = 5
 	url = https://kannel.org/
 	install = kannel.install
 	arch = any
-	groups = base-devel
 	license = custom
 	makedepends = mariadb
 	makedepends = postgresql
@@ -17,6 +16,8 @@ pkgbase = kannel
 	optdepends = postgresql: database backend
 	optdepends = sqlite: SQLite3 database backend
 	optdepends = hiredis
+	backup = etc/kannel/kannel.conf
+	backup = etc/kannel/modems.conf
 	source = https://kannel.org/download/1.4.5/gateway-1.4.5.tar.gz
 	source = kannel.conf
 	source = modems.conf
@@ -28,13 +29,13 @@ pkgbase = kannel
 	source = gateway-1.4.5.bison.patch
 	source = 10_fix_multiple_definitions.patch
 	md5sums = b6b5b48edb646e0e0e2ea5378c8ac9ff
-	md5sums = 7090740f6f82d8973bf07ba538a3dd80
+	md5sums = 4ce997cc057720b29a9635d478968fdb
 	md5sums = 24ae1183521fe871e39f499eed27b93a
 	md5sums = 7575cd21bcd397bcc02a01b57fb4d429
 	md5sums = ed309e56b6fa05e65d8eb70f15bbfee6
-	md5sums = 43c8248224a130e27ca2bad84eca9e42
-	md5sums = 7aedab47cc36958e2848c5c357ffb34b
-	md5sums = e4bac33d1ff8dc6947f5850c6fe3d6b0
+	md5sums = 840ce8e0872cbed6cdf4bb23f7fcf8b0
+	md5sums = 80f533ba7042d5ef29685b864601d3ae
+	md5sums = 5b0d139b7a153390598cfc278d80d5ea
 	md5sums = 5adb3c84885e70da557ea083c9dd205c
 	md5sums = 8e013264da946255b7e1040eead7b657
 
diff --git a/PKGBUILD b/PKGBUILD
index 67a600a78653..93e1382ae50a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ DLAGENTS=("https::/usr/bin/curl -k -o %o %u")
 
 pkgname=kannel
 pkgver=1.4.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Kannel is a compact and very powerful open source WAP and SMS gateway, it comes with extras!"
 arch=('any')
 license=('custom')
@@ -19,7 +19,8 @@ optdepends=('mariadb: MySQL database backend'
             'postgresql: database backend'
             'sqlite: SQLite3 database backend'
             'hiredis')
-groups=('base-devel')
+backup=("etc/${pkgname}/kannel.conf"
+        "etc/${pkgname}/modems.conf")
 source=("https://kannel.org/download/${pkgver}/gateway-${pkgver}.tar.gz"
         kannel.conf
         modems.conf
@@ -31,13 +32,13 @@ source=("https://kannel.org/download/${pkgver}/gateway-${pkgver}.tar.gz"
         gateway-${pkgver}.bison.patch
         10_fix_multiple_definitions.patch)
 md5sums=('b6b5b48edb646e0e0e2ea5378c8ac9ff'
-         '7090740f6f82d8973bf07ba538a3dd80'
+         '4ce997cc057720b29a9635d478968fdb'
          '24ae1183521fe871e39f499eed27b93a'
          '7575cd21bcd397bcc02a01b57fb4d429'
          'ed309e56b6fa05e65d8eb70f15bbfee6'
-         '43c8248224a130e27ca2bad84eca9e42'
-         '7aedab47cc36958e2848c5c357ffb34b'
-         'e4bac33d1ff8dc6947f5850c6fe3d6b0'
+         '840ce8e0872cbed6cdf4bb23f7fcf8b0'
+         '80f533ba7042d5ef29685b864601d3ae'
+         '5b0d139b7a153390598cfc278d80d5ea'
          '5adb3c84885e70da557ea083c9dd205c'
          '8e013264da946255b7e1040eead7b657')
 
@@ -50,7 +51,16 @@ prepare()
 
 build() {
   cd ${srcdir}/gateway-${pkgver}
-  ./configure --prefix=/usr/local --mandir=/usr/share/man --enable-start-stop-daemon --with-mysql --with-sqlite3 --with-pgsql --with-redis
+  ./configure \
+      --prefix=/usr \
+      --bindir=/usr/bin \
+      --sbindir=/usr/bin \
+      --mandir=/usr/share/man \
+      --enable-start-stop-daemon \
+      --with-mysql \
+      --with-sqlite3 \
+      --with-pgsql \
+      --with-redis
   make libgw.a
   make libgwlib.a
   make
diff --git a/kannel-bearerbox.service b/kannel-bearerbox.service
index 1cf106e75f1b..e043d9a12914 100644
--- a/kannel-bearerbox.service
+++ b/kannel-bearerbox.service
@@ -5,9 +5,9 @@ After = network.target
 [Service]
 User = kannel
 PIDFile = /run/kannel/bearerbox.pid
-ExecStart = /usr/local/sbin/start-stop-daemon --start \
+ExecStart = /usr/bin/start-stop-daemon --start \
               --pidfile /run/kannel/bearerbox.pid \
-              --exec /usr/local/sbin/bearerbox /etc/kannel/kannel.conf
+              --exec /usr/bin/bearerbox /etc/kannel/kannel.conf
 
 [Install]
 WantedBy = multi-user.target
diff --git a/kannel-smsbox.service b/kannel-smsbox.service
index 2b4a82a77bdb..bbfa7e35fa9b 100644
--- a/kannel-smsbox.service
+++ b/kannel-smsbox.service
@@ -6,9 +6,9 @@ After = kannel-bearerbox.service
 [Service]
 User = kannel
 PIDFile = /run/kannel/smsbox.pid
-ExecStart = /usr/local/sbin/start-stop-daemon --start \
+ExecStart = /usr/bin/start-stop-daemon --start \
               --pidfile /run/kannel/smsbox.pid \
-              --exec /usr/local/sbin/smsbox /etc/kannel/kannel.conf
+              --exec /usr/bin/smsbox /etc/kannel/kannel.conf
 
 [Install]
 WantedBy = multi-user.target
diff --git a/kannel-wapbox.service b/kannel-wapbox.service
index 16d08f5e892d..15426f5fef9c 100644
--- a/kannel-wapbox.service
+++ b/kannel-wapbox.service
@@ -6,9 +6,9 @@ After = kannel-bearerbox.service
 [Service]
 User = kannel
 PIDFile = /run/kannel/wapbox.pid
-ExecStart = /usr/local/sbin/start-stop-daemon --start \
+ExecStart = /usr/bin/start-stop-daemon --start \
               --pidfile /run/kannel/wapbox.pid \
-              --exec /usr/local/sbin/wapbox /etc/kannel/kannel.conf
+              --exec /usr/bin/wapbox /etc/kannel/kannel.conf
 
 [Install]
 WantedBy = multi-user.target
diff --git a/kannel.conf b/kannel.conf
index 57d325179f75..a5fc7a4e5599 100644
--- a/kannel.conf
+++ b/kannel.conf
@@ -22,6 +22,8 @@ include = "/etc/kannel/modems.conf"
 group = core
 admin-port = 13000
 smsbox-port = 13001
+wapbox-port = 13002
+wdp-interface-name = "0.0.0.0"
 admin-password = password
 status-password = password
 admin-deny-ip = "*.*.*.*"
@@ -123,3 +125,9 @@ accepted-smsc = usb0-modem
 # don't send a reply here (it'll come through sendsms):
 max-messages = 0
 get-url = http://127.0.0.1:8000/backend/kannel-usb0-smsc/?id=%p&text=%a&charset=%C&coding=%c
+
+#---------------------------------------------
+# WAPBOX SETUP
+
+group = wapbox
+bearerbox-host = 127.0.0.1