[arch-commits] Commit in loudmouth/trunk (3 files)

[Jan de Groot]

    Date: Monday, July 22, 2013 @ 11:47:26
  Author: jgc
Revision: 191252

upgpkg: loudmouth 1.4.3-4

Add patch to fix build with new glib
Add patch to fix issues with ipv4/6
Change autoreconf with standalone calls to aclocal/autoconf/automake

Added:
  loudmouth/trunk/07-glib-single-include.patch
  loudmouth/trunk/08-fix-ipv6-connect.patch
Modified:
  loudmouth/trunk/PKGBUILD

------------------------------+
 07-glib-single-include.patch |   17 +++++++++++++++++
 08-fix-ipv6-connect.patch    |   28 ++++++++++++++++++++++++++++
 PKGBUILD                     |   27 +++++++++++++++++++--------
 3 files changed, 64 insertions(+), 8 deletions(-)

Added: 07-glib-single-include.patch
===================================================================
--- 07-glib-single-include.patch	                        (rev 0)
+++ 07-glib-single-include.patch	2013-07-22 09:47:26 UTC (rev 191252)
@@ -0,0 +1,17 @@
+Description: Fix build failure with glib 2.32
+ where including individual glib headers is no longer allowed.
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665576
+Index: loudmouth-1.4.3/loudmouth/lm-error.c
+===================================================================
+--- loudmouth-1.4.3.orig/loudmouth/lm-error.c	2008-10-29 21:48:15.000000000 +0100
++++ loudmouth-1.4.3/loudmouth/lm-error.c	2012-03-26 00:24:19.518939657 +0200
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include <config.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include "lm-error.h"
+ 
+ /**

Added: 08-fix-ipv6-connect.patch
===================================================================
--- 08-fix-ipv6-connect.patch	                        (rev 0)
+++ 08-fix-ipv6-connect.patch	2013-07-22 09:47:26 UTC (rev 191252)
@@ -0,0 +1,28 @@
+Description: fix crash when falling back from IPv6 to IPv4
+ Previously, loudmouth would set socket->watch_connect to NULL when
+ encountering an error. When the connection attempt (to a different IPv6)
+ succeeded later on, _lm_socket_succeeded would therefore not remove the
+ socket_connect_cb watcher, leading to socket_connect_cb being called upon
+ socket activity and segfaulting the program.
+Author: Michael Stapelberg <stapelberg at debian.org>
+Bug-Debian: http://bugs.debian.org/631729
+Forwarded: no
+Last-Update: 2013-02-03
+--- a/loudmouth/lm-socket.c
++++ b/loudmouth/lm-socket.c
+@@ -529,7 +529,6 @@
+ 			/* error condition, but might be possible to recover
+ 			 * from it (by connecting to the next host) */
+ 			if (!_lm_socket_failed_with_error (connect_data, err)) {
+-				socket->watch_connect = NULL;
+ 				goto out;
+ 			}
+ 		}
+@@ -560,7 +559,6 @@
+ 				_lm_sock_close (connect_data->fd);
+ 				_lm_socket_failed_with_error (connect_data, err);
+ 
+-				socket->watch_connect = NULL;
+ 				goto out;
+ 			}
+ 		} 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-22 09:20:17 UTC (rev 191251)
+++ PKGBUILD	2013-07-22 09:47:26 UTC (rev 191252)
@@ -5,7 +5,7 @@
 
 pkgname=loudmouth
 pkgver=1.4.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A lightweight Jabber client library written in C/Glib"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -16,19 +16,30 @@
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
         01-fix-sasl-md5-digest-uri.patch
         03-drop-stanzas-on-fail.patch
-        04-use-pkg-config-for-gnutls.patch)
+        04-use-pkg-config-for-gnutls.patch
+        07-glib-single-include.patch
+        08-fix-ipv6-connect.patch)
 md5sums=('55339ca42494690c3942ee1465a96937'
          'dc799cea18b24847b1e008c7424010a3'
          'b7b2d81b01a5eee5fd5e21cae67b4af7'
-         'bffb25b9551df43255fe1706588582f3')
+         'bffb25b9551df43255fe1706588582f3'
+         'd1546ed54740de536f6bb79a18c5dccb'
+         '8e3071299776d32b9be27bba7d3f9ae0')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../01-fix-sasl-md5-digest-uri.patch
+  patch -Np1 -i ../03-drop-stanzas-on-fail.patch
+  patch -Np1 -i ../04-use-pkg-config-for-gnutls.patch
+  patch -Np1 -i ../07-glib-single-include.patch
+  patch -Np1 -i ../08-fix-ipv6-connect.patch
+  libtoolize --force
+  aclocal
+  autoconf
+  automake --add-missing
+}
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch"
-  patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch"
-  patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch"
-  libtoolize --force
-  autoreconf
   ./configure --prefix=/usr --disable-static
   make
 }