[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/files/, sys-fs/mtpfs/

2021-09-30 Thread Bernard Cafarelli 
commit: 8c778578a4f5e73a7edff20e09d35afbac7a8c06
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Thu Sep 30 22:20:05 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Sep 30 22:20:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c778578

sys-fs/mtpfs: fix deprecated init of lock

This became an error with glib 2.70

Closes: https://bugs.gentoo.org/814965
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 .../files/mtpfs-1.1-deprecated_lock_init.patch | 24 ++
 sys-fs/mtpfs/mtpfs-1.1-r6.ebuild   |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/sys-fs/mtpfs/files/mtpfs-1.1-deprecated_lock_init.patch 
b/sys-fs/mtpfs/files/mtpfs-1.1-deprecated_lock_init.patch
new file mode 100644
index 000..d369ebfe1f2
--- /dev/null
+++ b/sys-fs/mtpfs/files/mtpfs-1.1-deprecated_lock_init.patch
@@ -0,0 +1,24 @@
+diff -Naur mtpfs-1.1.orig/mtpfs.c mtpfs-1.1/mtpfs.c
+--- mtpfs-1.1.orig/mtpfs.c 2021-10-01 00:15:15.763423589 +0200
 mtpfs-1.1/mtpfs.c  2021-10-01 00:16:07.626486888 +0200
+@@ -1371,6 +1371,8 @@
+ extern int optind;
+ extern char *optarg;
+ 
++g_mutex_init(_lock);
++
+ //while ((opt = getopt(argc, argv, "d")) != -1 ) {
+ //switch (opt) {
+ //case 'd':
+diff -Naur mtpfs-1.1.orig/mtpfs.h mtpfs-1.1/mtpfs.h
+--- mtpfs-1.1.orig/mtpfs.h 2021-10-01 00:15:15.779423609 +0200
 mtpfs-1.1/mtpfs.h  2021-10-01 00:16:20.322502337 +0200
+@@ -77,7 +77,7 @@
+ static GSList *myfiles = NULL;
+ static LIBMTP_playlist_t *playlists = NULL;
+ static gboolean playlists_changed = FALSE;
+-static GMutex device_lock = G_STATIC_MUTEX_INIT;
++static GMutex device_lock;
+ 
+ 
+ #endif /* _MTPFS_H_ */

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
index 3bc2351e26c..04dd5b86b90 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
@@ -27,7 +27,8 @@ DOCS=(AUTHORS NEWS README)
 PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch
"${FILESDIR}"/${P}-unitialized-variable.patch
"${FILESDIR}"/${P}-wking-patches/
-   "${FILESDIR}"/${P}-g_printf.patch )
+   "${FILESDIR}"/${P}-g_printf.patch
+   "${FILESDIR}"/${P}-deprecated_lock_init.patch )
 
 src_prepare() {
default

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/

2021-08-16 Thread Sam James 
commit: f44244fef2efc4b1c4c43e6973fffd709d0f593f
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 16 21:22:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 16 21:22:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44244fe

sys-fs/mtpfs: add missing slot operator dep (libid3tag)

Signed-off-by: Sam James  gentoo.org>

 sys-fs/mtpfs/{mtpfs-1.1-r5.ebuild => mtpfs-1.1-r6.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
similarity index 92%
rename from sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
rename to sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
index 4230a9048a1..3bc2351e26c 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,10 +13,10 @@ KEYWORDS="amd64 x86"
 IUSE="debug mad"
 
 RDEPEND="dev-libs/glib:2
-   >=media-libs/libmtp-1.1.2
+   >=media-libs/libmtp-1.1.2:=

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/

2021-07-18 Thread Sergei Trofimovich 
commit: 302132c0e36c20ea542fefb012c44455e8d56ee0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul 18 13:46:02 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul 18 13:46:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302132c0

sys-fs/mtpfs: drop myself from maintainers

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/mtpfs/metadata.xml | 5 -
 1 file changed, 5 deletions(-)

diff --git a/sys-fs/mtpfs/metadata.xml b/sys-fs/mtpfs/metadata.xml
index cc200ab6955..cb18a07276c 100644
--- a/sys-fs/mtpfs/metadata.xml
+++ b/sys-fs/mtpfs/metadata.xml
@@ -5,11 +5,6 @@
voyag...@gentoo.org
Bernard Cafarelli

-   
-   sly...@gentoo.org
-   Sergei Trofimovich
-   
-

MTPfs is a FUSE filesystem that supports reading and writing 
from any
MTP device, as supported by libmtp. MTPfs includes extra 
features such

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/

2019-11-10 Thread Sergei Trofimovich 
commit: fa4269e65dd5d0d5c81c46df821ecbc845d7bfa8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 10 12:08:37 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 10 12:08:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4269e6

sys-fs/mtpfs: stabilize 1.1-r5 for amd64/x86

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/mtpfs/mtpfs-1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
index 8cc52ebc9b7..4230a9048a1 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug mad"
 
 RDEPEND="dev-libs/glib:2

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/

2019-11-10 Thread Sergei Trofimovich 
commit: e2810ad4780a2fdb3f99c47c83c5c165d9335408
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 10 12:08:48 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 10 12:08:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2810ad4

sys-fs/mtpfs: drop old

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/mtpfs/mtpfs-1.1-r4.ebuild | 55 
 1 file changed, 55 deletions(-)

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
deleted file mode 100644
index deab850ea32..000
--- a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A FUSE filesystem providing access to MTP devices"
-HOMEPAGE="https://www.adebenham.com/mtpfs/;
-SRC_URI="https://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}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=(AUTHORS NEWS README)
-
-PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch
-   "${FILESDIR}"/${P}-unitialized-variable.patch
-   "${FILESDIR}"/${P}-wking-patches/
-   "${FILESDIR}"/${P}-g_printf.patch )
-
-src_prepare() {
-   default
-   sed -e "/#include / a\
-   #include " -i mtpfs.h id3read.c || die #implicit
-}
-
-src_configure() {
-   econf $(use_enable debug) \
-   $(use_enable mad)
-}
-
-pkg_postinst() {
-   einfo "To mount your MTP device, issue:"
-   einfo "/usr/bin/mtpfs "
-   echo
-   einfo "To unmount your MTP device, issue:"
-   einfo "/usr/bin/fusermount -u "
-
-   if use debug; then
-   echo
-   einfo "You have enabled debugging output."
-   einfo "Please make sure you run mtpfs with the -d flag."
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/

2019-01-09 Thread Sergei Trofimovich 
commit: 63d5883b36ae6c5ac3c3100e1e4e0d13cc1aa672
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jan  9 08:03:30 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jan  9 08:04:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d5883b

sys-fs/mtpfs: pin to https://bugs.gentoo.org/673640
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/mtpfs/mtpfs-1.1-r5.ebuild | 55 
 1 file changed, 55 insertions(+)

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
new file mode 100644
index 000..8cc52ebc9b7
--- /dev/null
+++ b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A FUSE filesystem providing access to MTP devices"
+HOMEPAGE="https://www.adebenham.com/mtpfs/;
+SRC_URI="https://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
+   / a\
+   #include " -i mtpfs.h id3read.c || die #implicit
+}
+
+src_configure() {
+   econf $(use_enable debug) \
+   $(use_enable mad)
+}
+
+pkg_postinst() {
+   einfo "To mount your MTP device, issue:"
+   einfo "/usr/bin/mtpfs "
+   echo
+   einfo "To unmount your MTP device, issue:"
+   einfo "/usr/bin/fusermount -u "
+
+   if use debug; then
+   echo
+   einfo "You have enabled debugging output."
+   einfo "Please make sure you run mtpfs with the -d flag."
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/

2019-01-09 Thread Sergei Trofimovich 
commit: 1ee4e142d4163bfae1bad0147739b4b02adf617c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jan  9 08:04:02 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jan  9 08:04:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee4e142

sys-fs/mtpfs: drop old

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/mtpfs/Manifest|  1 -
 sys-fs/mtpfs/mtpfs-1.0.ebuild| 45 
 sys-fs/mtpfs/mtpfs-1.1-r3.ebuild | 56 
 3 files changed, 102 deletions(-)

diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index 273547b72b5..a6f34e7605c 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -1,2 +1 @@
-DIST mtpfs-1.0.tar.gz 104242 BLAKE2B 
b29e0cd88a726affbe0810ceac38378c60b97de99eaf0ca4f5b249f87ca982cc7c83faa0bbfc87b4ffb351c10573ce4778de1f9911842707279c4fb08b157d33
 SHA512 
af3bd067410f51bf76619a5d98a23c2a5755d2f5e2764221af145a463ab1b819332b00e358887488f2e26e29c91dcabceedf5f8637d97a9b2ba06b91281a6a4d
 DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 
7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62
 SHA512 
627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8

diff --git a/sys-fs/mtpfs/mtpfs-1.0.ebuild b/sys-fs/mtpfs/mtpfs-1.0.ebuild
deleted file mode 100644
index 0968c88c865..000
--- a/sys-fs/mtpfs/mtpfs-1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A FUSE filesystem providing access to MTP devices"
-HOMEPAGE="https://www.adebenham.com/mtpfs/;
-SRC_URI="https://www.adebenham.com/debian/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-libs/glib:2
-   media-libs/libid3tag
-   media-libs/libmad
-   media-libs/libmtp
-   sys-fs/fuse"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS NEWS README)
-
-src_prepare() {
-   sed -e "/#include / a\
-   #include " -i mtpfs.h id3read.c || die #implicit
-}
-
-src_configure() {
-   econf $(use_enable debug)
-}
-
-pkg_postinst() {
-   einfo "To mount your MTP device, issue:"
-   einfo "/usr/bin/mtpfs "
-   echo
-   einfo "To unmount your MTP device, issue:"
-   einfo "/usr/bin/fusermount -u "
-
-   if use debug; then
-   echo
-   einfo "You have enabled debugging output."
-   einfo "Please make sure you run mtpfs with the -d flag."
-   fi
-}

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild
deleted file mode 100644
index 5fb9a655bf9..000
--- a/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A FUSE filesystem providing access to MTP devices"
-HOMEPAGE="https://www.adebenham.com/mtpfs/;
-SRC_URI="https://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 / a\
-   #include " -i mtpfs.h id3read.c || die #implicit
-
-   epatch "${FILESDIR}"/${P}-fix-mutex-crash.patch
-   epatch "${FILESDIR}"/${P}-unitialized-variable.patch
-   epatch "${FILESDIR}"/${P}-wking-patches/*.patch
-   epatch "${FILESDIR}"/${P}-g_printf.patch
-}
-
-src_configure() {
-   econf $(use_enable debug) \
-   $(use_enable mad)
-}
-
-pkg_postinst() {
-   einfo "To mount your MTP device, issue:"
-   einfo "/usr/bin/mtpfs "
-   echo
-   einfo "To unmount your MTP device, issue:"
-   einfo "/usr/bin/fusermount -u "
-
-   if use debug; then
-   echo
-   einfo "You have enabled debugging output."
-   einfo "Please make sure you run mtpfs with the -d flag."
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/

2018-11-05 Thread Mikle Kolyada 
commit: 1de40158bf9b78e76fcb81dbb5c45c363c1e9dfb
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Nov  5 18:06:52 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Nov  5 18:07:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de40158

sys-fs/mtpfs: amd64 stable wrt bug #669956

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-fs/mtpfs/mtpfs-1.1-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
index 4c46f953d4b..deab850ea32 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug mad"
 
 RDEPEND="dev-libs/glib:2

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/

2018-10-30 Thread Thomas Deutschmann 
commit: 1a1e1d9ff72333cfc70b4de8997f7c424f7512b9
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Oct 31 01:03:21 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Oct 31 01:03:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1e1d9f

sys-fs/mtpfs: x86 stable (bug #669956)

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-fs/mtpfs/mtpfs-1.1-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
index e97428f4e0d..4c46f953d4b 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="debug mad"
 
 RDEPEND="dev-libs/glib:2

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/files/, sys-fs/mtpfs/

2018-07-23 Thread Sergei Trofimovich 
commit: 98d8f12d88876420bd8044e18772d977f94877ae
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Jul 20 10:39:47 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul 23 06:41:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d8f12d

sys-fs/mtpfs: EAPI7, improve ebuild

Closes: https://github.com/gentoo/gentoo/pull/9294

 .../files/mtpfs-1.1-unitialized-variable.patch |  4 +-
 sys-fs/mtpfs/mtpfs-1.1-r4.ebuild   | 55 ++
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch 
b/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch
index fb49624515b..f322d4770ab 100644
--- a/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch
+++ b/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch
@@ -1,6 +1,6 @@
 https://bugs.gentoo.org/556690
 mtpfs.c.old2015-08-04 21:56:13.080712801 +0200
-+++ mtpfs.c2015-08-04 21:20:54.822965092 +0200
+--- a/mtpfs.c  2015-08-04 21:56:13.080712801 +0200
 b/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;

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
new file mode 100644
index 000..e97428f4e0d
--- /dev/null
+++ b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A FUSE filesystem providing access to MTP devices"
+HOMEPAGE="https://www.adebenham.com/mtpfs/;
+SRC_URI="https://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}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=(AUTHORS NEWS README)
+
+PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch
+   "${FILESDIR}"/${P}-unitialized-variable.patch
+   "${FILESDIR}"/${P}-wking-patches/
+   "${FILESDIR}"/${P}-g_printf.patch )
+
+src_prepare() {
+   default
+   sed -e "/#include / a\
+   #include " -i mtpfs.h id3read.c || die #implicit
+}
+
+src_configure() {
+   econf $(use_enable debug) \
+   $(use_enable mad)
+}
+
+pkg_postinst() {
+   einfo "To mount your MTP device, issue:"
+   einfo "/usr/bin/mtpfs "
+   echo
+   einfo "To unmount your MTP device, issue:"
+   einfo "/usr/bin/fusermount -u "
+
+   if use debug; then
+   echo
+   einfo "You have enabled debugging output."
+   einfo "Please make sure you run mtpfs with the -d flag."
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/

2017-07-04 Thread Sergei Trofimovich 
commit: f0819572cb5f3dc5642bacf6be0d078681f68ab3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jul  4 21:45:30 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul  4 21:56:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0819572

sys-fs/mtpfs: switch HOMEPAGE to https://

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-fs/mtpfs/mtpfs-1.0.ebuild| 6 +++---
 sys-fs/mtpfs/mtpfs-1.1-r3.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-fs/mtpfs/mtpfs-1.0.ebuild b/sys-fs/mtpfs/mtpfs-1.0.ebuild
index c439d36d154..0968c88c865 100644
--- a/sys-fs/mtpfs/mtpfs-1.0.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
 DESCRIPTION="A FUSE filesystem providing access to MTP devices"
-HOMEPAGE="http://www.adebenham.com/mtpfs/;
-SRC_URI="http://www.adebenham.com/debian/${P}.tar.gz;
+HOMEPAGE="https://www.adebenham.com/mtpfs/;
+SRC_URI="https://www.adebenham.com/debian/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild
index 78afd40d85a..5fb9a655bf9 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ 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;
+HOMEPAGE="https://www.adebenham.com/mtpfs/;
+SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/

2017-07-04 Thread Sergei Trofimovich 
commit: 1e1634f143d7ed3d5395d02a49f3c3b147c5c3a6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jul  4 21:43:30 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul  4 21:56:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1634f1

sys-fs/mtpfs: drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-fs/mtpfs/mtpfs-1.1-r1.ebuild | 53 ---
 sys-fs/mtpfs/mtpfs-1.1-r2.ebuild | 54 
 sys-fs/mtpfs/mtpfs-1.1.ebuild| 49 
 3 files changed, 156 deletions(-)

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r1.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r1.ebuild
deleted file mode 100644
index e341f9aa75f..000
--- a/sys-fs/mtpfs/mtpfs-1.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 / a\
-   #include " -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 "
-   echo
-   einfo "To unmount your MTP device, issue:"
-   einfo "/usr/bin/fusermount -u "
-
-   if use debug; then
-   echo
-   einfo "You have enabled debugging output."
-   einfo "Please make sure you run mtpfs with the -d flag."
-   fi
-}

diff --git a/sys-fs/mtpfs/mtpfs-1.1-r2.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r2.ebuild
deleted file mode 100644
index 8dfd86568eb..000
--- a/sys-fs/mtpfs/mtpfs-1.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 / a\
-   #include " -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 "
-   echo
-   einfo "To unmount your MTP device, issue:"
-   einfo "/usr/bin/fusermount -u "
-
-   if use debug; then
-   echo
-   einfo "You have enabled debugging output."
-   einfo "Please make sure you run mtpfs with the -d flag."
-   fi
-}

diff --git a/sys-fs/mtpfs/mtpfs-1.1.ebuild b/sys-fs/mtpfs/mtpfs-1.1.ebuild
deleted file mode 100644
index 567f46ff5cf..000
--- a/sys-fs/mtpfs/mtpfs-1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-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 / a\
-   #include " -i mtpfs.h id3read.c || die #implicit
-}
-
-src_configure() {
-   econf $(use_enable debug) \
-   $(use_enable mad)
-}
-
-pkg_postinst() {
-   einfo "To mount your MTP device, issue:"
-   einfo "/usr/bin/mtpfs "
-   echo
-   einfo "To unmount your MTP device, issue:"
-   einfo "/usr/bin/fusermount -u "
-
-   if

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtpfs/files/, sys-fs/mtpfs/, sys-fs/mtpfs/files/mtpfs-1.1-wking-patches/

2015-09-28 Thread Sergei Trofimovich 
commit: c023f7466af628e1c9f6899cb6ae7d2323c3e865
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep 28 21:30:23 2015 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep 28 21:31:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c023f746

sys-fs/mtpfs: a huge robustification patchset by W. Trevor King!

Package-Manager: portage-2.2.22

 sys-fs/mtpfs/files/mtpfs-1.1-g_printf.patch|  10 ++
 .../0001-Use-GMutex-instead-of-GStaticMutex.patch  |  49 +
 ...evices-after-opening-the-connected-device.patch |  28 ++
 ...llocate-additional-byte-for-trailing-null.patch |  55 +++
 .../0004-Use-storageid-to-access-storageArea.patch |  42 
 ...DE-to-pull-out-the-access-portion-of-the-.patch |  46 +
 .../0006-Check-for-find_storage-failures.patch | 109 +
 ...path-instead-of-fields-0-for-find_storage.patch |  29 ++
 sys-fs/mtpfs/mtpfs-1.1-r3.ebuild   |  57 +++
 9 files changed, 425 insertions(+)

diff --git a/sys-fs/mtpfs/files/mtpfs-1.1-g_printf.patch 
b/sys-fs/mtpfs/files/mtpfs-1.1-g_printf.patch
new file mode 100644
index 000..21e08c8
--- /dev/null
+++ b/sys-fs/mtpfs/files/mtpfs-1.1-g_printf.patch
@@ -0,0 +1,10 @@
+diff --git a/mtpfs.h b/mtpfs.h
+index f9532fa..1042a3d 100644
+--- a/mtpfs.h
 b/mtpfs.h
+@@ -32,2 +32,5 @@
+ #endif
++#ifdef DEBUG
++#include 
++#endif
+ 

diff --git 
a/sys-fs/mtpfs/files/mtpfs-1.1-wking-patches/0001-Use-GMutex-instead-of-GStaticMutex.patch
 
b/sys-fs/mtpfs/files/mtpfs-1.1-wking-patches/0001-Use-GMutex-instead-of-GStaticMutex.patch
new file mode 100644
index 000..9c1970b
--- /dev/null
+++ 
b/sys-fs/mtpfs/files/mtpfs-1.1-wking-patches/0001-Use-GMutex-instead-of-GStaticMutex.patch
@@ -0,0 +1,49 @@
+From 39872d8ff354c40d881f416e3b8b6df911379d37 Mon Sep 17 00:00:00 2001
+From: "W. Trevor King" 
+Date: Sun, 23 Aug 2015 12:05:35 -0700
+Subject: [PATCH 1/7] Use GMutex instead of GStaticMutex
+
+The static version was deprecated in GLib 2.32 [1], which was released
+on 2012-03-24 [2].  The difference between the two was that before
+2.32, GMutex could not be statically allocated.  Since 2.32, GMutex
+can be statically allocated, so there's no reason to use GStaticMutex
+anymore.
+
+[1]: 
https://developer.gnome.org/glib/unstable/glib-Deprecated-Thread-APIs.html#GStaticMutex
+[2]: https://git.gnome.org/browse/glib/tag/?h=glib-2-32=2.32.0
+---
+ mtpfs.c | 4 ++--
+ mtpfs.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mtpfs.c b/mtpfs.c
+index 553d282..286cd24 100644
+--- a/mtpfs.c
 b/mtpfs.c
+@@ -28,8 +28,8 @@ static void dump_mtp_error()
+ #define dump_mtp_error()
+ #endif
+ 
+-#define enter_lock(a...)   do { DBG("lock"); DBG(a); 
g_static_mutex_lock(_lock); } while(0)
+-#define return_unlock(a)   do { DBG("return unlock"); 
g_static_mutex_unlock(_lock); return a; } while(0)
++#define enter_lock(a...)   do { DBG("lock"); DBG(a); 
g_mutex_lock(_lock); } while(0)
++#define return_unlock(a)   do { DBG("return unlock"); 
g_mutex_unlock(_lock); return a; } while(0)
+ 
+ void
+ free_files(LIBMTP_file_t *filelist)
+diff --git a/mtpfs.h b/mtpfs.h
+index 789eccb..f812ea6 100644
+--- a/mtpfs.h
 b/mtpfs.h
+@@ -73,7 +73,7 @@ static GSList *lostfiles = NULL;
+ static GSList *myfiles = NULL;
+ static LIBMTP_playlist_t *playlists = NULL;
+ static gboolean playlists_changed = FALSE;
+-static GStaticMutex device_lock = G_STATIC_MUTEX_INIT;
++static GMutex device_lock = G_STATIC_MUTEX_INIT;
+ 
+ 
+ #endif /* _MTPFS_H_ */
+-- 
+2.5.3
+

diff --git 
a/sys-fs/mtpfs/files/mtpfs-1.1-wking-patches/0002-Free-rawdevices-after-opening-the-connected-device.patch
 
b/sys-fs/mtpfs/files/mtpfs-1.1-wking-patches/0002-Free-rawdevices-after-opening-the-connected-device.patch
new file mode 100644
index 000..42089d5
--- /dev/null
+++ 
b/sys-fs/mtpfs/files/mtpfs-1.1-wking-patches/0002-Free-rawdevices-after-opening-the-connected-device.patch
@@ -0,0 +1,28 @@
+From 2fb900e9e915f9ec6ac2f233255a0a527da164c2 Mon Sep 17 00:00:00 2001
+From: "W. Trevor King" 
+Date: Sun, 23 Aug 2015 21:59:45 -0700
+Subject: [PATCH 2/7] Free rawdevices after opening the connected device
+
+Avoid leaking the raw-device memory.  For a similar example in the
+libmtp source, see LIBMTP_Get_First_Device [1].
+
+[1]: 
http://sourceforge.net/p/libmtp/code/ci/libmtp-1-1-9/tree/src/libmtp.c#l1690
+---
+ mtpfs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mtpfs.c b/mtpfs.c
+index 286cd24..bdd5f46 100644
+--- a/mtpfs.c
 b/mtpfs.c
+@@ -1390,6 +1390,7 @@ main (int argc, char *argv[])
+ 
+ fprintf(stdout, "Attempting to connect device\n");
+ device = LIBMTP_Open_Raw_Device([i]);
++free (rawdevices);
+ if (device == NULL) {
+ fprintf(stderr, "Unable to open raw device %d\n", i);
+ return 1;
+-- 
+2.5.3
+

diff --git