Overhaul, version bump to 4.5.1.1

5 files changed, 58 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e8eaaf025a4..8798b5aabfea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,28 @@
+# Generated by mksrcinfo v8
+# Sun Apr  7 22:46:25 UTC 2019
 pkgbase = coturn
-	pkgdesc = Free open source implementation of TURN and STUN Server
-	pkgver = 4.5.0.8
+	pkgdesc = Open-source implementation of TURN and STUN server
+	pkgver = 4.5.1.1
 	pkgrel = 1
 	url = https://github.com/coturn/coturn
 	install = turnserver.install
 	arch = i686
 	arch = x86_64
 	arch = armv7h
-	license = custom:New BSD
+	license = BSD
 	depends = libevent
 	depends = postgresql-libs
 	depends = libmariadbclient
 	depends = hiredis
 	depends = sqlite
-	provides = rfc5766-turn-server
-	conflicts = rfc5766-turn-server
+	conflicts = coturn-git
 	backup = etc/turnserver.conf
-	source = http://turnserver.open-sys.org/downloads/v4.5.0.8/turnserver-4.5.0.8.tar.gz
+	source = https://github.com/coturn/coturn/archive/4.5.1.1.tar.gz
 	source = turnserver.service
 	source = turnserver.tmpfiles.d
-	sha256sums = 94a9e67ac7d92c913b5bd8cb6b70ee6e9aa0e9e7cc3c984fc2d8cf381c6edf87
-	sha256sums = 319030c1916d353bfc3375626cc7f60d6eeca762fe4fce354f010212902c49dc
-	sha256sums = fe7ed64dc6844aabdfa00b76134b22d69d9097bd3f77120d704d0ee08c036c21
+	sha512sums = a5e1aecdab5a7060ffbc73cc8dd294cafa701f2e0d2a827e40901cb6001af5a2c5ecbafdf14662410713818aad0ad259133f0dc9b34730bf7911863e1e255f70
+	sha512sums = 7259fd6e28c035f93148604dc74021194b78b4432b633b751fab04e416ee47ac5aa4268bac388a84c3fdb73baf41c41e8b75234ae071a96d1cd0ccea6e58e6ea
+	sha512sums = 16810f12ebf75e744f6eaf12ebbb727823de2cc6ffb77fefbbae2021a1699a4ff6627c6171005d84468f391f1722cd4bd092c01431516d065fb4a557cdc1d50a
 
 pkgname = coturn
 
diff --git a/PKGBUILD b/PKGBUILD
index 71c7c8ed50ca..d6c76d25efb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,63 @@
-# Original Maintainer: Vladimir Tsanev <tsachev@gmail.com>
-# Maintainer: MoeRT09 <https://aur.archlinux.org/account/MoeRT09>
-# Maintainer: jlkon13 <internet@devpi.de>
+# Maintainer: Jean Lucas <jean@4ray.co>
+# Contributor: Vladimir Tsanev <tsachev@gmail.com>
+# Contributor: MoeRT09 <https://aur.archlinux.org/account/MoeRT09>
+# Contributor: jlkon13 <internet@devpi.de>
 
 pkgname=coturn
-_portname=turnserver
-pkgver=4.5.0.8
+pkgver=4.5.1.1
 pkgrel=1
-pkgdesc="Free open source implementation of TURN and STUN Server"
-arch=('i686' 'x86_64' 'armv7h')
-url="https://github.com/coturn/coturn"
-license=('custom:New BSD')
-depends=('libevent' 'postgresql-libs' 'libmariadbclient' 'hiredis' 'sqlite')
-conflicts=('rfc5766-turn-server')
-provides=('rfc5766-turn-server')
-install="$_portname.install"
-backup=("etc/turnserver.conf")
-source=(http://$_portname.open-sys.org/downloads/v$pkgver/$_portname-$pkgver.tar.gz $_portname.service $_portname.tmpfiles.d)
-
-sha256sums=('94a9e67ac7d92c913b5bd8cb6b70ee6e9aa0e9e7cc3c984fc2d8cf381c6edf87'
-            '319030c1916d353bfc3375626cc7f60d6eeca762fe4fce354f010212902c49dc'
-            'fe7ed64dc6844aabdfa00b76134b22d69d9097bd3f77120d704d0ee08c036c21')
+pkgdesc='Open-source implementation of TURN and STUN server'
+arch=(i686 x86_64 armv7h)
+url=https://github.com/coturn/coturn
+license=(BSD)
+depends=(libevent postgresql-libs libmariadbclient hiredis sqlite)
+conflicts=(coturn-git)
+install=turnserver.install
+backup=(etc/turnserver.conf)
+source=($url/archive/$pkgver.tar.gz
+        turnserver.service
+        turnserver.tmpfiles.d)
+sha512sums=('a5e1aecdab5a7060ffbc73cc8dd294cafa701f2e0d2a827e40901cb6001af5a2c5ecbafdf14662410713818aad0ad259133f0dc9b34730bf7911863e1e255f70'
+            '7259fd6e28c035f93148604dc74021194b78b4432b633b751fab04e416ee47ac5aa4268bac388a84c3fdb73baf41c41e8b75234ae071a96d1cd0ccea6e58e6ea'
+            '16810f12ebf75e744f6eaf12ebbb727823de2cc6ffb77fefbbae2021a1699a4ff6627c6171005d84468f391f1722cd4bd092c01431516d065fb4a557cdc1d50a')
 
 build() {
-  cd "$srcdir/$_portname-$pkgver"
-
-  ./configure --prefix=/usr --manprefix=/usr/share --examplesdir="/usr/share/$_portname/examples" --disable-rpath
-
+  cd coturn-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --manprefix=/usr/share \
+    --examplesdir=/usr/share/turnserver/examples \
+    --disable-rpath
   make
 }
 
 check() {
-  cd "$srcdir/$_portname-$pkgver"
-
+  cd coturn-$pkgver
   make check
 }
 
 package() {
-  cd "$srcdir/$_portname-$pkgver"
- 
-  make DESTDIR="$pkgdir" install
+  install -Dm 644 turnserver.service "$pkgdir"/usr/lib/systemd/system/turnserver.service
+  install -Dm 644 turnserver.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/turnserver.conf
 
-  install -D "$pkgdir/usr/share/$_portname/examples/etc/turnserver.conf" "$pkgdir/etc/turnserver.conf"
-  
-  rm -r "$pkgdir/usr/etc"
+  cd coturn-$pkgver
 
-  chmod 644 "$pkgdir/usr/lib/libturnclient.a"
+  make DESTDIR="$pkgdir" install
+  install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/coturn
 
-  install -Dm 644 "../$_portname.service" "$pkgdir/usr/lib/systemd/system/$_portname.service"
+  cd "$pkgdir"
 
-  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  # Create needed directories
+  mkdir -p {etc,var/log/turnserver}
 
+  # Have the config file use more appropriate directories
+  mv {usr/etc/turnserver.conf.default,etc/turnserver.conf}
   sed \
-          -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \
-          -i "$pkgdir/etc/turnserver.conf"
-  sed \
-          -e '/^#pidfile="\/var\/run\/turnserver.pid"$/c pidfile="\/var\/run\/turnserver\/turnserver.pid"' \
-          -i "$pkgdir/etc/turnserver.conf"
+    -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \
+    -e '/^#pidfile="\/var\/run\/turnserver.pid"$/c pidfile=\/var\/run\/turnserver\/turnserver.pid' \
+    -i etc/turnserver.conf
+  rmdir usr/etc
 
-  install -Dm644 "$srcdir/$_portname.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/$_portname.conf"
+  # Remove executable bits from files that erroneously have them
+  find {etc,usr/include,usr/lib,usr/share,var} -type f ! -name '*.sh' ! -name '*.pl' -exec chmod 644 {} +
 }
diff --git a/turnserver.install b/turnserver.install
index 5af408d7d21b..6ad737698e9a 100644
--- a/turnserver.install
+++ b/turnserver.install
@@ -1,14 +1,8 @@
 post_install() {
-
-  id turnserver &>/dev/null || \
-    useradd -r -g daemon -d / -s /usr/bin/nologin turnserver
-
-  install -dm 755 "/var/log/turnserver"
-  chown -R turnserver:daemon /var/log/turnserver
-
+  getent passwd turnserver >/dev/null || useradd -rd / -s /sbin/nologin turnserver
   systemd-tmpfiles --create turnserver.conf
-
-  echo "start server by issuing \"systemctl start turnserver.service\" or calling \"turnserver\""
+  chown -R turnserver:turnserver /var/log/turnserver
+  echo 'Settings are at /etc/turnserver.conf'
 }
 
 post_upgrade() {
diff --git a/turnserver.service b/turnserver.service
index 8e267b2e0b8a..c9866d1b954d 100644
--- a/turnserver.service
+++ b/turnserver.service
@@ -1,10 +1,10 @@
 [Unit]
-Description=STUN and TURN Relay Server for VoIP and WebRTC
+Description=STUN and TURN Relay server for VoIP and WebRTC
 After=network.target
 
 [Service]
-Type=forking
 User=turnserver
+Type=forking
 ExecStart=/usr/bin/turnserver -c /etc/turnserver.conf -o -v
 
 [Install]
diff --git a/turnserver.tmpfiles.d b/turnserver.tmpfiles.d
index ec1a897582b8..bb857488cea2 100644
--- a/turnserver.tmpfiles.d
+++ b/turnserver.tmpfiles.d
@@ -1 +1 @@
-d /run/turnserver 0755 turnserver daemon -
+d /run/turnserver 0755 turnserver turnserver -