summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2015-05-30 22:33:28 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2015-05-30 22:33:28 +0000
commitc61980c4439edd66749ea49b07c20619423af95e (patch)
tree2ca0389971b783c9200df8419320d5fa450f0cfa /sys-fs
parentDrop incorrectly backported patches: bug #550644 by Todd Goodman. (diff)
downloadhistorical-c61980c4439edd66749ea49b07c20619423af95e.tar.gz
historical-c61980c4439edd66749ea49b07c20619423af95e.tar.bz2
historical-c61980c4439edd66749ea49b07c20619423af95e.zip
Fixed crash on double mutex unlock for mtpfs_getattr_real(). Added myself to co-maintainers.
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x611FF3AA
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/mtpfs/ChangeLog11
-rw-r--r--sys-fs/mtpfs/Manifest26
-rw-r--r--sys-fs/mtpfs/files/mtpfs-1.1-fix-mutex-crash.patch70
-rw-r--r--sys-fs/mtpfs/metadata.xml5
-rw-r--r--sys-fs/mtpfs/mtpfs-1.1-r1.ebuild54
5 files changed, 147 insertions, 19 deletions
diff --git a/sys-fs/mtpfs/ChangeLog b/sys-fs/mtpfs/ChangeLog
index cc6cd95666cb..a92387d568f7 100644
--- a/sys-fs/mtpfs/ChangeLog
+++ b/sys-fs/mtpfs/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-fs/mtpfs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtpfs/ChangeLog,v 1.11 2014/03/17 07:02:46 xarthisius Exp $
+# 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 $
+
+*mtpfs-1.1-r1 (30 May 2015)
+
+ 30 May 2015; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/mtpfs-1.1-fix-mutex-crash.patch, +mtpfs-1.1-r1.ebuild, metadata.xml:
+ Fixed crash on double mutex unlock for mtpfs_getattr_real(). Added myself to
+ co-maintainers.
17 Mar 2014; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
Remove myself from metadata.xml
diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index 8793a5a752ab..e1fb773d8ee3 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -1,26 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST mtpfs-1.0.tar.gz 104242 SHA256 879ccf929a7ce395af30ae81314850a5cb55a0056107477016121b9392c49c13
+AUX mtpfs-1.1-fix-mutex-crash.patch 2115 SHA256 59f00dfd07219501044e72d0de22705d6e418576381775b1e511d4a38d525668 SHA512 800e1dd3d2b76503ee7ba03bbdce8cd43c6a64b4444d3f2f9b49e155b86b005c98ff2019043cbc440762ed8c4dc675a4666fe0fa4bfbc3c89971a2aeb16538e1 WHIRLPOOL d5cd84e9c920329d05bf952bd26af8e826adfffe05a53ecc4c2d505d9dc558268cd6555f81764d5d957459c7636e1538250244e6cbb6d8be3513154a55798d1a
+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.ebuild 1163 SHA256 4ddf5a870e6bc1559fdc489ec108070ae423754536ff2320a74c2d1095c066d1 SHA512 5c0e9c55c7a8e86f27cce213670c1bcf8c370c6aab45b24a84669b559eb5a046f492d11558ebd67cb0cc6a423ca340e49312dca0c5df66f21751cae5c79950ba WHIRLPOOL 62a064080069553eb75dbe2d3ce779e31967c212502614f2f72b124be1ba42873f9ad5bc81d5330844aacfff58c4e4b2cebf4e7ba2d8371104dc5878b7c47d7e
-MISC ChangeLog 1640 SHA256 825ea7db578885c29fa5c8e5100a9a7c45ded7ac52755b281e92ffcecb3ce295 SHA512 5a16d53b46e4e1025dd389de76eda8063b1d01f3976477e29001b1ae5f5b0228ee044d2fe7bb96acc88ec315c56be77803e6748b2b6c867cc340e76152fac45c WHIRLPOOL a1419a8ca047a3e79f39d6a9c1bc2792da5a494df60600fe603e6aaad3cb1b7429e0d0c62bad9e6841831f2d4339c942c4135a6fce6bb8252c63b672b0d7588f
-MISC metadata.xml 557 SHA256 ac785255a6ad9692c9078249b5f0840b136f16809da78c283b5efbbcdb31df13 SHA512 7f682e35c92464bef90561c2fbcb56364dddd8431dc2b59721ccfb5e4bbdebe7485ece51809786faf16827b59d5604f3e82aa6cf9bef9fbad9297c788b856851 WHIRLPOOL 4af858e025f841876fa162b89f416269db24dddebf21d30e0213955e02b0867dc0c0608aa053af5bf038b9450c3ec908715ea205d0767225e9681b860e0ac788
+MISC ChangeLog 1895 SHA256 44c44dee6017b27e62b241d8ce83d4dbfae932d60ee5f0f681190a2eb46e2145 SHA512 b56647e043bdfc7325e237a0b6aa6ff2c0231386e68870a9a5a0ed00aa08a1c4095b5ed90bfd8e318b0b9416e7ffd2cbb119d0d0ca63d7c63654ff9fa14b4ac3 WHIRLPOOL 2f8c59a088f532d4cd0f9e837f03af7be44a330621888e5d7f7efc8e7644fcb6aef9c170506a609036c397d87f75bfe73c823137b0a66b58e37664789a2162f3
+MISC metadata.xml 656 SHA256 969652b6370dbba1c48664ac52d80fc640e44c4fd851909a6991c0492ccbcb1a SHA512 69a44694e4a9ec5e90247b72b1fab77a4d7dd889a34a3c254dccff6fd7f32e27ef87a7a127a1f41bf4bd38e792ebfeb78ab1a13da08957fe59a70cb60c6414f9 WHIRLPOOL 4e4c5155dffb4d81cc5592c3c85888bf1f12929e6d0c2ce39df38190a30a445b4a4fb00d48824591ff199c20edb02818fd41c287ff44dd299db11cd6867d0a17
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iQIcBAEBCAAGBQJTJp3dAAoJEF0huFKJUZL54YUQAIcLD1vfk7DApywN7vqkNF3J
-kiR5uVkzlBYD2xLrGyCPBEy0MG7oODcre92vaLOfq0Wr0xEQC2VbMr8u/r+S7fVH
-qfB4T4gws5sLkVjOSKfmMfYmGcN7R89V+EF9jhWFxp/gKqLogzWTpM4Hhd0lb+6X
-JinLkhYeDyZRLequ2aWCEim78Tonl2roIub/eLgfhzPQOL8GjOpcs4hx144ar28y
-Ss89hGJsd/MhO3wzQn4kWUmg9Ix1rlvloRzjdOvnwlG/ErtsfvpEuNpmDhJI1CUU
-/1bP3q+b4vw8tdnGOu6hIAc5PrM0T5FKvEoUXer7IYxp98Aw7sgtKmV7z2hlR0BG
-FC1rdw+A6zoyUyT89AqCHeqsmYK75htUVkG9eiLktM64yQhFggask9xJxM5WITWu
-WIHsnOuhTiY5R2qb3p4ev2kG2XzosEjs9O0eyFaPPjd23uy83gq/P/OI6V+05Rh5
-RVAoIp+utCJD5r7O06haZIV+Lf7DqP/qWHbwwT3UEe2/0rJVHmCJxr2Zxds70pLE
-z8sxHVSszcgrjAAtFx0wEYEKD8PPYXXvvdinIH6YZX4ySZg64Xam9xXmU9ANch3s
-PPa96Y1TXjkG4Mf3Dwbnv7AT2E4CyyD5zp5t37yohZlJRYfHNg+Dxg7F2lw2U64p
-NkitcT1VUGSdEXjD6kE2
-=kqPl
+iEYEAREIAAYFAlVqOrgACgkQcaHudmEf86qHJACgiPYNRKYg4v8QalXu+s+B3sjo
+EJoAn2FGnWOssFgW8j0CvSmtzJislNkh
+=7TST
-----END PGP SIGNATURE-----
diff --git a/sys-fs/mtpfs/files/mtpfs-1.1-fix-mutex-crash.patch b/sys-fs/mtpfs/files/mtpfs-1.1-fix-mutex-crash.patch
new file mode 100644
index 000000000000..b344fc44bc1e
--- /dev/null
+++ b/sys-fs/mtpfs/files/mtpfs-1.1-fix-mutex-crash.patch
@@ -0,0 +1,70 @@
+commit c30d53648a713a3f7f7711f081732aa814c6e74d
+Author: Sergei Trofimovich <siarheit@google.com>
+Date: Sat May 30 23:20:42 2015 +0100
+
+ mtpfs.c: remove all unlocking calls from mtpfs_getattr_real
+
+ Lock is already acquired/freed in the caller function 'mtpfs_getattr'.
+ Noticed when trying to use mtpfs today :)
+
+ Should also fix the same issue https://github.com/cjd/mtpfs/issues/1
+ as I get the same backtrace.
+
+ Signed-off-by: Sergei Trofimovich <siarheit@google.com>
+
+diff --git a/mtpfs.c b/mtpfs.c
+index e5e1b03..553d282 100644
+--- a/mtpfs.c
++++ b/mtpfs.c
+@@ -776,5 +776,5 @@ mtpfs_getattr_real (const gchar * path, struct stat *stbuf)
+ {
+ int ret = 0;
+- if (path==NULL) return_unlock(-ENOENT);
++ if (path==NULL) return -ENOENT;
+ memset (stbuf, 0, sizeof (struct stat));
+
+@@ -787,5 +787,5 @@ mtpfs_getattr_real (const gchar * path, struct stat *stbuf)
+ stbuf->st_mode = S_IFDIR | 0777;
+ stbuf->st_nlink = 2;
+- return_unlock(0);
++ return 0;
+ }
+
+@@ -799,5 +799,5 @@ mtpfs_getattr_real (const gchar * path, struct stat *stbuf)
+ stbuf->st_blocks = 2;
+ stbuf->st_mtime = time(NULL);
+- return_unlock(0);
++ return 0;
+ }
+ }
+@@ -808,5 +808,5 @@ mtpfs_getattr_real (const gchar * path, struct stat *stbuf)
+ stbuf->st_mode = S_IFDIR | 0777;
+ stbuf->st_nlink = 2;
+- return_unlock(0);
++ return 0;
+ }
+
+@@ -843,9 +843,9 @@ mtpfs_getattr_real (const gchar * path, struct stat *stbuf)
+ stbuf->st_blocks = 2;
+ stbuf->st_mtime = time(NULL);
+- return_unlock(0);
++ return 0;
+ }
+ playlist = playlist->next;
+ }
+- return_unlock(-ENOENT);
++ return -ENOENT;
+ }
+
+@@ -864,9 +864,9 @@ mtpfs_getattr_real (const gchar * path, struct stat *stbuf)
+ stbuf->st_mode = S_IFREG | 0777;
+ stbuf->st_mtime = file->modificationdate;
+- return_unlock(0);
++ return 0;
+ }
+ }
+
+- return_unlock(-ENOENT);
++ return -ENOENT;
+ }
+
diff --git a/sys-fs/mtpfs/metadata.xml b/sys-fs/mtpfs/metadata.xml
index eb2e05fda10e..086187b8c231 100644
--- a/sys-fs/mtpfs/metadata.xml
+++ b/sys-fs/mtpfs/metadata.xml
@@ -5,6 +5,11 @@
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
+ <maintainer>
+ <email>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
+ </maintainer>
+
<longdescription>
MTPfs is a FUSE filesystem that supports reading and writing from any
MTP device, as supported by libmtp. MTPfs includes extra features such
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r1.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r1.ebuild
new file mode 100644
index 000000000000..47f9086d50ec
--- /dev/null
+++ b/sys-fs/mtpfs/mtpfs-1.1-r1.ebuild
@@ -0,0 +1,54 @@
+# 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-r1.ebuild,v 1.1 2015/05/30 22:33:27 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
+}
+
+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
+}