Date: Friday, January 5, 2018 @ 17:00:17 Author: spupykin Revision: 279115
archrelease: copy trunk to community-x86_64 Added: ejabberd/repos/community-x86_64/PKGBUILD (from rev 279113, ejabberd/trunk/PKGBUILD) ejabberd/repos/community-x86_64/ejabberd.logrotate (from rev 279113, ejabberd/trunk/ejabberd.logrotate) ejabberd/repos/community-x86_64/ejabberd.service (from rev 279113, ejabberd/trunk/ejabberd.service) ejabberd/repos/community-x86_64/print-deps.sh (from rev 279113, ejabberd/trunk/print-deps.sh) ejabberd/repos/community-x86_64/sysuser.conf (from rev 279113, ejabberd/trunk/sysuser.conf) Deleted: ejabberd/repos/community-x86_64/PKGBUILD ejabberd/repos/community-x86_64/ejabberd.logrotate ejabberd/repos/community-x86_64/ejabberd.service ejabberd/repos/community-x86_64/print-deps.sh ejabberd/repos/community-x86_64/sysuser.conf --------------------+ PKGBUILD | 311 +++++++++++++++++++++++++-------------------------- ejabberd.logrotate | 24 +-- ejabberd.service | 30 ++-- print-deps.sh | 54 ++++---- sysuser.conf | 4 5 files changed, 209 insertions(+), 214 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-01-05 17:00:15 UTC (rev 279114) +++ PKGBUILD 2018-01-05 17:00:17 UTC (rev 279115) @@ -1,158 +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=17.11 -pkgrel=1 -pkgdesc="Jabber server written in Erlang" -arch=('x86_64') -url="http://www.ejabberd.im/" -license=("GPL") -depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' - 'libyaml' 'sqlite') -makedepends=('git' 'rebar' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra') -backup=('etc/ejabberd/ejabberd.yml' - 'etc/ejabberd/ejabberdctl.cfg' - 'etc/logrotate.d/ejabberd') -options=(emptydirs) -source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz" - "base64url::git://github.com/dvv/base64url.git#commit=f2c64ed8b9bebc536fad37ad97243452b674b837" - "cache_tab::git://github.com/processone/cache_tab#commit=7e51861a590eb95e9fa9eb2b9ce0385c2b6b4d25" - "eimp::git://github.com/processone/eimp.git#commit=952c5491138cf762f514cbec71e51807fe201784" - "elixir::git://github.com/elixir-lang/elixir#commit=867da6f876c48279823a41a33030c95ef37379b2" - "epam::git://github.com/processone/epam#commit=0ead169d7f6a3f2d0b64cca282487e4fedfbffd9" - "eredis::git://github.com/wooga/eredis#commit=cbc013f516e464706493c01662e5e9dd82d1db01" - "esip::git://github.com/processone/esip#commit=634eb5b359626091b485570c8c55478ed141434a" - "ezlib::git://github.com/processone/ezlib#commit=ec6491d788436bb096022843e6ec7f58d2973ae3" - "fast_tls::git://github.com/processone/fast_tls#commit=3d4bcc9923c71f4bbdf6619a7c23c02df95c30f7" - "fast_xml::git://github.com/processone/fast_xml#commit=251d5caad0a9a25a9e7cebc8d5beeb63e0994b3f" - "fast_yaml::git://github.com/processone/fast_yaml#commit=739d1de538529bf30fbf45c9ebd9435f3840c5fd" - "fs::git://github.com/synrc/fs.git#commit=7367b7df4985d25c42551933601a7bea313ca255" - "goldrush::git://github.com/DeadZen/goldrush.git#commit=8f1b715d36b650ec1e1f5612c00e28af6ab0de82" - "hamcrest::git://github.com/basho/hamcrest-erlang.git#commit=ad3dbab419762fc2d5821abb88b989da006b85c6" - "iconv::git://github.com/processone/iconv#commit=04018df0cb0d2effa144fd599272e0a46b390497" - "jiffy::git://github.com/davisp/jiffy#commit=1febce3ca86c5ca5d5a3618ed3d5f125bb99e4c5" - "jose::git://github.com/potatosalad/erlang-jose.git#commit=f8f97fb651202386c951fccfcb61d123518ba05f" - "lager::git://github.com/erlang-lager/lager#commit=a10c23c51dea6bbd63e5048c8a5a702169973114" - "luerl::git://github.com/rvirding/luerl#commit=f7b2cc0ab6fa4245ebeda0169fc994aff0628bf9" - "meck::git://github.com/eproxus/meck#commit=70d6a33ce7407029dc59e22a5b3c1c61c1348b23" - "moka::git://github.com/processone/moka.git#commit=3eed3a6dd7dedb70a6cd18f86c7561a18626eb3b" - "p1_mysql::git://github.com/processone/p1_mysql#commit=c856f48abb59c189f793293cd0348c5fb19c4a97" - "p1_oauth2::git://github.com/processone/p1_oauth2#commit=fb7c35e043d5213575e84ee811b78a03fe5c3fd0" - "p1_pgsql::git://github.com/processone/p1_pgsql#commit=18a83eded75e092acfe7ed768f0a4bdbf310c05d" - "p1_utils::git://github.com/processone/p1_utils#commit=8c5c5cb7f1ba02358fd59ee5b98ebb43cba76fe8" - "rebar_elixir_plugin::git://github.com/processone/rebar_elixir_plugin#commit=10614dfef5d10b7071f7181858149259e50159f6" - "riakc::git://github.com/processone/riak-erlang-client.git#commit=63db9859cf478cc67d4149940a5a9eae8c5ca3bc" - "riak_pb::git://github.com/basho/riak_pb#commit=08771aba2ce4935b715d32d1b92555efdc3da994" - "samerlib::git://github.com/processone/samerlib#commit=fbbba035b1548ac4e681df00d61bf609645333a0" - "sqlite3::git://github.com/processone/erlang-sqlite3#commit=6ee3570060fbbf793a0bc873831e8eabb6c39851" - "stringprep::git://github.com/processone/stringprep#commit=321409614d322d66693b35c9da8238150dfb35e6" - "stun::git://github.com/processone/stun#commit=8ea7f1e1265f0a5428ff54884d045b97283305c6" - "xmpp::git://github.com/processone/xmpp#commit=d4e43f1ad9a830d534b475ac2c12093afd9e0e04" - "$pkgname.logrotate" - "ejabberd.service" - "sysuser.conf") -sha256sums=('a016cc2b6ab8a8b4f783bfc23e8d2d0380c3754b647a3f3faa1e972ee5e44a47' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2' - '94582b1df76f6d86abfcc78bf4c4ac79276761c75483dd40a45b7ff2b19dc8a8' - '0599a3d20153d620e9ac4fdb5bd7370854136235382a2fed4110b1950cf07d20') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - mkdir -p "$srcdir/$pkgname-$pkgver/deps" - for i in base64url cache_tab eimp elixir epam eredis esip ezlib fast_tls \ - fast_xml fast_yaml fs goldrush hamcrest iconv jiffy jose lager luerl \ - meck moka p1_mysql p1_oauth2 p1_pgsql p1_utils rebar_elixir_plugin \ - riakc riak_pb samerlib sqlite3 stringprep stun xmpp; do - rm -rf "$srcdir/$pkgname-$pkgver/deps/$i" - mv "$srcdir"/$i "$srcdir/$pkgname-$pkgver/deps" - done - - sed -i "s|git describe --tags 2>/dev/null|echo $pkgver|" configure.ac - sed -i "s|REQUIRE_ERLANG_MAX=\".*\"|REQUIRE_ERLANG_MAX=\"9.0.1\"|" configure.ac - sed -i 's#R15|R16|17|18#&|19|20#' deps/riakc/rebar.config - sed -i 's|crypto:rand_bytes|crypto:strong_rand_bytes|g' deps/esip/src/esip.erl -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - [ -x configure ] || ./autogen.sh - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --localstatedir=/var \ - --enable-all - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -Dm04750 deps/epam/priv/bin/epam "$pkgdir"/usr/lib/ejabberd-$pkgver/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/"* - chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd-$pkgver/priv/bin/captcha.sh" - rm -rf "$pkgdir/var/lock" - install -Dm0644 "$srcdir"/ejabberd.service "$pkgdir"/usr/lib/systemd/system/ejabberd.service - install -Dm644 "$srcdir"/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/ejabberd.conf - install -Dm644 tools/ejabberdctl.bc "$pkgdir"/usr/share/bash-completion/completions/ejabberdctl - - # workaround - ln -s mod_configure.beam "$pkgdir"/usr/lib/ejabberd-$pkgver/ebin/configure.beam - rm -f "$pkgdir"/usr/bin/{elixir,iex,mix} - - # /usr/lib/ejabberd symlink follows to ejabberd version - ln -s ejabberd-$pkgver "$pkgdir"/usr/lib/ejabberd - - # permissions - chown -R 17:17 "$pkgdir"/var/{lib,log}/ejabberd - chown root:17 \ - "$pkgdir"/etc/ejabberd/ejabberd.yml \ - "$pkgdir"/etc/ejabberd/ejabberdctl.cfg \ - "$pkgdir"/etc/ejabberd \ - "$pkgdir"/usr/lib/ejabberd/priv/bin/epam - - # fix eimp - chmod a+x "$pkgdir"/usr/lib/eimp-*/priv/bin/eimp -} - -# vim:set ts=2 sw=2 et: Copied: ejabberd/repos/community-x86_64/PKGBUILD (from rev 279113, ejabberd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-01-05 17:00:17 UTC (rev 279115) @@ -0,0 +1,153 @@ +# $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=17.12 +pkgrel=1 +pkgdesc="Jabber server written in Erlang" +arch=('x86_64') +url="http://www.ejabberd.im/" +license=("GPL") +depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' + 'libyaml' 'sqlite' 'gd') +makedepends=('git' 'rebar' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra') +backup=('etc/ejabberd/ejabberd.yml' + 'etc/ejabberd/ejabberdctl.cfg' + 'etc/logrotate.d/ejabberd') +options=(emptydirs) +source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz" + "base64url::git://github.com/dvv/base64url.git#commit=f2c64ed8b9bebc536fad37ad97243452b674b837" + "cache_tab::git://github.com/processone/cache_tab#commit=7e51861a590eb95e9fa9eb2b9ce0385c2b6b4d25" + "eimp::git://github.com/processone/eimp#commit=952c5491138cf762f514cbec71e51807fe201784" + "elixir::git://github.com/elixir-lang/elixir#commit=867da6f876c48279823a41a33030c95ef37379b2" + "epam::git://github.com/processone/epam#commit=0ead169d7f6a3f2d0b64cca282487e4fedfbffd9" + "eredis::git://github.com/wooga/eredis#commit=cbc013f516e464706493c01662e5e9dd82d1db01" + "esip::git://github.com/processone/esip#commit=7f33f6ed81a058d151912d417c874a9ea87b0470" + "ezlib::git://github.com/processone/ezlib#commit=ec6491d788436bb096022843e6ec7f58d2973ae3" + "fast_tls::git://github.com/processone/fast_tls#commit=e28214e27ed40a3f4faff45ea8ede51fc32fca5f" + "fast_xml::git://github.com/processone/fast_xml#commit=1c01a411831e5e4b9561a46e77e3163449a958f1" + "fast_yaml::git://github.com/processone/fast_yaml#commit=739d1de538529bf30fbf45c9ebd9435f3840c5fd" + "fs::git://github.com/synrc/fs#commit=7367b7df4985d25c42551933601a7bea313ca255" + "goldrush::git://github.com/DeadZen/goldrush.git#commit=8f1b715d36b650ec1e1f5612c00e28af6ab0de82" + "hamcrest::git://github.com/basho/hamcrest-erlang.git#commit=ad3dbab419762fc2d5821abb88b989da006b85c6" + "iconv::git://github.com/processone/iconv#commit=04018df0cb0d2effa144fd599272e0a46b390497" + "jiffy::git://github.com/davisp/jiffy#commit=1febce3ca86c5ca5d5a3618ed3d5f125bb99e4c5" + "jose::git://github.com/potatosalad/erlang-jose#commit=f8f97fb651202386c951fccfcb61d123518ba05f" + "lager::git://github.com/erlang-lager/lager#commit=a10c23c51dea6bbd63e5048c8a5a702169973114" + "luerl::git://github.com/rvirding/luerl#commit=f7b2cc0ab6fa4245ebeda0169fc994aff0628bf9" + "meck::git://github.com/eproxus/meck#commit=70d6a33ce7407029dc59e22a5b3c1c61c1348b23" + "moka::git://github.com/processone/moka#commit=3eed3a6dd7dedb70a6cd18f86c7561a18626eb3b" + "p1_mysql::git://github.com/processone/p1_mysql#commit=c856f48abb59c189f793293cd0348c5fb19c4a97" + "p1_oauth2::git://github.com/processone/p1_oauth2#commit=fb7c35e043d5213575e84ee811b78a03fe5c3fd0" + "p1_pgsql::git://github.com/processone/p1_pgsql#commit=18a83eded75e092acfe7ed768f0a4bdbf310c05d" + "p1_utils::git://github.com/processone/p1_utils#commit=8c5c5cb7f1ba02358fd59ee5b98ebb43cba76fe8" + "rebar_elixir_plugin::git://github.com/processone/rebar_elixir_plugin#commit=10614dfef5d10b7071f7181858149259e50159f6" + "riakc::git://github.com/processone/riak-erlang-client#commit=63db9859cf478cc67d4149940a5a9eae8c5ca3bc" + "riak_pb::git://github.com/basho/riak_pb#commit=08771aba2ce4935b715d32d1b92555efdc3da994" + "samerlib::git://github.com/processone/samerlib#commit=fbbba035b1548ac4e681df00d61bf609645333a0" + "sqlite3::git://github.com/processone/erlang-sqlite3#commit=6ee3570060fbbf793a0bc873831e8eabb6c39851" + "stringprep::git://github.com/processone/stringprep#commit=321409614d322d66693b35c9da8238150dfb35e6" + "stun::git://github.com/processone/stun#commit=b4d3fe315f46ae6ad16f4dc0bfe0a3ebb6e3aee6" + "xmpp::git://github.com/processone/xmpp#commit=96f4322b9fde1f028da63ad4e32d88823f5c4b61" + "$pkgname.logrotate" + "ejabberd.service" + "sysuser.conf") +sha256sums=('aa4e29ee084030671e9c042baa9e4449d8f3502fa920aea4155912ffa5486fce' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2' + '94582b1df76f6d86abfcc78bf4c4ac79276761c75483dd40a45b7ff2b19dc8a8' + '0599a3d20153d620e9ac4fdb5bd7370854136235382a2fed4110b1950cf07d20') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + mkdir -p "$srcdir/$pkgname-$pkgver/deps" + for i in \ + base64url cache_tab eimp elixir epam eredis esip ezlib fast_tls fast_xml fast_yaml fs goldrush hamcrest iconv jiffy jose lager luerl meck moka p1_mysql p1_oauth2 p1_pgsql p1_utils rebar_elixir_plugin riakc riak_pb samerlib sqlite3 stringprep stun xmpp \ + ; do + rm -rf "$srcdir/$pkgname-$pkgver/deps/$i" + mv "$srcdir"/$i "$srcdir/$pkgname-$pkgver/deps" + done + + sed -i "s|git describe --tags 2>/dev/null|echo $pkgver|" configure.ac +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + [ -x configure ] || ./autogen.sh + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --enable-all + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm04750 deps/epam/priv/bin/epam "$pkgdir"/usr/lib/ejabberd-$pkgver/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/"* + chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd-$pkgver/priv/bin/captcha.sh" + rm -rf "$pkgdir/var/lock" + install -Dm0644 "$srcdir"/ejabberd.service "$pkgdir"/usr/lib/systemd/system/ejabberd.service + install -Dm644 "$srcdir"/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/ejabberd.conf + install -Dm644 tools/ejabberdctl.bc "$pkgdir"/usr/share/bash-completion/completions/ejabberdctl + + # workaround + ln -s mod_configure.beam "$pkgdir"/usr/lib/ejabberd-$pkgver/ebin/configure.beam + rm -f "$pkgdir"/usr/bin/{elixir,iex,mix} + + # /usr/lib/ejabberd symlink follows to ejabberd version + ln -s ejabberd-$pkgver "$pkgdir"/usr/lib/ejabberd + + # permissions + chown -R 17:17 "$pkgdir"/var/{lib,log}/ejabberd + chown root:17 \ + "$pkgdir"/etc/ejabberd/ejabberd.yml \ + "$pkgdir"/etc/ejabberd/ejabberdctl.cfg \ + "$pkgdir"/etc/ejabberd \ + "$pkgdir"/usr/lib/ejabberd/priv/bin/epam + + # fix eimp + chmod a+x "$pkgdir"/usr/lib/eimp-*/priv/bin/eimp +} + +# vim:set ts=2 sw=2 et: Deleted: ejabberd.logrotate =================================================================== --- ejabberd.logrotate 2018-01-05 17:00:15 UTC (rev 279114) +++ ejabberd.logrotate 2018-01-05 17:00:17 UTC (rev 279115) @@ -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 279113, ejabberd/trunk/ejabberd.logrotate) =================================================================== --- ejabberd.logrotate (rev 0) +++ ejabberd.logrotate 2018-01-05 17:00:17 UTC (rev 279115) @@ -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 2018-01-05 17:00:15 UTC (rev 279114) +++ ejabberd.service 2018-01-05 17:00:17 UTC (rev 279115) @@ -1,15 +0,0 @@ -[Unit] -Description=A distributed, fault-tolerant Jabber/XMPP server -After=network.target - -[Service] -Type=forking -User=jabber -Environment=HOME=/var/lib/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 279113, ejabberd/trunk/ejabberd.service) =================================================================== --- ejabberd.service (rev 0) +++ ejabberd.service 2018-01-05 17:00:17 UTC (rev 279115) @@ -0,0 +1,15 @@ +[Unit] +Description=A distributed, fault-tolerant Jabber/XMPP server +After=network.target + +[Service] +Type=forking +User=jabber +Environment=HOME=/var/lib/ejabberd +LimitNOFILE=16000 +RestartSec=5 +ExecStart=/usr/bin/ejabberdctl start +ExecStop=/usr/bin/ejabberdctl stop + +[Install] +WantedBy=multi-user.target Deleted: print-deps.sh =================================================================== --- print-deps.sh 2018-01-05 17:00:15 UTC (rev 279114) +++ print-deps.sh 2018-01-05 17:00:17 UTC (rev 279115) @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Helper script which prints ejabberd deps' urls including commit hash -# - -cd src/ejabberd-*/config && cd .. - -if [ ! -d deps ]; then - [ -x configure ] || ./autogen.sh - ./configure --enable-all - make deps || exit 1 -fi - -cd deps ; ls -1 | while read g; do - test -d $g && \ - pushd $g &>/dev/null - if [ $? -eq 0 ]; then - U=`grep 'url =' .git/config | cut -f2 -d= | tr -d ' '` - C=`git rev-parse HEAD` - N=`basename $(pwd)` - echo -e "\t\"$N::$U#commit=$C\"" - fi - popd &>/dev/null -done | sed 's|https://|git://|' >PKGBUILD.inc - -cat PKGBUILD.inc | cut -f2 -d'"' | cut -f1 -d: | tr '\n' ' ' >PKGBUILD.inc2 Copied: ejabberd/repos/community-x86_64/print-deps.sh (from rev 279113, ejabberd/trunk/print-deps.sh) =================================================================== --- print-deps.sh (rev 0) +++ print-deps.sh 2018-01-05 17:00:17 UTC (rev 279115) @@ -0,0 +1,27 @@ +#!/bin/bash + +# +# Helper script which prints ejabberd deps' urls including commit hash +# + +cd src/ejabberd-*/config && cd .. + +if [ ! -d deps ]; then + [ -x configure ] || ./autogen.sh + ./configure --enable-all + make deps || exit 1 +fi + +cd deps ; ls -1 | while read g; do + test -d $g && \ + pushd $g &>/dev/null + if [ $? -eq 0 ]; then + U=`grep 'url =' .git/config | cut -f2 -d= | tr -d ' '` + C=`git rev-parse HEAD` + N=`basename $(pwd)` + echo -e "\t\"$N::$U#commit=$C\"" + fi + popd &>/dev/null +done | sed 's|https://|git://|' >PKGBUILD.inc + +cat PKGBUILD.inc | cut -f2 -d'"' | cut -f1 -d: | tr '\n' ' ' >PKGBUILD.inc2 Deleted: sysuser.conf =================================================================== --- sysuser.conf 2018-01-05 17:00:15 UTC (rev 279114) +++ sysuser.conf 2018-01-05 17:00:17 UTC (rev 279115) @@ -1,2 +0,0 @@ -g jabber 17 - - -u jabber 17 - /var/empty Copied: ejabberd/repos/community-x86_64/sysuser.conf (from rev 279113, ejabberd/trunk/sysuser.conf) =================================================================== --- sysuser.conf (rev 0) +++ sysuser.conf 2018-01-05 17:00:17 UTC (rev 279115) @@ -0,0 +1,2 @@ +g jabber 17 - - +u jabber 17 - /var/empty