[arch-commits] Commit in networkmanager/trunk (PKGBUILD dhcpv6-mixed.patch)

[Jan Steffens]

    Date: Tuesday, April 26, 2016 @ 20:48:48
  Author: heftig
Revision: 266183

1.2.0-3

Added:
  networkmanager/trunk/dhcpv6-mixed.patch
Modified:
  networkmanager/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    8 ++++++--
 dhcpv6-mixed.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-26 16:40:33 UTC (rev 266182)
+++ PKGBUILD	2016-04-26 18:48:48 UTC (rev 266183)
@@ -9,7 +9,7 @@
 pkgbase=networkmanager
 pkgname=(networkmanager libnm-glib)
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
@@ -21,10 +21,11 @@
              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
+        hidepid.patch dhcpv6-mixed.patch
         NetworkManager.conf)
 sha256sums=('e947cf30fa3d19dce88e6f6af51f06dc282b7db7996f946aaa37b03526ef2a80'
             '1de5b511b6b4a933739b0ef48ede1830fa3d6dea2277c1302b12b08fa83a73f1'
+            'f7771790485f24d788fe35f5922ad044a29c6d89b34458d9e99938503b2a3b39'
             '452e4f77c1de92b1e08f6f58674a6c52a2b2d65b7deb0ba436e9afa91ee15103')
 
 prepare() {
@@ -33,6 +34,9 @@
   # 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

Added: dhcpv6-mixed.patch
===================================================================
--- dhcpv6-mixed.patch	                        (rev 0)
+++ dhcpv6-mixed.patch	2016-04-26 18:48:48 UTC (rev 266183)
@@ -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
+