[arch-commits] Commit in networkmanager/repos (14 files)

Jan Steffens heftig at archlinux.org
Tue Apr 26 18:56:30 UTC 2016


    Date: Tuesday, April 26, 2016 @ 20:56:30
  Author: heftig
Revision: 266184

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

Added:
  networkmanager/repos/testing-i686/NetworkManager.conf
    (from rev 266183, networkmanager/trunk/NetworkManager.conf)
  networkmanager/repos/testing-i686/PKGBUILD
    (from rev 266183, networkmanager/trunk/PKGBUILD)
  networkmanager/repos/testing-i686/dhcpv6-mixed.patch
    (from rev 266183, networkmanager/trunk/dhcpv6-mixed.patch)
  networkmanager/repos/testing-i686/hidepid.patch
    (from rev 266183, networkmanager/trunk/hidepid.patch)
  networkmanager/repos/testing-x86_64/NetworkManager.conf
    (from rev 266183, networkmanager/trunk/NetworkManager.conf)
  networkmanager/repos/testing-x86_64/PKGBUILD
    (from rev 266183, networkmanager/trunk/PKGBUILD)
  networkmanager/repos/testing-x86_64/dhcpv6-mixed.patch
    (from rev 266183, networkmanager/trunk/dhcpv6-mixed.patch)
  networkmanager/repos/testing-x86_64/hidepid.patch
    (from rev 266183, networkmanager/trunk/hidepid.patch)
Deleted:
  networkmanager/repos/testing-i686/NetworkManager.conf
  networkmanager/repos/testing-i686/PKGBUILD
  networkmanager/repos/testing-i686/hidepid.patch
  networkmanager/repos/testing-x86_64/NetworkManager.conf
  networkmanager/repos/testing-x86_64/PKGBUILD
  networkmanager/repos/testing-x86_64/hidepid.patch

------------------------------------+
 /NetworkManager.conf               |   18 ++
 /PKGBUILD                          |  254 +++++++++++++++++++++++++++++++++++
 /hidepid.patch                     |  108 ++++++++++++++
 testing-i686/NetworkManager.conf   |    9 -
 testing-i686/PKGBUILD              |  123 ----------------
 testing-i686/dhcpv6-mixed.patch    |   34 ++++
 testing-i686/hidepid.patch         |   54 -------
 testing-x86_64/NetworkManager.conf |    9 -
 testing-x86_64/PKGBUILD            |  123 ----------------
 testing-x86_64/dhcpv6-mixed.patch  |   34 ++++
 testing-x86_64/hidepid.patch       |   54 -------
 11 files changed, 448 insertions(+), 372 deletions(-)

Deleted: testing-i686/NetworkManager.conf
===================================================================
--- testing-i686/NetworkManager.conf	2016-04-26 18:48:48 UTC (rev 266183)
+++ testing-i686/NetworkManager.conf	2016-04-26 18:56:30 UTC (rev 266184)
@@ -1,9 +0,0 @@
-[main]
-plugins=keyfile
-dhcp=internal
-dns=default
-
-## HTTP-based connectivity check
-#[connectivity]
-#uri=http://nmcheck.gnome.org/check_network_status.txt
-#interval=100

Copied: networkmanager/repos/testing-i686/NetworkManager.conf (from rev 266183, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- testing-i686/NetworkManager.conf	                        (rev 0)
+++ testing-i686/NetworkManager.conf	2016-04-26 18:56:30 UTC (rev 266184)
@@ -0,0 +1,9 @@
+[main]
+plugins=keyfile
+dhcp=internal
+dns=default
+
+## HTTP-based connectivity check
+#[connectivity]
+#uri=http://nmcheck.gnome.org/check_network_status.txt
+#interval=100

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2016-04-26 18:48:48 UTC (rev 266183)
+++ testing-i686/PKGBUILD	2016-04-26 18:56:30 UTC (rev 266184)
@@ -1,123 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinxu.org>
-# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
-
-pkgbase=networkmanager
-pkgname=(networkmanager libnm-glib)
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="Network Management daemon"
-arch=(i686 x86_64)
-license=(GPL2 LGPL2.1)
-url="http://www.gnome.org/projects/NetworkManager/"
-_pppver=2.4.7
-makedepends=(intltool dhclient iptables gobject-introspection gtk-doc
-             "ppp=$_pppver" modemmanager dbus-glib iproute2 nss polkit
-             wpa_supplicant libsoup systemd libgudev libmm-glib rp-pppoe
-             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
-        NetworkManager.conf)
-sha256sums=('e947cf30fa3d19dce88e6f6af51f06dc282b7db7996f946aaa37b03526ef2a80'
-            '1de5b511b6b4a933739b0ef48ede1830fa3d6dea2277c1302b12b08fa83a73f1'
-            '452e4f77c1de92b1e08f6f58674a6c52a2b2d65b7deb0ba436e9afa91ee15103')
-
-prepare() {
-  cd NetworkManager-$pkgver
-
-  # https://bugs.archlinux.org/task/48984
-  patch -Np1 -i ../hidepid.patch
-
-  2to3 -w libnm src tools
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd NetworkManager-$pkgver
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --sbindir=/usr/bin \
-    --libexecdir=/usr/lib/networkmanager \
-    --with-crypto=nss \
-    --with-dhclient=/usr/bin/dhclient \
-    --without-dhcpcd \
-    --with-dnsmasq=/usr/bin/dnsmasq \
-    --with-iptables=/usr/bin/iptables \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --with-udev-dir=/usr/lib/udev \
-    --with-resolvconf=/usr/bin/resolvconf \
-    --with-pppd=/usr/bin/pppd \
-    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
-    --with-pppoe=/usr/bin/pppoe \
-    --with-kernel-firmware-dir=/usr/lib/firmware \
-    --with-session-tracking=systemd \
-    --with-modem-manager-1 \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax \
-    --enable-modify-system \
-    --enable-doc \
-    --enable-gtk-doc
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-check() {
-  cd NetworkManager-$pkgver
-  make -k check
-}
-
-package_networkmanager() {
-  depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib
-           libnewt libndp libteam)
-  optdepends=('dnsmasq: connection sharing'
-              'bluez: Bluetooth support'
-              'openresolv: resolvconf support'
-              'ppp: dialup connection support'
-              'rp-pppoe: ADSL support'
-              'dhclient: External DHCP client'
-              'modemmanager: cellular network support')
-  backup=('etc/NetworkManager/NetworkManager.conf')
-
-  cd NetworkManager-$pkgver
-  make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" -C libnm uninstall
-  make DESTDIR="$pkgdir" -C libnm-glib uninstall
-  make DESTDIR="$pkgdir" -C libnm-util uninstall
-  make DESTDIR="$pkgdir" -C vapi uninstall
-
-  # Some stuff to move is left over
-  mv "$pkgdir/usr/include" ..
-  mv "$pkgdir/usr/lib/pkgconfig" ..
-
-  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
-
-  rm -r "$pkgdir/var/run"
-  rmdir -p --ignore-fail-on-non-empty \
-    "$pkgdir"/usr/{share/{vala/vapi,gir-1.0},lib/girepository-1.0}
-}
-
-package_libnm-glib() {
-  pkgdesc="NetworkManager library"
-  depends=(libgudev nss dbus-glib libutil-linux)
-
-  install -d "$pkgdir/usr/lib"
-  mv include "$pkgdir/usr"
-  mv pkgconfig "$pkgdir/usr/lib"
-
-  cd NetworkManager-$pkgver
-  make DESTDIR="$pkgdir" -C libnm install
-  make DESTDIR="$pkgdir" -C libnm-util install
-  make DESTDIR="$pkgdir" -C libnm-glib install
-  make DESTDIR="$pkgdir" -C vapi install
-}

Copied: networkmanager/repos/testing-i686/PKGBUILD (from rev 266183, networkmanager/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2016-04-26 18:56:30 UTC (rev 266184)
@@ -0,0 +1,127 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
+
+pkgbase=networkmanager
+pkgname=(networkmanager libnm-glib)
+pkgver=1.2.0
+pkgrel=3
+pkgdesc="Network Management daemon"
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/"
+_pppver=2.4.7
+makedepends=(intltool dhclient iptables gobject-introspection gtk-doc
+             "ppp=$_pppver" modemmanager dbus-glib iproute2 nss polkit
+             wpa_supplicant libsoup systemd libgudev libmm-glib rp-pppoe
+             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'
+            '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
+}
+
+build() {
+  cd NetworkManager-$pkgver
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --sbindir=/usr/bin \
+    --libexecdir=/usr/lib/networkmanager \
+    --with-crypto=nss \
+    --with-dhclient=/usr/bin/dhclient \
+    --without-dhcpcd \
+    --with-dnsmasq=/usr/bin/dnsmasq \
+    --with-iptables=/usr/bin/iptables \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-udev-dir=/usr/lib/udev \
+    --with-resolvconf=/usr/bin/resolvconf \
+    --with-pppd=/usr/bin/pppd \
+    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+    --with-pppoe=/usr/bin/pppoe \
+    --with-kernel-firmware-dir=/usr/lib/firmware \
+    --with-session-tracking=systemd \
+    --with-modem-manager-1 \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc \
+    --enable-gtk-doc
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+check() {
+  cd NetworkManager-$pkgver
+  make -k check
+}
+
+package_networkmanager() {
+  depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib
+           libnewt libndp libteam)
+  optdepends=('dnsmasq: connection sharing'
+              'bluez: Bluetooth support'
+              'openresolv: resolvconf support'
+              'ppp: dialup connection support'
+              'rp-pppoe: ADSL support'
+              'dhclient: External DHCP client'
+              'modemmanager: cellular network support')
+  backup=('etc/NetworkManager/NetworkManager.conf')
+
+  cd NetworkManager-$pkgver
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C libnm uninstall
+  make DESTDIR="$pkgdir" -C libnm-glib uninstall
+  make DESTDIR="$pkgdir" -C libnm-util uninstall
+  make DESTDIR="$pkgdir" -C vapi uninstall
+
+  # Some stuff to move is left over
+  mv "$pkgdir/usr/include" ..
+  mv "$pkgdir/usr/lib/pkgconfig" ..
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+  rm -r "$pkgdir/var/run"
+  rmdir -p --ignore-fail-on-non-empty \
+    "$pkgdir"/usr/{share/{vala/vapi,gir-1.0},lib/girepository-1.0}
+}
+
+package_libnm-glib() {
+  pkgdesc="NetworkManager library"
+  depends=(libgudev nss dbus-glib libutil-linux)
+
+  install -d "$pkgdir/usr/lib"
+  mv include "$pkgdir/usr"
+  mv pkgconfig "$pkgdir/usr/lib"
+
+  cd NetworkManager-$pkgver
+  make DESTDIR="$pkgdir" -C libnm install
+  make DESTDIR="$pkgdir" -C libnm-util install
+  make DESTDIR="$pkgdir" -C libnm-glib install
+  make DESTDIR="$pkgdir" -C vapi install
+}

Copied: networkmanager/repos/testing-i686/dhcpv6-mixed.patch (from rev 266183, networkmanager/trunk/dhcpv6-mixed.patch)
===================================================================
--- testing-i686/dhcpv6-mixed.patch	                        (rev 0)
+++ testing-i686/dhcpv6-mixed.patch	2016-04-26 18:56:30 UTC (rev 266184)
@@ -0,0 +1,34 @@
+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: testing-i686/hidepid.patch
===================================================================
--- testing-i686/hidepid.patch	2016-04-26 18:48:48 UTC (rev 266183)
+++ testing-i686/hidepid.patch	2016-04-26 18:56:30 UTC (rev 266184)
@@ -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
-

Copied: networkmanager/repos/testing-i686/hidepid.patch (from rev 266183, networkmanager/trunk/hidepid.patch)
===================================================================
--- testing-i686/hidepid.patch	                        (rev 0)
+++ testing-i686/hidepid.patch	2016-04-26 18:56:30 UTC (rev 266184)
@@ -0,0 +1,54 @@
+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
+

Deleted: testing-x86_64/NetworkManager.conf
===================================================================
--- testing-x86_64/NetworkManager.conf	2016-04-26 18:48:48 UTC (rev 266183)
+++ testing-x86_64/NetworkManager.conf	2016-04-26 18:56:30 UTC (rev 266184)
@@ -1,9 +0,0 @@
-[main]
-plugins=keyfile
-dhcp=internal
-dns=default
-
-## HTTP-based connectivity check
-#[connectivity]
-#uri=http://nmcheck.gnome.org/check_network_status.txt
-#interval=100

Copied: networkmanager/repos/testing-x86_64/NetworkManager.conf (from rev 266183, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- testing-x86_64/NetworkManager.conf	                        (rev 0)
+++ testing-x86_64/NetworkManager.conf	2016-04-26 18:56:30 UTC (rev 266184)
@@ -0,0 +1,9 @@
+[main]
+plugins=keyfile
+dhcp=internal
+dns=default
+
+## HTTP-based connectivity check
+#[connectivity]
+#uri=http://nmcheck.gnome.org/check_network_status.txt
+#interval=100

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2016-04-26 18:48:48 UTC (rev 266183)
+++ testing-x86_64/PKGBUILD	2016-04-26 18:56:30 UTC (rev 266184)
@@ -1,123 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinxu.org>
-# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
-
-pkgbase=networkmanager
-pkgname=(networkmanager libnm-glib)
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="Network Management daemon"
-arch=(i686 x86_64)
-license=(GPL2 LGPL2.1)
-url="http://www.gnome.org/projects/NetworkManager/"
-_pppver=2.4.7
-makedepends=(intltool dhclient iptables gobject-introspection gtk-doc
-             "ppp=$_pppver" modemmanager dbus-glib iproute2 nss polkit
-             wpa_supplicant libsoup systemd libgudev libmm-glib rp-pppoe
-             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
-        NetworkManager.conf)
-sha256sums=('e947cf30fa3d19dce88e6f6af51f06dc282b7db7996f946aaa37b03526ef2a80'
-            '1de5b511b6b4a933739b0ef48ede1830fa3d6dea2277c1302b12b08fa83a73f1'
-            '452e4f77c1de92b1e08f6f58674a6c52a2b2d65b7deb0ba436e9afa91ee15103')
-
-prepare() {
-  cd NetworkManager-$pkgver
-
-  # https://bugs.archlinux.org/task/48984
-  patch -Np1 -i ../hidepid.patch
-
-  2to3 -w libnm src tools
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd NetworkManager-$pkgver
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --sbindir=/usr/bin \
-    --libexecdir=/usr/lib/networkmanager \
-    --with-crypto=nss \
-    --with-dhclient=/usr/bin/dhclient \
-    --without-dhcpcd \
-    --with-dnsmasq=/usr/bin/dnsmasq \
-    --with-iptables=/usr/bin/iptables \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --with-udev-dir=/usr/lib/udev \
-    --with-resolvconf=/usr/bin/resolvconf \
-    --with-pppd=/usr/bin/pppd \
-    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
-    --with-pppoe=/usr/bin/pppoe \
-    --with-kernel-firmware-dir=/usr/lib/firmware \
-    --with-session-tracking=systemd \
-    --with-modem-manager-1 \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax \
-    --enable-modify-system \
-    --enable-doc \
-    --enable-gtk-doc
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-check() {
-  cd NetworkManager-$pkgver
-  make -k check
-}
-
-package_networkmanager() {
-  depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib
-           libnewt libndp libteam)
-  optdepends=('dnsmasq: connection sharing'
-              'bluez: Bluetooth support'
-              'openresolv: resolvconf support'
-              'ppp: dialup connection support'
-              'rp-pppoe: ADSL support'
-              'dhclient: External DHCP client'
-              'modemmanager: cellular network support')
-  backup=('etc/NetworkManager/NetworkManager.conf')
-
-  cd NetworkManager-$pkgver
-  make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" -C libnm uninstall
-  make DESTDIR="$pkgdir" -C libnm-glib uninstall
-  make DESTDIR="$pkgdir" -C libnm-util uninstall
-  make DESTDIR="$pkgdir" -C vapi uninstall
-
-  # Some stuff to move is left over
-  mv "$pkgdir/usr/include" ..
-  mv "$pkgdir/usr/lib/pkgconfig" ..
-
-  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
-
-  rm -r "$pkgdir/var/run"
-  rmdir -p --ignore-fail-on-non-empty \
-    "$pkgdir"/usr/{share/{vala/vapi,gir-1.0},lib/girepository-1.0}
-}
-
-package_libnm-glib() {
-  pkgdesc="NetworkManager library"
-  depends=(libgudev nss dbus-glib libutil-linux)
-
-  install -d "$pkgdir/usr/lib"
-  mv include "$pkgdir/usr"
-  mv pkgconfig "$pkgdir/usr/lib"
-
-  cd NetworkManager-$pkgver
-  make DESTDIR="$pkgdir" -C libnm install
-  make DESTDIR="$pkgdir" -C libnm-util install
-  make DESTDIR="$pkgdir" -C libnm-glib install
-  make DESTDIR="$pkgdir" -C vapi install
-}

Copied: networkmanager/repos/testing-x86_64/PKGBUILD (from rev 266183, networkmanager/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2016-04-26 18:56:30 UTC (rev 266184)
@@ -0,0 +1,127 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
+
+pkgbase=networkmanager
+pkgname=(networkmanager libnm-glib)
+pkgver=1.2.0
+pkgrel=3
+pkgdesc="Network Management daemon"
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/"
+_pppver=2.4.7
+makedepends=(intltool dhclient iptables gobject-introspection gtk-doc
+             "ppp=$_pppver" modemmanager dbus-glib iproute2 nss polkit
+             wpa_supplicant libsoup systemd libgudev libmm-glib rp-pppoe
+             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'
+            '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
+}
+
+build() {
+  cd NetworkManager-$pkgver
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --sbindir=/usr/bin \
+    --libexecdir=/usr/lib/networkmanager \
+    --with-crypto=nss \
+    --with-dhclient=/usr/bin/dhclient \
+    --without-dhcpcd \
+    --with-dnsmasq=/usr/bin/dnsmasq \
+    --with-iptables=/usr/bin/iptables \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-udev-dir=/usr/lib/udev \
+    --with-resolvconf=/usr/bin/resolvconf \
+    --with-pppd=/usr/bin/pppd \
+    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+    --with-pppoe=/usr/bin/pppoe \
+    --with-kernel-firmware-dir=/usr/lib/firmware \
+    --with-session-tracking=systemd \
+    --with-modem-manager-1 \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc \
+    --enable-gtk-doc
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+check() {
+  cd NetworkManager-$pkgver
+  make -k check
+}
+
+package_networkmanager() {
+  depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib
+           libnewt libndp libteam)
+  optdepends=('dnsmasq: connection sharing'
+              'bluez: Bluetooth support'
+              'openresolv: resolvconf support'
+              'ppp: dialup connection support'
+              'rp-pppoe: ADSL support'
+              'dhclient: External DHCP client'
+              'modemmanager: cellular network support')
+  backup=('etc/NetworkManager/NetworkManager.conf')
+
+  cd NetworkManager-$pkgver
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C libnm uninstall
+  make DESTDIR="$pkgdir" -C libnm-glib uninstall
+  make DESTDIR="$pkgdir" -C libnm-util uninstall
+  make DESTDIR="$pkgdir" -C vapi uninstall
+
+  # Some stuff to move is left over
+  mv "$pkgdir/usr/include" ..
+  mv "$pkgdir/usr/lib/pkgconfig" ..
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+  rm -r "$pkgdir/var/run"
+  rmdir -p --ignore-fail-on-non-empty \
+    "$pkgdir"/usr/{share/{vala/vapi,gir-1.0},lib/girepository-1.0}
+}
+
+package_libnm-glib() {
+  pkgdesc="NetworkManager library"
+  depends=(libgudev nss dbus-glib libutil-linux)
+
+  install -d "$pkgdir/usr/lib"
+  mv include "$pkgdir/usr"
+  mv pkgconfig "$pkgdir/usr/lib"
+
+  cd NetworkManager-$pkgver
+  make DESTDIR="$pkgdir" -C libnm install
+  make DESTDIR="$pkgdir" -C libnm-util install
+  make DESTDIR="$pkgdir" -C libnm-glib install
+  make DESTDIR="$pkgdir" -C vapi install
+}

Copied: networkmanager/repos/testing-x86_64/dhcpv6-mixed.patch (from rev 266183, networkmanager/trunk/dhcpv6-mixed.patch)
===================================================================
--- testing-x86_64/dhcpv6-mixed.patch	                        (rev 0)
+++ testing-x86_64/dhcpv6-mixed.patch	2016-04-26 18:56:30 UTC (rev 266184)
@@ -0,0 +1,34 @@
+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: testing-x86_64/hidepid.patch
===================================================================
--- testing-x86_64/hidepid.patch	2016-04-26 18:48:48 UTC (rev 266183)
+++ testing-x86_64/hidepid.patch	2016-04-26 18:56:30 UTC (rev 266184)
@@ -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
-

Copied: networkmanager/repos/testing-x86_64/hidepid.patch (from rev 266183, networkmanager/trunk/hidepid.patch)
===================================================================
--- testing-x86_64/hidepid.patch	                        (rev 0)
+++ testing-x86_64/hidepid.patch	2016-04-26 18:56:30 UTC (rev 266184)
@@ -0,0 +1,54 @@
+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
+



More information about the arch-commits mailing list