[arch-commits] Commit in networkmanager/trunk (3 files)

[Jan Steffens]

    Date: Wednesday, May 11, 2016 @ 14:27:02
  Author: heftig
Revision: 267797

1.2.2-1

Modified:
  networkmanager/trunk/PKGBUILD
Deleted:
  networkmanager/trunk/dhcpv6-mixed.patch
  networkmanager/trunk/hidepid.patch

--------------------+
 PKGBUILD           |   15 ++------------
 dhcpv6-mixed.patch |   34 --------------------------------
 hidepid.patch      |   54 ---------------------------------------------------
 3 files changed, 3 insertions(+), 100 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-11 12:00:10 UTC (rev 267796)
+++ PKGBUILD	2016-05-11 12:27:02 UTC (rev 267797)
@@ -8,8 +8,8 @@
 
 pkgbase=networkmanager
 pkgname=(networkmanager libnm-glib)
-pkgver=1.2.0
-pkgrel=3
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
@@ -21,22 +21,13 @@
              libnewt libndp libteam vala perl-yaml python-gobject)
 checkdepends=(libx11 python-dbus)
 source=(https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-        hidepid.patch dhcpv6-mixed.patch
         NetworkManager.conf)
-sha256sums=('e947cf30fa3d19dce88e6f6af51f06dc282b7db7996f946aaa37b03526ef2a80'
-            '1de5b511b6b4a933739b0ef48ede1830fa3d6dea2277c1302b12b08fa83a73f1'
-            'f7771790485f24d788fe35f5922ad044a29c6d89b34458d9e99938503b2a3b39'
+sha256sums=('41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9'
             '452e4f77c1de92b1e08f6f58674a6c52a2b2d65b7deb0ba436e9afa91ee15103')
 
 prepare() {
   cd NetworkManager-$pkgver
 
-  # https://bugs.archlinux.org/task/48984
-  patch -Np1 -i ../hidepid.patch
-
-  # https://bugs.archlinux.org/task/49081
-  patch -Np1 -i ../dhcpv6-mixed.patch
-
   2to3 -w libnm src tools
 
   NOCONFIGURE=1 ./autogen.sh

Deleted: dhcpv6-mixed.patch
===================================================================
--- dhcpv6-mixed.patch	2016-05-11 12:00:10 UTC (rev 267796)
+++ dhcpv6-mixed.patch	2016-05-11 12:27:02 UTC (rev 267797)
@@ -1,34 +0,0 @@
-From 50dc5fecabc2c3434d7a652b4f5642556b4e87bf Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw at redhat.com>
-Date: Mon, 25 Apr 2016 15:39:50 -0500
-Subject: dhcp/systemd: actually hook up information-only mode
-
-Fixes: 89d1e466157839096b446068a780cb2563424a5a
-Tested-by: Celti on IRC
-(cherry picked from commit 8c8a577a30acc0b5f1d4765493f6547f275477b0)
-
-diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c
-index 5d49c27..1674341 100644
---- a/src/dhcp-manager/nm-dhcp-systemd.c
-+++ b/src/dhcp-manager/nm-dhcp-systemd.c
-@@ -857,6 +857,7 @@ dhcp6_event_cb (sd_dhcp6_client *client, int event, gpointer user_data)
- 		nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_FAIL, NULL, NULL);
- 		break;
- 	case SD_DHCP6_CLIENT_EVENT_IP_ACQUIRE:
-+	case SD_DHCP6_CLIENT_EVENT_INFORMATION_REQUEST:
- 		bound6_handle (self);
- 		break;
- 	default:
-@@ -893,6 +894,9 @@ ip6_start (NMDhcpClient *client,
- 		return FALSE;
- 	}
- 
-+	if (info_only)
-+	    sd_dhcp6_client_set_information_request (priv->client6, 1);
-+
- 	/* NM stores the entire DUID which includes the uint16 "type", while systemd
- 	 * wants the type passed separately from the following data.
- 	 */
--- 
-cgit v0.10.2
-

Deleted: hidepid.patch
===================================================================
--- hidepid.patch	2016-05-11 12:00:10 UTC (rev 267796)
+++ hidepid.patch	2016-05-11 12:27:02 UTC (rev 267797)
@@ -1,54 +0,0 @@
-From 4f06ae603e268f237d439afe3f3e7e662a0c2727 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller at redhat.com>
-Date: Fri, 22 Apr 2016 11:36:26 +0200
-Subject: auth: allow failures to read process start_time from /proc/$PID/stat
- with hidepid
-
-When mounting /proc with hidepid, we might fail to read the
-start-time of the process from /proc/$PID/stat. In this case,
-we should just accept a start-time of zero.
-
-On the other side of authentication, polkit should accept a zero
-start-time too.
-
-nm_utils_get_start_time_for_pid() has other uses in NetworkManager,
-mostly when killing a process from a PIDFILE or during
-nm_utils_kill_process_sync(). In both these cases, this will only
-succeed if we try to kill a process that also runs a root.
-
-For processes started by the current instance, we don't care about the
-PIDFILE and use nm_utils_kill_child_?sync() -- so there is no problem
-with hidepid there.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764502
-(cherry picked from commit 3d505b3f87c9cb9bfdc9b9a1fc67f57330701d03)
-
-diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
-index 494d52d..86b873f 100644
---- a/src/nm-auth-subject.c
-+++ b/src/nm-auth-subject.c
-@@ -360,9 +360,18 @@ constructed (GObject *object)
- 		priv->unix_process.start_time = nm_utils_get_start_time_for_pid (priv->unix_process.pid, NULL, NULL);
- 
- 		if (!priv->unix_process.start_time) {
--			/* could not detect the process start time. The subject is invalid, but don't
--			 * assert against it. */
--			_clear_private (priv);
-+			/* Is the process already gone? Then fail creation of the auth subject
-+			 * by clearing the type. */
-+			if (kill (priv->unix_process.pid, 0) != 0)
-+				_clear_private (priv);
-+
-+			/* Otherwise, although we didn't detect a start_time, the process is still around.
-+			 * That could be due to procfs mounted with hidepid. So just accept the request.
-+			 *
-+			 * Polkit on the other side, will accept 0 and try to lookup /proc/$PID/stat
-+			 * itself (and if it fails to do so, assume a start-time of 0 and proceed).
-+			 * The only combination that would fail here, is when NM is able to read the
-+			 * start-time, but polkit is not. */
- 		}
- 		return;
- 	default:
--- 
-cgit v0.10.2
-