update pcr/rfc5766-turn-server

7 files changed, 147 insertions, 59 deletions

diff --git a/pcr/rfc5766-turn-server/ChangeLog b/pcr/rfc5766-turn-server/ChangeLog
index 5accefa5b..fd52b6d89 100644
--- a/pcr/rfc5766-turn-server/ChangeLog
+++ b/pcr/rfc5766-turn-server/ChangeLog
@@ -1,5 +1,89 @@
+2014-02-24 Vladimir Tsanev <tsachev@gmail.com>
+    * 3.2.2.8-1 :
+    New upstream release.
+2014-02-18 Vladimir Tsanev <tsachev@gmail.com>
+    * 3.2.2.7-1 :
+    New upstream release.
+
+2014-02-12 Vladimir Tsanev <tsachev@gmail.com>
+    * 3.2.2.6-1 :
+    New upstream release.
+
+2014-02-04 Vladimir Tsanev <tsachev@gmail.com>
+    * 3.2.2.5-1 :
+    New upstream release and PKGBUILD cleanup.
+
+2014-01-31 Vladimir Tsanev <tsachev@gmail.com>
+    * 3.2.2.4-1 :
+    New upstream release. New download site.
+
+2013-12-11 Vladimir Tsanev <tsachev@gamil.com>
+    * 3.1.2.2-1 :
+    New upstream release.
+
+2013-11-23 Vladimir Tsanev <tsachev@gamil.com>
+    * 3.0.0.0-1 :
+    New upstream release.
+
+2013-10-22 Vladimir Tsanev <tsachev@gamil.com>
+    * 2.6.6.0-1 :
+    New upstream release. --disable-rpath flag added to configure
+
+2013-10-16 Vladimir Tsanev <tsachev@gamil.com>
+    * 2.6.5.2-1 :
+    New upstream release.
+
+2013-09-07 Vladimir Tsanev <tsachev@gamil.com>
+    * 2.6.2.1-1 :
+    New upstream release.
+    Trivial PKGBUILD fixes.
+
+2013-08-09 Vladimir Tsanev <tsachev@gamil.com>
+    * 2.6.1.4-1 :
+    New upstream release.
+
+2013-08-09 Vladimir Tsanev <tsachev@gamil.com>
+    * 2.6.1.1-1 :
+    New upstream release.
+
+2013-07-19 Vladimir Tsanev <tsachev@gamil.com>
+    * 2.5.1.2-1 :
+    New upstream release.
+
+2013-07-19 Vladimir Tsanev <tsachev@gamil.com>
+    * 2.1.1.1-1 :
+    New upstream release.
+
+2013-07-16 Vladimir Tsanev <tsachev@gamil.com>
+    * 2.0.0.0-1 :
+    New upstream release.
+
+2013-06-24 Vladimir Tsanev <tsachev@gamil.com>
+    * 1.8.7.0-2 :
+    More packaging cleanup.
+
+    * 1.8.7.0-1 :
+    New upstream release and package cleanup.
+
+2013-06-12 Vladimir Tsanev <tsachev@gamil.com>
+    
+    * 1.8.6.3-1 :
+    Upstream release.
+
+2013-06-07 Vladimir Tsanev <tsachev@gamil.com>
+    
+    * 1.8.6.1-3 :
+    'postgresql-libs' 'libmysqlclient' and 'hiredis' cannot be optional.
+
+2013-06-06 Vladimir Tsanev <tsachev@gamil.com>
+    
+    * 1.8.6.1-2 :
+    Added systemd service. Fixed redis support.
+
+    * 1.8.6.1-1 :
+    New upstream release.
+
 2013-06-05 Vladimir Tsanev <tsachev@gamil.com>
     
     * 1.8.6.0-1 :
     Initial package created.
-
diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD
index c070ad309..fc14b4a76 100644
--- a/pcr/rfc5766-turn-server/PKGBUILD
+++ b/pcr/rfc5766-turn-server/PKGBUILD
@@ -1,64 +1,59 @@
-# Maintainer: Vladimir Tsanev <tsachev@gmail.com>
+# Maintainer: orphan
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Michał Masłowski <mtjm@mtjm.eu>
+# Maintainer (AUR): Vladimir Tsanev <tsachev@gmail.com>
 
 pkgname=rfc5766-turn-server
 _portname=turnserver
-pkgver=2.6.2.1
+pkgver=3.2.2.8
 pkgrel=1
 pkgdesc="STUN and TURN Relay Server for VoIP and WebRTC"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/rfc5766-turn-server/"
-license=('custom:BSDNew')
+license=('BSD3')
 depends=('libevent' 'postgresql-libs' 'libmysqlclient' 'hiredis')
-optdepends=('postgresql-client: to use postgresql'
-            'mariadb: mariadb backend'
-            'redis: redis backend')
+install="$_portname.install"
 backup=("etc/turnserver.conf" "etc/turnuserdb.conf")
-changelog=ChangeLog
-source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz
-        turn.service stun.service)
+changelog='ChangeLog'
+source=(http://$_portname.open-sys.org/downloads/v$pkgver/$_portname-$pkgver.tar.gz $_portname.service $_portname.tmpfiles.d)
+md5sums=('c16ff9ced1ba0797fbd16a66161dca2c'
+         'bf568b614a17ee439e831b8f8aa7236a'
+         'aa7bf422a9dfba7febb56dc172feb1cf')
+sha1sums=('0faa1514f6819827f3ad0cffe2dc7bc6eef257cc'
+          '0c5b348e793bd52ce0ee38d420b26c9b2a2e2ca5'
+          '445e9982549d7ed018bc1fb6176a730313ae3d26')
 
 build() {
-  cd "${srcdir}/$_portname-${pkgver}"
-  
-  ./configure --prefix=/usr \
-              --manprefix=/usr/share \
-              --examplesdir="/usr/share/$_portname/examples"
+  cd "$srcdir/$_portname-$pkgver"
 
+  ./configure --prefix=/usr --manprefix=/usr/share --examplesdir="/usr/share/$_portname/examples" --disable-rpath
   make
 }
 
 check() {
-  cd "${srcdir}/$_portname-${pkgver}"
+  cd "$srcdir/$_portname-$pkgver"
   make check
 }
 
 package() {
-  cd "${srcdir}/$_portname-${pkgver}"
+  cd "$srcdir/$_portname-$pkgver"
   make DESTDIR="$pkgdir" install
   
-  
-  install -D "$pkgdir/usr/share/$_portname/examples/etc/turnserver.conf" \
-             "$pkgdir/etc/turnserver.conf"
-  install -D "$pkgdir/usr/share/$_portname/examples/etc/turnuserdb.conf" \
-             "$pkgdir/etc/turnuserdb.conf"
-  install -D "$srcdir/stun.service" \
-             "$pkgdir/usr/lib/systemd/system/stun.service"
-  install -D "$srcdir/turn.service" \
-             "$pkgdir/usr/lib/systemd/system/turn.service"
-  rm -r "$pkgdir/usr/etc"
-
   chmod 644 "$pkgdir/usr/lib/libturnclient.a"
 
-  install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-  install -dm 755 "$pkgdir/var/log/$_portname"
+  mv "$pkgdir/usr/etc" "$pkgdir/etc"
+  local file
+  for file in "$pkgdir/etc"/*.default; do
+    mv "$file" "${file%.default}"
+    chmod 644 "${file%.default}"
+  done
+  sed -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 "$pkgdir/etc/turnserver.conf"
+
+  install -Dm644 "../$_portname.service"    "$pkgdir/usr/lib/systemd/system/$_portname.service"
+  install -Dm644 "../$_portname.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/$_portname.conf"
 
-  sed \
-          -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \
-          -i "${pkgdir}"/etc/turnserver.conf
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
-sha1sums=('d7f01e6fadbe56fe4535d67a7d178a9cfba110b8'
-          '0c5b348e793bd52ce0ee38d420b26c9b2a2e2ca5'
-          'b12805c049787cd1433181afaba4111f89740e63')
-sha256sums=('4d131f353aadb15901d175755075af65abf2a0e820d7281c9c164285642ff9c1'
-            '319030c1916d353bfc3375626cc7f60d6eeca762fe4fce354f010212902c49dc'
-            '63198e4f802c7b4b44e671e0fcaebca36589ebb11405e51ab9f36c80327ac4d9')
diff --git a/pcr/rfc5766-turn-server/stun.service b/pcr/rfc5766-turn-server/stun.service
deleted file mode 100644
index bddb6168a..000000000
--- a/pcr/rfc5766-turn-server/stun.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=STUN Server
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/turnserver --stun-only
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/rfc5766-turn-server/turn.service b/pcr/rfc5766-turn-server/turn.service
deleted file mode 100644
index 54cc5f01a..000000000
--- a/pcr/rfc5766-turn-server/turn.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=TURN Server
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/turnserver
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/rfc5766-turn-server/turnserver.install b/pcr/rfc5766-turn-server/turnserver.install
new file mode 100644
index 000000000..84f31ca7f
--- /dev/null
+++ b/pcr/rfc5766-turn-server/turnserver.install
@@ -0,0 +1,17 @@
+post_install() {
+  id turnserver &>/dev/null || \
+    useradd -g daemon -M -s /usr/bin/false turnserver
+
+  install -dm 755 "/var/log/turnserver"
+  chown -R turnserver:daemon /var/log/turnserver
+
+  systemd-tmpfiles --create turnserver.conf
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  userdel turnserver
+}
diff --git a/pcr/rfc5766-turn-server/turnserver.service b/pcr/rfc5766-turn-server/turnserver.service
new file mode 100644
index 000000000..8e267b2e0
--- /dev/null
+++ b/pcr/rfc5766-turn-server/turnserver.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=STUN and TURN Relay Server for VoIP and WebRTC
+After=network.target
+
+[Service]
+Type=forking
+User=turnserver
+ExecStart=/usr/bin/turnserver -c /etc/turnserver.conf -o -v
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/rfc5766-turn-server/turnserver.tmpfiles.d b/pcr/rfc5766-turn-server/turnserver.tmpfiles.d
new file mode 100644
index 000000000..ec1a89758
--- /dev/null
+++ b/pcr/rfc5766-turn-server/turnserver.tmpfiles.d
@@ -0,0 +1 @@
+d /run/turnserver 0755 turnserver daemon -