git » modemmanager.git » commit 116b311

1.4.12

author Jan Alexander Steffens
2015-10-09 00:22:14 UTC
committer Jan Alexander Steffens
2015-10-09 00:22:14 UTC
parent 99e8117e6323c4aa949b6ecf77207d7def4555da

1.4.12

PKGBUILD +4 -7
bus-signals.patch +0 -43

diff --git a/PKGBUILD b/PKGBUILD
index 63e1500..5853439 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,19 @@
 
 pkgbase=modemmanager
 pkgname=(modemmanager libmm-glib)
-pkgver=1.4.10
-pkgrel=2
+pkgver=1.4.12
+pkgrel=1
 pkgdesc="Mobile broadband modem management service"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/ModemManager/"
 license=(GPL2 LGPL2.1)
 depends=(systemd libgudev polkit ppp libqmi libmbim hicolor-icon-theme)
 makedepends=(intltool gtk-doc gobject-introspection vala)
-source=(http://www.freedesktop.org/software/ModemManager/ModemManager-${pkgver}.tar.xz
-        bus-signals.patch)
-sha256sums=('107ba0b4d0749aebb0347691a39f60891cc6004aeca8b2128d69c50557049a63'
-            '2bf544ace3e79276f8e9c113fe3468506da74eb7f4ce1de5b33ea0e955dfd09e')
+source=(http://www.freedesktop.org/software/ModemManager/ModemManager-${pkgver}.tar.xz)
+sha256sums=('7ef5035375a953b285a742591df0a65fd442f4641ce4d8f4392a41d6d6bc70b3')
 
 prepare() {
   cd ModemManager-$pkgver
-  patch -Np1 -i ../bus-signals.patch
 }
 
 build() {
diff --git a/bus-signals.patch b/bus-signals.patch
deleted file mode 100644
index b1e7e9b..0000000
--- a/bus-signals.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a043f8064b6d1fb1ce5ee4b1d263117ea6eac505 Mon Sep 17 00:00:00 2001
-From: David Herrmann <dh.herrmann@gmail.com>
-Date: Wed, 15 Jul 2015 13:49:49 +0200
-Subject: policy: don't prevent us from receiving signals
-
-By using:
-    <deny send_destination="org.freedesktop.ModemManager1"/>
-
-..we prevent anyone on the system from sending us signals, even if we
-subscribed to them. This is clearly not what this line intended. More
-importantly, we silently break mm-auth-provider-polkit, as we never
-receiver 'changed' signals via PolkitAuthority. Right now, this is not
-required by the implementation of PolkitAuthority, but ModemManager
-should not place restrictions on the implementation of external
-libraries.
-
-So make sure we only prevent Method-Calls to be sent to us. Any other
-message that we didn't expect is automatically discarded by gdbus,
-anyway.
-
-Without this change, debugging dbus policies constantly shows messages
-that Polkit couldn't send the 'changed' signal to ModemManager. This is
-suppressed in non-debugging mode. But it would make debugging a lot
-easier, if we'd avoid force-dropping those events and not clutter the
-debug-log.
-
-diff --git a/data/org.freedesktop.ModemManager1.conf.polkit b/data/org.freedesktop.ModemManager1.conf.polkit
-index d1ea166..6b90b4b 100644
---- a/data/org.freedesktop.ModemManager1.conf.polkit
-+++ b/data/org.freedesktop.ModemManager1.conf.polkit
-@@ -3,7 +3,8 @@
-  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
- <busconfig>
-   <policy context="default">
--    <deny send_destination="org.freedesktop.ModemManager1"/>
-+    <deny send_destination="org.freedesktop.ModemManager1"
-+          send_type="method_call"/>
- 
-     <!-- Methods listed here are explicitly allowed or PolicyKit protected.
-          The rest are restricted to root for security.
--- 
-cgit v0.10.2
-