[arch-commits] Commit in prosody/repos/community-x86_64 (12 files)
Sergej Pupykin
spupykin at archlinux.org
Wed Mar 25 15:03:54 UTC 2020
Date: Wednesday, March 25, 2020 @ 15:03:53
Author: spupykin
Revision: 604238
archrelease: copy trunk to community-x86_64
Added:
prosody/repos/community-x86_64/PKGBUILD
(from rev 604237, prosody/trunk/PKGBUILD)
prosody/repos/community-x86_64/prosody.install
(from rev 604237, prosody/trunk/prosody.install)
prosody/repos/community-x86_64/prosody.logrotated
(from rev 604237, prosody/trunk/prosody.logrotated)
prosody/repos/community-x86_64/prosody.service
(from rev 604237, prosody/trunk/prosody.service)
prosody/repos/community-x86_64/prosody.tmpfile.d
(from rev 604237, prosody/trunk/prosody.tmpfile.d)
prosody/repos/community-x86_64/sysuser.conf
(from rev 604237, prosody/trunk/sysuser.conf)
Deleted:
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 | 176 +++++++++++++++++++++++++--------------------------
prosody.install | 46 ++++++-------
prosody.logrotated | 18 ++---
prosody.service | 30 ++++----
prosody.tmpfile.d | 4 -
sysuser.conf | 6 -
6 files changed, 140 insertions(+), 140 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-25 15:03:38 UTC (rev 604237)
+++ PKGBUILD 2020-03-25 15:03:53 UTC (rev 604238)
@@ -1,88 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# 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
-epoch=1
-pkgrel=1
-pkgver=0.11.4
-pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
-arch=('x86_64')
-url="https://prosody.im/"
-license=('MIT')
-depends=('lua52' 'lua52-socket' 'lua52-expat' 'lua52-filesystem' 'libidn'
- 'openssl')
-conflicts=('prosody')
-provides=('prosody')
-optdepends=('lua52-sec: TLS encryption support'
-# 'lua52-event: libevent support'
- 'lua52-dbi: SQL storage support')
-install=prosody.install
-backup=('etc/prosody/prosody.cfg.lua')
-validpgpkeys=('32A9EDDE3609931EB98CEAC315907E8E7BDD6BFE'
- '3E52119EF853C59678DBBF6BADED9A77B67AD329')
-source=("https://prosody.im/downloads/source/prosody-$pkgver.tar.gz"{,.asc}
- 'prosody.tmpfile.d'
- 'prosody.logrotated'
- 'sysuser.conf'
- 'prosody.service')
-sha256sums=('b5f26fa343c7f32f6242721d6991cb35f5d2a28d2bf59d2bc329a940523704fd'
- 'SKIP'
- '0753bd9260f1cfdce6e18e01a61e320b396acfe9fca8ccf3250653bfa6af997e'
- '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
- 'e5c30ffbb066f0ed3444475b3313490c535d8c9df018726f6cecf9e3ddfd2e48'
- 'ea34a3802e9a6b181cc1039eda48538fc9335c432223b225a8801d9d636f268c')
-
-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.2 \
- --cflags="${CFLAGS} -fPIC -Wall -Wextra -D_GNU_SOURCE" \
- --ldflags="${LDFLAGS} -shared" --no-example-certs \
- --runwith=lua5.2
- 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/*
-}
Copied: prosody/repos/community-x86_64/PKGBUILD (from rev 604237, prosody/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-25 15:03:53 UTC (rev 604238)
@@ -0,0 +1,88 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# 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
+epoch=1
+pkgrel=1
+pkgver=0.11.5
+pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
+arch=('x86_64')
+url="https://prosody.im/"
+license=('MIT')
+depends=('lua52' 'lua52-socket' 'lua52-expat' 'lua52-filesystem' 'libidn'
+ 'openssl')
+conflicts=('prosody')
+provides=('prosody')
+optdepends=('lua52-sec: TLS encryption support'
+# 'lua52-event: libevent support'
+ 'lua52-dbi: SQL storage support')
+install=prosody.install
+backup=('etc/prosody/prosody.cfg.lua')
+validpgpkeys=('32A9EDDE3609931EB98CEAC315907E8E7BDD6BFE'
+ '3E52119EF853C59678DBBF6BADED9A77B67AD329')
+source=("https://prosody.im/downloads/source/prosody-$pkgver.tar.gz"{,.asc}
+ 'prosody.tmpfile.d'
+ 'prosody.logrotated'
+ 'sysuser.conf'
+ 'prosody.service')
+sha256sums=('55f8bd65d5d2af61cc739bd6164e4207011e0d2d260cde583071c90d8d85408b'
+ 'SKIP'
+ '0753bd9260f1cfdce6e18e01a61e320b396acfe9fca8ccf3250653bfa6af997e'
+ '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
+ 'e5c30ffbb066f0ed3444475b3313490c535d8c9df018726f6cecf9e3ddfd2e48'
+ 'ea34a3802e9a6b181cc1039eda48538fc9335c432223b225a8801d9d636f268c')
+
+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.2 \
+ --cflags="${CFLAGS} -fPIC -Wall -Wextra -D_GNU_SOURCE" \
+ --ldflags="${LDFLAGS} -shared" --no-example-certs \
+ --runwith=lua5.2
+ 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: prosody.install
===================================================================
--- prosody.install 2020-03-25 15:03:38 UTC (rev 604237)
+++ prosody.install 2020-03-25 15:03:53 UTC (rev 604238)
@@ -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 604237, prosody/trunk/prosody.install)
===================================================================
--- prosody.install (rev 0)
+++ prosody.install 2020-03-25 15:03:53 UTC (rev 604238)
@@ -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: prosody.logrotated
===================================================================
--- prosody.logrotated 2020-03-25 15:03:38 UTC (rev 604237)
+++ prosody.logrotated 2020-03-25 15:03:53 UTC (rev 604238)
@@ -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 604237, prosody/trunk/prosody.logrotated)
===================================================================
--- prosody.logrotated (rev 0)
+++ prosody.logrotated 2020-03-25 15:03:53 UTC (rev 604238)
@@ -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: prosody.service
===================================================================
--- prosody.service 2020-03-25 15:03:38 UTC (rev 604237)
+++ prosody.service 2020-03-25 15:03:53 UTC (rev 604238)
@@ -1,15 +0,0 @@
-[Unit]
-Description=XMPP (Jabber) Server
-After=network.target
-Documentation=https://prosody.im/doc
-Documentation=https://wiki.archlinux.org/index.php/Prosody
-
-[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 604237, prosody/trunk/prosody.service)
===================================================================
--- prosody.service (rev 0)
+++ prosody.service 2020-03-25 15:03:53 UTC (rev 604238)
@@ -0,0 +1,15 @@
+[Unit]
+Description=XMPP (Jabber) Server
+After=network.target
+Documentation=https://prosody.im/doc
+Documentation=https://wiki.archlinux.org/index.php/Prosody
+
+[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: prosody.tmpfile.d
===================================================================
--- prosody.tmpfile.d 2020-03-25 15:03:38 UTC (rev 604237)
+++ prosody.tmpfile.d 2020-03-25 15:03:53 UTC (rev 604238)
@@ -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 604237, prosody/trunk/prosody.tmpfile.d)
===================================================================
--- prosody.tmpfile.d (rev 0)
+++ prosody.tmpfile.d 2020-03-25 15:03:53 UTC (rev 604238)
@@ -0,0 +1,2 @@
+d /run/prosody 0755 prosody jabber -
+d /var/lib/prosody 0750 prosody jabber -
Deleted: sysuser.conf
===================================================================
--- sysuser.conf 2020-03-25 15:03:38 UTC (rev 604237)
+++ sysuser.conf 2020-03-25 15:03:53 UTC (rev 604238)
@@ -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 604237, prosody/trunk/sysuser.conf)
===================================================================
--- sysuser.conf (rev 0)
+++ sysuser.conf 2020-03-25 15:03:53 UTC (rev 604238)
@@ -0,0 +1,3 @@
+g jabber 17 - -
+u prosody - "Prosody XMPP Server" /var/lib/prosody
+m prosody jabber
More information about the arch-commits
mailing list