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

Sergej Pupykin spupykin at archlinux.org
Tue Feb 10 15:23:22 UTC 2015


    Date: Tuesday, February 10, 2015 @ 16:23:21
  Author: spupykin
Revision: 127468

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

Added:
  ejabberd/repos/community-i686/PKGBUILD
    (from rev 127467, ejabberd/trunk/PKGBUILD)
  ejabberd/repos/community-i686/ejabberd.install
    (from rev 127467, ejabberd/trunk/ejabberd.install)
  ejabberd/repos/community-i686/ejabberd.logrotate
    (from rev 127467, ejabberd/trunk/ejabberd.logrotate)
  ejabberd/repos/community-i686/ejabberd.service
    (from rev 127467, ejabberd/trunk/ejabberd.service)
  ejabberd/repos/community-i686/sysuser.conf
    (from rev 127467, ejabberd/trunk/sysuser.conf)
  ejabberd/repos/community-x86_64/PKGBUILD
    (from rev 127467, ejabberd/trunk/PKGBUILD)
  ejabberd/repos/community-x86_64/ejabberd.install
    (from rev 127467, ejabberd/trunk/ejabberd.install)
  ejabberd/repos/community-x86_64/ejabberd.logrotate
    (from rev 127467, ejabberd/trunk/ejabberd.logrotate)
  ejabberd/repos/community-x86_64/ejabberd.service
    (from rev 127467, ejabberd/trunk/ejabberd.service)
  ejabberd/repos/community-x86_64/sysuser.conf
    (from rev 127467, ejabberd/trunk/sysuser.conf)
Deleted:
  ejabberd/repos/community-i686/PKGBUILD
  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/ejabberd.install
  ejabberd/repos/community-x86_64/ejabberd.logrotate
  ejabberd/repos/community-x86_64/ejabberd.service

-------------------------------------+
 /PKGBUILD                           |  240 ++++++++++++++++++++++++++++++++++
 /ejabberd.install                   |   42 +++++
 /ejabberd.logrotate                 |   24 +++
 /ejabberd.service                   |   28 +++
 community-i686/PKGBUILD             |  121 -----------------
 community-i686/ejabberd.install     |   29 ----
 community-i686/ejabberd.logrotate   |   12 -
 community-i686/ejabberd.service     |   14 -
 community-i686/sysuser.conf         |    3 
 community-x86_64/PKGBUILD           |  121 -----------------
 community-x86_64/ejabberd.install   |   29 ----
 community-x86_64/ejabberd.logrotate |   12 -
 community-x86_64/ejabberd.service   |   14 -
 community-x86_64/sysuser.conf       |    3 
 14 files changed, 340 insertions(+), 352 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-02-10 15:22:55 UTC (rev 127467)
+++ community-i686/PKGBUILD	2015-02-10 15:23:21 UTC (rev 127468)
@@ -1,121 +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=14.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' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
-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"
-	"git://github.com/eproxus/meck"
-	"esip::git://github.com/processone/p1_sip"
-	"git://github.com/basho/riak_pb"
-	"riakc::git://github.com/basho/riak-erlang-client"
-	"protobuffs::git://github.com/basho/erlang_protobuffs.git"
-	"git://github.com/processone/p1_utils"
-	"$pkgname.logrotate"
-	"ejabberd.service"
-	"https://github.com/processone/ejabberd/commit/7bdc1151b.patch")
-md5sums=('afa0961e10e136664576e841b0a675df'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'f97c8a96160f30e0aecc9526c12e6606'
-         'a437aff9d7d477fb036d527205617e18'
-         '1f803ad9831aa2fa55d8a307642371cc')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-#  patch -p1 <$srcdir/7bdc1151b.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 \
-           meck esip riak_pb riakc p1_utils protobuffs; do
-    rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
-    mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
-  done
-
-  pushd deps/lhttpc/src/
-  mv lhttpc.app.src lhttpc.app.src.bak
-  cat lhttpc.app.src.bak | iconv -f utf8 -c >lhttpc.app.src
-  popd
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  [ -x configure ] || ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --enable-all
-  make
-  make -C doc
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm04750 deps/p1_pam/priv/bin/epam $pkgdir/usr/lib/ejabberd/priv/bin/epam
-  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 127467, ejabberd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-02-10 15:23:21 UTC (rev 127468)
@@ -0,0 +1,120 @@
+# $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=14.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' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
+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"
+	"git://github.com/eproxus/meck"
+	"esip::git://github.com/processone/p1_sip"
+	"git://github.com/basho/riak_pb"
+	"riakc::git://github.com/basho/riak-erlang-client"
+	"protobuffs::git://github.com/basho/erlang_protobuffs.git"
+	"git://github.com/processone/p1_utils"
+	"$pkgname.logrotate"
+	"ejabberd.service"
+	"sysuser.conf")
+md5sums=('afa0961e10e136664576e841b0a675df'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'f97c8a96160f30e0aecc9526c12e6606'
+         'a437aff9d7d477fb036d527205617e18'
+         '458fc41be4adb9554a53b8f9ae05fbee')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  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 \
+           meck esip riak_pb riakc p1_utils protobuffs; do
+    rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
+    mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
+  done
+
+  pushd deps/lhttpc/src/
+  mv lhttpc.app.src lhttpc.app.src.bak
+  cat lhttpc.app.src.bak | iconv -f utf8 -c >lhttpc.app.src
+  popd
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  [ -x configure ] || ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --enable-all
+  make
+  make -C doc
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm04750 deps/p1_pam/priv/bin/epam $pkgdir/usr/lib/ejabberd/priv/bin/epam
+  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
+  install -Dm644 $srcdir/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/ejabberd.conf
+  # workaround
+  ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/ejabberd.install
===================================================================
--- community-i686/ejabberd.install	2015-02-10 15:22:55 UTC (rev 127467)
+++ community-i686/ejabberd.install	2015-02-10 15:23:21 UTC (rev 127468)
@@ -1,29 +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 \
-    usr/lib/ejabberd/priv/bin/epam
-}
-
-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 \
-    usr/lib/ejabberd/priv/bin/epam
-  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 127467, ejabberd/trunk/ejabberd.install)
===================================================================
--- community-i686/ejabberd.install	                        (rev 0)
+++ community-i686/ejabberd.install	2015-02-10 15:23:21 UTC (rev 127468)
@@ -0,0 +1,21 @@
+post_install() {
+  systemd-sysusers ejabberd.conf
+  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 \
+    usr/lib/ejabberd/priv/bin/epam
+}
+
+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 \
+    usr/lib/ejabberd/priv/bin/epam
+  echo "!!! it is major update. Config must be converted to yaml format."
+}

Deleted: community-i686/ejabberd.logrotate
===================================================================
--- community-i686/ejabberd.logrotate	2015-02-10 15:22:55 UTC (rev 127467)
+++ community-i686/ejabberd.logrotate	2015-02-10 15:23:21 UTC (rev 127468)
@@ -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 127467, ejabberd/trunk/ejabberd.logrotate)
===================================================================
--- community-i686/ejabberd.logrotate	                        (rev 0)
+++ community-i686/ejabberd.logrotate	2015-02-10 15:23:21 UTC (rev 127468)
@@ -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	2015-02-10 15:22:55 UTC (rev 127467)
+++ community-i686/ejabberd.service	2015-02-10 15:23:21 UTC (rev 127468)
@@ -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 127467, ejabberd/trunk/ejabberd.service)
===================================================================
--- community-i686/ejabberd.service	                        (rev 0)
+++ community-i686/ejabberd.service	2015-02-10 15:23:21 UTC (rev 127468)
@@ -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

Copied: ejabberd/repos/community-i686/sysuser.conf (from rev 127467, ejabberd/trunk/sysuser.conf)
===================================================================
--- community-i686/sysuser.conf	                        (rev 0)
+++ community-i686/sysuser.conf	2015-02-10 15:23:21 UTC (rev 127468)
@@ -0,0 +1,3 @@
+g jabber     17     -            -
+u ejabberd   -      -            /var/lib/ejabberd
+m ejabberd   jabber

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-02-10 15:22:55 UTC (rev 127467)
+++ community-x86_64/PKGBUILD	2015-02-10 15:23:21 UTC (rev 127468)
@@ -1,121 +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=14.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' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
-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"
-	"git://github.com/eproxus/meck"
-	"esip::git://github.com/processone/p1_sip"
-	"git://github.com/basho/riak_pb"
-	"riakc::git://github.com/basho/riak-erlang-client"
-	"protobuffs::git://github.com/basho/erlang_protobuffs.git"
-	"git://github.com/processone/p1_utils"
-	"$pkgname.logrotate"
-	"ejabberd.service"
-	"https://github.com/processone/ejabberd/commit/7bdc1151b.patch")
-md5sums=('afa0961e10e136664576e841b0a675df'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'f97c8a96160f30e0aecc9526c12e6606'
-         'a437aff9d7d477fb036d527205617e18'
-         '1f803ad9831aa2fa55d8a307642371cc')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-#  patch -p1 <$srcdir/7bdc1151b.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 \
-           meck esip riak_pb riakc p1_utils protobuffs; do
-    rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
-    mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
-  done
-
-  pushd deps/lhttpc/src/
-  mv lhttpc.app.src lhttpc.app.src.bak
-  cat lhttpc.app.src.bak | iconv -f utf8 -c >lhttpc.app.src
-  popd
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  [ -x configure ] || ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --enable-all
-  make
-  make -C doc
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm04750 deps/p1_pam/priv/bin/epam $pkgdir/usr/lib/ejabberd/priv/bin/epam
-  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 127467, ejabberd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-02-10 15:23:21 UTC (rev 127468)
@@ -0,0 +1,120 @@
+# $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=14.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' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
+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"
+	"git://github.com/eproxus/meck"
+	"esip::git://github.com/processone/p1_sip"
+	"git://github.com/basho/riak_pb"
+	"riakc::git://github.com/basho/riak-erlang-client"
+	"protobuffs::git://github.com/basho/erlang_protobuffs.git"
+	"git://github.com/processone/p1_utils"
+	"$pkgname.logrotate"
+	"ejabberd.service"
+	"sysuser.conf")
+md5sums=('afa0961e10e136664576e841b0a675df'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'f97c8a96160f30e0aecc9526c12e6606'
+         'a437aff9d7d477fb036d527205617e18'
+         '458fc41be4adb9554a53b8f9ae05fbee')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  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 \
+           meck esip riak_pb riakc p1_utils protobuffs; do
+    rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
+    mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
+  done
+
+  pushd deps/lhttpc/src/
+  mv lhttpc.app.src lhttpc.app.src.bak
+  cat lhttpc.app.src.bak | iconv -f utf8 -c >lhttpc.app.src
+  popd
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  [ -x configure ] || ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --enable-all
+  make
+  make -C doc
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm04750 deps/p1_pam/priv/bin/epam $pkgdir/usr/lib/ejabberd/priv/bin/epam
+  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
+  install -Dm644 $srcdir/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/ejabberd.conf
+  # workaround
+  ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/ejabberd.install
===================================================================
--- community-x86_64/ejabberd.install	2015-02-10 15:22:55 UTC (rev 127467)
+++ community-x86_64/ejabberd.install	2015-02-10 15:23:21 UTC (rev 127468)
@@ -1,29 +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 \
-    usr/lib/ejabberd/priv/bin/epam
-}
-
-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 \
-    usr/lib/ejabberd/priv/bin/epam
-  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 127467, ejabberd/trunk/ejabberd.install)
===================================================================
--- community-x86_64/ejabberd.install	                        (rev 0)
+++ community-x86_64/ejabberd.install	2015-02-10 15:23:21 UTC (rev 127468)
@@ -0,0 +1,21 @@
+post_install() {
+  systemd-sysusers ejabberd.conf
+  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 \
+    usr/lib/ejabberd/priv/bin/epam
+}
+
+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 \
+    usr/lib/ejabberd/priv/bin/epam
+  echo "!!! it is major update. Config must be converted to yaml format."
+}

Deleted: community-x86_64/ejabberd.logrotate
===================================================================
--- community-x86_64/ejabberd.logrotate	2015-02-10 15:22:55 UTC (rev 127467)
+++ community-x86_64/ejabberd.logrotate	2015-02-10 15:23:21 UTC (rev 127468)
@@ -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 127467, ejabberd/trunk/ejabberd.logrotate)
===================================================================
--- community-x86_64/ejabberd.logrotate	                        (rev 0)
+++ community-x86_64/ejabberd.logrotate	2015-02-10 15:23:21 UTC (rev 127468)
@@ -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	2015-02-10 15:22:55 UTC (rev 127467)
+++ community-x86_64/ejabberd.service	2015-02-10 15:23:21 UTC (rev 127468)
@@ -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 127467, ejabberd/trunk/ejabberd.service)
===================================================================
--- community-x86_64/ejabberd.service	                        (rev 0)
+++ community-x86_64/ejabberd.service	2015-02-10 15:23:21 UTC (rev 127468)
@@ -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

Copied: ejabberd/repos/community-x86_64/sysuser.conf (from rev 127467, ejabberd/trunk/sysuser.conf)
===================================================================
--- community-x86_64/sysuser.conf	                        (rev 0)
+++ community-x86_64/sysuser.conf	2015-02-10 15:23:21 UTC (rev 127468)
@@ -0,0 +1,3 @@
+g jabber     17     -            -
+u ejabberd   -      -            /var/lib/ejabberd
+m ejabberd   jabber



More information about the arch-commits mailing list