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

[Tom Gundersen]

    Date: Saturday, August 4, 2012 @ 05:34:23
  Author: tomegun
Revision: 164732

upgpkg: libimobiledevice 1.1.4-2

fix segfault in upower when iphone plugged at boot

Added:
  libimobiledevice/trunk/HOME-segfault.patch
Modified:
  libimobiledevice/trunk/PKGBUILD
Deleted:
  libimobiledevice/trunk/swig-version-check.patch

--------------------------+
 HOME-segfault.patch      |   14 ++++++++++++++
 PKGBUILD                 |   10 +++++++---
 swig-version-check.patch |   14 --------------
 3 files changed, 21 insertions(+), 17 deletions(-)

Added: HOME-segfault.patch
===================================================================
--- HOME-segfault.patch	                        (rev 0)
+++ HOME-segfault.patch	2012-08-04 09:34:23 UTC (rev 164732)
@@ -0,0 +1,14 @@
+The patch fixes segfault when both $XDG_CONFIG_HOME and $HOME are unset
+Signed-off-by: Maxim Mikityanskiy <maxtram95 at gmail.com>
+--- src/userpref.c.orig	2012-06-04 17:04:57.387303630 +0300
++++ src/userpref.c	2012-06-04 17:06:05.741301627 +0300
+@@ -125,6 +125,9 @@
+ 	const char *cdir = getenv("XDG_CONFIG_HOME");
+ 	if (!cdir) {
+ 		cdir = getenv("HOME");
++		if (!cdir) {
++			cdir="/root";
++		}
+ 		strcpy(__config_dir, cdir);
+ 		strcat(__config_dir, DIR_SEP_S);
+ 		strcat(__config_dir, ".config");

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-04 09:32:24 UTC (rev 164731)
+++ PKGBUILD	2012-08-04 09:34:23 UTC (rev 164732)
@@ -4,18 +4,21 @@
 
 pkgname=libimobiledevice
 pkgver=1.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
 url="http://libimobiledevice.org/"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 depends=('usbmuxd' 'gnutls' 'libgcrypt')
 options=('!libtool')
-source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
+source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2
+	HOME-segfault.patch)
 
 build() {
   cd "$pkgname-$pkgver"
 
+  patch -p0 < "$srcdir/HOME-segfault.patch"
+
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr
   make
 }
@@ -24,4 +27,5 @@
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('3f28cbc6a2e30d34685049c0abde5183')
+md5sums=('3f28cbc6a2e30d34685049c0abde5183'
+         '0de709dbf8e79d0b00cca06f5e61d57c')

Deleted: swig-version-check.patch
===================================================================
--- swig-version-check.patch	2012-08-04 09:32:24 UTC (rev 164731)
+++ swig-version-check.patch	2012-08-04 09:34:23 UTC (rev 164732)
@@ -1,14 +0,0 @@
-diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure
---- libimobiledevice-1.0.3.old/configure	2010-10-04 07:38:37.000000000 -0700
-+++ libimobiledevice-1.0.3/configure	2010-10-08 05:43:05.466686656 -0700
-@@ -3477,9 +3477,7 @@
-                         if test -z "$available_patch" ; then
-                                 available_patch=0
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+                        if test $available_major -lt $required_major ; then
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
- $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
-                                 SWIG=false