Date: Monday, October 2, 2017 @ 17:06:41 Author: spupykin Revision: 261292
archrelease: copy trunk to community-i686, community-x86_64 Added: prosody/repos/community-i686/PKGBUILD (from rev 261289, prosody/trunk/PKGBUILD) prosody/repos/community-i686/prosody.install (from rev 261289, prosody/trunk/prosody.install) prosody/repos/community-i686/prosody.logrotated (from rev 261289, prosody/trunk/prosody.logrotated) prosody/repos/community-i686/prosody.service (from rev 261289, prosody/trunk/prosody.service) prosody/repos/community-i686/prosody.tmpfile.d (from rev 261289, prosody/trunk/prosody.tmpfile.d) prosody/repos/community-i686/sysuser.conf (from rev 261289, prosody/trunk/sysuser.conf) prosody/repos/community-x86_64/PKGBUILD (from rev 261289, prosody/trunk/PKGBUILD) prosody/repos/community-x86_64/prosody.install (from rev 261289, prosody/trunk/prosody.install) prosody/repos/community-x86_64/prosody.logrotated (from rev 261289, prosody/trunk/prosody.logrotated) prosody/repos/community-x86_64/prosody.service (from rev 261289, prosody/trunk/prosody.service) prosody/repos/community-x86_64/prosody.tmpfile.d (from rev 261289, prosody/trunk/prosody.tmpfile.d) prosody/repos/community-x86_64/sysuser.conf (from rev 261290, prosody/trunk/sysuser.conf) Deleted: prosody/repos/community-i686/PKGBUILD 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/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 | 178 ++++++++++++++++++++++++++++++++++ /prosody.install | 46 ++++++++ /prosody.logrotated | 18 +++ /prosody.service | 28 +++++ /prosody.tmpfile.d | 4 /sysuser.conf | 6 + community-i686/PKGBUILD | 90 ----------------- community-i686/prosody.install | 23 ---- community-i686/prosody.logrotated | 9 - community-i686/prosody.service | 14 -- community-i686/prosody.tmpfile.d | 2 community-i686/sysuser.conf | 3 community-x86_64/PKGBUILD | 90 ----------------- community-x86_64/prosody.install | 23 ---- community-x86_64/prosody.logrotated | 9 - community-x86_64/prosody.service | 14 -- community-x86_64/prosody.tmpfile.d | 2 community-x86_64/sysuser.conf | 3 18 files changed, 280 insertions(+), 282 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-10-02 17:06:39 UTC (rev 261291) +++ community-i686/PKGBUILD 2017-10-02 17:06:41 UTC (rev 261292) @@ -1,90 +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 -epoch=1 -pkgrel=1 -pkgver=0.10.0 -pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua (${_branch} is ${_branch_desc} 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' - 'lua51-dbi: SQL storage support') -install=prosody.install -backup=('etc/prosody/prosody.cfg.lua') -validpgpkeys=('32A9EDDE3609931EB98CEAC315907E8E7BDD6BFE') -source=("https://prosody.im/downloads/source/prosody-$pkgver.tar.gz"{,.asc} - 'prosody.tmpfile.d' - 'prosody.logrotated' - 'sysuser.conf' - 'prosody.service') -sha256sums=('7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498' - 'SKIP' - '0753bd9260f1cfdce6e18e01a61e320b396acfe9fca8ccf3250653bfa6af997e' - '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f' - 'e5c30ffbb066f0ed3444475b3313490c535d8c9df018726f6cecf9e3ddfd2e48' - 'af4d725c580a5f3aa875194042cdb3859ee70e1dc057650c46a4a10e6a1d3544') - -prepare() { - cd prosody-$pkgver - - # 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-$pkgver - ./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-$pkgver - 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 - install -Dm 0644 "$srcdir"/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody - rm "${pkgdir}"/etc/prosody/certs/* -} Copied: prosody/repos/community-i686/PKGBUILD (from rev 261289, prosody/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-10-02 17:06:41 UTC (rev 261292) @@ -0,0 +1,89 @@ +# $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 +epoch=1 +pkgrel=2 +pkgver=0.10.0 +pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua" +arch=('i686' 'x86_64') +url="https://prosody.im/" +license=('MIT') +depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn' + 'openssl') +conflicts=('prosody') +provides=('prosody') +optdepends=('lua51-sec: TLS encryption support' + 'lua51-bitop: websocket support' + 'lua51-event: libevent support' + 'lua51-dbi: SQL storage support') +install=prosody.install +backup=('etc/prosody/prosody.cfg.lua') +validpgpkeys=('32A9EDDE3609931EB98CEAC315907E8E7BDD6BFE') +source=("https://prosody.im/downloads/source/prosody-$pkgver.tar.gz"{,.asc} + 'prosody.tmpfile.d' + 'prosody.logrotated' + 'sysuser.conf' + 'prosody.service') +sha256sums=('7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498' + 'SKIP' + '0753bd9260f1cfdce6e18e01a61e320b396acfe9fca8ccf3250653bfa6af997e' + '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f' + 'e5c30ffbb066f0ed3444475b3313490c535d8c9df018726f6cecf9e3ddfd2e48' + 'af4d725c580a5f3aa875194042cdb3859ee70e1dc057650c46a4a10e6a1d3544') + +prepare() { + cd prosody-$pkgver + + # 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-$pkgver + ./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-$pkgver + 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/COPYING + install -Dm 0644 "$srcdir"/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody + rm "${pkgdir}"/etc/prosody/certs/* +} Deleted: community-i686/prosody.install =================================================================== --- community-i686/prosody.install 2017-10-02 17:06:39 UTC (rev 261291) +++ community-i686/prosody.install 2017-10-02 17:06:41 UTC (rev 261292) @@ -1,23 +0,0 @@ -post_install() { - echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" - echo ">> Probably you need to do 'chown prosody:jabber /var/lib/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 261289, prosody/trunk/prosody.install) =================================================================== --- community-i686/prosody.install (rev 0) +++ community-i686/prosody.install 2017-10-02 17:06:41 UTC (rev 261292) @@ -0,0 +1,23 @@ +post_install() { + echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" + echo ">> Probably you need to do 'chown prosody:jabber /var/lib/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 2017-10-02 17:06:39 UTC (rev 261291) +++ community-i686/prosody.logrotated 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 261289, prosody/trunk/prosody.logrotated) =================================================================== --- community-i686/prosody.logrotated (rev 0) +++ community-i686/prosody.logrotated 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 2017-10-02 17:06:39 UTC (rev 261291) +++ community-i686/prosody.service 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 261289, prosody/trunk/prosody.service) =================================================================== --- community-i686/prosody.service (rev 0) +++ community-i686/prosody.service 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 2017-10-02 17:06:39 UTC (rev 261291) +++ community-i686/prosody.tmpfile.d 2017-10-02 17:06:41 UTC (rev 261292) @@ -1,2 +0,0 @@ -d /run/prosody 0755 prosody jabber - -d /var/lib/prosody 0750 prosody jabber - Copied: prosody/repos/community-i686/prosody.tmpfile.d (from rev 261289, prosody/trunk/prosody.tmpfile.d) =================================================================== --- community-i686/prosody.tmpfile.d (rev 0) +++ community-i686/prosody.tmpfile.d 2017-10-02 17:06:41 UTC (rev 261292) @@ -0,0 +1,2 @@ +d /run/prosody 0755 prosody jabber - +d /var/lib/prosody 0750 prosody jabber - Deleted: community-i686/sysuser.conf =================================================================== --- community-i686/sysuser.conf 2017-10-02 17:06:39 UTC (rev 261291) +++ community-i686/sysuser.conf 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 261289, prosody/trunk/sysuser.conf) =================================================================== --- community-i686/sysuser.conf (rev 0) +++ community-i686/sysuser.conf 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 2017-10-02 17:06:39 UTC (rev 261291) +++ community-x86_64/PKGBUILD 2017-10-02 17:06:41 UTC (rev 261292) @@ -1,90 +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 -epoch=1 -pkgrel=1 -pkgver=0.10.0 -pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua (${_branch} is ${_branch_desc} 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' - 'lua51-dbi: SQL storage support') -install=prosody.install -backup=('etc/prosody/prosody.cfg.lua') -validpgpkeys=('32A9EDDE3609931EB98CEAC315907E8E7BDD6BFE') -source=("https://prosody.im/downloads/source/prosody-$pkgver.tar.gz"{,.asc} - 'prosody.tmpfile.d' - 'prosody.logrotated' - 'sysuser.conf' - 'prosody.service') -sha256sums=('7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498' - 'SKIP' - '0753bd9260f1cfdce6e18e01a61e320b396acfe9fca8ccf3250653bfa6af997e' - '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f' - 'e5c30ffbb066f0ed3444475b3313490c535d8c9df018726f6cecf9e3ddfd2e48' - 'af4d725c580a5f3aa875194042cdb3859ee70e1dc057650c46a4a10e6a1d3544') - -prepare() { - cd prosody-$pkgver - - # 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-$pkgver - ./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-$pkgver - 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 - install -Dm 0644 "$srcdir"/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody - rm "${pkgdir}"/etc/prosody/certs/* -} Copied: prosody/repos/community-x86_64/PKGBUILD (from rev 261289, prosody/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-10-02 17:06:41 UTC (rev 261292) @@ -0,0 +1,89 @@ +# $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 +epoch=1 +pkgrel=2 +pkgver=0.10.0 +pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua" +arch=('i686' 'x86_64') +url="https://prosody.im/" +license=('MIT') +depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn' + 'openssl') +conflicts=('prosody') +provides=('prosody') +optdepends=('lua51-sec: TLS encryption support' + 'lua51-bitop: websocket support' + 'lua51-event: libevent support' + 'lua51-dbi: SQL storage support') +install=prosody.install +backup=('etc/prosody/prosody.cfg.lua') +validpgpkeys=('32A9EDDE3609931EB98CEAC315907E8E7BDD6BFE') +source=("https://prosody.im/downloads/source/prosody-$pkgver.tar.gz"{,.asc} + 'prosody.tmpfile.d' + 'prosody.logrotated' + 'sysuser.conf' + 'prosody.service') +sha256sums=('7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498' + 'SKIP' + '0753bd9260f1cfdce6e18e01a61e320b396acfe9fca8ccf3250653bfa6af997e' + '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f' + 'e5c30ffbb066f0ed3444475b3313490c535d8c9df018726f6cecf9e3ddfd2e48' + 'af4d725c580a5f3aa875194042cdb3859ee70e1dc057650c46a4a10e6a1d3544') + +prepare() { + cd prosody-$pkgver + + # 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-$pkgver + ./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-$pkgver + 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/COPYING + install -Dm 0644 "$srcdir"/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody + rm "${pkgdir}"/etc/prosody/certs/* +} Deleted: community-x86_64/prosody.install =================================================================== --- community-x86_64/prosody.install 2017-10-02 17:06:39 UTC (rev 261291) +++ community-x86_64/prosody.install 2017-10-02 17:06:41 UTC (rev 261292) @@ -1,23 +0,0 @@ -post_install() { - echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" - echo ">> Probably you need to do 'chown prosody:jabber /var/lib/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 261289, prosody/trunk/prosody.install) =================================================================== --- community-x86_64/prosody.install (rev 0) +++ community-x86_64/prosody.install 2017-10-02 17:06:41 UTC (rev 261292) @@ -0,0 +1,23 @@ +post_install() { + echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" + echo ">> Probably you need to do 'chown prosody:jabber /var/lib/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 2017-10-02 17:06:39 UTC (rev 261291) +++ community-x86_64/prosody.logrotated 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 261289, prosody/trunk/prosody.logrotated) =================================================================== --- community-x86_64/prosody.logrotated (rev 0) +++ community-x86_64/prosody.logrotated 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 2017-10-02 17:06:39 UTC (rev 261291) +++ community-x86_64/prosody.service 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 261289, prosody/trunk/prosody.service) =================================================================== --- community-x86_64/prosody.service (rev 0) +++ community-x86_64/prosody.service 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 2017-10-02 17:06:39 UTC (rev 261291) +++ community-x86_64/prosody.tmpfile.d 2017-10-02 17:06:41 UTC (rev 261292) @@ -1,2 +0,0 @@ -d /run/prosody 0755 prosody jabber - -d /var/lib/prosody 0750 prosody jabber - Copied: prosody/repos/community-x86_64/prosody.tmpfile.d (from rev 261289, prosody/trunk/prosody.tmpfile.d) =================================================================== --- community-x86_64/prosody.tmpfile.d (rev 0) +++ community-x86_64/prosody.tmpfile.d 2017-10-02 17:06:41 UTC (rev 261292) @@ -0,0 +1,2 @@ +d /run/prosody 0755 prosody jabber - +d /var/lib/prosody 0750 prosody jabber - Deleted: community-x86_64/sysuser.conf =================================================================== --- community-x86_64/sysuser.conf 2017-10-02 17:06:39 UTC (rev 261291) +++ community-x86_64/sysuser.conf 2017-10-02 17:06:41 UTC (rev 261292) @@ -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 261290, prosody/trunk/sysuser.conf) =================================================================== --- community-x86_64/sysuser.conf (rev 0) +++ community-x86_64/sysuser.conf 2017-10-02 17:06:41 UTC (rev 261292) @@ -0,0 +1,3 @@ +g jabber 17 - - +u prosody - "Prosody XMPP Server" /var/lib/prosody +m prosody jabber