[arch-commits] Commit in prosody/trunk (PKGBUILD prosody.install)

[Sergej Pupykin]

    Date: Monday, September 5, 2016 @ 13:45:38
  Author: spupykin
Revision: 188577

upgpkg: prosody 0.10.r7656+.296543556065+-1

upd

Modified:
  prosody/trunk/PKGBUILD
  prosody/trunk/prosody.install

-----------------+
 PKGBUILD        |   77 ++++++++++++++++++++++++++++++++----------------------
 prosody.install |    1 
 2 files changed, 46 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-05 12:59:43 UTC (rev 188576)
+++ PKGBUILD	2016-09-05 13:45:38 UTC (rev 188577)
@@ -1,48 +1,66 @@
 # $Id$
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Dwayne Bent <dbb at dbb.io>
+# Old Maintainer: Dwayne Bent <dbb at dbb.io>
+# Old Maintainer: Tilman Vatteroth <tilman.vatteroth at uni-dortmund.de>
 # Contributor: Paul-Sebastian Manole <brokenthorn at gmail.com>
 # Contributor: Timothée Ravier <tim at siosm.fr>
+# Contributor: Christoph Stahl <christoph.stahl at uni-dortmund.de>
 
 pkgname=prosody
-pkgver=0.9.10
-pkgrel=2
-pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
+pkgrel=1
+pkgver=0.10.r7656+.296543556065+
+pkgver() {
+  cd "$srcdir/prosody-hg"
+  printf "0.10.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
+}
+pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua (development build from trunk-branch)"
 arch=('i686' 'x86_64')
-url="http://prosody.im/"
+url="https://prosody.im/"
 license=('MIT')
 depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn'
          'openssl')
+makedepends=('mercurial')
+conflicts=('prosody')
+provides=('prosody')
 optdepends=('lua51-sec: TLS encryption support'
-	    'lua51-zlib: compression support')
+	    'lua51-bitop: websocket support'
+	    'lua51-event: libevent support')
 install=prosody.install
-backup=('etc/logrotate.d/prosody'
-        'etc/prosody/prosody.cfg.lua')
-validpgpkeys=('32A9EDDE3609931EB98CEAC315907E8E7BDD6BFE'
-	      '3E52119EF853C59678DBBF6BADED9A77B67AD329')
-source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
-        'prosody.logrotated'
-        'fix-config.patch'
+backup=('etc/prosody/prosody.cfg.lua')
+source=("prosody-hg::hg+https://hg.prosody.im/trunk"
         'prosody.tmpfile.d'
-        'prosody.service'
-        'sysuser.conf')
-md5sums=('ef6d4a9e6dcae577eb52f7277d7beac5'
-         'SKIP'
-         '5b44aee99f1fa9e7f055e067688cafbd'
-         '01b6aa0b1e1e3067756c45b0751bee78'
+        'sysuser.conf'
+        'prosody.service')
+md5sums=('SKIP'
          'dc8405a6a235b83dc8a0dcdf7b71cbaa'
-         'e5957c72ed81f9ade2dd7a08bec21fdb'
-         '385ca73d9f6046f3636266ce9bf38797')
+         '385ca73d9f6046f3636266ce9bf38797'
+         'e5957c72ed81f9ade2dd7a08bec21fdb')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 < $srcdir/fix-config.patch
-  sed -i 's|require "socket"|local socket = require "socket"|' prosodyctl
-  sed -i 's|sock, err = socket.udp();|sock, err = (socket.udp4 or socket.udp)();|g' net/dns.lua
+  cd prosody-hg
+
+  # disable logging to output and activate syslog
+  sed -i s/"info = "/"-- info = "/g prosody.cfg.lua.dist
+  sed -i s/"error = "/"-- error = "/g prosody.cfg.lua.dist
+  sed -i s/"--\ \"\*syslog\"\;"/"\"*syslog\"\;"/g prosody.cfg.lua.dist
+
+  # add pidfile and daemonize
+  # daemonize is important for systemd!
+  mv prosody.cfg.lua.dist prosody.cfg.lua.old
+
+  echo --Important for systemd >> prosody.cfg.lua.dist
+  echo -- daemonize is important for systemd. if you set this to false the systemd startup will freeze. >> prosody.cfg.lua.dist
+  echo daemonize = true >> prosody.cfg.lua.dist
+  echo 'pidfile = "/run/prosody/prosody.pid"'>> prosody.cfg.lua.dist
+  echo "" >> prosody.cfg.lua.dist
+  cat prosody.cfg.lua.old >> prosody.cfg.lua.dist
+  rm prosody.cfg.lua.old
+
+  #sed -i 's|sock, err = socket.udp();|sock, err = (socket.udp4 or socket.udp)();|g' net/dns.lua
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd prosody-hg
   ./configure --ostype=linux --prefix=/usr --sysconfdir=/etc/prosody \
     --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1 \
     --cflags="${CFLAGS} -fPIC -Wall -Wextra -D_GNU_SOURCE" \
@@ -52,11 +70,10 @@
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd prosody-hg
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" install -C tools/migration
 
-#  install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody
   install -Dm 0644 $srcdir/prosody.tmpfile.d "${pkgdir}"/usr/lib/tmpfiles.d/prosody.conf
   install -Dm 0644 $srcdir/prosody.service "${pkgdir}"/usr/lib/systemd/system/prosody.service
   install -Dm644 $srcdir/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/prosody.conf
@@ -65,8 +82,6 @@
     install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i}
   done
 
-  install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
+  install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/prosody-hg/COPYING
   rm "${pkgdir}"/etc/prosody/certs/*
 }
-
-# vim: ft=sh syn=sh ts=2 sw=2

Modified: prosody.install
===================================================================
--- prosody.install	2016-09-05 12:59:43 UTC (rev 188576)
+++ prosody.install	2016-09-05 13:45:38 UTC (rev 188577)
@@ -10,7 +10,6 @@
 
 post_upgrade() {
     post_install $1
-    echo "Now prosody logs to syslog by default"
 }
 
 post_remove() {