Add a patch to prevent multiple plugins from simultaneously controlling one modem port (bug #456782, thanks to Tony Vroon). Drop old.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 75 insertions, 115 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index 6006d840ca5c..05e021e998d9 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/modemmanager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.50 2013/02/03 19:38:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.51 2013/02/12 04:59:21 tetromino Exp $
+
+*modemmanager-0.6.0.0-r1 (12 Feb 2013)
+
+  12 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/modemmanager-0.5-glib-2.31.patch, -modemmanager-0.5.2.0-r3.ebuild,
+  +modemmanager-0.6.0.0-r1.ebuild,
+  +files/modemmanager-0.6.0.0-multi-plugin-probing.patch:
+  Add a patch to prevent multiple plugins from simultaneously controlling one
+  modem port (bug #456782, thanks to Tony Vroon). Drop old.
 
   03 Feb 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild:
   Stable for arm, wrt bug #448006
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 8c5a78afc884..44bef4e88352 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,12 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 01-org.freedesktop.ModemManager.pkla 285 SHA256 c4eeb956c5bfa0dfe30efe1ae1c88e60674425dcc786c080da0d17f245c0e5f5 SHA512 e1b1e6a0cbfea979782141fc477381ea72a9e3bf75152b393aa322ebae520dbaf2b5907e817ee29f0744fc79f3217fe6a0994ebc1873e83e9d747df65ebea533 WHIRLPOOL 3fac122700eb0f643e64ac05edbe41abf48d88cbc6227619faaf567fde8df7981f38d523b183bf0deaa2b90fbd1617fb97ebdfefe615b12cb44dc36eaedaa4e4
 AUX 01-org.freedesktop.ModemManager.rules 286 SHA256 a47b769279c128633d150899e10f6a3795523212d56603c4396500b15e04ebfe SHA512 184897bbee83f852e91d66d6a4ec4eabbe40f72f6a32573f59e19d9d86d9d12ae07e4386c7427e64ea5edfa73b5fa8e37acc785daca9a3565b8bd1fc8c5ee909 WHIRLPOOL 6016d01ea05feb85c249257a0b3a7e4154a1abcfc830d54eb70de090cb58253c478d5bd77db951ecb93ca2a3f35f188b7b0c11bc5303faab9c6843475e8fa94b
-AUX modemmanager-0.5-glib-2.31.patch 2648 SHA256 7a59df7d4db579ca5b794410956733002ea509b67f0180353a92573a9b9e8671 SHA512 1946608c48e9ea9de5d3343d5a5a20292aa9bfd4a214018e1073648b6edb894cac8d0cdf4879b71f4b803c62df8eb17c3cb2c076e0276115c54e8db820c53d3d WHIRLPOOL ed2e9626e6d782ee1f903fcf142a81302ae37495d5781b92c728723819f3342e9067738d5d15d485271608dc934549a85a05b128febcfed3c606f96ecd3be955
-DIST ModemManager-0.5.2.0.tar.xz 492728 SHA256 7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8 SHA512 4c304c08c3740171148f9d5c8102ec18fa128589a5dac0f8bcb172e49d5e236a36b2167fa2e6ab6f592dd54cda24740309618c39b5afa8d020b66e9639e05fc4 WHIRLPOOL faf8db858c6e833a1e7475e626f247838f1f863e18e813eb39b1231fe138d1ade12e6f8f73a3e1768cc00442e313a9717e06b8263dec1198810ece6e2f67ed3e
+AUX modemmanager-0.6.0.0-multi-plugin-probing.patch 1490 SHA256 ba0d64f488c01ec7e73230082e0e8d537884d6684440328cac4e8c9d36e64775 SHA512 6fb5a44784d9d4a14c12d1de2704eaebc76c65ae2805232472a4efbb9b6bd23f1ceea56bafde94c629c4f782f7ecd44bdf7b8a35261bc4496599bdca81cfe73b WHIRLPOOL ec0321424a69a94c028485ab9efc33200fe23498308f9cbba846e93445f9570227b3ed709497a04be54e34fd5bf156c446b205fb0b1f6c81104353a72a107dc7
 DIST ModemManager-0.6.0.0.tar.xz 531136 SHA256 d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2 SHA512 c4c823a422ee458b70ad5c78feb61de4007507050e8c4789e4397b7bd476ea14b68f9a6b1c95820ec437b97310e34c0396912ea936474638651d868d3828eb4a WHIRLPOOL 2434b39c53f5233c0e03a6b27afa00f0d46927bf29794a643f42b7b797f8c018f69019769903f08398a49093f788f26d2882a735b46be374f903d50752228225
 DIST ModemManager-0.7.990.tar.xz 1101016 SHA256 36547db99fccd7eac1f1dd75178232a61306c6b11e8926b83bcfc3a12c4222ca SHA512 bb0b3527b62d4cb6d1b8faeeab00b026965475e06cfc4109256d5dde4708d5f6b99f8ba4dd2bb82157671cc0026ad7cfed96b0d68ee63e2cfe361149dffe720d WHIRLPOOL 7d9a175af915b5058e2890f7a39aecd66bdf2b4e9524de96b6d5481708df5c1119e744f7ffb1755ad8ec20198521f8a843a90eedc7a28e75006f98326ca96afe
-EBUILD modemmanager-0.5.2.0-r3.ebuild 2972 SHA256 9da52719998532753d0127dd65295299ce27bd3b7a2fb7901268f92e633cc2c8 SHA512 bc8ee700934db94fbc323a4cfaad1ae84d5ab8c707b0f7769ecf1cf9ef4971045f664f38a1f1293319384acebfb9b2c8b198c99812f835ded0009a75dc043ba6 WHIRLPOOL ba4de79b473da0806759748df83a66870ba0a60bf188ea2759f2d1b32f3541e93e908b5f1663db4993a8ac3344d086309940aedd857a48560a3dbd28743b2448
+EBUILD modemmanager-0.6.0.0-r1.ebuild 3076 SHA256 b0c0b0f1ad8a0650514936076f36b46f4f69901135ce6db37a89b9b4eed9e364 SHA512 ff92664c96dd6754048409c9560fe4489ca4d1d3e513d9fb53b6fd31fb51c42dadefa23ee8434bc96899de9de12d501a12922592fcb1bef9b2bf03f8b2d6d48c WHIRLPOOL c50af489885811c4c7c925b29d6dccc439960680facd36f8df79126b61c47d343fe0b4d414016ed7d5e08312d7873a6bcbc31d5f547a82ab8f14cc185d42170a
 EBUILD modemmanager-0.6.0.0.ebuild 2984 SHA256 97648ee02d5fc25049a0b259013e591ce15d46a0d632d1b8f6e9ff2d645771ff SHA512 5b99d00098f472dc7234bb6889ee53155b064c588e30a3bb7e19e8370b3b713eca55b47aa6232498a0d9302759c6550420d1a30752087e797b3da939591b9842 WHIRLPOOL 58e92639fa8637fcb0ef8c48cad887f4e59d571bdf1f766336c1ff578512cd268fab05564e2e60c7c9a6851e09d83298112e3ff716add5f1aecbedb60701bbe5
 EBUILD modemmanager-0.7.990.ebuild 3352 SHA256 7db193ff1635313eba972dce19e09fed1a422b04410fd37051c5e9791d7200e6 SHA512 ebe588bed39bd0c3ad07de70442dcc8c40c8006e3712eadd33fa494e5a8e19c07deb7e3a3d0c7587af10b10402a2b7abf38ab7a06995aba305f6fde7857d4cbb WHIRLPOOL 4f9f2972a39b32fc817e79f6c25d6a2e065fb7a4685612ff5e2d4487e5bc7a32410fcbe2c4c7f81c450aac3cf6b2b5f11e3892cc03e75ac894dc7466dbd68352
 EBUILD modemmanager-9999.ebuild 3478 SHA256 e122d88c7229fab336af65f6cbefec2583d0d5d10d9068958d9a5e89a1b786cd SHA512 9d8f5d917a3c9c4e192fc98214f8db27db80606b490e1ae4d2340174abe6453b296f1d580854957c3a929cfd8f6411b33ed2095f8e1391456c7fe7fc18046b47 WHIRLPOOL 3fd05742762215caaf3a5d7458ba90ce525bc746d9983229b5079c6e74e5da2fd0cd6885ac125740a17a8599e470c503907429acdc12e811f6c4a6161962654c
-MISC ChangeLog 9155 SHA256 25bd0e3ee7b7c0ce471297fa5e0b8ffa17fdee0accc2bb9d7b161e6911563dfe SHA512 a4d3547c2dc3a7400e4c325302667d79dfd6a5b59bfc155d499e717714b3242e69fabd35dc064395e6d315321925e2d2b8d34107e2d44dce31fe81751a374417 WHIRLPOOL 5a34218aa4e55af1527e6e0cb2c3a613ab58e36865debac0f528895517a1ce8f36dc2e242efb9c71046199ab842442846c446180addca16f4e18f4651ef4af60
+MISC ChangeLog 9568 SHA256 d34bf13aeaa3b861ca615cddae95ead14fad1662770a79a2630ae50c9dd9fe22 SHA512 8693276fe370e835e276a5bb163d0ed79701c26e62960df6a68bb470c4b8c18eb78940fce5408c9ab4aef03becdac3d7d533bd4980886bc2f8e18241a78d73ff WHIRLPOOL 5bdb1d22a65368ad4904268cb47cf9dbe485d140306b0a87e98816bacd2e1985fdf03dc9993aa10c63f4819aa6b8fcd35e0a569d7a496ca6fa4e98330b4354bb
 MISC metadata.xml 587 SHA256 3eff4190df97408f06b36550998acdcb88d5e67a0c5273e96f096f8d465000de SHA512 c3d354b45ddd5642678a3e3ad2f3e458e24e1b437b6b38a3c8471f29c15e4587c14ee9877bcdf6eacffe5051adb8f46090da91061eab7576ec26b034bb5826ff WHIRLPOOL b786fb60690516c72f2b320b2be17818ab5daea3c34b568d7e7ab4c7b0c98b9a9612f420faa1f69cafe427589de84055ff1ce30d1e5333d290b52c121d5525c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRGcwqAAoJEJ0WA1zPCt1hcjMH/2bJnYGDC8tTGxR+H39rOvb6
+e2q+kO7p2zoI+vEIvHdi1re6fDBqReEREPUAiJExT7GTSSyc5CYWCyTdPk/SHOSA
+n9Z+DVFBaLY9AN/fj957sG3TPQZOedOtyDJMadR7u9u0fH2d6H0y7ub90W3F7YOF
+lrAYsL19w223xQ1eyRoBqA7mKhsY43ke+IfdEjen86JM6zQh17N45KZ2wksIKW1x
+HbPArqCGebPzUpB3X2ja7ojF3SLkqCh209+BLsHONMdIKkQx6Qcizzg/AxyUhQKU
+fdnm8mQYiF1E9yxKrUsUMS0dt7sRTMRChhrjeYI8gYef9YKoAiRld/jizTL+hZY=
+=I5iF
+-----END PGP SIGNATURE-----
diff --git a/net-misc/modemmanager/files/modemmanager-0.5-glib-2.31.patch b/net-misc/modemmanager/files/modemmanager-0.5-glib-2.31.patch
deleted file mode 100644
index a8aa19184756..000000000000
--- a/net-misc/modemmanager/files/modemmanager-0.5-glib-2.31.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 6406f9eb7042f63a38343412864b6a129be7fe75 Mon Sep 17 00:00:00 2001
-From: Aleksander Morgado <aleksander@lanedo.com>
-Date: Mon, 24 Oct 2011 21:09:11 +0200
-Subject: [PATCH] core: don't include private headers from glib
-
-The "glib/gtypes.h" is now considered private, and only "glib.h" should be
-included directly.
----
- src/mm-at-serial-port.h   |    1 -
- src/mm-manager.h          |    1 -
- src/mm-modem-base.h       |    1 -
- src/mm-plugin-base.h      |    1 -
- src/mm-port.h             |    1 -
- src/mm-qcdm-serial-port.h |    1 -
- src/mm-serial-port.h      |    1 -
- 7 files changed, 0 insertions(+), 7 deletions(-)
-
-diff --git a/src/mm-at-serial-port.h b/src/mm-at-serial-port.h
-index 5d5f13f..cec5dc3 100644
---- a/src/mm-at-serial-port.h
-+++ b/src/mm-at-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_AT_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-serial-port.h"
-diff --git a/src/mm-manager.h b/src/mm-manager.h
-index 1c98458..c6a64bd 100644
---- a/src/mm-manager.h
-+++ b/src/mm-manager.h
-@@ -17,7 +17,6 @@
- #ifndef MM_MANAGER_H
- #define MM_MANAGER_H
- 
--#include <glib/gtypes.h>
- #include <glib-object.h>
- #include <dbus/dbus-glib.h>
- #include "mm-modem.h"
-diff --git a/src/mm-modem-base.h b/src/mm-modem-base.h
-index 0409957..d0cda3d 100644
---- a/src/mm-modem-base.h
-+++ b/src/mm-modem-base.h
-@@ -18,7 +18,6 @@
- #define MM_MODEM_BASE_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-port.h"
-diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h
-index 799f681..e69ad17 100644
---- a/src/mm-plugin-base.h
-+++ b/src/mm-plugin-base.h
-@@ -17,7 +17,6 @@
- #define MM_PLUGIN_BASE_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #define G_UDEV_API_IS_SUBJECT_TO_CHANGE
-diff --git a/src/mm-port.h b/src/mm-port.h
-index 4bcffd4..df935db 100644
---- a/src/mm-port.h
-+++ b/src/mm-port.h
-@@ -17,7 +17,6 @@
- #define MM_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- typedef enum {
-diff --git a/src/mm-qcdm-serial-port.h b/src/mm-qcdm-serial-port.h
-index 2786ee8..605016d 100644
---- a/src/mm-qcdm-serial-port.h
-+++ b/src/mm-qcdm-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_QCDM_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-serial-port.h"
-diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h
-index ae38017..f988af3 100644
---- a/src/mm-serial-port.h
-+++ b/src/mm-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-port.h"
--- 
-1.7.8.6
-
diff --git a/net-misc/modemmanager/files/modemmanager-0.6.0.0-multi-plugin-probing.patch b/net-misc/modemmanager/files/modemmanager-0.6.0.0-multi-plugin-probing.patch
new file mode 100644
index 000000000000..43dd652c5313
--- /dev/null
+++ b/net-misc/modemmanager/files/modemmanager-0.6.0.0-multi-plugin-probing.patch
@@ -0,0 +1,37 @@
+From f6d9f53369200ba277a48de3a24c377799765559 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Wed, 3 Oct 2012 18:35:07 -0500
+Subject: [PATCH] core: stop probing if a Modem has already been created for a
+ port (bgo #685398)
+
+If a port finishes probing from the first plugin, and then starts
+being probed by a second plugin, and then a different port finishes
+probing and creates a Modem object for that device, always let the
+Modem object's plugin grab the port and ignore any other plugin.
+Only one plugin may control modem ports.
+---
+ src/mm-manager.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/mm-manager.c b/src/mm-manager.c
+index 728a115..e13d1f7 100644
+--- a/src/mm-manager.c
++++ b/src/mm-manager.c
+@@ -703,6 +703,14 @@ supports_callback (MMPlugin *plugin,
+              * supports it.
+              */
+             next_plugin = existing_plugin;
++        } else if (plugin != existing_plugin) {
++            /* A modem object may have been created by one of this device's other
++             * ports while this port was getting probed; now that we have a
++             * modem, just use the modem's plugin and ignore this plugin
++             * completely.  All ports of a modem must be handled by the same
++             * plugin.
++             */
++            next_plugin = NULL;
+         } else {
+             mm_dbg ("(%s/%s): plugin %p (%s) existing %p (%s) info->best %p (%s)",
+                     info->subsys, info->name,
+-- 
+1.8.1.2
+
diff --git a/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild b/net-misc/modemmanager/modemmanager-0.6.0.0-r1.ebuild
index d1ed335d720c..6da864f665ad 100644
--- a/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.6.0.0-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild,v 1.7 2013/01/28 05:11:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.6.0.0-r1.ebuild,v 1.1 2013/02/12 04:59:21 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GNOME_ORG_MODULE="ModemManager"
 
-inherit gnome.org user multilib toolchain-funcs udev
+inherit eutils gnome.org user multilib toolchain-funcs udev
 
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc policykit test"
 
 RDEPEND=">=dev-libs/glib-2.18:2
@@ -26,7 +26,12 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog NEWS README"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.0.0-multi-plugin-probing.patch" #456782
+
+	epatch_user
+	default
+}
 
 src_configure() {
 	# ppp-2.4.5 changes the plugin directory
@@ -62,7 +67,7 @@ src_install() {
 	fi
 
 	# Remove useless .la files
-	find "${D}" -name '*.la' -delete
+	prune_libtool_files --modules
 }
 
 pkg_postinst() {