Date: Thursday, July 31, 2014 @ 15:15:00 Author: spupykin Revision: 116632
upgpkg: ejabberd 14.07-1 upd Modified: ejabberd/trunk/PKGBUILD Deleted: ejabberd/trunk/crash-fix.patch -----------------+ PKGBUILD | 23 +++++++++++++++++++---- crash-fix.patch | 14 -------------- 2 files changed, 19 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-07-31 11:02:32 UTC (rev 116631) +++ PKGBUILD 2014-07-31 13:15:00 UTC (rev 116632) @@ -4,7 +4,7 @@ # Contributor: Alexander Rødseth <rods...@gmail.com> pkgname=ejabberd -pkgver=14.05 +pkgver=14.07 pkgrel=1 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686') @@ -11,7 +11,7 @@ url="http://www.ejabberd.im/" license=("GPL") depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml') -makedepends=('git' 'rebar') +makedepends=('git' 'rebar' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra') backup=('etc/ejabberd/ejabberd.yml' 'etc/ejabberd/ejabberdctl.cfg' 'etc/logrotate.d/ejabberd') @@ -36,9 +36,15 @@ "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=('16bffbf9b9e18b69133e983fd82364b6' +md5sums=('a26b8acfc8fd15d94874befa06da15be' 'SKIP' 'SKIP' 'SKIP' @@ -56,6 +62,12 @@ 'SKIP' 'SKIP' 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' 'f97c8a96160f30e0aecc9526c12e6606' 'a437aff9d7d477fb036d527205617e18') @@ -65,7 +77,8 @@ 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 + 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 @@ -78,9 +91,11 @@ build() { cd "$srcdir/$pkgname-$pkgver" + [ -x configure ] || ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-all make + make -C doc } package() { Deleted: crash-fix.patch =================================================================== --- crash-fix.patch 2014-07-31 11:02:32 UTC (rev 116631) +++ crash-fix.patch 2014-07-31 13:15:00 UTC (rev 116632) @@ -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(