Fix crash due to use uinitialised device ID, bug #556690 and fix by LE GARREC Vincent.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 81 insertions, 5 deletions

diff --git a/sys-fs/mtpfs/ChangeLog b/sys-fs/mtpfs/ChangeLog
index a92387d568f7..0b6244eccbe7 100644
--- a/sys-fs/mtpfs/ChangeLog
+++ b/sys-fs/mtpfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/mtpfs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtpfs/ChangeLog,v 1.12 2015/05/30 22:33:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtpfs/ChangeLog,v 1.13 2015/08/05 21:01:09 slyfox Exp $
+
+*mtpfs-1.1-r2 (05 Aug 2015)
+
+  05 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/mtpfs-1.1-unitialized-variable.patch, +mtpfs-1.1-r2.ebuild:
+  Fix crash due to use uinitialised device ID, bug #556690 and fix by LE GARREC
+  Vincent.
 
 *mtpfs-1.1-r1 (30 May 2015)
 
diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index e1fb773d8ee3..47f6362b13d6 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 AUX mtpfs-1.1-fix-mutex-crash.patch 2115 SHA256 59f00dfd07219501044e72d0de22705d6e418576381775b1e511d4a38d525668 SHA512 800e1dd3d2b76503ee7ba03bbdce8cd43c6a64b4444d3f2f9b49e155b86b005c98ff2019043cbc440762ed8c4dc675a4666fe0fa4bfbc3c89971a2aeb16538e1 WHIRLPOOL d5cd84e9c920329d05bf952bd26af8e826adfffe05a53ecc4c2d505d9dc558268cd6555f81764d5d957459c7636e1538250244e6cbb6d8be3513154a55798d1a
+AUX mtpfs-1.1-unitialized-variable.patch 346 SHA256 869c659af32c0b999694e6f6973728c98458dd1e31630514dbaa03f35e3aaf68 SHA512 17bec46c584435ff4e636a0b66c612605cdf2ecb029c92058be4e97981758edef31fef7ec31f2e79816fa0c6c3590fe8730abadbe0cbcef825abecdd05aeae8c WHIRLPOOL 2d5e6bffc2157fea6d5aca7d80002c5dd7a6b8bef9d64ddbfd8f71e78099a19945f5da477cb6e082ac5128865a73afa0d89d0089f117526c85715b6ec1e9a33f
 DIST mtpfs-1.0.tar.gz 104242 SHA256 879ccf929a7ce395af30ae81314850a5cb55a0056107477016121b9392c49c13 SHA512 af3bd067410f51bf76619a5d98a23c2a5755d2f5e2764221af145a463ab1b819332b00e358887488f2e26e29c91dcabceedf5f8637d97a9b2ba06b91281a6a4d WHIRLPOOL 074effa8933a26cf6a98af92c7629833cd0a831baae3fb3c296eda62b22477df9d43404b2452644e83ae0902e427717854ec9c4cd5fa1c9705d83b82471f3476
 DIST mtpfs-1.1.tar.gz 108329 SHA256 1baf357de16995a5f0b5bc1b6833517a77456481d861cdba70f1ce1316ce4c1d SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8 WHIRLPOOL 891b84f52cbb1ab19f25a45ac73253b0fd1c0f3340d5989eca7cc33ac04c964e3a21062969e9995f90bd0b3b82ebe819854c5de2a729a3efe95d06da1d094d7b
 EBUILD mtpfs-1.0.ebuild 1092 SHA256 7069939c90fd8f211bfc94e57e0c0b7b1ee8169c009942f1abf65d3f753852be SHA512 de91a07c43bf2c4c16680caf9b83f2aabea07196890fda54cda1cbfc1f766b33c59dbadd307644dc78bc4ec2b7bae83e73725dd1d6d84d428bd99bd69a1f9395 WHIRLPOOL 7db59d04b09b90f599096f67c3695b913b9d0fc9cf9b2bebd2f2a196525ee5eb9edbecf62a3c1cdc68592cb26aa158d833f4e777dbbe9dd9e8a0a98d3dcf1c0a
 EBUILD mtpfs-1.1-r1.ebuild 1229 SHA256 a667beba2c332795eb69ba9e3e8b628e30f2a81ae82dd98523433414799678f1 SHA512 857f6ff0c88f991a6a0177de83313c87d1158417cea19efaffe081c39647ff01aa952bbb7733dd6bf2642efe20664f01a880580d6b62a64ac58a1f9bb5322a8c WHIRLPOOL cc5fde73a58a55883a915f72fcc10a1ca4353291b1e017fcdeb472b2188b8c6036b6ea466961bf55f673574f9ee405e29f343e9f56de639650aa6eab06cc4ede
+EBUILD mtpfs-1.1-r2.ebuild 1283 SHA256 efc06a4b790d78756abf24586003eea66d4fa943d931d7ba49dc6a4637011728 SHA512 821d28d9711853c6befc3c150ccc12f6f6b9f8214c7cbf929aabb851de34941673670105a42db2aea35aa15092f5276d7703b8d78fee977d430f3ac8df2bc431 WHIRLPOOL a019316191f89d0fa5714e1e92aa6b3b1de9ca7155001f0fe63900ddcee49cc430994b3d830e6094fa8330d1ceb1aab774d81f9e7465acad43da49f03c374575
 EBUILD mtpfs-1.1.ebuild 1163 SHA256 4ddf5a870e6bc1559fdc489ec108070ae423754536ff2320a74c2d1095c066d1 SHA512 5c0e9c55c7a8e86f27cce213670c1bcf8c370c6aab45b24a84669b559eb5a046f492d11558ebd67cb0cc6a423ca340e49312dca0c5df66f21751cae5c79950ba WHIRLPOOL 62a064080069553eb75dbe2d3ce779e31967c212502614f2f72b124be1ba42873f9ad5bc81d5330844aacfff58c4e4b2cebf4e7ba2d8371104dc5878b7c47d7e
-MISC ChangeLog 1895 SHA256 44c44dee6017b27e62b241d8ce83d4dbfae932d60ee5f0f681190a2eb46e2145 SHA512 b56647e043bdfc7325e237a0b6aa6ff2c0231386e68870a9a5a0ed00aa08a1c4095b5ed90bfd8e318b0b9416e7ffd2cbb119d0d0ca63d7c63654ff9fa14b4ac3 WHIRLPOOL 2f8c59a088f532d4cd0f9e837f03af7be44a330621888e5d7f7efc8e7644fcb6aef9c170506a609036c397d87f75bfe73c823137b0a66b58e37664789a2162f3
+MISC ChangeLog 2139 SHA256 800d9a7933bbb894ddf295122f08e4d6b385764074a5a97f8d1d39029f4f9e45 SHA512 523a815ce76e756abb93fd6f1f007abc6030bd7cf3fe0acfc768e46ec9254d941e96a876fa0720f128095d6367dc2c7b62e2cb4639efdc75c75c92b13c918467 WHIRLPOOL af6d4f75d19318f56c0484982f6fdaa9cbba5d569055cc2bf5d0e96e9a1943add5a632932cff90f1f69a2cd6d514e75ea5a120fa8791739701ef2e3351cfd1e4
 MISC metadata.xml 656 SHA256 969652b6370dbba1c48664ac52d80fc640e44c4fd851909a6991c0492ccbcb1a SHA512 69a44694e4a9ec5e90247b72b1fab77a4d7dd889a34a3c254dccff6fd7f32e27ef87a7a127a1f41bf4bd38e792ebfeb78ab1a13da08957fe59a70cb60c6414f9 WHIRLPOOL 4e4c5155dffb4d81cc5592c3c85888bf1f12929e6d0c2ce39df38190a30a445b4a4fb00d48824591ff199c20edb02818fd41c287ff44dd299db11cd6867d0a17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVqOrgACgkQcaHudmEf86qHJACgiPYNRKYg4v8QalXu+s+B3sjo
-EJoAn2FGnWOssFgW8j0CvSmtzJislNkh
-=7TST
+iEYEAREIAAYFAlXCeZoACgkQcaHudmEf86oHBwCcDxMfZJQ8IiZfRKVW2/ahpgPH
+k7MAn33+NGvtAEgP1q8r9tJvLk00eYp1
+=4xM8
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch b/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch
new file mode 100644
index 000000000000..fb49624515b8
--- /dev/null
+++ b/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/556690
+--- mtpfs.c.old	2015-08-04 21:56:13.080712801 +0200
++++ mtpfs.c	2015-08-04 21:20:54.822965092 +0200
+@@ -1324,7 +1324,7 @@ main (int argc, char *argv[])
+     LIBMTP_raw_device_t * rawdevices;
+     int numrawdevices;
+     LIBMTP_error_number_t err;
+-    int i;
++    int i = 0;
+ 
+     int opt;
+     extern int optind;
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r2.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r2.ebuild
new file mode 100644
index 000000000000..73cd780c73ff
--- /dev/null
+++ b/sys-fs/mtpfs/mtpfs-1.1-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtpfs/mtpfs-1.1-r2.ebuild,v 1.1 2015/08/05 21:01:09 slyfox Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A FUSE filesystem providing access to MTP devices"
+HOMEPAGE="http://www.adebenham.com/mtpfs/"
+SRC_URI="http://www.adebenham.com/files/mtp/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug mad"
+
+RDEPEND="dev-libs/glib:2
+	>=media-libs/libmtp-1.1.2
+	sys-fs/fuse
+	mad? (
+		media-libs/libid3tag
+		media-libs/libmad
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS NEWS README)
+
+src_prepare() {
+	sed -e "/#include <string.h>/ a\
+		#include <stdlib.h>" -i mtpfs.h id3read.c || die #implicit
+
+	epatch "${FILESDIR}"/${P}-fix-mutex-crash.patch
+	epatch "${FILESDIR}"/${P}-unitialized-variable.patch
+}
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_enable mad)
+}
+
+pkg_postinst() {
+	einfo "To mount your MTP device, issue:"
+	einfo "    /usr/bin/mtpfs <mountpoint>"
+	echo
+	einfo "To unmount your MTP device, issue:"
+	einfo "    /usr/bin/fusermount -u <mountpoint>"
+
+	if use debug; then
+		echo
+		einfo "You have enabled debugging output."
+		einfo "Please make sure you run mtpfs with the -d flag."
+	fi
+}