Bug#696669: unblock: network-manager/0.9.4.0-7

2013-01-05 Thread Michael Biebl 
retitle 696669 unblock: network-manager/0.9.4.0-8
thanks

On 28.12.2012 19:32, Michael Biebl wrote:
 On 25.12.2012 15:46, Julien Cristau wrote:
 There's a /etc/polkit-1/localauthority/10-vendor.d directory, which
 seems appropriate for use by... the vendor?
 
 As mentioned on IRC: the existence of that directory is a result of
 /etc/polkit-1/localauthority/ being a copy of the directory structure in
 /var/lib/polkit-1/localauthority/. It is not an indication that it
 should be used for vendor-shipped files.
 I agree that /var is a questionable choice for files being shipped in
 (vendor) packages. Newer versions of polkit will use
 /usr/share/polkit-1. Nevertheless, polkit uses the etc-overrides-foo
 scheme, only that it is not (yet) /usr, but /var.

As Julien insisted on that change, I've done that in -8 (even if I'm not that 
happy about this).

That said, the full changelog is now:

network-manager (0.9.4.0-8) unstable; urgency=low

  * Move the pkla file to /etc/polkit-1 as requested by the release team.
  * debian/patches/04-systemd-set-kill-mode-process.patch: By default, when
shutting NM down, systemd will kill everything in its cgroup. But this
can cause problems (eg, NM thinking that dhclient crashed and then taking
down an interface that it would otherwise have left up). Fix this by
setting KillMode=process, which tells systemd to only kill NM itself, and
let NM kill its children. Patch cherry-picked from upstream Git.

 -- Michael Biebl bi...@debian.org  Sat, 05 Jan 2013 20:23:27 +0100

network-manager (0.9.4.0-7) unstable; urgency=low

  * Install a PolicyKit pkla file which allows members of group netdev or sudo
to create system-wide network connections without being prompted for the
admin password. (Closes: #642136)
  * Cherry-pick patches for libnm-glib which fix various segfaults e.g. in
gnome-control-center when switching between overview and network settings
panel or in gnome-shell and nm-applet when restarting NetworkManager.
(Closes: #696143) (bgo: #674473)

 -- Michael Biebl bi...@debian.org  Fri, 21 Dec 2012 03:48:18 +0100

Updated debdiff attached.

unblock network-manager/0.9.4.0-8

Cheers,
Michael


-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff --git a/debian/changelog b/debian/changelog
index 8b905b9..cc2ead9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+network-manager (0.9.4.0-8) unstable; urgency=low
+
+  * Move the pkla file to /etc/polkit-1 as requested by the release team.
+  * debian/patches/04-systemd-set-kill-mode-process.patch: By default, when
+shutting NM down, systemd will kill everything in its cgroup. But this
+can cause problems (eg, NM thinking that dhclient crashed and then taking
+down an interface that it would otherwise have left up). Fix this by
+setting KillMode=process, which tells systemd to only kill NM itself, and
+let NM kill its children. Patch cherry-picked from upstream Git.
+
+ -- Michael Biebl bi...@debian.org  Sat, 05 Jan 2013 20:23:27 +0100
+
+network-manager (0.9.4.0-7) unstable; urgency=low
+
+  * Install a PolicyKit pkla file which allows members of group netdev or sudo
+to create system-wide network connections without being prompted for the
+admin password. (Closes: #642136)
+  * Cherry-pick patches for libnm-glib which fix various segfaults e.g. in
+gnome-control-center when switching between overview and network settings
+panel or in gnome-shell and nm-applet when restarting NetworkManager.
+(Closes: #696143) (bgo: #674473)
+
+ -- Michael Biebl bi...@debian.org  Fri, 21 Dec 2012 03:48:18 +0100
+
 network-manager (0.9.4.0-6) unstable; urgency=low
 
   * debian/rules: Use xz compression for binary packages.
diff --git a/debian/network-manager.install b/debian/network-manager.install
index 35b81be..e896132 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -21,3 +21,4 @@ lib/udev/rules.d/*.rules
 lib/systemd/system/NetworkManager.service
 lib/systemd/system/NetworkManager-wait-online.service
 debian/NetworkManager.conf etc/NetworkManager/
+debian/org.freedesktop.NetworkManager.pkla 
etc/polkit-1/localauthority/10-vendor.d/
diff --git a/debian/org.freedesktop.NetworkManager.pkla 
b/debian/org.freedesktop.NetworkManager.pkla
new file mode 100644
index 000..7acba4e
--- /dev/null
+++ b/debian/org.freedesktop.NetworkManager.pkla
@@ -0,0 +1,6 @@
+[Adding or changing system-wide NetworkManager connections]
+Identity=unix-group:netdev;unix-group:sudo
+Action=org.freedesktop.NetworkManager.settings.modify.system
+ResultAny=no
+ResultInactive=no
+ResultActive=yes
diff --git a/debian/patches/04-systemd-set-kill-mode-process.patch 
b/debian/patches/04-systemd-set-kill-mode-process.patch
new file mode 100644
index 000..daed7ae
--- /dev/null
+++ b/debian/patches/04-systemd-set-kill-mode-process.patch
@@ -0,0 +1,27 @@
+commit

Bug#696669: unblock: network-manager/0.9.4.0-7

2012-12-28 Thread Michael Biebl 
On 25.12.2012 15:46, Julien Cristau wrote:
 There's a /etc/polkit-1/localauthority/10-vendor.d directory, which
 seems appropriate for use by... the vendor?

As mentioned on IRC: the existence of that directory is a result of
/etc/polkit-1/localauthority/ being a copy of the directory structure in
/var/lib/polkit-1/localauthority/. It is not an indication that it
should be used for vendor-shipped files.
I agree that /var is a questionable choice for files being shipped in
(vendor) packages. Newer versions of polkit will use
/usr/share/polkit-1. Nevertheless, polkit uses the etc-overrides-foo
scheme, only that it is not (yet) /usr, but /var.


Cheers,
Michael
-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?



signature.asc
Description: OpenPGP digital signature

Bug#696669: unblock: network-manager/0.9.4.0-7

2012-12-25 Thread Michael Biebl 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package network-manager

It fixes two RC bugs.

The patches for the libnm-glib are somewhat largeish, but they are taken
from upstream and have been part of network-manager 0.9.6, which has
been released for quite some time and is also available from
experimental for over 2 months without any related bug report.

The full changelog is

network-manager (0.9.4.0-7) unstable; urgency=low

  * Install a PolicyKit pkla file which allows members of group netdev or sudo
to create system-wide network connections without being prompted for the
admin password. (Closes: #642136)
  * Cherry-pick patches for libnm-glib which fix various segfaults e.g. in
gnome-control-center when switching between overview and network settings
panel or in gnome-shell and nm-applet when restarting NetworkManager.
(Closes: #696143) (bgo: #674473)

 -- Michael Biebl bi...@debian.org  Fri, 21 Dec 2012 03:48:18 +0100

Complete debdiff is attached.

Cheers,
Michael

unblock network-manager/0.9.4.0-7

-- System Information:
Debian Release: 7.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.6-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/changelog b/debian/changelog
index 8b905b9..1d27379 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+network-manager (0.9.4.0-7) unstable; urgency=low
+
+  * Install a PolicyKit pkla file which allows members of group netdev or sudo
+to create system-wide network connections without being prompted for the
+admin password. (Closes: #642136)
+  * Cherry-pick patches for libnm-glib which fix various segfaults e.g. in
+gnome-control-center when switching between overview and network settings
+panel or in gnome-shell and nm-applet when restarting NetworkManager.
+(Closes: #696143) (bgo: #674473)
+
+ -- Michael Biebl bi...@debian.org  Fri, 21 Dec 2012 03:48:18 +0100
+
 network-manager (0.9.4.0-6) unstable; urgency=low
 
   * debian/rules: Use xz compression for binary packages.
diff --git a/debian/network-manager.install b/debian/network-manager.install
index 35b81be..6bd49d2 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -21,3 +21,4 @@ lib/udev/rules.d/*.rules
 lib/systemd/system/NetworkManager.service
 lib/systemd/system/NetworkManager-wait-online.service
 debian/NetworkManager.conf etc/NetworkManager/
+debian/org.freedesktop.NetworkManager.pkla var/lib/polkit-1/localauthority/10-vendor.d/
diff --git a/debian/org.freedesktop.NetworkManager.pkla b/debian/org.freedesktop.NetworkManager.pkla
new file mode 100644
index 000..7acba4e
--- /dev/null
+++ b/debian/org.freedesktop.NetworkManager.pkla
@@ -0,0 +1,6 @@
+[Adding or changing system-wide NetworkManager connections]
+Identity=unix-group:netdev;unix-group:sudo
+Action=org.freedesktop.NetworkManager.settings.modify.system
+ResultAny=no
+ResultInactive=no
+ResultActive=yes
diff --git a/debian/patches/18-libnm-glib-NULL-out-priv-fields-on-dispose.patch b/debian/patches/18-libnm-glib-NULL-out-priv-fields-on-dispose.patch
new file mode 100644
index 000..74a86a4
--- /dev/null
+++ b/debian/patches/18-libnm-glib-NULL-out-priv-fields-on-dispose.patch
@@ -0,0 +1,670 @@
+From be18dd06cd138be232ff68ec7af19cfcf2f969ed Mon Sep 17 00:00:00 2001
+From: Dan Winship d...@gnome.org
+Date: Mon, 23 Apr 2012 15:02:48 +
+Subject: libnm-glib: NULL out priv fields on dispose()
+
+In some situations, objects might get used after being disposed, so
+clear out their various priv fields so we don't try to access unreffed
+objects, freed strings, etc.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=674473
+---
+Index: network-manager/include/nm-glib-compat.h
+===
+--- network-manager.orig/include/nm-glib-compat.h	2012-10-30 21:02:36.779282426 +0100
 network-manager/include/nm-glib-compat.h	2012-12-21 01:13:58.030742565 +0100
+@@ -42,6 +42,16 @@
+ 		g_simple_async_result_set_from_error (result, __error); \
+ 		g_error_free (__error); \
+ 	} G_STMT_END
++
++#define g_clear_object(object_ptr) \
++	G_STMT_START { \
++		GObject **__obj_p = object_ptr; \
++		if (*__obj_p) { \
++			g_object_unref (*__obj_p); \
++			*__obj_p = NULL; \
++		} \
++	} G_STMT_END
++
+ #endif
+ 
+ #endif  /* NM_GLIB_COMPAT_H */
+Index: network-manager/libnm-glib/nm-access-point.c
+===
+--- network-manager.orig/libnm-glib/nm-access-point.c	2012-10-30 21:02:36.783282401 +0100
 network-manager/libnm-glib/nm-access-point.c	2012-12-21 01:13:58.030742565 +0100
+@@ -41,7 +41,6 @@
+ #define NM_ACCESS_POINT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),

Bug#696669: unblock: network-manager/0.9.4.0-7

2012-12-25 Thread Julien Cristau 
On Tue, Dec 25, 2012 at 15:06:12 +0100, Michael Biebl wrote:

   * Install a PolicyKit pkla file which allows members of group netdev or sudo
 to create system-wide network connections without being prompted for the
 admin password. (Closes: #642136)

The location for this file doesn't make much sense to me.  Either /usr
or /etc I would understand, but AIUI /var means it's stuff that gets
written to at runtime by NM, which doesn't seem appropriate here.

Cheers,
Julien


signature.asc
Description: Digital signature

Bug#696669: unblock: network-manager/0.9.4.0-7

2012-12-25 Thread Michael Biebl 
On 25.12.2012 15:29, Julien Cristau wrote:
 On Tue, Dec 25, 2012 at 15:06:12 +0100, Michael Biebl wrote:
 
   * Install a PolicyKit pkla file which allows members of group netdev or 
 sudo
 to create system-wide network connections without being prompted for the
 admin password. (Closes: #642136)
 
 The location for this file doesn't make much sense to me.  Either /usr
 or /etc I would understand, but AIUI /var means it's stuff that gets
 written to at runtime by NM, which doesn't seem appropriate here.

Basically I agree with you, but that's simply where PolicyKit version
0.105 (and older) store the pklocalauthority files [1] for pkla files
shipped by distro/3rd-party packages. /etc/polkit-1 is reserved for the
local admin to override settings from /var.

Michael



[1]
http://www.freedesktop.org/software/polkit/docs/0.105/pklocalauthority.8.html
(Directory Structure).
-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?



signature.asc
Description: OpenPGP digital signature

Bug#696669: unblock: network-manager/0.9.4.0-7

2012-12-25 Thread Julien Cristau 
On Tue, Dec 25, 2012 at 15:39:19 +0100, Michael Biebl wrote:

 On 25.12.2012 15:29, Julien Cristau wrote:
  On Tue, Dec 25, 2012 at 15:06:12 +0100, Michael Biebl wrote:
  
* Install a PolicyKit pkla file which allows members of group netdev or 
  sudo
  to create system-wide network connections without being prompted for 
  the
  admin password. (Closes: #642136)
  
  The location for this file doesn't make much sense to me.  Either /usr
  or /etc I would understand, but AIUI /var means it's stuff that gets
  written to at runtime by NM, which doesn't seem appropriate here.
 
 Basically I agree with you, but that's simply where PolicyKit version
 0.105 (and older) store the pklocalauthority files [1] for pkla files
 shipped by distro/3rd-party packages. /etc/polkit-1 is reserved for the
 local admin to override settings from /var.
 
There's a /etc/polkit-1/localauthority/10-vendor.d directory, which
seems appropriate for use by... the vendor?

Cheers,
Julien


signature.asc
Description: Digital signature