Date: Thursday, October 9, 2014 @ 14:54:01
Author: spupykin
Revision: 120444
archrelease: copy trunk to community-i686, community-x86_64
Added:
prosody/repos/community-i686/PKGBUILD
(from rev 120443, prosody/trunk/PKGBUILD)
prosody/repos/community-i686/fix-config.patch
(from rev 120443, prosody/trunk/fix-config.patch)
prosody/repos/community-i686/prosody.install
(from rev 120443, prosody/trunk/prosody.install)
prosody/repos/community-i686/prosody.logrotated
(from rev 120443, prosody/trunk/prosody.logrotated)
prosody/repos/community-i686/prosody.service
(from rev 120443, prosody/trunk/prosody.service)
prosody/repos/community-i686/prosody.tmpfile.d
(from rev 120443, prosody/trunk/prosody.tmpfile.d)
prosody/repos/community-x86_64/PKGBUILD
(from rev 120443, prosody/trunk/PKGBUILD)
prosody/repos/community-x86_64/fix-config.patch
(from rev 120443, prosody/trunk/fix-config.patch)
prosody/repos/community-x86_64/prosody.install
(from rev 120443, prosody/trunk/prosody.install)
prosody/repos/community-x86_64/prosody.logrotated
(from rev 120443, prosody/trunk/prosody.logrotated)
prosody/repos/community-x86_64/prosody.service
(from rev 120443, prosody/trunk/prosody.service)
prosody/repos/community-x86_64/prosody.tmpfile.d
(from rev 120443, prosody/trunk/prosody.tmpfile.d)
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-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
-------------------------------------+
/PKGBUILD | 128 ++++++++++++++++++++++++++++++++++
/fix-config.patch | 88 +++++++++++++++++++++++
/prosody.install | 76 ++++++++++++++++++++
/prosody.logrotated | 18 ++++
/prosody.service | 26 ++++++
/prosody.tmpfile.d | 2
community-i686/PKGBUILD | 64 -----------------
community-i686/fix-config.patch | 44 -----------
community-i686/prosody.install | 38 ----------
community-i686/prosody.logrotated | 9 --
community-i686/prosody.service | 13 ---
community-i686/prosody.tmpfile.d | 1
community-x86_64/PKGBUILD | 64 -----------------
community-x86_64/fix-config.patch | 44 -----------
community-x86_64/prosody.install | 38 ----------
community-x86_64/prosody.logrotated | 9 --
community-x86_64/prosody.service | 13 ---
community-x86_64/prosody.tmpfile.d | 1
18 files changed, 338 insertions(+), 338 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-i686/PKGBUILD 2014-10-09 12:54:01 UTC (rev 120444)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: Dwayne Bent <d...@dbb.io>
-# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com>
-# Contributor: Timothée Ravier <t...@siosm.fr>
-
-pkgname=prosody
-pkgver=0.9.4
-pkgrel=3
-pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
-arch=('i686' 'x86_64')
-url="http://prosody.im/";
-license=('MIT')
-depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn'
- 'openssl')
-optdepends=('lua51-sec: TLS encryption support')
-install=prosody.install
-backup=('etc/logrotate.d/prosody'
- 'etc/prosody/prosody.cfg.lua')
-source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
- 'prosody.logrotated'
- 'fix-config.patch'
- 'prosody.tmpfile.d'
- 'prosody.service')
-md5sums=('94f9a613c834c276352ac5b142fb72e0'
- 'SKIP'
- '5b44aee99f1fa9e7f055e067688cafbd'
- '01b6aa0b1e1e3067756c45b0751bee78'
- 'e2f5a1df410b05696a30dcb058841084'
- 'e74045f27cb60908d535969906781f75')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 < ../fix-config.patch
-}
-
-build() {
- cd ${pkgname}-${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 ${pkgname}-${pkgver}
- 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
-
- for i in tools/*.lua; do
- install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i}
- done
-
- install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
- rm "${pkgdir}"/etc/prosody/certs/*
-}
-
-# vim: ft=sh syn=sh ts=2 sw=2
Copied: prosody/repos/community-i686/PKGBUILD (from rev 120443,
prosody/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-10-09 12:54:01 UTC (rev 120444)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: Dwayne Bent <d...@dbb.io>
+# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com>
+# Contributor: Timothée Ravier <t...@siosm.fr>
+
+pkgname=prosody
+pkgver=0.9.5
+pkgrel=1
+pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
+arch=('i686' 'x86_64')
+url="http://prosody.im/";
+license=('MIT')
+depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn'
+ 'openssl')
+optdepends=('lua51-sec: TLS encryption support')
+install=prosody.install
+backup=('etc/logrotate.d/prosody'
+ 'etc/prosody/prosody.cfg.lua')
+source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
+ 'prosody.logrotated'
+ 'fix-config.patch'
+ 'prosody.tmpfile.d'
+ 'prosody.service')
+md5sums=('11a506017c49f7e5ab9049f123b55420'
+ 'SKIP'
+ '5b44aee99f1fa9e7f055e067688cafbd'
+ '01b6aa0b1e1e3067756c45b0751bee78'
+ 'e2f5a1df410b05696a30dcb058841084'
+ 'e74045f27cb60908d535969906781f75')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 < ../fix-config.patch
+}
+
+build() {
+ cd ${pkgname}-${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 ${pkgname}-${pkgver}
+ 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
+
+ for i in tools/*.lua; do
+ install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i}
+ done
+
+ install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
+ rm "${pkgdir}"/etc/prosody/certs/*
+}
+
+# vim: ft=sh syn=sh ts=2 sw=2
Deleted: community-i686/fix-config.patch
===================================================================
--- community-i686/fix-config.patch 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-i686/fix-config.patch 2014-10-09 12:54:01 UTC (rev 120444)
@@ -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 120443,
prosody/trunk/fix-config.patch)
===================================================================
--- community-i686/fix-config.patch (rev 0)
+++ community-i686/fix-config.patch 2014-10-09 12:54:01 UTC (rev 120444)
@@ -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 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-i686/prosody.install 2014-10-09 12:54:01 UTC (rev 120444)
@@ -1,38 +0,0 @@
-post_install() {
- if [ -z "`grep '^prosody:' /etc/group`" ]; then
- groupadd -g 412 prosody
- fi
- if [ -z "`grep '^prosody:' /etc/passwd`" ]; then
- useradd -u 412 -d /var/lib/prosody -g prosody -s /bin/false prosody
- fi
-
- chown prosody:prosody var/lib/prosody
- [ -d var/log/prosody ] && chown prosody:prosody var/log/prosody
-
- echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody";
-
- systemd-tmpfiles --create prosody.conf
-}
-
-post_upgrade() {
- post_install $1
- echo "Now prosody logs to syslog by default"
-}
-
-post_remove() {
- userdel prosody
-
- 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 120443,
prosody/trunk/prosody.install)
===================================================================
--- community-i686/prosody.install (rev 0)
+++ community-i686/prosody.install 2014-10-09 12:54:01 UTC (rev 120444)
@@ -0,0 +1,38 @@
+post_install() {
+ if [ -z "`grep '^prosody:' /etc/group`" ]; then
+ groupadd -g 412 prosody
+ fi
+ if [ -z "`grep '^prosody:' /etc/passwd`" ]; then
+ useradd -u 412 -d /var/lib/prosody -g prosody -s /bin/false prosody
+ fi
+
+ chown prosody:prosody var/lib/prosody
+ [ -d var/log/prosody ] && chown prosody:prosody var/log/prosody
+
+ echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody";
+
+ systemd-tmpfiles --create prosody.conf
+}
+
+post_upgrade() {
+ post_install $1
+ echo "Now prosody logs to syslog by default"
+}
+
+post_remove() {
+ userdel prosody
+
+ 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 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-i686/prosody.logrotated 2014-10-09 12:54:01 UTC (rev 120444)
@@ -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 120443,
prosody/trunk/prosody.logrotated)
===================================================================
--- community-i686/prosody.logrotated (rev 0)
+++ community-i686/prosody.logrotated 2014-10-09 12:54:01 UTC (rev 120444)
@@ -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 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-i686/prosody.service 2014-10-09 12:54:01 UTC (rev 120444)
@@ -1,13 +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
-
-[Install]
-WantedBy=multi-user.target
-
Copied: prosody/repos/community-i686/prosody.service (from rev 120443,
prosody/trunk/prosody.service)
===================================================================
--- community-i686/prosody.service (rev 0)
+++ community-i686/prosody.service 2014-10-09 12:54:01 UTC (rev 120444)
@@ -0,0 +1,13 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
+
Deleted: community-i686/prosody.tmpfile.d
===================================================================
--- community-i686/prosody.tmpfile.d 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-i686/prosody.tmpfile.d 2014-10-09 12:54:01 UTC (rev 120444)
@@ -1 +0,0 @@
-d /run/prosody 0755 412 412
Copied: prosody/repos/community-i686/prosody.tmpfile.d (from rev 120443,
prosody/trunk/prosody.tmpfile.d)
===================================================================
--- community-i686/prosody.tmpfile.d (rev 0)
+++ community-i686/prosody.tmpfile.d 2014-10-09 12:54:01 UTC (rev 120444)
@@ -0,0 +1 @@
+d /run/prosody 0755 412 412
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-x86_64/PKGBUILD 2014-10-09 12:54:01 UTC (rev 120444)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: Dwayne Bent <d...@dbb.io>
-# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com>
-# Contributor: Timothée Ravier <t...@siosm.fr>
-
-pkgname=prosody
-pkgver=0.9.4
-pkgrel=3
-pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
-arch=('i686' 'x86_64')
-url="http://prosody.im/";
-license=('MIT')
-depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn'
- 'openssl')
-optdepends=('lua51-sec: TLS encryption support')
-install=prosody.install
-backup=('etc/logrotate.d/prosody'
- 'etc/prosody/prosody.cfg.lua')
-source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
- 'prosody.logrotated'
- 'fix-config.patch'
- 'prosody.tmpfile.d'
- 'prosody.service')
-md5sums=('94f9a613c834c276352ac5b142fb72e0'
- 'SKIP'
- '5b44aee99f1fa9e7f055e067688cafbd'
- '01b6aa0b1e1e3067756c45b0751bee78'
- 'e2f5a1df410b05696a30dcb058841084'
- 'e74045f27cb60908d535969906781f75')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 < ../fix-config.patch
-}
-
-build() {
- cd ${pkgname}-${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 ${pkgname}-${pkgver}
- 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
-
- for i in tools/*.lua; do
- install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i}
- done
-
- install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
- rm "${pkgdir}"/etc/prosody/certs/*
-}
-
-# vim: ft=sh syn=sh ts=2 sw=2
Copied: prosody/repos/community-x86_64/PKGBUILD (from rev 120443,
prosody/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-10-09 12:54:01 UTC (rev 120444)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: Dwayne Bent <d...@dbb.io>
+# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com>
+# Contributor: Timothée Ravier <t...@siosm.fr>
+
+pkgname=prosody
+pkgver=0.9.5
+pkgrel=1
+pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
+arch=('i686' 'x86_64')
+url="http://prosody.im/";
+license=('MIT')
+depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn'
+ 'openssl')
+optdepends=('lua51-sec: TLS encryption support')
+install=prosody.install
+backup=('etc/logrotate.d/prosody'
+ 'etc/prosody/prosody.cfg.lua')
+source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
+ 'prosody.logrotated'
+ 'fix-config.patch'
+ 'prosody.tmpfile.d'
+ 'prosody.service')
+md5sums=('11a506017c49f7e5ab9049f123b55420'
+ 'SKIP'
+ '5b44aee99f1fa9e7f055e067688cafbd'
+ '01b6aa0b1e1e3067756c45b0751bee78'
+ 'e2f5a1df410b05696a30dcb058841084'
+ 'e74045f27cb60908d535969906781f75')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 < ../fix-config.patch
+}
+
+build() {
+ cd ${pkgname}-${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 ${pkgname}-${pkgver}
+ 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
+
+ for i in tools/*.lua; do
+ install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i}
+ done
+
+ install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
+ rm "${pkgdir}"/etc/prosody/certs/*
+}
+
+# vim: ft=sh syn=sh ts=2 sw=2
Deleted: community-x86_64/fix-config.patch
===================================================================
--- community-x86_64/fix-config.patch 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-x86_64/fix-config.patch 2014-10-09 12:54:01 UTC (rev 120444)
@@ -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 120443,
prosody/trunk/fix-config.patch)
===================================================================
--- community-x86_64/fix-config.patch (rev 0)
+++ community-x86_64/fix-config.patch 2014-10-09 12:54:01 UTC (rev 120444)
@@ -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 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-x86_64/prosody.install 2014-10-09 12:54:01 UTC (rev 120444)
@@ -1,38 +0,0 @@
-post_install() {
- if [ -z "`grep '^prosody:' /etc/group`" ]; then
- groupadd -g 412 prosody
- fi
- if [ -z "`grep '^prosody:' /etc/passwd`" ]; then
- useradd -u 412 -d /var/lib/prosody -g prosody -s /bin/false prosody
- fi
-
- chown prosody:prosody var/lib/prosody
- [ -d var/log/prosody ] && chown prosody:prosody var/log/prosody
-
- echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody";
-
- systemd-tmpfiles --create prosody.conf
-}
-
-post_upgrade() {
- post_install $1
- echo "Now prosody logs to syslog by default"
-}
-
-post_remove() {
- userdel prosody
-
- 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 120443,
prosody/trunk/prosody.install)
===================================================================
--- community-x86_64/prosody.install (rev 0)
+++ community-x86_64/prosody.install 2014-10-09 12:54:01 UTC (rev 120444)
@@ -0,0 +1,38 @@
+post_install() {
+ if [ -z "`grep '^prosody:' /etc/group`" ]; then
+ groupadd -g 412 prosody
+ fi
+ if [ -z "`grep '^prosody:' /etc/passwd`" ]; then
+ useradd -u 412 -d /var/lib/prosody -g prosody -s /bin/false prosody
+ fi
+
+ chown prosody:prosody var/lib/prosody
+ [ -d var/log/prosody ] && chown prosody:prosody var/log/prosody
+
+ echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody";
+
+ systemd-tmpfiles --create prosody.conf
+}
+
+post_upgrade() {
+ post_install $1
+ echo "Now prosody logs to syslog by default"
+}
+
+post_remove() {
+ userdel prosody
+
+ 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 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-x86_64/prosody.logrotated 2014-10-09 12:54:01 UTC (rev 120444)
@@ -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 120443,
prosody/trunk/prosody.logrotated)
===================================================================
--- community-x86_64/prosody.logrotated (rev 0)
+++ community-x86_64/prosody.logrotated 2014-10-09 12:54:01 UTC (rev 120444)
@@ -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 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-x86_64/prosody.service 2014-10-09 12:54:01 UTC (rev 120444)
@@ -1,13 +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
-
-[Install]
-WantedBy=multi-user.target
-
Copied: prosody/repos/community-x86_64/prosody.service (from rev 120443,
prosody/trunk/prosody.service)
===================================================================
--- community-x86_64/prosody.service (rev 0)
+++ community-x86_64/prosody.service 2014-10-09 12:54:01 UTC (rev 120444)
@@ -0,0 +1,13 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
+
Deleted: community-x86_64/prosody.tmpfile.d
===================================================================
--- community-x86_64/prosody.tmpfile.d 2014-10-09 12:53:36 UTC (rev 120443)
+++ community-x86_64/prosody.tmpfile.d 2014-10-09 12:54:01 UTC (rev 120444)
@@ -1 +0,0 @@
-d /run/prosody 0755 412 412
Copied: prosody/repos/community-x86_64/prosody.tmpfile.d (from rev 120443,
prosody/trunk/prosody.tmpfile.d)
===================================================================
--- community-x86_64/prosody.tmpfile.d (rev 0)
+++ community-x86_64/prosody.tmpfile.d 2014-10-09 12:54:01 UTC (rev 120444)
@@ -0,0 +1 @@
+d /run/prosody 0755 412 412
