[arch-commits] Commit in ejabberd/trunk (PKGBUILD crash-fix.patch)

[Sergej Pupykin]

    Date: Saturday, November 16, 2013 @ 01:07:41
  Author: spupykin
Revision: 101069

upgpkg: ejabberd 13.10-4

upd

Added:
  ejabberd/trunk/crash-fix.patch
Modified:
  ejabberd/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   13 ++++++++++---
 crash-fix.patch |   14 ++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-15 23:24:55 UTC (rev 101068)
+++ PKGBUILD	2013-11-16 00:07:41 UTC (rev 101069)
@@ -5,7 +5,7 @@
 
 pkgname=ejabberd
 pkgver=13.10
-pkgrel=3
+pkgrel=4
 pkgdesc="Jabber server written in Erlang"
 arch=('x86_64' 'i686')
 url="http://www.ejabberd.im/"
@@ -37,7 +37,8 @@
 	"git://github.com/cmullaparthi/ibrowse"
 	"git://github.com/esl/lhttpc"
 	"$pkgname.logrotate"
-	"ejabberd.service")
+	"ejabberd.service"
+	"crash-fix.patch")
 md5sums=('70a78db576e36c1e714205c983c8a568'
          'SKIP'
          'SKIP'
@@ -57,9 +58,13 @@
          'SKIP'
          'SKIP'
          'f97c8a96160f30e0aecc9526c12e6606'
-         'a437aff9d7d477fb036d527205617e18')
+         'a437aff9d7d477fb036d527205617e18'
+         'ef3dd667dec1627c1597c7f6f3cfcd4a')
 
 prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 <$srcdir/crash-fix.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 \
@@ -87,6 +92,8 @@
   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:

Added: crash-fix.patch
===================================================================
--- crash-fix.patch	                        (rev 0)
+++ crash-fix.patch	2013-11-16 00:07:41 UTC (rev 101069)
@@ -0,0 +1,14 @@
+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(