From 005a14f92ef5d35e4c47d970cb7e69367a835958 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 20 Sep 2012 01:37:39 -0700 Subject: Thu Sep 20 01:37:13 PDT 2012 --- extra/networkmanager/PKGBUILD | 15 ++++++---- extra/networkmanager/nm-polkit-permissive.patch | 12 ++++++++ extra/networkmanager/repair-signals.patch | 37 +++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 extra/networkmanager/nm-polkit-permissive.patch create mode 100644 extra/networkmanager/repair-signals.patch (limited to 'extra/networkmanager') diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index f349fed07..f48b107ab 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166518 2012-09-09 15:40:49Z heftig $ +# $Id: PKGBUILD 166778 2012-09-19 08:12:49Z heftig $ # Maintainer: Jan de Groot # Contributor: Wael Nasreddine # Contributor: Tor Krill @@ -8,7 +8,7 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') @@ -26,17 +26,22 @@ options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch + nm-polkit-permissive.patch repair-signals.patch) sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' + 'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06' + 'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6') build() { cd $_pkgname-$pkgver patch -Np1 -i ../disable_set_hostname.patch patch -Np1 -i ../dnsmasq-path.patch + patch -Np1 -i ../nm-polkit-permissive.patch + patch -Np1 -i ../repair-signals.patch # FS#31115 ./configure \ --prefix=/usr \ @@ -46,7 +51,7 @@ build() { --with-crypto=nss \ --with-distro=arch \ --with-dhclient=/usr/sbin/dhclient \ - --with-dhcpcd=/sbin/dhcpcd \ + --with-dhcpcd=/usr/sbin/dhcpcd \ --with-iptables=/usr/sbin/iptables \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-udev-dir=/usr/lib/udev \ diff --git a/extra/networkmanager/nm-polkit-permissive.patch b/extra/networkmanager/nm-polkit-permissive.patch new file mode 100644 index 000000000..1ac406224 --- /dev/null +++ b/extra/networkmanager/nm-polkit-permissive.patch @@ -0,0 +1,12 @@ +diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in +--- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive 2011-03-24 14:21:35.100912222 -0500 ++++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in 2011-03-24 14:21:49.916726997 -0500 +@@ -95,7 +95,7 @@ + <_message>System policy prevents modification of network settings for all users + + no +- auth_admin_keep ++ yes + + + diff --git a/extra/networkmanager/repair-signals.patch b/extra/networkmanager/repair-signals.patch new file mode 100644 index 000000000..cf1319dc5 --- /dev/null +++ b/extra/networkmanager/repair-signals.patch @@ -0,0 +1,37 @@ +From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Thu, 13 Sep 2012 09:32:53 +0000 +Subject: core: wait until we daemonized before setting up signals (bgo #683932) + +If we mask signals before daemonizing, the daemon process will not be +able to handle them, and thus would be unkillable with anything other +than SIGKILL. +--- +diff --git a/src/main.c b/src/main.c +index 8bc6d3f..5b82cfa 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -401,10 +401,6 @@ main (int argc, char *argv[]) + exit (1); + } + +- /* Set up unix signal handling */ +- if (!setup_signals ()) +- exit (1); +- + /* Set locale to be able to use environment variables */ + setlocale (LC_ALL, ""); + +@@ -501,6 +497,10 @@ main (int argc, char *argv[]) + wrote_pidfile = TRUE; + } + ++ /* Set up unix signal handling - before creating threads, but after daemonizing! */ ++ if (!setup_signals ()) ++ exit (1); ++ + if (g_fatal_warnings) { + GLogLevelFlags fatal_mask; + +-- +cgit v0.9.0.2-2-gbebe -- cgit v1.2.3-54-g00ecf