[arch-commits] Commit in modemmanager/repos (10 files)

Jan Steffens heftig at archlinux.org
Thu Jul 16 19:37:17 UTC 2015


    Date: Thursday, July 16, 2015 @ 21:37:17
  Author: heftig
Revision: 242290

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  modemmanager/repos/extra-i686/PKGBUILD
    (from rev 242289, modemmanager/trunk/PKGBUILD)
  modemmanager/repos/extra-i686/bus-signals.patch
    (from rev 242289, modemmanager/trunk/bus-signals.patch)
  modemmanager/repos/extra-i686/modemmanager.install
    (from rev 242289, modemmanager/trunk/modemmanager.install)
  modemmanager/repos/extra-x86_64/PKGBUILD
    (from rev 242289, modemmanager/trunk/PKGBUILD)
  modemmanager/repos/extra-x86_64/bus-signals.patch
    (from rev 242289, modemmanager/trunk/bus-signals.patch)
  modemmanager/repos/extra-x86_64/modemmanager.install
    (from rev 242289, modemmanager/trunk/modemmanager.install)
Deleted:
  modemmanager/repos/extra-i686/PKGBUILD
  modemmanager/repos/extra-i686/modemmanager.install
  modemmanager/repos/extra-x86_64/PKGBUILD
  modemmanager/repos/extra-x86_64/modemmanager.install

-----------------------------------+
 /PKGBUILD                         |  148 ++++++++++++++++++++++++++++++++++++
 /modemmanager.install             |   26 ++++++
 extra-i686/PKGBUILD               |   67 ----------------
 extra-i686/bus-signals.patch      |   43 ++++++++++
 extra-i686/modemmanager.install   |   13 ---
 extra-x86_64/PKGBUILD             |   67 ----------------
 extra-x86_64/bus-signals.patch    |   43 ++++++++++
 extra-x86_64/modemmanager.install |   13 ---
 8 files changed, 260 insertions(+), 160 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-07-16 19:36:04 UTC (rev 242289)
+++ extra-i686/PKGBUILD	2015-07-16 19:37:17 UTC (rev 242290)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgbase=modemmanager
-pkgname=(modemmanager libmm-glib)
-pkgver=1.4.10
-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)
-sha256sums=('107ba0b4d0749aebb0347691a39f60891cc6004aeca8b2128d69c50557049a63')
-
-build() {
-  cd ModemManager-$pkgver
-  ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --sbindir=/usr/bin \
-        --with-udev-base-dir=/usr/lib/udev \
-        --with-polkit=permissive \
-        --enable-gtk-doc \
-        --disable-static
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-check() {
-  cd ModemManager-$pkgver
-  make -k check
-}
-
-package_modemmanager() {
-  depends+=(libmm-glib)
-  optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
-  options=(!emptydirs)
-  install=modemmanager.install
-
-  cd ModemManager-$pkgver
-  make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" -C libmm-glib uninstall
-  make DESTDIR="$pkgdir" -C vapi uninstall
-
-  # Some stuff to move is left over
-  mv "$pkgdir/usr/include" ..
-  mv "$pkgdir/usr/lib/pkgconfig" ..
-}
-
-package_libmm-glib() {
-  pkgdesc="ModemManager library"
-  depends=(glib2)
-
-  install -d "$pkgdir/usr/lib"
-  mv include "$pkgdir/usr"
-  mv pkgconfig "$pkgdir/usr/lib"
-
-  cd ModemManager-$pkgver
-  make DESTDIR="$pkgdir" -C libmm-glib install
-  make DESTDIR="$pkgdir" -C vapi install
-}

Copied: modemmanager/repos/extra-i686/PKGBUILD (from rev 242289, modemmanager/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-07-16 19:37:17 UTC (rev 242290)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgbase=modemmanager
+pkgname=(modemmanager libmm-glib)
+pkgver=1.4.10
+pkgrel=2
+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')
+
+prepare() {
+  cd ModemManager-$pkgver
+  patch -Np1 -i ../bus-signals.patch
+}
+
+build() {
+  cd ModemManager-$pkgver
+  ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --sbindir=/usr/bin \
+        --with-udev-base-dir=/usr/lib/udev \
+        --with-polkit=permissive \
+        --enable-gtk-doc \
+        --disable-static
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+check() {
+  cd ModemManager-$pkgver
+  make -k check
+}
+
+package_modemmanager() {
+  depends+=(libmm-glib)
+  optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
+  options=(!emptydirs)
+  install=modemmanager.install
+
+  cd ModemManager-$pkgver
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C libmm-glib uninstall
+  make DESTDIR="$pkgdir" -C vapi uninstall
+
+  # Some stuff to move is left over
+  mv "$pkgdir/usr/include" ..
+  mv "$pkgdir/usr/lib/pkgconfig" ..
+}
+
+package_libmm-glib() {
+  pkgdesc="ModemManager library"
+  depends=(glib2)
+
+  install -d "$pkgdir/usr/lib"
+  mv include "$pkgdir/usr"
+  mv pkgconfig "$pkgdir/usr/lib"
+
+  cd ModemManager-$pkgver
+  make DESTDIR="$pkgdir" -C libmm-glib install
+  make DESTDIR="$pkgdir" -C vapi install
+}

Copied: modemmanager/repos/extra-i686/bus-signals.patch (from rev 242289, modemmanager/trunk/bus-signals.patch)
===================================================================
--- extra-i686/bus-signals.patch	                        (rev 0)
+++ extra-i686/bus-signals.patch	2015-07-16 19:37:17 UTC (rev 242290)
@@ -0,0 +1,43 @@
+From a043f8064b6d1fb1ce5ee4b1d263117ea6eac505 Mon Sep 17 00:00:00 2001
+From: David Herrmann <dh.herrmann at 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
+

Deleted: extra-i686/modemmanager.install
===================================================================
--- extra-i686/modemmanager.install	2015-07-16 19:36:04 UTC (rev 242289)
+++ extra-i686/modemmanager.install	2015-07-16 19:37:17 UTC (rev 242290)
@@ -1,13 +0,0 @@
-post_install() {
-  if [[ -x usr/bin/gtk-update-icon-cache ]]; then
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: modemmanager/repos/extra-i686/modemmanager.install (from rev 242289, modemmanager/trunk/modemmanager.install)
===================================================================
--- extra-i686/modemmanager.install	                        (rev 0)
+++ extra-i686/modemmanager.install	2015-07-16 19:37:17 UTC (rev 242290)
@@ -0,0 +1,13 @@
+post_install() {
+  if [[ -x usr/bin/gtk-update-icon-cache ]]; then
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-07-16 19:36:04 UTC (rev 242289)
+++ extra-x86_64/PKGBUILD	2015-07-16 19:37:17 UTC (rev 242290)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgbase=modemmanager
-pkgname=(modemmanager libmm-glib)
-pkgver=1.4.10
-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)
-sha256sums=('107ba0b4d0749aebb0347691a39f60891cc6004aeca8b2128d69c50557049a63')
-
-build() {
-  cd ModemManager-$pkgver
-  ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --sbindir=/usr/bin \
-        --with-udev-base-dir=/usr/lib/udev \
-        --with-polkit=permissive \
-        --enable-gtk-doc \
-        --disable-static
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-check() {
-  cd ModemManager-$pkgver
-  make -k check
-}
-
-package_modemmanager() {
-  depends+=(libmm-glib)
-  optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
-  options=(!emptydirs)
-  install=modemmanager.install
-
-  cd ModemManager-$pkgver
-  make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" -C libmm-glib uninstall
-  make DESTDIR="$pkgdir" -C vapi uninstall
-
-  # Some stuff to move is left over
-  mv "$pkgdir/usr/include" ..
-  mv "$pkgdir/usr/lib/pkgconfig" ..
-}
-
-package_libmm-glib() {
-  pkgdesc="ModemManager library"
-  depends=(glib2)
-
-  install -d "$pkgdir/usr/lib"
-  mv include "$pkgdir/usr"
-  mv pkgconfig "$pkgdir/usr/lib"
-
-  cd ModemManager-$pkgver
-  make DESTDIR="$pkgdir" -C libmm-glib install
-  make DESTDIR="$pkgdir" -C vapi install
-}

Copied: modemmanager/repos/extra-x86_64/PKGBUILD (from rev 242289, modemmanager/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-07-16 19:37:17 UTC (rev 242290)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgbase=modemmanager
+pkgname=(modemmanager libmm-glib)
+pkgver=1.4.10
+pkgrel=2
+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')
+
+prepare() {
+  cd ModemManager-$pkgver
+  patch -Np1 -i ../bus-signals.patch
+}
+
+build() {
+  cd ModemManager-$pkgver
+  ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --sbindir=/usr/bin \
+        --with-udev-base-dir=/usr/lib/udev \
+        --with-polkit=permissive \
+        --enable-gtk-doc \
+        --disable-static
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+check() {
+  cd ModemManager-$pkgver
+  make -k check
+}
+
+package_modemmanager() {
+  depends+=(libmm-glib)
+  optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
+  options=(!emptydirs)
+  install=modemmanager.install
+
+  cd ModemManager-$pkgver
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C libmm-glib uninstall
+  make DESTDIR="$pkgdir" -C vapi uninstall
+
+  # Some stuff to move is left over
+  mv "$pkgdir/usr/include" ..
+  mv "$pkgdir/usr/lib/pkgconfig" ..
+}
+
+package_libmm-glib() {
+  pkgdesc="ModemManager library"
+  depends=(glib2)
+
+  install -d "$pkgdir/usr/lib"
+  mv include "$pkgdir/usr"
+  mv pkgconfig "$pkgdir/usr/lib"
+
+  cd ModemManager-$pkgver
+  make DESTDIR="$pkgdir" -C libmm-glib install
+  make DESTDIR="$pkgdir" -C vapi install
+}

Copied: modemmanager/repos/extra-x86_64/bus-signals.patch (from rev 242289, modemmanager/trunk/bus-signals.patch)
===================================================================
--- extra-x86_64/bus-signals.patch	                        (rev 0)
+++ extra-x86_64/bus-signals.patch	2015-07-16 19:37:17 UTC (rev 242290)
@@ -0,0 +1,43 @@
+From a043f8064b6d1fb1ce5ee4b1d263117ea6eac505 Mon Sep 17 00:00:00 2001
+From: David Herrmann <dh.herrmann at 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
+

Deleted: extra-x86_64/modemmanager.install
===================================================================
--- extra-x86_64/modemmanager.install	2015-07-16 19:36:04 UTC (rev 242289)
+++ extra-x86_64/modemmanager.install	2015-07-16 19:37:17 UTC (rev 242290)
@@ -1,13 +0,0 @@
-post_install() {
-  if [[ -x usr/bin/gtk-update-icon-cache ]]; then
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: modemmanager/repos/extra-x86_64/modemmanager.install (from rev 242289, modemmanager/trunk/modemmanager.install)
===================================================================
--- extra-x86_64/modemmanager.install	                        (rev 0)
+++ extra-x86_64/modemmanager.install	2015-07-16 19:37:17 UTC (rev 242290)
@@ -0,0 +1,13 @@
+post_install() {
+  if [[ -x usr/bin/gtk-update-icon-cache ]]; then
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}



More information about the arch-commits mailing list