Date: Wednesday, November 16, 2016 @ 17:20:21 Author: spupykin Revision: 196043
archrelease: copy trunk to community-i686, community-x86_64 Added: prosody/repos/community-i686/PKGBUILD (from rev 196042, prosody/trunk/PKGBUILD) prosody/repos/community-i686/fix-config.patch (from rev 196042, prosody/trunk/fix-config.patch) prosody/repos/community-i686/prosody.install (from rev 196042, prosody/trunk/prosody.install) prosody/repos/community-i686/prosody.logrotated (from rev 196042, prosody/trunk/prosody.logrotated) prosody/repos/community-i686/prosody.service (from rev 196042, prosody/trunk/prosody.service) prosody/repos/community-i686/prosody.tmpfile.d (from rev 196042, prosody/trunk/prosody.tmpfile.d) prosody/repos/community-i686/sysuser.conf (from rev 196042, prosody/trunk/sysuser.conf) prosody/repos/community-x86_64/PKGBUILD (from rev 196042, prosody/trunk/PKGBUILD) prosody/repos/community-x86_64/fix-config.patch (from rev 196042, prosody/trunk/fix-config.patch) prosody/repos/community-x86_64/prosody.install (from rev 196042, prosody/trunk/prosody.install) prosody/repos/community-x86_64/prosody.logrotated (from rev 196042, prosody/trunk/prosody.logrotated) prosody/repos/community-x86_64/prosody.service (from rev 196042, prosody/trunk/prosody.service) prosody/repos/community-x86_64/prosody.tmpfile.d (from rev 196042, prosody/trunk/prosody.tmpfile.d) prosody/repos/community-x86_64/sysuser.conf (from rev 196042, prosody/trunk/sysuser.conf) Deleted: prosody/repos/community-i686/PKGBUILD prosody/repos/community-i686/fix-config.patch prosody/repos/community-i686/prosody.install prosody/repos/community-i686/prosody.logrotated prosody/repos/community-i686/prosody.service prosody/repos/community-i686/prosody.tmpfile.d prosody/repos/community-i686/sysuser.conf prosody/repos/community-x86_64/PKGBUILD prosody/repos/community-x86_64/fix-config.patch prosody/repos/community-x86_64/prosody.install prosody/repos/community-x86_64/prosody.logrotated prosody/repos/community-x86_64/prosody.service prosody/repos/community-x86_64/prosody.tmpfile.d prosody/repos/community-x86_64/sysuser.conf -------------------------------------+ /PKGBUILD | 174 ++++++++++++++++++++++++++++++++++ /fix-config.patch | 88 +++++++++++++++++ /prosody.install | 56 ++++++++++ /prosody.logrotated | 18 +++ /prosody.service | 28 +++++ /prosody.tmpfile.d | 2 /sysuser.conf | 6 + community-i686/PKGBUILD | 87 ----------------- community-i686/fix-config.patch | 44 -------- community-i686/prosody.install | 28 ----- community-i686/prosody.logrotated | 9 - community-i686/prosody.service | 14 -- community-i686/prosody.tmpfile.d | 1 community-i686/sysuser.conf | 3 community-x86_64/PKGBUILD | 87 ----------------- community-x86_64/fix-config.patch | 44 -------- community-x86_64/prosody.install | 28 ----- community-x86_64/prosody.logrotated | 9 - community-x86_64/prosody.service | 14 -- community-x86_64/prosody.tmpfile.d | 1 community-x86_64/sysuser.conf | 3 21 files changed, 372 insertions(+), 372 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-11-16 17:19:50 UTC (rev 196042) +++ community-i686/PKGBUILD 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,87 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Old Maintainer: Dwayne Bent <d...@dbb.io> -# Old Maintainer: Tilman Vatteroth <tilman.vatter...@uni-dortmund.de> -# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com> -# Contributor: Timothée Ravier <t...@siosm.fr> -# Contributor: Christoph Stahl <christoph.st...@uni-dortmund.de> - -pkgname=prosody -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="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-bitop: websocket support' - 'lua51-event: libevent support') -install=prosody.install -backup=('etc/prosody/prosody.cfg.lua') -source=("prosody-hg::hg+https://hg.prosody.im/trunk" - 'prosody.tmpfile.d' - 'sysuser.conf' - 'prosody.service') -md5sums=('SKIP' - 'dc8405a6a235b83dc8a0dcdf7b71cbaa' - '385ca73d9f6046f3636266ce9bf38797' - 'e5957c72ed81f9ade2dd7a08bec21fdb') - -prepare() { - 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 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" \ - --ldflags="${LDFLAGS} -shared" --no-example-certs \ - --runwith=lua5.1 - make -} - -package() { - cd prosody-hg - make DESTDIR="${pkgdir}" install - make DESTDIR="${pkgdir}" install -C tools/migration - - 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 - - for i in tools/*.lua; do - install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i} - done - - install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/prosody-hg/COPYING - rm "${pkgdir}"/etc/prosody/certs/* -} Copied: prosody/repos/community-i686/PKGBUILD (from rev 196042, prosody/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,87 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Old Maintainer: Dwayne Bent <d...@dbb.io> +# Old Maintainer: Tilman Vatteroth <tilman.vatter...@uni-dortmund.de> +# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com> +# Contributor: Timothée Ravier <t...@siosm.fr> +# Contributor: Christoph Stahl <christoph.st...@uni-dortmund.de> + +pkgname=prosody +pkgrel=1 +pkgver=0.10.r7717+.9c8eb0239eef+ +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="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-bitop: websocket support' + 'lua51-event: libevent support') +install=prosody.install +backup=('etc/prosody/prosody.cfg.lua') +source=("prosody-hg::hg+https://hg.prosody.im/trunk" + 'prosody.tmpfile.d' + 'sysuser.conf' + 'prosody.service') +md5sums=('SKIP' + 'dc8405a6a235b83dc8a0dcdf7b71cbaa' + '385ca73d9f6046f3636266ce9bf38797' + 'e5957c72ed81f9ade2dd7a08bec21fdb') + +prepare() { + 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 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" \ + --ldflags="${LDFLAGS} -shared" --no-example-certs \ + --runwith=lua5.1 + make +} + +package() { + cd prosody-hg + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install -C tools/migration + + 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 + + for i in tools/*.lua; do + install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i} + done + + install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/prosody-hg/COPYING + rm "${pkgdir}"/etc/prosody/certs/* +} Deleted: community-i686/fix-config.patch =================================================================== --- community-i686/fix-config.patch 2016-11-16 17:19:50 UTC (rev 196042) +++ community-i686/fix-config.patch 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,44 +0,0 @@ -diff -wbBur prosody-0.9.4/prosody.cfg.lua.dist prosody-0.9.4.my/prosody.cfg.lua.dist ---- prosody-0.9.4/prosody.cfg.lua.dist 2014-04-01 20:05:32.000000000 +0400 -+++ prosody-0.9.4.my/prosody.cfg.lua.dist 2014-05-20 19:00:36.414576199 +0400 -@@ -11,6 +11,9 @@ - -- The only thing left to do is rename this file to remove the .dist ending, and fill in the - -- blanks. Good luck, and happy Jabbering! - -+daemonize = true -+pidfile = "/run/prosody/prosody.pid" -+s2s_require_encryption = true - - ---------- Server-wide settings ---------- - -- Settings in this section apply to the whole server and are the default settings -@@ -63,7 +66,7 @@ - --"http_files"; -- Serve static files from a directory over HTTP - - -- Other specific functionality -- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. -+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. - --"groups"; -- Shared roster support - --"announce"; -- Send announcement to all online users - --"welcome"; -- Welcome users who register accounts -@@ -94,7 +97,7 @@ - -- Force clients to use encrypted connections? This option will - -- prevent clients from authenticating unless they are using encryption. - --c2s_require_encryption = false -+c2s_require_encryption = true - - -- Force certificate authentication for server-to-server connections? - -- This provides ideal security, but requires servers you communicate -@@ -139,9 +142,9 @@ - -- Logging configuration - -- For advanced logging see http://prosody.im/doc/logging - log = { -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging -- error = "prosody.err"; -- -- "*syslog"; -- Uncomment this for logging to syslog -+ -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging -+ -- error = "prosody.err"; -+ "*syslog"; -- Uncomment this for logging to syslog - -- "*console"; -- Log to the console, useful for debugging with daemonize=false - } - Copied: prosody/repos/community-i686/fix-config.patch (from rev 196042, prosody/trunk/fix-config.patch) =================================================================== --- community-i686/fix-config.patch (rev 0) +++ community-i686/fix-config.patch 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,44 @@ +diff -wbBur prosody-0.9.4/prosody.cfg.lua.dist prosody-0.9.4.my/prosody.cfg.lua.dist +--- prosody-0.9.4/prosody.cfg.lua.dist 2014-04-01 20:05:32.000000000 +0400 ++++ prosody-0.9.4.my/prosody.cfg.lua.dist 2014-05-20 19:00:36.414576199 +0400 +@@ -11,6 +11,9 @@ + -- The only thing left to do is rename this file to remove the .dist ending, and fill in the + -- blanks. Good luck, and happy Jabbering! + ++daemonize = true ++pidfile = "/run/prosody/prosody.pid" ++s2s_require_encryption = true + + ---------- Server-wide settings ---------- + -- Settings in this section apply to the whole server and are the default settings +@@ -63,7 +66,7 @@ + --"http_files"; -- Serve static files from a directory over HTTP + + -- Other specific functionality +- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. ++ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + --"groups"; -- Shared roster support + --"announce"; -- Send announcement to all online users + --"welcome"; -- Welcome users who register accounts +@@ -94,7 +97,7 @@ + -- Force clients to use encrypted connections? This option will + -- prevent clients from authenticating unless they are using encryption. + +-c2s_require_encryption = false ++c2s_require_encryption = true + + -- Force certificate authentication for server-to-server connections? + -- This provides ideal security, but requires servers you communicate +@@ -139,9 +142,9 @@ + -- Logging configuration + -- For advanced logging see http://prosody.im/doc/logging + log = { +- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging +- error = "prosody.err"; +- -- "*syslog"; -- Uncomment this for logging to syslog ++ -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging ++ -- error = "prosody.err"; ++ "*syslog"; -- Uncomment this for logging to syslog + -- "*console"; -- Log to the console, useful for debugging with daemonize=false + } + Deleted: community-i686/prosody.install =================================================================== --- community-i686/prosody.install 2016-11-16 17:19:50 UTC (rev 196042) +++ community-i686/prosody.install 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,28 +0,0 @@ -post_install() { - systemd-sysusers prosody.conf - systemd-tmpfiles --create prosody.conf - - chown prosody:jabber var/lib/prosody - [ -d var/log/prosody ] && chown prosody:jabber var/log/prosody - - echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - paths=(/etc/prosody /var/lib/prosody /var/log/prosody - /var/log/old/prosody) - first=true - for path in ${paths[@]}; do - if [ -d $path ]; then - if $first; then - first=false - echo "==> Leftover Paths:" - fi - echo "==> $path" - fi - done -} Copied: prosody/repos/community-i686/prosody.install (from rev 196042, prosody/trunk/prosody.install) =================================================================== --- community-i686/prosody.install (rev 0) +++ community-i686/prosody.install 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,28 @@ +post_install() { + systemd-sysusers prosody.conf + systemd-tmpfiles --create prosody.conf + + chown prosody:jabber var/lib/prosody + [ -d var/log/prosody ] && chown prosody:jabber var/log/prosody + + echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + paths=(/etc/prosody /var/lib/prosody /var/log/prosody + /var/log/old/prosody) + first=true + for path in ${paths[@]}; do + if [ -d $path ]; then + if $first; then + first=false + echo "==> Leftover Paths:" + fi + echo "==> $path" + fi + done +} Deleted: community-i686/prosody.logrotated =================================================================== --- community-i686/prosody.logrotated 2016-11-16 17:19:50 UTC (rev 196042) +++ community-i686/prosody.logrotated 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,9 +0,0 @@ -/var/log/prosody/prosody.log /var/log/prosody/prosody.err { - # olddir /var/log/old/prosody - create 644 prosody prosody - sharedscripts - missingok - postrotate - /bin/kill -HUP `cat /run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true - endscript -} Copied: prosody/repos/community-i686/prosody.logrotated (from rev 196042, prosody/trunk/prosody.logrotated) =================================================================== --- community-i686/prosody.logrotated (rev 0) +++ community-i686/prosody.logrotated 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,9 @@ +/var/log/prosody/prosody.log /var/log/prosody/prosody.err { + # olddir /var/log/old/prosody + create 644 prosody prosody + sharedscripts + missingok + postrotate + /bin/kill -HUP `cat /run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true + endscript +} Deleted: community-i686/prosody.service =================================================================== --- community-i686/prosody.service 2016-11-16 17:19:50 UTC (rev 196042) +++ community-i686/prosody.service 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,14 +0,0 @@ -[Unit] -Description=XMPP (Jabber) Server -After=network.target - -[Service] -Type=forking -PIDFile=/run/prosody/prosody.pid -ExecStart=/usr/bin/prosodyctl start -ExecStop=/usr/bin/prosodyctl stop -ExecReload=/usr/bin/prosodyctl reload - -[Install] -WantedBy=multi-user.target - Copied: prosody/repos/community-i686/prosody.service (from rev 196042, prosody/trunk/prosody.service) =================================================================== --- community-i686/prosody.service (rev 0) +++ community-i686/prosody.service 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,14 @@ +[Unit] +Description=XMPP (Jabber) Server +After=network.target + +[Service] +Type=forking +PIDFile=/run/prosody/prosody.pid +ExecStart=/usr/bin/prosodyctl start +ExecStop=/usr/bin/prosodyctl stop +ExecReload=/usr/bin/prosodyctl reload + +[Install] +WantedBy=multi-user.target + Deleted: community-i686/prosody.tmpfile.d =================================================================== --- community-i686/prosody.tmpfile.d 2016-11-16 17:19:50 UTC (rev 196042) +++ community-i686/prosody.tmpfile.d 2016-11-16 17:20:21 UTC (rev 196043) @@ -1 +0,0 @@ -d /run/prosody 0755 prosody jabber - Copied: prosody/repos/community-i686/prosody.tmpfile.d (from rev 196042, prosody/trunk/prosody.tmpfile.d) =================================================================== --- community-i686/prosody.tmpfile.d (rev 0) +++ community-i686/prosody.tmpfile.d 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1 @@ +d /run/prosody 0755 prosody jabber - Deleted: community-i686/sysuser.conf =================================================================== --- community-i686/sysuser.conf 2016-11-16 17:19:50 UTC (rev 196042) +++ community-i686/sysuser.conf 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,3 +0,0 @@ -g jabber 17 - - -u prosody - "Prosody XMPP Server" /var/lib/prosody -m prosody jabber Copied: prosody/repos/community-i686/sysuser.conf (from rev 196042, prosody/trunk/sysuser.conf) =================================================================== --- community-i686/sysuser.conf (rev 0) +++ community-i686/sysuser.conf 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,3 @@ +g jabber 17 - - +u prosody - "Prosody XMPP Server" /var/lib/prosody +m prosody jabber Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-11-16 17:19:50 UTC (rev 196042) +++ community-x86_64/PKGBUILD 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,87 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Old Maintainer: Dwayne Bent <d...@dbb.io> -# Old Maintainer: Tilman Vatteroth <tilman.vatter...@uni-dortmund.de> -# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com> -# Contributor: Timothée Ravier <t...@siosm.fr> -# Contributor: Christoph Stahl <christoph.st...@uni-dortmund.de> - -pkgname=prosody -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="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-bitop: websocket support' - 'lua51-event: libevent support') -install=prosody.install -backup=('etc/prosody/prosody.cfg.lua') -source=("prosody-hg::hg+https://hg.prosody.im/trunk" - 'prosody.tmpfile.d' - 'sysuser.conf' - 'prosody.service') -md5sums=('SKIP' - 'dc8405a6a235b83dc8a0dcdf7b71cbaa' - '385ca73d9f6046f3636266ce9bf38797' - 'e5957c72ed81f9ade2dd7a08bec21fdb') - -prepare() { - 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 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" \ - --ldflags="${LDFLAGS} -shared" --no-example-certs \ - --runwith=lua5.1 - make -} - -package() { - cd prosody-hg - make DESTDIR="${pkgdir}" install - make DESTDIR="${pkgdir}" install -C tools/migration - - 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 - - for i in tools/*.lua; do - install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i} - done - - install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/prosody-hg/COPYING - rm "${pkgdir}"/etc/prosody/certs/* -} Copied: prosody/repos/community-x86_64/PKGBUILD (from rev 196042, prosody/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,87 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Old Maintainer: Dwayne Bent <d...@dbb.io> +# Old Maintainer: Tilman Vatteroth <tilman.vatter...@uni-dortmund.de> +# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com> +# Contributor: Timothée Ravier <t...@siosm.fr> +# Contributor: Christoph Stahl <christoph.st...@uni-dortmund.de> + +pkgname=prosody +pkgrel=1 +pkgver=0.10.r7717+.9c8eb0239eef+ +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="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-bitop: websocket support' + 'lua51-event: libevent support') +install=prosody.install +backup=('etc/prosody/prosody.cfg.lua') +source=("prosody-hg::hg+https://hg.prosody.im/trunk" + 'prosody.tmpfile.d' + 'sysuser.conf' + 'prosody.service') +md5sums=('SKIP' + 'dc8405a6a235b83dc8a0dcdf7b71cbaa' + '385ca73d9f6046f3636266ce9bf38797' + 'e5957c72ed81f9ade2dd7a08bec21fdb') + +prepare() { + 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 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" \ + --ldflags="${LDFLAGS} -shared" --no-example-certs \ + --runwith=lua5.1 + make +} + +package() { + cd prosody-hg + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install -C tools/migration + + 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 + + for i in tools/*.lua; do + install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i} + done + + install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/prosody-hg/COPYING + rm "${pkgdir}"/etc/prosody/certs/* +} Deleted: community-x86_64/fix-config.patch =================================================================== --- community-x86_64/fix-config.patch 2016-11-16 17:19:50 UTC (rev 196042) +++ community-x86_64/fix-config.patch 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,44 +0,0 @@ -diff -wbBur prosody-0.9.4/prosody.cfg.lua.dist prosody-0.9.4.my/prosody.cfg.lua.dist ---- prosody-0.9.4/prosody.cfg.lua.dist 2014-04-01 20:05:32.000000000 +0400 -+++ prosody-0.9.4.my/prosody.cfg.lua.dist 2014-05-20 19:00:36.414576199 +0400 -@@ -11,6 +11,9 @@ - -- The only thing left to do is rename this file to remove the .dist ending, and fill in the - -- blanks. Good luck, and happy Jabbering! - -+daemonize = true -+pidfile = "/run/prosody/prosody.pid" -+s2s_require_encryption = true - - ---------- Server-wide settings ---------- - -- Settings in this section apply to the whole server and are the default settings -@@ -63,7 +66,7 @@ - --"http_files"; -- Serve static files from a directory over HTTP - - -- Other specific functionality -- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. -+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. - --"groups"; -- Shared roster support - --"announce"; -- Send announcement to all online users - --"welcome"; -- Welcome users who register accounts -@@ -94,7 +97,7 @@ - -- Force clients to use encrypted connections? This option will - -- prevent clients from authenticating unless they are using encryption. - --c2s_require_encryption = false -+c2s_require_encryption = true - - -- Force certificate authentication for server-to-server connections? - -- This provides ideal security, but requires servers you communicate -@@ -139,9 +142,9 @@ - -- Logging configuration - -- For advanced logging see http://prosody.im/doc/logging - log = { -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging -- error = "prosody.err"; -- -- "*syslog"; -- Uncomment this for logging to syslog -+ -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging -+ -- error = "prosody.err"; -+ "*syslog"; -- Uncomment this for logging to syslog - -- "*console"; -- Log to the console, useful for debugging with daemonize=false - } - Copied: prosody/repos/community-x86_64/fix-config.patch (from rev 196042, prosody/trunk/fix-config.patch) =================================================================== --- community-x86_64/fix-config.patch (rev 0) +++ community-x86_64/fix-config.patch 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,44 @@ +diff -wbBur prosody-0.9.4/prosody.cfg.lua.dist prosody-0.9.4.my/prosody.cfg.lua.dist +--- prosody-0.9.4/prosody.cfg.lua.dist 2014-04-01 20:05:32.000000000 +0400 ++++ prosody-0.9.4.my/prosody.cfg.lua.dist 2014-05-20 19:00:36.414576199 +0400 +@@ -11,6 +11,9 @@ + -- The only thing left to do is rename this file to remove the .dist ending, and fill in the + -- blanks. Good luck, and happy Jabbering! + ++daemonize = true ++pidfile = "/run/prosody/prosody.pid" ++s2s_require_encryption = true + + ---------- Server-wide settings ---------- + -- Settings in this section apply to the whole server and are the default settings +@@ -63,7 +66,7 @@ + --"http_files"; -- Serve static files from a directory over HTTP + + -- Other specific functionality +- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. ++ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + --"groups"; -- Shared roster support + --"announce"; -- Send announcement to all online users + --"welcome"; -- Welcome users who register accounts +@@ -94,7 +97,7 @@ + -- Force clients to use encrypted connections? This option will + -- prevent clients from authenticating unless they are using encryption. + +-c2s_require_encryption = false ++c2s_require_encryption = true + + -- Force certificate authentication for server-to-server connections? + -- This provides ideal security, but requires servers you communicate +@@ -139,9 +142,9 @@ + -- Logging configuration + -- For advanced logging see http://prosody.im/doc/logging + log = { +- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging +- error = "prosody.err"; +- -- "*syslog"; -- Uncomment this for logging to syslog ++ -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging ++ -- error = "prosody.err"; ++ "*syslog"; -- Uncomment this for logging to syslog + -- "*console"; -- Log to the console, useful for debugging with daemonize=false + } + Deleted: community-x86_64/prosody.install =================================================================== --- community-x86_64/prosody.install 2016-11-16 17:19:50 UTC (rev 196042) +++ community-x86_64/prosody.install 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,28 +0,0 @@ -post_install() { - systemd-sysusers prosody.conf - systemd-tmpfiles --create prosody.conf - - chown prosody:jabber var/lib/prosody - [ -d var/log/prosody ] && chown prosody:jabber var/log/prosody - - echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - paths=(/etc/prosody /var/lib/prosody /var/log/prosody - /var/log/old/prosody) - first=true - for path in ${paths[@]}; do - if [ -d $path ]; then - if $first; then - first=false - echo "==> Leftover Paths:" - fi - echo "==> $path" - fi - done -} Copied: prosody/repos/community-x86_64/prosody.install (from rev 196042, prosody/trunk/prosody.install) =================================================================== --- community-x86_64/prosody.install (rev 0) +++ community-x86_64/prosody.install 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,28 @@ +post_install() { + systemd-sysusers prosody.conf + systemd-tmpfiles --create prosody.conf + + chown prosody:jabber var/lib/prosody + [ -d var/log/prosody ] && chown prosody:jabber var/log/prosody + + echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + paths=(/etc/prosody /var/lib/prosody /var/log/prosody + /var/log/old/prosody) + first=true + for path in ${paths[@]}; do + if [ -d $path ]; then + if $first; then + first=false + echo "==> Leftover Paths:" + fi + echo "==> $path" + fi + done +} Deleted: community-x86_64/prosody.logrotated =================================================================== --- community-x86_64/prosody.logrotated 2016-11-16 17:19:50 UTC (rev 196042) +++ community-x86_64/prosody.logrotated 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,9 +0,0 @@ -/var/log/prosody/prosody.log /var/log/prosody/prosody.err { - # olddir /var/log/old/prosody - create 644 prosody prosody - sharedscripts - missingok - postrotate - /bin/kill -HUP `cat /run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true - endscript -} Copied: prosody/repos/community-x86_64/prosody.logrotated (from rev 196042, prosody/trunk/prosody.logrotated) =================================================================== --- community-x86_64/prosody.logrotated (rev 0) +++ community-x86_64/prosody.logrotated 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,9 @@ +/var/log/prosody/prosody.log /var/log/prosody/prosody.err { + # olddir /var/log/old/prosody + create 644 prosody prosody + sharedscripts + missingok + postrotate + /bin/kill -HUP `cat /run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true + endscript +} Deleted: community-x86_64/prosody.service =================================================================== --- community-x86_64/prosody.service 2016-11-16 17:19:50 UTC (rev 196042) +++ community-x86_64/prosody.service 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,14 +0,0 @@ -[Unit] -Description=XMPP (Jabber) Server -After=network.target - -[Service] -Type=forking -PIDFile=/run/prosody/prosody.pid -ExecStart=/usr/bin/prosodyctl start -ExecStop=/usr/bin/prosodyctl stop -ExecReload=/usr/bin/prosodyctl reload - -[Install] -WantedBy=multi-user.target - Copied: prosody/repos/community-x86_64/prosody.service (from rev 196042, prosody/trunk/prosody.service) =================================================================== --- community-x86_64/prosody.service (rev 0) +++ community-x86_64/prosody.service 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,14 @@ +[Unit] +Description=XMPP (Jabber) Server +After=network.target + +[Service] +Type=forking +PIDFile=/run/prosody/prosody.pid +ExecStart=/usr/bin/prosodyctl start +ExecStop=/usr/bin/prosodyctl stop +ExecReload=/usr/bin/prosodyctl reload + +[Install] +WantedBy=multi-user.target + Deleted: community-x86_64/prosody.tmpfile.d =================================================================== --- community-x86_64/prosody.tmpfile.d 2016-11-16 17:19:50 UTC (rev 196042) +++ community-x86_64/prosody.tmpfile.d 2016-11-16 17:20:21 UTC (rev 196043) @@ -1 +0,0 @@ -d /run/prosody 0755 prosody jabber - Copied: prosody/repos/community-x86_64/prosody.tmpfile.d (from rev 196042, prosody/trunk/prosody.tmpfile.d) =================================================================== --- community-x86_64/prosody.tmpfile.d (rev 0) +++ community-x86_64/prosody.tmpfile.d 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1 @@ +d /run/prosody 0755 prosody jabber - Deleted: community-x86_64/sysuser.conf =================================================================== --- community-x86_64/sysuser.conf 2016-11-16 17:19:50 UTC (rev 196042) +++ community-x86_64/sysuser.conf 2016-11-16 17:20:21 UTC (rev 196043) @@ -1,3 +0,0 @@ -g jabber 17 - - -u prosody - "Prosody XMPP Server" /var/lib/prosody -m prosody jabber Copied: prosody/repos/community-x86_64/sysuser.conf (from rev 196042, prosody/trunk/sysuser.conf) =================================================================== --- community-x86_64/sysuser.conf (rev 0) +++ community-x86_64/sysuser.conf 2016-11-16 17:20:21 UTC (rev 196043) @@ -0,0 +1,3 @@ +g jabber 17 - - +u prosody - "Prosody XMPP Server" /var/lib/prosody +m prosody jabber