Fix segmentation fault when both XDG_CONFIG_HOME and HOME are unset wrt #423155c3 by Davide Pesavento

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 104 insertions, 2 deletions

diff --git a/app-pda/libimobiledevice/ChangeLog b/app-pda/libimobiledevice/ChangeLog
index e838f9210855..6f2151cc72d7 100644
--- a/app-pda/libimobiledevice/ChangeLog
+++ b/app-pda/libimobiledevice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-pda/libimobiledevice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.31 2012/05/19 08:19:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.32 2012/08/05 13:03:59 ssuominen Exp $
+
+*libimobiledevice-1.1.4-r2 (05 Aug 2012)
+
+  05 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libimobiledevice-1.1.4-r2.ebuild,
+  +files/libimobiledevice-1.1.4-HOME-segfault.patch:
+  Fix segmentation fault when both $XDG_CONFIG_HOME and $HOME are unset wrt
+  #423155c3 by Davide Pesavento
 
   19 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   -libimobiledevice-1.1.4.ebuild:
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index a4eebbf1fc8d..9acc10e61ca5 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libimobiledevice-1.1.4-HOME-segfault.patch 405 SHA256 6239658026bb6ccf37d4bffc94aec454a5a56182084020c47c21a450a15cd396 SHA512 c341a75e8221f36482344e1703302ac7015b4549e6e3f5bbe2d5af237b035f89ead5df47f376c7face231d4d5e653451c4bfed499d78809d953b3733a4be2f39 WHIRLPOOL f9c73803ccc1806253051f40de16f6e05b776eacd17a518f4b108c29c7f8d4bc6228be53af194a7f214c2784dcb28bd64096395be4002463c1c703584d100f44
 AUX libimobiledevice-1.1.4-cython.patch 5449 SHA256 f9ae71e6de6199a5f9929d9e880679dec8f9107d592ea159c24d43565e1bacaa SHA512 771c4e80d033323b41ff961534ca91e7b3451fe1f922c87f73601508329d1141eeb469c69745f40eb9dd1ddf1e4643262e0087baef82ef1193859c103c2d3946 WHIRLPOOL a28bbfd402358819ddca34e52ae3f8099e3ecb05daa14b93bb5071cb341bb552edf7cba76f61072785c9e0191756d2268eeec4d4b3cef5c19bf1ee4d179c4885
 AUX libimobiledevice-1.1.4-openssl.patch 1375 SHA256 014125ba0d2638de262c8b2deb86ea3201c90107714cc3af468aaf0f7a720392 SHA512 d1ade98d0c98cb5cdf78ed8c2689824ea697c4812d1ae733582db567ea35f62bb975521a06d51fb2af9d52b62125ae51f088626eace6c134ed421b7f04a308dc WHIRLPOOL 3ac9337adac1c417176e0b605aacae957c8266d1c58a6a3c4abc72edbc3b4d2108e2c53a771f57c0388898e075447263fea703272de0f77367557c93c66408a0
 DIST libimobiledevice-1.1.1.tar.bz2 459976 SHA256 c544d7bf0e7d6a97f3c446b2fb4597f19aac7b184ea806e16cd6a7852fd25f67 SHA512 0ee29853374e546db7ed27e4cd248cc885dc4bef0b048474a15e48bc90522730043c4dee9efc147c69463ee41f657df30a354c4d1a018ef3c86d453cd8ffa02b WHIRLPOOL 26958816841928032810c8275e3066ff4774be255575bde892e6dd7d6560a45cc77f6b4e0ce9b120736d37519fcd60491576073d949b0700b75fc61a63ad13b2
 DIST libimobiledevice-1.1.4.tar.bz2 508371 SHA256 67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8 SHA512 6c48254d70d264c47e141112c25538d2c168284d8277b2e892cd97d48b6670c8d39c89672384e6b83610e8752f8f3fc36af283117cb1a210139b5e6272001be7 WHIRLPOOL a70dc50aad08bbc5f20573c53b8317e9df58c3a279529daa803570d90178e428291cf44a7ac7aed1cc6231ef4b17f8b0add70f97aa2b8babae41889968091d7f
 EBUILD libimobiledevice-1.1.1.ebuild 1586 SHA256 c2d54971760a08c5d4e4b12e000f795be8910c107cbb7127f26bd849117551c6 SHA512 4c209169bd32088a0955967c529d36bb62d7dc7486a1ec6799fa7b15174ea3cca5b445c6622d023e1aeaf7d9505c229994ccd138b499952fca995d19745c9e33 WHIRLPOOL e793cc0f2e7361e7abca80ccd394bb85c124fb5b4e513192e49e3623f2a3069f755833b86ff50b91e4f471cf91cf44d8e5b776d50d74f1f00d7a210bb302abd0
 EBUILD libimobiledevice-1.1.4-r1.ebuild 1363 SHA256 e9635370e2c0c384f10f8d5cffa08fffd77a7e4535ed51c39075094ffd5da6ec SHA512 81095b9010f08501106809bf408781cccc5670d10d4b9d736746e3c1ed45eeb83e9e5128d5b3314f636e8a160db816c85ff01146217dfc358e638150d1e71f4c WHIRLPOOL 7df844a2ec6523a33370bac27b614b4b017c9d9ed28befcffab5092f38de91cd78bc8aa42b2a8640939a734cf90066d444b6536989eedab9d4141e8d7d313ef7
-MISC ChangeLog 4788 SHA256 7a4151d1cfc7a801152b128fe3d14e29f197cb373319bc9cd050e542fe5e31ea SHA512 750626d8796bc27b2d6ec592c83b15aa2da97cde966b340e0d331427f8c0f1d40560187c8af57710ec64a9755a023b5eda1cc01a7905de88eaf9a4e8abac9fd7 WHIRLPOOL 3418c451596a542cec05b2902efeb875ec95c94a636bac1070ea5c04249282b6676c573828785adacbcc0d768b826d170d05c0f8fb1671014ad18cc3efcae231
+EBUILD libimobiledevice-1.1.4-r2.ebuild 1406 SHA256 0fc694efe917036599af9ebf546e3fae9d0305e87bfe10cbf2ade81617d561b0 SHA512 0c578a06c1ca4b43d0a0a0b738e2eb992597eb08564559b45142eff49ca9e3b5a097286f28bf95ae867c1d6c2e6b7f0a55d472cd38b9510ba6068c116f19c565 WHIRLPOOL c7fa86705d2796731de08fa5e55da71373afb69aacebe4459fc2e23c2d0e1273f09d38730f585d55215f56b3afd3a7de59d97a40158129122190b99b23d73d15
+MISC ChangeLog 5083 SHA256 3a009fa67681b3b5ac2a2b060ca4072091e32c3fcb8721c782ccb8fe265e6efc SHA512 0225b7b8154fab163a512984f43a1ab8e1148a3dd53cf45b1bab6e32bdfce3d8fd1f7fb04c239373c5f8cada22be54913f8142b02a323a70a64e01e405977dfa WHIRLPOOL 3d70bec9f3764bcfda25297438f98a9727657dccd890970a32800a7082a9b21cb8a71e91a869a05a060509341a69b4c0aa8285bfacef7fcc135ffac596930fc2
 MISC metadata.xml 156 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb SHA512 c07d56b6668ae429bd774f35ecae73eb324423aa863c7cc327a511de84d24f099668029fde69132110676115b4763ee96e3e1a7ef1a9db6248d606e65df11d4b WHIRLPOOL 4364f66f79aa67bc6b1762698b41683da5018d08602f509f525bc3e4a3521f2100e0ea92d84bb30617bef9beda48a3cc0ef9b1b9a4219fe05a54559d7423b6d1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJQHm8/AAoJEEdUh39IaPFNT1QH/0BraFrZtILZJMUXQEDKwTGU
+/3B3PcJISDLO8a7jkhGg66+crU/LRY58hlnVu0kFpbWTxCM1bZDNvglapnGQrabQ
+C3qiTlX8YJTnVGLPTLnU+gKSssybjo7KjIzSea86d8kA7BjA1jOQnP6XlcdrKf6z
+dpenEFVC1dZ1sE460nRBn1u1SYVXWeiXFdnHo7AB0Ls+MQav7kYyoHkFQ0QMBmAq
+K6FVUDshUileY9fRDYwkXlSGqpu/Eh6uLnBbFErNAY+bRyUWFX6aqY/Gd1ozTr1G
+DXSo4fgVYuDV1nASqBXRQJDF2LImr+gezCNGNZC8OQhHvKEnnpITuJJmdOxK3uQ=
+=bYOH
+-----END PGP SIGNATURE-----
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.1.4-HOME-segfault.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.1.4-HOME-segfault.patch
new file mode 100644
index 000000000000..1dc82b763aab
--- /dev/null
+++ b/app-pda/libimobiledevice/files/libimobiledevice-1.1.4-HOME-segfault.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/show_bug.cgi?id=423155#c3
+http://libiphone.lighthouseapp.com/projects/27916-libiphone/tickets/265
+
+--- src/userpref.c
++++ src/userpref.c
+@@ -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");
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.1.4-r2.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..4616f6c99764
--- /dev/null
+++ b/app-pda/libimobiledevice/libimobiledevice-1.1.4-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.4-r2.ebuild,v 1.1 2012/08/05 13:03:59 ssuominen Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.7"
+inherit autotools eutils python
+
+DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="gnutls python"
+
+RDEPEND=">=app-pda/libplist-1.8-r1[python?]
+	>=app-pda/usbmuxd-1.0.8
+	gnutls? (
+		dev-libs/libgcrypt
+		>=dev-libs/libtasn1-1.1
+		>=net-libs/gnutls-2.2.0
+		)
+	!gnutls? ( dev-libs/openssl:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.14.1-r1 )"
+
+DOCS="AUTHORS NEWS README"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-cython.patch \
+		"${FILESDIR}"/${P}-openssl.patch \
+		"${FILESDIR}"/${P}-HOME-segfault.patch
+
+	eautoreconf
+
+	>py-compile
+}
+
+src_configure() {
+	local myconf='--disable-static'
+	use python || myconf+=' --without-cython'
+	use gnutls && myconf+=' --disable-openssl'
+
+	econf ${myconf}
+}
+
+src_install() {
+	default
+	dohtml docs/html/*
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}