diff -Nru netcfg-1.135ubuntu6/debian/changelog netcfg-1.138ubuntu1/debian/changelog
--- netcfg-1.135ubuntu6/debian/changelog	2016-05-12 15:24:10.000000000 +0000
+++ netcfg-1.138ubuntu1/debian/changelog	2016-08-12 08:34:18.000000000 +0000
@@ -1,3 +1,59 @@
+netcfg (1.138ubuntu1) yakkety; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Set default hostname to 'ubuntu'.
+    - Set priority for get_domain to high for static configurations.
+    - Set priority for get_domain to medium for non-static configurations.
+    - Use 'auto <interface>' for all interfaces, dropping allow-hotplug
+      which doesn't work with current udev.
+    - Set DHCP and DHCPv6 timeout to 30s.
+    - Use isc-dhcp-client-udeb on all architectures.
+    - Flush all addresses and routes before configuring interfaces
+      (LP: #848072)
+    - Don't copy /etc/resolv.conf to target if resolvconf is installed.  (We
+      already write resolvconf configuration to /etc/network/interfaces.)
+    - Add a post-base-install hook to detect resolvconf and copy
+      /run/resolvconf/resolv.conf to outside the target so that when /run is
+      bind-mounted DNS resolving continues to work. (LP: #926447)
+    - Apply patch from Alec Warner making netcfg respect
+      netcfg/dhcpv6_timeout and running dhclient in one-shot mode (-1).
+      (LP: #917905)
+    - Fix nm-conf to generate a valid NetworkManager static configuration
+      file.
+    - Always allow fe80::/64 for the default gateway. (LP: #1382295)
+    - Add vlan support.
+    - On s390x ask if DHCP autoconfiguration should be performed or not.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 12 Aug 2016 09:34:18 +0100
+
+netcfg (1.138) unstable; urgency=medium
+
+  [ Hendrik Brueckner ]
+  * common/ipaddr: remove leading and trailing whitespaces
+  * static: trim user-specified values for IP and other addresses
+  * Closes: #818611, LP: #1541955
+
+  [ Dimitri John Ledkov ]
+  * dhcp.c: check return result of two more fgets calls
+  * nm-conf.c: check return result of fscanf
+  * Makefile: link with -lm to resolve undefined log and other functions
+  * All of above resolves FTBFS
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 02 Apr 2016 08:06:37 +0200
+
+netcfg (1.137) unstable; urgency=medium
+
+  [ Colin Watson ]
+  * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
+
+ -- Christian Perrier <bubulle@debian.org>  Tue, 02 Feb 2016 07:02:48 +0100
+
+netcfg (1.136) unstable; urgency=medium
+
+  * Fix confusing indentation pointed out by GCC 6 (closes: #811589).
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 20 Jan 2016 13:43:39 +0000
+
 netcfg (1.135ubuntu6) yakkety; urgency=medium
 
   * With vlan connection type, finish-install.d would decide to purge
diff -Nru netcfg-1.135ubuntu6/debian/control netcfg-1.138ubuntu1/debian/control
--- netcfg-1.135ubuntu6/debian/control	2016-04-06 18:34:51.000000000 +0000
+++ netcfg-1.138ubuntu1/debian/control	2016-08-12 08:12:34.000000000 +0000
@@ -7,8 +7,8 @@
 	Christian Perrier <bubulle@debian.org>,
 	Philipp Kern <pkern@debian.org>
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.9.0), libdebconfclient0-dev (>= 0.46), libdebian-installer4-dev (>= 0.41), po-debconf (>= 0.5.0), libiw-dev (>= 27+28pre9) [!s390 !s390x !sparc !kfreebsd-any !hurd-any], check, libsubunit-dev
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/netcfg.git
-Vcs-Git: git://anonscm.debian.org/d-i/netcfg.git
+Vcs-Browser: https://anonscm.debian.org/cgit/d-i/netcfg.git
+Vcs-Git: https://anonscm.debian.org/git/d-i/netcfg.git
 
 Package: netcfg
 Package-Type: udeb
diff -Nru netcfg-1.135ubuntu6/debian/po/be.po netcfg-1.138ubuntu1/debian/po/be.po
--- netcfg-1.135ubuntu6/debian/po/be.po	2016-04-06 18:34:51.000000000 +0000
+++ netcfg-1.138ubuntu1/debian/po/be.po	2016-08-12 08:12:34.000000000 +0000
@@ -23,9 +23,10 @@
 "Project-Id-Version: be\n"
 "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n"
 "POT-Creation-Date: 2012-11-03 22:02+0000\n"
-"PO-Revision-Date: 2012-11-07 09:49+0300\n"
-"Last-Translator: Viktar Siarheichyk <vics@eq.by>\n"
-"Language-Team: Belarusian <i18n@mova.org>\n"
+"PO-Revision-Date: 2015-12-21 15:13+0300\n"
+"Last-Translator: Viktar Siarheichyk <vics@fsfe.org>\n"
+"Language-Team: Debian l10n team for Belarusian <debian-l10n-belarusian@lists."
+"debian.org>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru netcfg-1.135ubuntu6/debian/po/da.po netcfg-1.138ubuntu1/debian/po/da.po
--- netcfg-1.135ubuntu6/debian/po/da.po	2016-04-06 18:34:51.000000000 +0000
+++ netcfg-1.138ubuntu1/debian/po/da.po	2016-08-12 08:12:34.000000000 +0000
@@ -39,7 +39,7 @@
 "Project-Id-Version: debian-installer_packages_po_sublevel1_da\n"
 "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n"
 "POT-Creation-Date: 2012-11-03 22:02+0000\n"
-"PO-Revision-Date: 2015-03-05 20:12+0200\n"
+"PO-Revision-Date: 2015-08-16 20:20+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
diff -Nru netcfg-1.135ubuntu6/debian/po/tr.po netcfg-1.138ubuntu1/debian/po/tr.po
--- netcfg-1.135ubuntu6/debian/po/tr.po	2016-04-06 18:34:51.000000000 +0000
+++ netcfg-1.138ubuntu1/debian/po/tr.po	2016-08-12 08:12:34.000000000 +0000
@@ -29,7 +29,7 @@
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n"
 "POT-Creation-Date: 2012-11-03 22:02+0000\n"
-"PO-Revision-Date: 2015-06-30 01:49+0200\n"
+"PO-Revision-Date: 2016-07-25 23:45+0300\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: Debian L10N Turkish\n"
 "Language: tr\n"
@@ -717,7 +717,7 @@
 "The value you have provided is not valid. The maximum waiting time (in "
 "seconds) for network link detection must be a positive integer."
 msgstr ""
-"Girdiğiniz değer geçersiz. En uzun bekleme süresi pozitif bir tamsayı "
+"Girdiğiniz değer geçersiz. En uzun bekleme süresi pozitif bir tam sayı "
 "olmalıdır."
 
 #. Type: select
diff -Nru netcfg-1.135ubuntu6/dhcp.c netcfg-1.138ubuntu1/dhcp.c
--- netcfg-1.135ubuntu6/dhcp.c	2016-04-20 11:23:15.000000000 +0000
+++ netcfg-1.138ubuntu1/dhcp.c	2016-08-12 08:16:30.000000000 +0000
@@ -711,14 +711,15 @@
     if (!have_domain && (d = fopen(DOMAIN_FILE, "r")) != NULL) {
         di_debug("Reading domain name returned via DHCP");
         domain[0] = '\0';
-        if (fgets(domain, sizeof(domain), d) != NULL)
+        while (fgets(domain, sizeof(domain), d) != NULL) {
             rtrim(domain);
+            di_debug("DHCP domain name is '%s'", domain);
+            if (!empty_str(domain)) {
+                have_domain = 1;
+            }
+        }
         fclose(d);
         unlink(DOMAIN_FILE);
-        di_debug("DHCP domain name is '%s'", domain);
-        if (!empty_str(domain)) {
-            have_domain = 1;
-        }
     }
 
     /*
@@ -731,8 +732,9 @@
         
         di_debug("Reading NTP servers from DHCP info");
         
-        if (fgets(ntpservers, DHCP_OPTION_LEN, d) != NULL)
+        while (fgets(ntpservers, DHCP_OPTION_LEN, d) != NULL) {
             rtrim(ntpservers);
+        }
         fclose(d);
         unlink(NTP_SERVER_FILE);
 
diff -Nru netcfg-1.135ubuntu6/netcfg.c netcfg-1.138ubuntu1/netcfg.c
--- netcfg-1.135ubuntu6/netcfg.c	2016-05-11 10:43:18.000000000 +0000
+++ netcfg-1.138ubuntu1/netcfg.c	2016-08-12 08:26:58.000000000 +0000
@@ -129,8 +129,8 @@
      * disable_autoconfig was preseeded */
     debconf_fget(client, "netcfg/disable_autoconfig", "seen");
     if (!strcmp(client->value, "true"))
-        debconf_fset(client, "netcfg/use_autoconfig", "seen", "true");	    
-    
+        debconf_fset(client, "netcfg/use_autoconfig", "seen", "true");
+
     /* also support disable_dhcp for compatibility */
     debconf_get(client, "netcfg/disable_dhcp");
 
diff -Nru netcfg-1.135ubuntu6/nm-conf.c netcfg-1.138ubuntu1/nm-conf.c
--- netcfg-1.135ubuntu6/nm-conf.c	2016-04-20 11:23:15.000000000 +0000
+++ netcfg-1.138ubuntu1/nm-conf.c	2016-08-12 08:18:29.000000000 +0000
@@ -305,12 +305,12 @@
     else {
         int i;
 
-        if (fscanf(file, "%s\n", mac_addr) > 0) {
+        if (fscanf(file, "%s\n", mac_addr) != EOF) {
             /* Should be upper case. */
             for (i = 0; mac_addr[i]; i++) {
                 mac_addr[i] = toupper(mac_addr[i]);
             }
-        }
+	}
     }
 }
 
diff -Nru netcfg-1.135ubuntu6/wpa.c netcfg-1.138ubuntu1/wpa.c
--- netcfg-1.135ubuntu6/wpa.c	2016-04-06 18:34:51.000000000 +0000
+++ netcfg-1.138ubuntu1/wpa.c	2016-08-12 08:12:34.000000000 +0000
@@ -261,29 +261,29 @@
                  CMD_PROGRESSCANCELLED)
              goto stop;
 
-             if (debconf_progress_step(client, 1) == CMD_PROGRESSCANCELLED)
-                 goto stop;
+         if (debconf_progress_step(client, 1) == CMD_PROGRESSCANCELLED)
+             goto stop;
 
-             sleep(1);
+         sleep(1);
 
-             if ((seconds_slept <= wpa_timeout) && (seconds_slept % 5) == 0) {
-                 if (!wpa_status()) {
-                     debconf_progress_set(client, wpa_timeout);
-                     debconf_progress_info(client, "netcfg/wpa_success_note");
-                     state = 0;
-                     sleep(2);
-                     goto stop;
-                 }
-             }
-             if (seconds_slept == wpa_timeout) {
-                 debconf_progress_stop(client);
-                 debconf_capb(client, "backup");
-                 debconf_capb(client, "");
-                 debconf_input(client, "critical", "netcfg/wpa_supplicant_failed");
-                 debconf_go(client);
-                 debconf_capb(client, "backup");
-                 return 1;
+         if ((seconds_slept <= wpa_timeout) && (seconds_slept % 5) == 0) {
+             if (!wpa_status()) {
+                 debconf_progress_set(client, wpa_timeout);
+                 debconf_progress_info(client, "netcfg/wpa_success_note");
+                 state = 0;
+                 sleep(2);
+                 goto stop;
              }
+         }
+         if (seconds_slept == wpa_timeout) {
+             debconf_progress_stop(client);
+             debconf_capb(client, "backup");
+             debconf_capb(client, "");
+             debconf_input(client, "critical", "netcfg/wpa_supplicant_failed");
+             debconf_go(client);
+             debconf_capb(client, "backup");
+             return 1;
+         }
     }
     stop:
         debconf_progress_stop(client);