Date: Monday, October 27, 2014 @ 12:35:39 Author: spupykin Revision: 121483
archrelease: copy trunk to community-i686 Added: ejabberd/repos/community-i686/PKGBUILD (from rev 121482, ejabberd/trunk/PKGBUILD) ejabberd/repos/community-i686/ejabberd.install (from rev 121482, ejabberd/trunk/ejabberd.install) ejabberd/repos/community-i686/ejabberd.logrotate (from rev 121482, ejabberd/trunk/ejabberd.logrotate) ejabberd/repos/community-i686/ejabberd.service (from rev 121482, ejabberd/trunk/ejabberd.service) Deleted: ejabberd/repos/community-i686/PKGBUILD ejabberd/repos/community-i686/ejabberd.install ejabberd/repos/community-i686/ejabberd.logrotate ejabberd/repos/community-i686/ejabberd.service --------------------+ PKGBUILD | 238 +++++++++++++++++++++++++-------------------------- ejabberd.install | 58 ++++++------ ejabberd.logrotate | 24 ++--- ejabberd.service | 28 +++--- 4 files changed, 176 insertions(+), 172 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-10-27 11:30:28 UTC (rev 121482) +++ PKGBUILD 2014-10-27 11:35:39 UTC (rev 121483) @@ -1,117 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Jeff 'codemac' Mickey <j...@archlinux.org> -# Contributor: Alexander Rødseth <rods...@gmail.com> - -pkgname=ejabberd -pkgver=14.07 -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") -md5sums=('a26b8acfc8fd15d94874befa06da15be' - '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') - -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 - # 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 121482, ejabberd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-10-27 11:35:39 UTC (rev 121483) @@ -0,0 +1,121 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Jeff 'codemac' Mickey <j...@archlinux.org> +# Contributor: Alexander Rødseth <rods...@gmail.com> + +pkgname=ejabberd +pkgver=14.07 +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" + "https://github.com/processone/ejabberd/commit/7bdc1151b.patch") +md5sums=('a26b8acfc8fd15d94874befa06da15be' + '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: Deleted: ejabberd.install =================================================================== --- ejabberd.install 2014-10-27 11:30:28 UTC (rev 121482) +++ ejabberd.install 2014-10-27 11:35:39 UTC (rev 121483) @@ -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 121482, ejabberd/trunk/ejabberd.install) =================================================================== --- ejabberd.install (rev 0) +++ ejabberd.install 2014-10-27 11:35:39 UTC (rev 121483) @@ -0,0 +1,29 @@ +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: Deleted: ejabberd.logrotate =================================================================== --- ejabberd.logrotate 2014-10-27 11:30:28 UTC (rev 121482) +++ ejabberd.logrotate 2014-10-27 11:35:39 UTC (rev 121483) @@ -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 121482, ejabberd/trunk/ejabberd.logrotate) =================================================================== --- ejabberd.logrotate (rev 0) +++ ejabberd.logrotate 2014-10-27 11:35:39 UTC (rev 121483) @@ -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: ejabberd.service =================================================================== --- ejabberd.service 2014-10-27 11:30:28 UTC (rev 121482) +++ ejabberd.service 2014-10-27 11:35:39 UTC (rev 121483) @@ -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 121482, ejabberd/trunk/ejabberd.service) =================================================================== --- ejabberd.service (rev 0) +++ ejabberd.service 2014-10-27 11:35:39 UTC (rev 121483) @@ -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