Merge ~juliank/ubuntu/+source/systemd:lp1805183 into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-cosmic

[Julian Andres Klode]

Unmerged commits

16d761d... by Julian Andres Klode on 2018-12-17

Only restart resolved on changes in dhclient enter hook

This prevents spurious restarts of resolved on rebounds when
the addresses did not change.

LP: #1805183

8f76036... by Dimitri John Ledkov on 2018-12-03

releasing package systemd version 239-7ubuntu15

702a456... by Victor Tapia on 2018-12-03

resolved: Increase size of TCP stub replies

DNS_PACKET_PAYLOAD_SIZE_MAX is limiting the size of the stub replies to
512 with EDNS off or 4096 with EDNS on, without checking the protocol
used. This makes TCP replies for clients without EDNS support to be
limited to 512, making the truncate flag useless if the query result is
bigger than 512 bytes.

This commit increases the size of TCP replies to DNS_PACKET_SIZE_MAX

LP: #1804487
Fixes: #10816
(cherry picked from commit e6eed9445956cfa496e1db933bfd3530db23bfce)

1fac256... by Dimitri John Ledkov on 2018-12-03

core: set /run size to 10%, like initramfs-tools does.

Currently there is a difference between initrd and initrd-less boots,
w.r.t. size= mount option of /run. This yields different runtime journald caps
(1% vs 10%), and on dense deployments of containers may result in OOM kills.

LP: #1799251

7de2b4d... by Dimitri John Ledkov on 2018-11-29

releasing package systemd version 239-7ubuntu14

3b764ec... by Dimitri John Ledkov on 2018-11-29

Fix compat with new meson.

e56f2c8... by Dimitri John Ledkov on 2018-11-28

releasing package systemd version 239-7ubuntu13

3006fed... by Dimitri John Ledkov on 2018-11-28

Stop testing that gdm3 is up.

Ubuntu Desktop is only supported on amd64, and on real hardware. Testing that
gdm3 fails to start (yet continues to be running, with a half broken logind
session) is not useful on dummy xorg video cards in nested VMs.

LP: #1805358

b726531... by Dimitri John Ledkov on 2018-11-23

releasing package systemd version 239-7ubuntu12

fea585b... by Dimitri John Ledkov on 2018-11-23

Switch gbp.conf to disco.

diff --git a/debian/changelog b/debian/changelog
index 0459106..a71a38a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 systemd (239-7ubuntu10.5) cosmic; urgency=medium
 
   * hwdb: Revert wlan keycode changes, rely on xkeyboard-config fixes instead.
@@ -27,6 +28,9 @@ systemd (239-7ubuntu10.5) cosmic; urgency=medium
     (LP: #1805358)
     File: debian/tests/control
     https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=969183a983e22c7f923cc21b6bb1789e2af30746
+=======
+systemd (239-7ubuntu15) disco; urgency=medium
+>>>>>>> debian/changelog
 
   * core: set /run size to 10%, like initramfs-tools does.
     Currently there is a difference between initrd and initrd-less boots,
@@ -34,7 +38,11 @@ systemd (239-7ubuntu10.5) cosmic; urgency=medium
     (1% vs 10%), and on dense deployments of containers may result in OOM kills.
     (LP: #1799251)
     File: debian/patches/debian/UBUNTU-core-set-run-size-to-10-like-initramfs-tools-does.patch
+<<<<<<< debian/changelog
     https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=78445beff750e38b87cee0ca41883a09d613ce51
+=======
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fac2568fe716dc1a41bada78293dc6327a6df0d
+>>>>>>> debian/changelog
 
   * resolved: Increase size of TCP stub replies.
     DNS_PACKET_PAYLOAD_SIZE_MAX is limiting the size of the stub replies to
@@ -48,9 +56,71 @@ systemd (239-7ubuntu10.5) cosmic; urgency=medium
     (LP: #1804487)
     Author: Victor Tapia
     File: debian/patches/resolved-Increase-size-of-TCP-stub-replies.patch
+<<<<<<< debian/changelog
     https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5c939591ebc128be9920e6c05dc72277fdce935e
 
  -- Dimitri John Ledkov <[e-mail]>  Tue, 04 Dec 2018 10:18:46 +0000
+=======
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=702a4566174c4d2bd84b70805107cfc1a7c128cc
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 03 Dec 2018 13:49:24 +0000
+
+systemd (239-7ubuntu14) disco; urgency=medium
+
+  * Fix compat with new meson.
+    File: debian/patches/meson-rename-Ddebug-to-Ddebug-extra.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3b764ec1b76768a8c40635019fa5a8acb81b223e
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 29 Nov 2018 16:53:00 +0000
+
+systemd (239-7ubuntu13) disco; urgency=medium
+
+  * Stop testing that gdm3 is up.
+    Ubuntu Desktop is only supported on amd64, and on real hardware. Testing that
+    gdm3 fails to start (yet continues to be running, with a half broken logind
+    session) is not useful on dummy xorg video cards in nested VMs.
+    (LP: #1805358)
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3006fedda1d1ca3f04c5f593e8018bb6d1196025
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 28 Nov 2018 16:02:25 +0000
+
+systemd (239-7ubuntu12) disco; urgency=medium
+
+  * hwdb: Revert wlan keycode changes, rely on xkeyboard-config fixes instead.
+    (LP: #1799364)
+    Author: seb128
+    File: debian/patches/hwdb-revert-airplane-mode-keys-handling-on-Dell.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=cabc076fdd67ced21fc789e44e0366a2f561a5bc
+
+  * test: Set executable bits on TEST-22-TMPFILES shell scripts. (LP: #1804864)
+    File: debian/patches/test-Set-executable-bits-on-TEST-22-TMPFILES-shell-script.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0e5b6e44a962f299565949e1006a4ba86d171dc3
+
+  * Switch gbp.conf to disco.
+    File: debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fea585b259e3e766d8d3dbc9690e879c054ddc87
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 23 Nov 2018 18:38:43 +0000
+
+systemd (239-7ubuntu11) disco; urgency=medium
+
+  * hwdb: Fix wlan keycode for all Dell Latitude and Precision systems
+    (LP: #1799364)
+    Author: Shih-Yuan Lee (FourDollars)
+    File: debian/patches/hwdb-Fix-wlan-keycode-for-all-Dell-Latitude-and-Precision.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d8ac9a5640be39ede9cebcd8c4cc44e8811e0e49
+
+  * hwdb: Update PNP IDs of Goldstar (now: LG Electronics) (LP: #1804584)
+    File: debian/patches/hwdb-Update-PNP-IDs-of-Goldstar-now-LG-Electronics-.-1005.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=10204fb5761c759be6ddf27dc43c851ef24c96cb
+
+  * btrfs-util: unbreak tmpfiles' subvol creation
+    File: debian/patches/btrfs-util-unbreak-tmpfiles-subvol-creation.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=4ab5b8275a0487e301553fb6de6a905abb7ea833
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 22 Nov 2018 16:30:28 +0000
+>>>>>>> debian/changelog
 
 systemd (239-7ubuntu10.4) cosmic-security; urgency=medium
 
diff --git a/debian/extra/dhclient-enter-resolved-hook b/debian/extra/dhclient-enter-resolved-hook
index b504f5b..c2d59e4 100755
--- a/debian/extra/dhclient-enter-resolved-hook
+++ b/debian/extra/dhclient-enter-resolved-hook
@@ -28,6 +28,9 @@ if [ -x /lib/systemd/systemd-resolved ] ; then
               fi
               statedir="/run/systemd/resolved.conf.d"
               mkdir -p $statedir
+
+              oldstate="$(mktemp)"
+              md5sum $statedir/isc-dhcp-v4-$interface.conf $statedir/isc-dhcp-v6-$interface.conf &> $oldstate
               if [ -n "$new_domain_name_servers" ] ; then
                   cat <<EOF >$statedir/isc-dhcp-v4-$interface.conf
 [Resolve]
@@ -50,7 +53,12 @@ Domains=$new_dhcp6_domain_search
 EOF
                   fi
               fi
-              systemctl try-reload-or-restart systemd-resolved.service
+
+              if ! cmp --quiet $oldstate <(md5sum $statedir/isc-dhcp-v4-$interface.conf $statedir/isc-dhcp-v6-$interface.conf 2>&1); then
+                  systemctl try-reload-or-restart systemd-resolved.service
+              fi
+
+              rm $oldstate
           }
                 ;;
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 41a8c4c..3a68a3d 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 pristine-tar = False
 patch-numbers = False
-debian-branch = ubuntu-cosmic
+debian-branch = ubuntu-disco
 
 [dch]
 full = True
diff --git a/debian/patches/meson-rename-Ddebug-to-Ddebug-extra.patch b/debian/patches/meson-rename-Ddebug-to-Ddebug-extra.patch
new file mode 100644
index 0000000..6d0d8e3
--- /dev/null
+++ b/debian/patches/meson-rename-Ddebug-to-Ddebug-extra.patch
@@ -0,0 +1,41 @@
+From: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= <[e-mail]>
+Date: Sun, 19 Aug 2018 19:11:30 +0200
+Subject: meson: rename -Ddebug to -Ddebug-extra
+
+Meson added -Doptimization and -Ddebug options, which obviously causes
+a conflict with our -Ddebug options. Let's rename it.
+
+Fixes #9883.
+
+(cherry picked from commit 8f6b442a78d0b485f044742ad90b2e8271b4e68e)
+---
+ meson.build       | 2 +-
+ meson_options.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e1dc2ca..bf13664 100644
+--- a/meson.build
++++ b/meson.build
+@@ -779,7 +779,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
+ 
+ enable_debug_hashmap = false
+ enable_debug_mmap_cache = false
+-foreach name : get_option('debug')
++foreach name : get_option('debug-extra')
+         if name == 'hashmap'
+                 enable_debug_hashmap = true
+         elif name == 'mmap-cache'
+diff --git a/meson_options.txt b/meson_options.txt
+index 16c1f2b..dc7951b 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -46,7 +46,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
+        description : 'path to debug shell binary')
+ option('debug-tty', type : 'string', value : '/dev/tty9',
+        description : 'specify the tty device for debug shell')
+-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
+        description : 'enable extra debugging')
+ option('memory-accounting-default', type : 'boolean',
+        description : 'enable MemoryAccounting= by default')
diff --git a/debian/patches/series b/debian/patches/series
index 6c7127a..227163f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,8 +46,14 @@ exec-util-in-execute_directories-support-initial-exec-env.patch
 core-execute-environment_generators-with-manager-s-enviro.patch
 core-execute-generators-with-manager-s-environmnet.patch
 hwdb-Fix-wlan-keycode-for-all-Dell-Latitude-and-Precision.patch
+<<<<<<< debian/patches/series
 hwdb-revert-airplane-mode-keys-handling-on-Dell.patch
 hwdb-Update-PNP-IDs-of-Goldstar-now-LG-Electronics-.-1005.patch
+=======
+hwdb-Update-PNP-IDs-of-Goldstar-now-LG-Electronics-.-1005.patch
+hwdb-revert-airplane-mode-keys-handling-on-Dell.patch
+meson-rename-Ddebug-to-Ddebug-extra.patch
+>>>>>>> debian/patches/series
 resolved-Increase-size-of-TCP-stub-replies.patch
 debian/Use-Debian-specific-config-files.patch
 debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch