[arch-commits] Commit in ejabberd/repos (20 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Thu Apr 17 10:33:05 UTC 2014


    Date: Thursday, April 17, 2014 @ 12:33:05
  Author: spupykin
Revision: 109642

archrelease: copy trunk to community-x86_64, community-i686

Added:
  ejabberd/repos/community-i686/PKGBUILD
    (from rev 109641, ejabberd/trunk/PKGBUILD)
  ejabberd/repos/community-i686/crash-fix.patch
    (from rev 109641, ejabberd/trunk/crash-fix.patch)
  ejabberd/repos/community-i686/ejabberd.install
    (from rev 109641, ejabberd/trunk/ejabberd.install)
  ejabberd/repos/community-i686/ejabberd.logrotate
    (from rev 109641, ejabberd/trunk/ejabberd.logrotate)
  ejabberd/repos/community-i686/ejabberd.service
    (from rev 109641, ejabberd/trunk/ejabberd.service)
  ejabberd/repos/community-x86_64/PKGBUILD
    (from rev 109641, ejabberd/trunk/PKGBUILD)
  ejabberd/repos/community-x86_64/crash-fix.patch
    (from rev 109641, ejabberd/trunk/crash-fix.patch)
  ejabberd/repos/community-x86_64/ejabberd.install
    (from rev 109641, ejabberd/trunk/ejabberd.install)
  ejabberd/repos/community-x86_64/ejabberd.logrotate
    (from rev 109641, ejabberd/trunk/ejabberd.logrotate)
  ejabberd/repos/community-x86_64/ejabberd.service
    (from rev 109641, ejabberd/trunk/ejabberd.service)
Deleted:
  ejabberd/repos/community-i686/PKGBUILD
  ejabberd/repos/community-i686/crash-fix.patch
  ejabberd/repos/community-i686/ejabberd.install
  ejabberd/repos/community-i686/ejabberd.logrotate
  ejabberd/repos/community-i686/ejabberd.service
  ejabberd/repos/community-x86_64/PKGBUILD
  ejabberd/repos/community-x86_64/crash-fix.patch
  ejabberd/repos/community-x86_64/ejabberd.install
  ejabberd/repos/community-x86_64/ejabberd.logrotate
  ejabberd/repos/community-x86_64/ejabberd.service

-------------------------------------+
 /PKGBUILD                           |  220 ++++++++++++++++++++++++++++++++++
 /crash-fix.patch                    |   28 ++++
 /ejabberd.install                   |   42 ++++++
 /ejabberd.logrotate                 |   24 +++
 /ejabberd.service                   |   28 ++++
 community-i686/PKGBUILD             |   99 ---------------
 community-i686/crash-fix.patch      |   14 --
 community-i686/ejabberd.install     |   21 ---
 community-i686/ejabberd.logrotate   |   12 -
 community-i686/ejabberd.service     |   14 --
 community-x86_64/PKGBUILD           |   99 ---------------
 community-x86_64/crash-fix.patch    |   14 --
 community-x86_64/ejabberd.install   |   21 ---
 community-x86_64/ejabberd.logrotate |   12 -
 community-x86_64/ejabberd.service   |   14 --
 15 files changed, 342 insertions(+), 320 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-04-17 10:32:43 UTC (rev 109641)
+++ community-i686/PKGBUILD	2014-04-17 10:33:05 UTC (rev 109642)
@@ -1,99 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
-# Contributor: Alexander Rødseth <rodseth at gmail.com>
-
-pkgname=ejabberd
-pkgver=13.12
-pkgrel=1
-pkgdesc="Jabber server written in Erlang"
-arch=('x86_64' 'i686')
-url="http://www.ejabberd.im/"
-license=("GPL")
-depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml')
-makedepends=('git' 'rebar')
-backup=('etc/ejabberd/ejabberd.yml'
-	'etc/ejabberd/ejabberdctl.cfg'
-	'etc/logrotate.d/ejabberd')
-install=$pkgname.install
-replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn'
-	  'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
-	"p1_cache_tab::git://github.com/processone/cache_tab"
-	"p1_tls::git://github.com/processone/tls"
-	"p1_stringprep::git://github.com/processone/stringprep"
-	"p1_xml::git://github.com/processone/xml"
-	"p1_yaml::git://github.com/processone/p1_yaml"
-	"git://github.com/rds13/xmlrpc"
-	"p1_pam::git://github.com/processone/epam"
-	"p1_zlib::git://github.com/processone/zlib"
-	"git://github.com/basho/lager"
-	"p1_iconv::git://github.com/processone/eiconv"
-	"git://github.com/DeadZen/goldrush.git"
-	"p1_mysql::git://github.com/processone/mysql.git"
-	"p1_pgsql::git://github.com/processone/pgsql.git"
-	"p1_stun::git://github.com/processone/stun"
-	"git://github.com/davisp/jiffy"
-	"git://github.com/cmullaparthi/ibrowse"
-	"git://github.com/esl/lhttpc"
-	"$pkgname.logrotate"
-	"ejabberd.service"
-	"crash-fix.patch")
-md5sums=('6eadb6f190d55c8a679de5496ca0c4a9'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'f97c8a96160f30e0aecc9526c12e6606'
-         'a437aff9d7d477fb036d527205617e18'
-         'ef3dd667dec1627c1597c7f6f3cfcd4a')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 <$srcdir/crash-fix.patch
-
-  mkdir -p "$srcdir/$pkgname-$pkgver/deps"
-  for i in goldrush lager p1_cache_tab p1_iconv p1_pam \
-           p1_stringprep p1_tls p1_xml p1_yaml p1_zlib xmlrpc \
-           p1_mysql p1_pgsql p1_stun jiffy ibrowse lhttpc; do
-    rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
-    mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
-  done
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --enable-all
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -d "$pkgdir/var/lib/$pkgname"
-  install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
-  chmod ug+r "$pkgdir/etc/$pkgname/"*
-  mkdir -p $pkgdir/usr/bin
-  mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
-  chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
-  rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
-  install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
-  # workaround
-  ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
-}
-
-# vim:set ts=2 sw=2 et:

Copied: ejabberd/repos/community-i686/PKGBUILD (from rev 109641, ejabberd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-04-17 10:33:05 UTC (rev 109642)
@@ -0,0 +1,110 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+
+pkgname=ejabberd
+pkgver=13.12
+pkgrel=2
+pkgdesc="Jabber server written in Erlang"
+arch=('x86_64' 'i686')
+url="http://www.ejabberd.im/"
+license=("GPL")
+depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml')
+makedepends=('git' 'rebar')
+backup=('etc/ejabberd/ejabberd.yml'
+	'etc/ejabberd/ejabberdctl.cfg'
+	'etc/logrotate.d/ejabberd')
+install=$pkgname.install
+replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn'
+	  'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
+	"p1_cache_tab::git://github.com/processone/cache_tab"
+	"p1_tls::git://github.com/processone/tls"
+	"p1_stringprep::git://github.com/processone/stringprep"
+	"p1_xml::git://github.com/processone/xml"
+	"p1_yaml::git://github.com/processone/p1_yaml"
+	"git://github.com/rds13/xmlrpc"
+	"p1_pam::git://github.com/processone/epam"
+	"p1_zlib::git://github.com/processone/zlib"
+	"git://github.com/basho/lager"
+	"p1_iconv::git://github.com/processone/eiconv"
+	"git://github.com/DeadZen/goldrush.git"
+	"p1_mysql::git://github.com/processone/mysql.git"
+	"p1_pgsql::git://github.com/processone/pgsql.git"
+	"p1_stun::git://github.com/processone/stun"
+	"git://github.com/davisp/jiffy"
+	"git://github.com/cmullaparthi/ibrowse"
+	"git://github.com/esl/lhttpc"
+	"$pkgname.logrotate"
+	"ejabberd.service"
+	"crash-fix.patch"
+	"https://github.com/processone/ejabberd/commit/7af7b7d3f0c4bf399fb7db54c38090c8d1a25873.patch"
+	"https://github.com/processone/ejabberd/commit/d97b4fd9ca36858a12bc5e6841334cde4c8f0431.patch")
+md5sums=('6eadb6f190d55c8a679de5496ca0c4a9'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'f97c8a96160f30e0aecc9526c12e6606'
+         'a437aff9d7d477fb036d527205617e18'
+         'ef3dd667dec1627c1597c7f6f3cfcd4a'
+         'aa8cf60e39b0deee112e20f305022ade'
+         '5f2cada6c6504f1e3874ef33606751c8')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -p1 <$srcdir/crash-fix.patch
+
+  # erlang 17 fix
+  patch -p1 <$srcdir/d97b4fd9ca36858a12bc5e6841334cde4c8f0431.patch
+  patch -p1 <$srcdir/7af7b7d3f0c4bf399fb7db54c38090c8d1a25873.patch
+
+  mkdir -p "$srcdir/$pkgname-$pkgver/deps"
+  for i in goldrush lager p1_cache_tab p1_iconv p1_pam \
+           p1_stringprep p1_tls p1_xml p1_yaml p1_zlib xmlrpc \
+           p1_mysql p1_pgsql p1_stun jiffy ibrowse lhttpc; do
+    rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
+    mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
+  done
+
+  sed -i 's|%%% @author.*|%%% @author Oscar Hellstrom <oscar at hellstrom.st>|g' deps/lhttpc/src/lhttpc.app.src
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --enable-all
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -d "$pkgdir/var/lib/$pkgname"
+  install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
+  chmod ug+r "$pkgdir/etc/$pkgname/"*
+  mkdir -p $pkgdir/usr/bin
+  mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
+  chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
+  rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
+  install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
+  # workaround
+  ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/crash-fix.patch
===================================================================
--- community-i686/crash-fix.patch	2014-04-17 10:32:43 UTC (rev 109641)
+++ community-i686/crash-fix.patch	2014-04-17 10:33:05 UTC (rev 109642)
@@ -1,14 +0,0 @@
-diff -wbBur ejabberd-13.10/src/ejabberd_c2s.erl ejabberd-13.10.q/src/ejabberd_c2s.erl
---- ejabberd-13.10/src/ejabberd_c2s.erl	2013-09-27 13:19:22.000000000 +0400
-+++ ejabberd-13.10.q/src/ejabberd_c2s.erl	2013-11-16 03:37:15.525501597 +0400
-@@ -536,8 +536,8 @@
- 				[StateData#state.socket,
- 				 jlib:jid_to_string(JID), AuthModule]),
- 			SID = {now(), self()},
--			Conn = (StateData#state.sockmod):get_conn_type(
--				    StateData#state.socket),
-+			Conn = get_conn_type(
-+				    StateData),
- 			Info = [{ip, StateData#state.ip}, {conn, Conn},
- 				    {auth_module, AuthModule}],
-                         Res = jlib:make_result_iq_reply(

Copied: ejabberd/repos/community-i686/crash-fix.patch (from rev 109641, ejabberd/trunk/crash-fix.patch)
===================================================================
--- community-i686/crash-fix.patch	                        (rev 0)
+++ community-i686/crash-fix.patch	2014-04-17 10:33:05 UTC (rev 109642)
@@ -0,0 +1,14 @@
+diff -wbBur ejabberd-13.10/src/ejabberd_c2s.erl ejabberd-13.10.q/src/ejabberd_c2s.erl
+--- ejabberd-13.10/src/ejabberd_c2s.erl	2013-09-27 13:19:22.000000000 +0400
++++ ejabberd-13.10.q/src/ejabberd_c2s.erl	2013-11-16 03:37:15.525501597 +0400
+@@ -536,8 +536,8 @@
+ 				[StateData#state.socket,
+ 				 jlib:jid_to_string(JID), AuthModule]),
+ 			SID = {now(), self()},
+-			Conn = (StateData#state.sockmod):get_conn_type(
+-				    StateData#state.socket),
++			Conn = get_conn_type(
++				    StateData),
+ 			Info = [{ip, StateData#state.ip}, {conn, Conn},
+ 				    {auth_module, AuthModule}],
+                         Res = jlib:make_result_iq_reply(

Deleted: community-i686/ejabberd.install
===================================================================
--- community-i686/ejabberd.install	2014-04-17 10:32:43 UTC (rev 109641)
+++ community-i686/ejabberd.install	2014-04-17 10:33:05 UTC (rev 109642)
@@ -1,21 +0,0 @@
-post_install() {
-  groupadd -r jabber
-  useradd -r -G jabber -d /var/lib/ejabberd ejabberd
-  chown -R ejabberd.jabber /var/log/ejabberd
-  chown -R ejabberd.jabber /var/lib/ejabberd
-  chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
-}
-
-post_upgrade() {
-  chown -R ejabberd.jabber /var/log/ejabberd
-  chown -R ejabberd.jabber /var/lib/ejabberd
-  chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
-  echo "!!! it is major update. Config must be converted to yaml format."
-}
-
-post_remove() {
-  userdel ejabberd
-  groupdel jabber
-}
-
-# vim:set ts=2 sw=2 et:

Copied: ejabberd/repos/community-i686/ejabberd.install (from rev 109641, ejabberd/trunk/ejabberd.install)
===================================================================
--- community-i686/ejabberd.install	                        (rev 0)
+++ community-i686/ejabberd.install	2014-04-17 10:33:05 UTC (rev 109642)
@@ -0,0 +1,21 @@
+post_install() {
+  groupadd -r jabber
+  useradd -r -G jabber -d /var/lib/ejabberd ejabberd
+  chown -R ejabberd.jabber /var/log/ejabberd
+  chown -R ejabberd.jabber /var/lib/ejabberd
+  chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+}
+
+post_upgrade() {
+  chown -R ejabberd.jabber /var/log/ejabberd
+  chown -R ejabberd.jabber /var/lib/ejabberd
+  chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+  echo "!!! it is major update. Config must be converted to yaml format."
+}
+
+post_remove() {
+  userdel ejabberd
+  groupdel jabber
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/ejabberd.logrotate
===================================================================
--- community-i686/ejabberd.logrotate	2014-04-17 10:32:43 UTC (rev 109641)
+++ community-i686/ejabberd.logrotate	2014-04-17 10:33:05 UTC (rev 109642)
@@ -1,12 +0,0 @@
-/var/log/ejabberd/ejabberd.log {
-     weekly
-     missingok
-     rotate 10
-     compress
-     delaycompress
-     ifempty
-     nomail
-     sharedscripts
-     postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
-     endscript
-}

Copied: ejabberd/repos/community-i686/ejabberd.logrotate (from rev 109641, ejabberd/trunk/ejabberd.logrotate)
===================================================================
--- community-i686/ejabberd.logrotate	                        (rev 0)
+++ community-i686/ejabberd.logrotate	2014-04-17 10:33:05 UTC (rev 109642)
@@ -0,0 +1,12 @@
+/var/log/ejabberd/ejabberd.log {
+     weekly
+     missingok
+     rotate 10
+     compress
+     delaycompress
+     ifempty
+     nomail
+     sharedscripts
+     postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
+     endscript
+}

Deleted: community-i686/ejabberd.service
===================================================================
--- community-i686/ejabberd.service	2014-04-17 10:32:43 UTC (rev 109641)
+++ community-i686/ejabberd.service	2014-04-17 10:33:05 UTC (rev 109642)
@@ -1,14 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=forking
-User=ejabberd
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/bin/ejabberdctl start
-ExecStop=/usr/bin/ejabberdctl stop
-
-[Install]
-WantedBy=multi-user.target

Copied: ejabberd/repos/community-i686/ejabberd.service (from rev 109641, ejabberd/trunk/ejabberd.service)
===================================================================
--- community-i686/ejabberd.service	                        (rev 0)
+++ community-i686/ejabberd.service	2014-04-17 10:33:05 UTC (rev 109642)
@@ -0,0 +1,14 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=forking
+User=ejabberd
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/usr/bin/ejabberdctl start
+ExecStop=/usr/bin/ejabberdctl stop
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-04-17 10:32:43 UTC (rev 109641)
+++ community-x86_64/PKGBUILD	2014-04-17 10:33:05 UTC (rev 109642)
@@ -1,99 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
-# Contributor: Alexander Rødseth <rodseth at gmail.com>
-
-pkgname=ejabberd
-pkgver=13.12
-pkgrel=1
-pkgdesc="Jabber server written in Erlang"
-arch=('x86_64' 'i686')
-url="http://www.ejabberd.im/"
-license=("GPL")
-depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml')
-makedepends=('git' 'rebar')
-backup=('etc/ejabberd/ejabberd.yml'
-	'etc/ejabberd/ejabberdctl.cfg'
-	'etc/logrotate.d/ejabberd')
-install=$pkgname.install
-replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn'
-	  'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
-	"p1_cache_tab::git://github.com/processone/cache_tab"
-	"p1_tls::git://github.com/processone/tls"
-	"p1_stringprep::git://github.com/processone/stringprep"
-	"p1_xml::git://github.com/processone/xml"
-	"p1_yaml::git://github.com/processone/p1_yaml"
-	"git://github.com/rds13/xmlrpc"
-	"p1_pam::git://github.com/processone/epam"
-	"p1_zlib::git://github.com/processone/zlib"
-	"git://github.com/basho/lager"
-	"p1_iconv::git://github.com/processone/eiconv"
-	"git://github.com/DeadZen/goldrush.git"
-	"p1_mysql::git://github.com/processone/mysql.git"
-	"p1_pgsql::git://github.com/processone/pgsql.git"
-	"p1_stun::git://github.com/processone/stun"
-	"git://github.com/davisp/jiffy"
-	"git://github.com/cmullaparthi/ibrowse"
-	"git://github.com/esl/lhttpc"
-	"$pkgname.logrotate"
-	"ejabberd.service"
-	"crash-fix.patch")
-md5sums=('6eadb6f190d55c8a679de5496ca0c4a9'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'f97c8a96160f30e0aecc9526c12e6606'
-         'a437aff9d7d477fb036d527205617e18'
-         'ef3dd667dec1627c1597c7f6f3cfcd4a')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 <$srcdir/crash-fix.patch
-
-  mkdir -p "$srcdir/$pkgname-$pkgver/deps"
-  for i in goldrush lager p1_cache_tab p1_iconv p1_pam \
-           p1_stringprep p1_tls p1_xml p1_yaml p1_zlib xmlrpc \
-           p1_mysql p1_pgsql p1_stun jiffy ibrowse lhttpc; do
-    rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
-    mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
-  done
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --enable-all
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -d "$pkgdir/var/lib/$pkgname"
-  install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
-  chmod ug+r "$pkgdir/etc/$pkgname/"*
-  mkdir -p $pkgdir/usr/bin
-  mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
-  chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
-  rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
-  install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
-  # workaround
-  ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
-}
-
-# vim:set ts=2 sw=2 et:

Copied: ejabberd/repos/community-x86_64/PKGBUILD (from rev 109641, ejabberd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-04-17 10:33:05 UTC (rev 109642)
@@ -0,0 +1,110 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+
+pkgname=ejabberd
+pkgver=13.12
+pkgrel=2
+pkgdesc="Jabber server written in Erlang"
+arch=('x86_64' 'i686')
+url="http://www.ejabberd.im/"
+license=("GPL")
+depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml')
+makedepends=('git' 'rebar')
+backup=('etc/ejabberd/ejabberd.yml'
+	'etc/ejabberd/ejabberdctl.cfg'
+	'etc/logrotate.d/ejabberd')
+install=$pkgname.install
+replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn'
+	  'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
+	"p1_cache_tab::git://github.com/processone/cache_tab"
+	"p1_tls::git://github.com/processone/tls"
+	"p1_stringprep::git://github.com/processone/stringprep"
+	"p1_xml::git://github.com/processone/xml"
+	"p1_yaml::git://github.com/processone/p1_yaml"
+	"git://github.com/rds13/xmlrpc"
+	"p1_pam::git://github.com/processone/epam"
+	"p1_zlib::git://github.com/processone/zlib"
+	"git://github.com/basho/lager"
+	"p1_iconv::git://github.com/processone/eiconv"
+	"git://github.com/DeadZen/goldrush.git"
+	"p1_mysql::git://github.com/processone/mysql.git"
+	"p1_pgsql::git://github.com/processone/pgsql.git"
+	"p1_stun::git://github.com/processone/stun"
+	"git://github.com/davisp/jiffy"
+	"git://github.com/cmullaparthi/ibrowse"
+	"git://github.com/esl/lhttpc"
+	"$pkgname.logrotate"
+	"ejabberd.service"
+	"crash-fix.patch"
+	"https://github.com/processone/ejabberd/commit/7af7b7d3f0c4bf399fb7db54c38090c8d1a25873.patch"
+	"https://github.com/processone/ejabberd/commit/d97b4fd9ca36858a12bc5e6841334cde4c8f0431.patch")
+md5sums=('6eadb6f190d55c8a679de5496ca0c4a9'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'f97c8a96160f30e0aecc9526c12e6606'
+         'a437aff9d7d477fb036d527205617e18'
+         'ef3dd667dec1627c1597c7f6f3cfcd4a'
+         'aa8cf60e39b0deee112e20f305022ade'
+         '5f2cada6c6504f1e3874ef33606751c8')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -p1 <$srcdir/crash-fix.patch
+
+  # erlang 17 fix
+  patch -p1 <$srcdir/d97b4fd9ca36858a12bc5e6841334cde4c8f0431.patch
+  patch -p1 <$srcdir/7af7b7d3f0c4bf399fb7db54c38090c8d1a25873.patch
+
+  mkdir -p "$srcdir/$pkgname-$pkgver/deps"
+  for i in goldrush lager p1_cache_tab p1_iconv p1_pam \
+           p1_stringprep p1_tls p1_xml p1_yaml p1_zlib xmlrpc \
+           p1_mysql p1_pgsql p1_stun jiffy ibrowse lhttpc; do
+    rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
+    mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
+  done
+
+  sed -i 's|%%% @author.*|%%% @author Oscar Hellstrom <oscar at hellstrom.st>|g' deps/lhttpc/src/lhttpc.app.src
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --enable-all
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -d "$pkgdir/var/lib/$pkgname"
+  install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
+  chmod ug+r "$pkgdir/etc/$pkgname/"*
+  mkdir -p $pkgdir/usr/bin
+  mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
+  chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
+  rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
+  install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
+  # workaround
+  ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/crash-fix.patch
===================================================================
--- community-x86_64/crash-fix.patch	2014-04-17 10:32:43 UTC (rev 109641)
+++ community-x86_64/crash-fix.patch	2014-04-17 10:33:05 UTC (rev 109642)
@@ -1,14 +0,0 @@
-diff -wbBur ejabberd-13.10/src/ejabberd_c2s.erl ejabberd-13.10.q/src/ejabberd_c2s.erl
---- ejabberd-13.10/src/ejabberd_c2s.erl	2013-09-27 13:19:22.000000000 +0400
-+++ ejabberd-13.10.q/src/ejabberd_c2s.erl	2013-11-16 03:37:15.525501597 +0400
-@@ -536,8 +536,8 @@
- 				[StateData#state.socket,
- 				 jlib:jid_to_string(JID), AuthModule]),
- 			SID = {now(), self()},
--			Conn = (StateData#state.sockmod):get_conn_type(
--				    StateData#state.socket),
-+			Conn = get_conn_type(
-+				    StateData),
- 			Info = [{ip, StateData#state.ip}, {conn, Conn},
- 				    {auth_module, AuthModule}],
-                         Res = jlib:make_result_iq_reply(

Copied: ejabberd/repos/community-x86_64/crash-fix.patch (from rev 109641, ejabberd/trunk/crash-fix.patch)
===================================================================
--- community-x86_64/crash-fix.patch	                        (rev 0)
+++ community-x86_64/crash-fix.patch	2014-04-17 10:33:05 UTC (rev 109642)
@@ -0,0 +1,14 @@
+diff -wbBur ejabberd-13.10/src/ejabberd_c2s.erl ejabberd-13.10.q/src/ejabberd_c2s.erl
+--- ejabberd-13.10/src/ejabberd_c2s.erl	2013-09-27 13:19:22.000000000 +0400
++++ ejabberd-13.10.q/src/ejabberd_c2s.erl	2013-11-16 03:37:15.525501597 +0400
+@@ -536,8 +536,8 @@
+ 				[StateData#state.socket,
+ 				 jlib:jid_to_string(JID), AuthModule]),
+ 			SID = {now(), self()},
+-			Conn = (StateData#state.sockmod):get_conn_type(
+-				    StateData#state.socket),
++			Conn = get_conn_type(
++				    StateData),
+ 			Info = [{ip, StateData#state.ip}, {conn, Conn},
+ 				    {auth_module, AuthModule}],
+                         Res = jlib:make_result_iq_reply(

Deleted: community-x86_64/ejabberd.install
===================================================================
--- community-x86_64/ejabberd.install	2014-04-17 10:32:43 UTC (rev 109641)
+++ community-x86_64/ejabberd.install	2014-04-17 10:33:05 UTC (rev 109642)
@@ -1,21 +0,0 @@
-post_install() {
-  groupadd -r jabber
-  useradd -r -G jabber -d /var/lib/ejabberd ejabberd
-  chown -R ejabberd.jabber /var/log/ejabberd
-  chown -R ejabberd.jabber /var/lib/ejabberd
-  chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
-}
-
-post_upgrade() {
-  chown -R ejabberd.jabber /var/log/ejabberd
-  chown -R ejabberd.jabber /var/lib/ejabberd
-  chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
-  echo "!!! it is major update. Config must be converted to yaml format."
-}
-
-post_remove() {
-  userdel ejabberd
-  groupdel jabber
-}
-
-# vim:set ts=2 sw=2 et:

Copied: ejabberd/repos/community-x86_64/ejabberd.install (from rev 109641, ejabberd/trunk/ejabberd.install)
===================================================================
--- community-x86_64/ejabberd.install	                        (rev 0)
+++ community-x86_64/ejabberd.install	2014-04-17 10:33:05 UTC (rev 109642)
@@ -0,0 +1,21 @@
+post_install() {
+  groupadd -r jabber
+  useradd -r -G jabber -d /var/lib/ejabberd ejabberd
+  chown -R ejabberd.jabber /var/log/ejabberd
+  chown -R ejabberd.jabber /var/lib/ejabberd
+  chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+}
+
+post_upgrade() {
+  chown -R ejabberd.jabber /var/log/ejabberd
+  chown -R ejabberd.jabber /var/lib/ejabberd
+  chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+  echo "!!! it is major update. Config must be converted to yaml format."
+}
+
+post_remove() {
+  userdel ejabberd
+  groupdel jabber
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/ejabberd.logrotate
===================================================================
--- community-x86_64/ejabberd.logrotate	2014-04-17 10:32:43 UTC (rev 109641)
+++ community-x86_64/ejabberd.logrotate	2014-04-17 10:33:05 UTC (rev 109642)
@@ -1,12 +0,0 @@
-/var/log/ejabberd/ejabberd.log {
-     weekly
-     missingok
-     rotate 10
-     compress
-     delaycompress
-     ifempty
-     nomail
-     sharedscripts
-     postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
-     endscript
-}

Copied: ejabberd/repos/community-x86_64/ejabberd.logrotate (from rev 109641, ejabberd/trunk/ejabberd.logrotate)
===================================================================
--- community-x86_64/ejabberd.logrotate	                        (rev 0)
+++ community-x86_64/ejabberd.logrotate	2014-04-17 10:33:05 UTC (rev 109642)
@@ -0,0 +1,12 @@
+/var/log/ejabberd/ejabberd.log {
+     weekly
+     missingok
+     rotate 10
+     compress
+     delaycompress
+     ifempty
+     nomail
+     sharedscripts
+     postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
+     endscript
+}

Deleted: community-x86_64/ejabberd.service
===================================================================
--- community-x86_64/ejabberd.service	2014-04-17 10:32:43 UTC (rev 109641)
+++ community-x86_64/ejabberd.service	2014-04-17 10:33:05 UTC (rev 109642)
@@ -1,14 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=forking
-User=ejabberd
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/bin/ejabberdctl start
-ExecStop=/usr/bin/ejabberdctl stop
-
-[Install]
-WantedBy=multi-user.target

Copied: ejabberd/repos/community-x86_64/ejabberd.service (from rev 109641, ejabberd/trunk/ejabberd.service)
===================================================================
--- community-x86_64/ejabberd.service	                        (rev 0)
+++ community-x86_64/ejabberd.service	2014-04-17 10:33:05 UTC (rev 109642)
@@ -0,0 +1,14 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=forking
+User=ejabberd
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/usr/bin/ejabberdctl start
+ExecStop=/usr/bin/ejabberdctl stop
+
+[Install]
+WantedBy=multi-user.target




More information about the arch-commits mailing list