Date: Wednesday, November 6, 2013 @ 16:24:46 Author: spupykin Revision: 100625
upgpkg: ejabberd 13.10-2 upd Modified: ejabberd/trunk/PKGBUILD ejabberd/trunk/ejabberd.install ejabberd/trunk/ejabberd.service ------------------+ PKGBUILD | 32 ++++++++++++++++++++------------ ejabberd.install | 10 +++------- ejabberd.service | 3 ++- 3 files changed, 25 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-06 14:17:22 UTC (rev 100624) +++ PKGBUILD 2013-11-06 15:24:46 UTC (rev 100625) @@ -5,28 +5,28 @@ pkgname=ejabberd pkgver=13.10 -pkgrel=1 +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') # TODO: build all deps as packages -backup=('etc/ejabberd/ejabberd.cfg' +makedepends=('git') +backup=('etc/ejabberd/ejabberd.yml' 'etc/ejabberd/ejabberdctl.cfg' 'etc/logrotate.d/ejabberd') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz" - "git://github.com/processone/cache_tab" - "git://github.com/processone/tls" - "git://github.com/processone/stringprep" - "git://github.com/processone/xml" - "git://github.com/processone/p1_yaml" + "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" - "git://github.com/processone/epam" - "git://github.com/processone/zlib" + "p1_pam::git://github.com/processone/epam" + "p1_zlib::git://github.com/processone/zlib" "git://github.com/basho/lager" - "git://github.com/processone/eiconv" + "p1_iconv::git://github.com/processone/eiconv" "git://github.com/DeadZen/goldrush.git" "$pkgname.logrotate" "ejabberd.service") @@ -43,8 +43,16 @@ 'SKIP' 'SKIP' 'f97c8a96160f30e0aecc9526c12e6606' - 'df32aa17e40a7bc5d9946d3ba6fe5e16') + 'a437aff9d7d477fb036d527205617e18') +prepare() { + 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; 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 \ Modified: ejabberd.install =================================================================== --- ejabberd.install 2013-11-06 14:17:22 UTC (rev 100624) +++ ejabberd.install 2013-11-06 15:24:46 UTC (rev 100625) @@ -3,18 +3,14 @@ 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 /usr/lib/ejabberd/priv/bin/epam - chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd - chmod 4750 /usr/lib/ejabberd/priv/bin/epam + 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.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd - chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam - chmod 4750 /usr/lib/ejabberd/priv/bin/epam - echo ">> ejabberd looks into /var/lib/ejabberd for mnesia db now" + 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() { Modified: ejabberd.service =================================================================== --- ejabberd.service 2013-11-06 14:17:22 UTC (rev 100624) +++ ejabberd.service 2013-11-06 15:24:46 UTC (rev 100625) @@ -7,7 +7,8 @@ User=ejabberd LimitNOFILE=16000 RestartSec=5 -ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\" +ExecStart=/usr/bin/ejabberdctl start +ExecStop=/usr/bin/ejabberdctl stop [Install] WantedBy=multi-user.target