Date: Saturday, September 29, 2012 @ 06:55:58
  Author: heftig
Revision: 167248

archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64

Added:
  networkmanager/repos/gnome-unstable-i686/
  networkmanager/repos/gnome-unstable-i686/NetworkManager.conf
    (from rev 167247, networkmanager/trunk/NetworkManager.conf)
  networkmanager/repos/gnome-unstable-i686/PKGBUILD
    (from rev 167247, networkmanager/trunk/PKGBUILD)
  networkmanager/repos/gnome-unstable-i686/disable_set_hostname.patch
    (from rev 167247, networkmanager/trunk/disable_set_hostname.patch)
  networkmanager/repos/gnome-unstable-i686/dnsmasq-path.patch
    (from rev 167247, networkmanager/trunk/dnsmasq-path.patch)
  networkmanager/repos/gnome-unstable-i686/networkmanager.install
    (from rev 167247, networkmanager/trunk/networkmanager.install)
  networkmanager/repos/gnome-unstable-i686/nm-polkit-permissive.patch
    (from rev 167247, networkmanager/trunk/nm-polkit-permissive.patch)
  networkmanager/repos/gnome-unstable-i686/repair-signals.patch
    (from rev 167247, networkmanager/trunk/repair-signals.patch)
  networkmanager/repos/gnome-unstable-x86_64/
  networkmanager/repos/gnome-unstable-x86_64/NetworkManager.conf
    (from rev 167247, networkmanager/trunk/NetworkManager.conf)
  networkmanager/repos/gnome-unstable-x86_64/PKGBUILD
    (from rev 167247, networkmanager/trunk/PKGBUILD)
  networkmanager/repos/gnome-unstable-x86_64/disable_set_hostname.patch
    (from rev 167247, networkmanager/trunk/disable_set_hostname.patch)
  networkmanager/repos/gnome-unstable-x86_64/dnsmasq-path.patch
    (from rev 167247, networkmanager/trunk/dnsmasq-path.patch)
  networkmanager/repos/gnome-unstable-x86_64/networkmanager.install
    (from rev 167247, networkmanager/trunk/networkmanager.install)
  networkmanager/repos/gnome-unstable-x86_64/nm-polkit-permissive.patch
    (from rev 167247, networkmanager/trunk/nm-polkit-permissive.patch)
  networkmanager/repos/gnome-unstable-x86_64/repair-signals.patch
    (from rev 167247, networkmanager/trunk/repair-signals.patch)

--------------------------------------------------+
 gnome-unstable-i686/NetworkManager.conf          |    2 
 gnome-unstable-i686/PKGBUILD                     |   75 +++++++++++++++++++++
 gnome-unstable-i686/disable_set_hostname.patch   |   19 +++++
 gnome-unstable-i686/dnsmasq-path.patch           |   30 ++++++++
 gnome-unstable-i686/networkmanager.install       |    9 ++
 gnome-unstable-i686/nm-polkit-permissive.patch   |   12 +++
 gnome-unstable-i686/repair-signals.patch         |   37 ++++++++++
 gnome-unstable-x86_64/NetworkManager.conf        |    2 
 gnome-unstable-x86_64/PKGBUILD                   |   75 +++++++++++++++++++++
 gnome-unstable-x86_64/disable_set_hostname.patch |   19 +++++
 gnome-unstable-x86_64/dnsmasq-path.patch         |   30 ++++++++
 gnome-unstable-x86_64/networkmanager.install     |    9 ++
 gnome-unstable-x86_64/nm-polkit-permissive.patch |   12 +++
 gnome-unstable-x86_64/repair-signals.patch       |   37 ++++++++++
 14 files changed, 368 insertions(+)

Copied: networkmanager/repos/gnome-unstable-i686/NetworkManager.conf (from rev 
167247, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- gnome-unstable-i686/NetworkManager.conf                             (rev 0)
+++ gnome-unstable-i686/NetworkManager.conf     2012-09-29 10:55:58 UTC (rev 
167248)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile

Copied: networkmanager/repos/gnome-unstable-i686/PKGBUILD (from rev 167247, 
networkmanager/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD                                (rev 0)
+++ gnome-unstable-i686/PKGBUILD        2012-09-29 10:55:58 UTC (rev 167248)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Maintainer: Jan de Groot <j...@archlinxu.org>
+# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org>
+# Contributor: Tor Krill <t...@krill.nu>
+# Contributor: Will Rea <sillywi...@gmail.com>
+# Contributor: Valentine Sinitsyn <e_...@inbox.ru>
+
+pkgname=networkmanager
+_pkgname=NetworkManager
+pkgver=0.9.6.0
+pkgrel=3
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/$_pkgname/";
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
+         libsoup systemd)
+makedepends=(intltool dhcpcd iptables gobject-introspection)
+optdepends=('modemmanager: for modem management service'
+            'dhcpcd: alternative DHCP client; does not support DHCPv6'
+            'iptables: Connection sharing'
+            'dnsmasq: Connection sharing'
+            'bluez: Bluetooth support'
+            'openresolv: resolvconf support')
+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
+        nm-polkit-permissive.patch repair-signals.patch)
+sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07'
+            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+            '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 \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/networkmanager \
+    --with-crypto=nss \
+    --with-distro=arch \
+    --with-dhclient=/usr/sbin/dhclient \
+    --with-dhcpcd=/usr/sbin/dhcpcd \
+    --with-iptables=/usr/sbin/iptables \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-udev-dir=/usr/lib/udev \
+    --with-resolvconf=/usr/sbin/resolvconf \
+    --with-session-tracking=systemd \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax
+
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+
+  rm -r "$pkgdir/var/run"
+}

Copied: networkmanager/repos/gnome-unstable-i686/disable_set_hostname.patch 
(from rev 167247, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- gnome-unstable-i686/disable_set_hostname.patch                              
(rev 0)
+++ gnome-unstable-i686/disable_set_hostname.patch      2012-09-29 10:55:58 UTC 
(rev 167248)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c 
NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c  2011-08-23 06:41:02.099686450 
+0000
++++ NetworkManager-0.9.0/src/nm-policy.c       2011-08-23 06:43:38.227791737 
+0000
+@@ -302,6 +302,7 @@
+               return;
+       }
+ 
++#if 0
+       /* Try automatically determined hostname from the best device's IP 
config */
+       if (!best4)
+               best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+               }
+       }
+ 
++#endif
+       /* If no automatically-configured hostname, try using the hostname from
+        * when NM started up.
+        */

Copied: networkmanager/repos/gnome-unstable-i686/dnsmasq-path.patch (from rev 
167247, networkmanager/trunk/dnsmasq-path.patch)
===================================================================
--- gnome-unstable-i686/dnsmasq-path.patch                              (rev 0)
+++ gnome-unstable-i686/dnsmasq-path.patch      2012-09-29 10:55:58 UTC (rev 
167248)
@@ -0,0 +1,30 @@
+diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 
NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c
+--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c    2011-10-10 
23:38:20.000000000 +0200
++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c    
2012-03-06 09:07:24.137460927 +0100
+@@ -52,8 +52,11 @@
+ find_dnsmasq (void)
+ {
+       static const char *paths[] = {
++              "/usr/local/bin/dnsmasq",
+               "/usr/local/sbin/dnsmasq",
++              "/usr/bin/dnsmasq",
+               "/usr/sbin/dnsmasq",
++              "/bin/dnsmasq",
+               "/sbin/dnsmasq",
+               NULL
+       };
+diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 
NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c
+--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c    
2011-04-19 07:06:22.000000000 +0200
++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c    
2012-03-06 09:07:58.603851818 +0100
+@@ -170,8 +170,11 @@
+ nm_find_dnsmasq (void)
+ {
+       static const char *dnsmasq_binary_paths[] = {
++              "/usr/local/bin/dnsmasq",
+               "/usr/local/sbin/dnsmasq",
++              "/usr/bin/dnsmasq",
+               "/usr/sbin/dnsmasq",
++              "/bin/dnsmasq",
+               "/sbin/dnsmasq",
+               NULL
+       };

Copied: networkmanager/repos/gnome-unstable-i686/networkmanager.install (from 
rev 167247, networkmanager/trunk/networkmanager.install)
===================================================================
--- gnome-unstable-i686/networkmanager.install                          (rev 0)
+++ gnome-unstable-i686/networkmanager.install  2012-09-29 10:55:58 UTC (rev 
167248)
@@ -0,0 +1,9 @@
+post_upgrade() {
+  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
+ATTENTION:
+  /etc/NetworkManager/nm-system-settings.conf has been replaced
+  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+  any custom settings to the new config file.
+MSG
+  true
+}

Copied: networkmanager/repos/gnome-unstable-i686/nm-polkit-permissive.patch 
(from rev 167247, networkmanager/trunk/nm-polkit-permissive.patch)
===================================================================
--- gnome-unstable-i686/nm-polkit-permissive.patch                              
(rev 0)
+++ gnome-unstable-i686/nm-polkit-permissive.patch      2012-09-29 10:55:58 UTC 
(rev 167248)
@@ -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</_message>
+     <defaults>
+       <allow_inactive>no</allow_inactive>
+-      <allow_active>auth_admin_keep</allow_active>
++      <allow_active>yes</allow_active>
+     </defaults>
+   </action>
+ 

Copied: networkmanager/repos/gnome-unstable-i686/repair-signals.patch (from rev 
167247, networkmanager/trunk/repair-signals.patch)
===================================================================
--- gnome-unstable-i686/repair-signals.patch                            (rev 0)
+++ gnome-unstable-i686/repair-signals.patch    2012-09-29 10:55:58 UTC (rev 
167248)
@@ -0,0 +1,37 @@
+From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetrom...@gentoo.org>
+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

Copied: networkmanager/repos/gnome-unstable-x86_64/NetworkManager.conf (from 
rev 167247, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- gnome-unstable-x86_64/NetworkManager.conf                           (rev 0)
+++ gnome-unstable-x86_64/NetworkManager.conf   2012-09-29 10:55:58 UTC (rev 
167248)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile

Copied: networkmanager/repos/gnome-unstable-x86_64/PKGBUILD (from rev 167247, 
networkmanager/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD                              (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD      2012-09-29 10:55:58 UTC (rev 167248)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Maintainer: Jan de Groot <j...@archlinxu.org>
+# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org>
+# Contributor: Tor Krill <t...@krill.nu>
+# Contributor: Will Rea <sillywi...@gmail.com>
+# Contributor: Valentine Sinitsyn <e_...@inbox.ru>
+
+pkgname=networkmanager
+_pkgname=NetworkManager
+pkgver=0.9.6.0
+pkgrel=3
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/$_pkgname/";
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
+         libsoup systemd)
+makedepends=(intltool dhcpcd iptables gobject-introspection)
+optdepends=('modemmanager: for modem management service'
+            'dhcpcd: alternative DHCP client; does not support DHCPv6'
+            'iptables: Connection sharing'
+            'dnsmasq: Connection sharing'
+            'bluez: Bluetooth support'
+            'openresolv: resolvconf support')
+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
+        nm-polkit-permissive.patch repair-signals.patch)
+sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07'
+            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+            '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 \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/networkmanager \
+    --with-crypto=nss \
+    --with-distro=arch \
+    --with-dhclient=/usr/sbin/dhclient \
+    --with-dhcpcd=/usr/sbin/dhcpcd \
+    --with-iptables=/usr/sbin/iptables \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-udev-dir=/usr/lib/udev \
+    --with-resolvconf=/usr/sbin/resolvconf \
+    --with-session-tracking=systemd \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax
+
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+
+  rm -r "$pkgdir/var/run"
+}

Copied: networkmanager/repos/gnome-unstable-x86_64/disable_set_hostname.patch 
(from rev 167247, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- gnome-unstable-x86_64/disable_set_hostname.patch                            
(rev 0)
+++ gnome-unstable-x86_64/disable_set_hostname.patch    2012-09-29 10:55:58 UTC 
(rev 167248)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c 
NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c  2011-08-23 06:41:02.099686450 
+0000
++++ NetworkManager-0.9.0/src/nm-policy.c       2011-08-23 06:43:38.227791737 
+0000
+@@ -302,6 +302,7 @@
+               return;
+       }
+ 
++#if 0
+       /* Try automatically determined hostname from the best device's IP 
config */
+       if (!best4)
+               best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+               }
+       }
+ 
++#endif
+       /* If no automatically-configured hostname, try using the hostname from
+        * when NM started up.
+        */

Copied: networkmanager/repos/gnome-unstable-x86_64/dnsmasq-path.patch (from rev 
167247, networkmanager/trunk/dnsmasq-path.patch)
===================================================================
--- gnome-unstable-x86_64/dnsmasq-path.patch                            (rev 0)
+++ gnome-unstable-x86_64/dnsmasq-path.patch    2012-09-29 10:55:58 UTC (rev 
167248)
@@ -0,0 +1,30 @@
+diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 
NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c
+--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c    2011-10-10 
23:38:20.000000000 +0200
++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c    
2012-03-06 09:07:24.137460927 +0100
+@@ -52,8 +52,11 @@
+ find_dnsmasq (void)
+ {
+       static const char *paths[] = {
++              "/usr/local/bin/dnsmasq",
+               "/usr/local/sbin/dnsmasq",
++              "/usr/bin/dnsmasq",
+               "/usr/sbin/dnsmasq",
++              "/bin/dnsmasq",
+               "/sbin/dnsmasq",
+               NULL
+       };
+diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 
NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c
+--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c    
2011-04-19 07:06:22.000000000 +0200
++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c    
2012-03-06 09:07:58.603851818 +0100
+@@ -170,8 +170,11 @@
+ nm_find_dnsmasq (void)
+ {
+       static const char *dnsmasq_binary_paths[] = {
++              "/usr/local/bin/dnsmasq",
+               "/usr/local/sbin/dnsmasq",
++              "/usr/bin/dnsmasq",
+               "/usr/sbin/dnsmasq",
++              "/bin/dnsmasq",
+               "/sbin/dnsmasq",
+               NULL
+       };

Copied: networkmanager/repos/gnome-unstable-x86_64/networkmanager.install (from 
rev 167247, networkmanager/trunk/networkmanager.install)
===================================================================
--- gnome-unstable-x86_64/networkmanager.install                                
(rev 0)
+++ gnome-unstable-x86_64/networkmanager.install        2012-09-29 10:55:58 UTC 
(rev 167248)
@@ -0,0 +1,9 @@
+post_upgrade() {
+  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
+ATTENTION:
+  /etc/NetworkManager/nm-system-settings.conf has been replaced
+  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+  any custom settings to the new config file.
+MSG
+  true
+}

Copied: networkmanager/repos/gnome-unstable-x86_64/nm-polkit-permissive.patch 
(from rev 167247, networkmanager/trunk/nm-polkit-permissive.patch)
===================================================================
--- gnome-unstable-x86_64/nm-polkit-permissive.patch                            
(rev 0)
+++ gnome-unstable-x86_64/nm-polkit-permissive.patch    2012-09-29 10:55:58 UTC 
(rev 167248)
@@ -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</_message>
+     <defaults>
+       <allow_inactive>no</allow_inactive>
+-      <allow_active>auth_admin_keep</allow_active>
++      <allow_active>yes</allow_active>
+     </defaults>
+   </action>
+ 

Copied: networkmanager/repos/gnome-unstable-x86_64/repair-signals.patch (from 
rev 167247, networkmanager/trunk/repair-signals.patch)
===================================================================
--- gnome-unstable-x86_64/repair-signals.patch                          (rev 0)
+++ gnome-unstable-x86_64/repair-signals.patch  2012-09-29 10:55:58 UTC (rev 
167248)
@@ -0,0 +1,37 @@
+From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetrom...@gentoo.org>
+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

Reply via email to