summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog28
-rw-r--r--debian/patches/dhclient-never-send-the-hostname-in-DHCP-requests.patch67
-rw-r--r--debian/patches/series1
3 files changed, 96 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e93e091..523f634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,13 @@ network-manager (1.6.2-2) unstable; urgency=medium
-- Michael Biebl <biebl@debian.org> Tue, 14 Mar 2017 22:12:18 +0100
+network-manager (1.6.2-1+0.tails1) feature-stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * New patch: prevent dhclient from ever sending the hostname in DHCP requests.
+
+ -- intrigeri <intrigeri@boum.org> Wed, 08 Mar 2017 08:48:17 +0000
+
network-manager (1.6.2-1) unstable; urgency=medium
* New upstream release
@@ -78,6 +85,13 @@ network-manager (1.4.4-1) unstable; urgency=medium
-- Aron Xu <aron@debian.org> Tue, 20 Dec 2016 20:57:07 +0800
+network-manager (1.4.2-3+0.tails1) feature-stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * New patch: prevent dhclient from ever sending the hostname in DHCP requests.
+
+ -- intrigeri <intrigeri@boum.org> Thu, 22 Dec 2016 13:00:00 +0000
+
network-manager (1.4.2-3) unstable; urgency=medium
* Notify the AccessPoint change after an AP is removed.
@@ -88,6 +102,13 @@ network-manager (1.4.2-3) unstable; urgency=medium
-- Michael Biebl <biebl@debian.org> Fri, 25 Nov 2016 12:53:50 +0100
+network-manager (1.4.2-2+0.tails1) feature-stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * New patch: prevent dhclient from ever sending the hostname in DHCP requests.
+
+ -- intrigeri <intrigeri@boum.org> Wed, 16 Nov 2016 17:02:52 +0000
+
network-manager (1.4.2-2) unstable; urgency=medium
* Drop Build-Depends on dh-systemd, no longer necessary with debhelper 10.
@@ -149,6 +170,13 @@ network-manager (1.4.0-1) unstable; urgency=medium
-- Michael Biebl <biebl@debian.org> Fri, 26 Aug 2016 16:13:15 +0200
+network-manager (1.2.4-2.0tails1) feature-stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * New patch: prevent dhclient from ever sending the hostname in DHCP requests.
+
+ -- intrigeri <intrigeri@boum.org> Fri, 26 Aug 2016 09:07:10 +0000
+
network-manager (1.2.4-2) unstable; urgency=medium
* Demote isc-dhcp-client from Depends to Recommends.
diff --git a/debian/patches/dhclient-never-send-the-hostname-in-DHCP-requests.patch b/debian/patches/dhclient-never-send-the-hostname-in-DHCP-requests.patch
new file mode 100644
index 0000000..0d945a2
--- /dev/null
+++ b/debian/patches/dhclient-never-send-the-hostname-in-DHCP-requests.patch
@@ -0,0 +1,67 @@
+From: intrigeri <intrigeri@boum.org>
+Date: Fri, 26 Aug 2016 08:59:33 +0000
+Subject: dhclient: never send the hostname in DHCP requests
+Forwarded: not-needed
+Bug-Tails: https://labs.riseup.net/code/issues/11720
+Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=768076
+
+---
+ src/dhcp/nm-dhcp-dhclient-utils.c | 3 ++-
+ src/dhcp/tests/test-dhcp-dhclient.c | 16 +++-------------
+ 2 files changed, 5 insertions(+), 14 deletions(-)
+
+diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c
+index 008f8af..f0ec110 100644
+--- a/src/dhcp/nm-dhcp-dhclient-utils.c
++++ b/src/dhcp/nm-dhcp-dhclient-utils.c
+@@ -112,7 +112,8 @@ add_ip4_config (GString *str, GBytes *client_id, const char *hostname, const cha
+ g_string_append (str, "; # added by NetworkManager\n");
+ }
+
+- add_hostname4 (str, hostname, fqdn);
++ /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=768076 */
++ /* add_hostname4 (str, hostname, fqdn); */
+
+ g_string_append_c (str, '\n');
+
+diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
+index 046dd7e..f9441fa 100644
+--- a/src/dhcp/tests/test-dhcp-dhclient.c
++++ b/src/dhcp/tests/test-dhcp-dhclient.c
+@@ -308,11 +308,7 @@ test_existing_ascii_client_id (void)
+
+ static const char *fqdn_expected = \
+ "# Created by NetworkManager\n"
+- "\n"
+- "send fqdn.fqdn \"foo.bar.com\"; # added by NetworkManager\n"
+- "send fqdn.encoded on;\n"
+- "send fqdn.server-update on;\n"
+- "\n"
++ "\n\n"
+ "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
+ "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
+ "option wpad code 252 = string;\n"
+@@ -343,11 +339,7 @@ static const char *fqdn_options_override_orig = \
+ static const char *fqdn_options_override_expected = \
+ "# Created by NetworkManager\n"
+ "# Merged from /path/to/dhclient.conf\n"
+- "\n"
+- "send fqdn.fqdn \"example2.com\"; # added by NetworkManager\n"
+- "send fqdn.encoded on;\n"
+- "send fqdn.server-update on;\n"
+- "\n"
++ "\n\n"
+ "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
+ "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
+ "option wpad code 252 = string;\n"
+@@ -382,9 +374,7 @@ static const char *override_hostname_orig = \
+ static const char *override_hostname_expected = \
+ "# Created by NetworkManager\n"
+ "# Merged from /path/to/dhclient.conf\n"
+- "\n"
+- "send host-name \"blahblah\"; # added by NetworkManager\n"
+- "\n"
++ "\n\n"
+ "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
+ "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
+ "option wpad code 252 = string;\n"
diff --git a/debian/patches/series b/debian/patches/series
index 7df065a..acef697 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ wifi-also-show-the-NM-D-Bus-path-for-the-Wi-Fi-AP-in-nm_w.patch
device-separately-handle-NMDevice-s-autoconnect-by-user-a.patch
device-add-get_autoconnect_allowed-virtual-function.patch
device-wifi-block-autoconnect-while-scanning-is-in-progre.patch
+dhclient-never-send-the-hostname-in-DHCP-requests.patch