Merge ~paelzer/ubuntu/+source/openssh:lp-1876320-include-does-apply-defaults-mutliple-times-FOCAL into ubuntu/+source/openssh:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4080

Note: The SRU template isn't ready yet as I wait for the bug reporter to confirm this works first.

[Lucas Kanashiro (lucaskanashiro)]

* Changelog:
  - [-] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [-] no upstream changes to consider
  - [-] no further upstream version to consider
  - [-] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [-] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [-] no new patches added
  - [√] patches match what was proposed upstream
  - [√] patches correctly included in debian/patches/series
  - [√] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [√] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

LGTM, +1.

review: Approve

[Christian Ehrhardt  (paelzer)]

This is still waiting for the SRU Team

[Christian Ehrhardt  (paelzer)]

SRU completed

diff --git a/debian/changelog b/debian/changelog
index e9ee5d1..2fc7908 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:8.2p1-4ubuntu0.1) focal; urgency=medium
+
+  * d/p/lp-1876320-*: avoid applying defaults for every include statement
+    (LP: #1876320)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 29 May 2020 09:37:09 +0200
+
 openssh (1:8.2p1-4) unstable; urgency=medium
 
   * Add /etc/ssh/ssh_config.d/ to openssh-client.
diff --git a/debian/control b/debian/control
index 98ee018..d6618e9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: openssh
 Section: net
 Priority: standard
-Maintainer: Debian OpenSSH Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian OpenSSH Maintainers <[e-mail]>
 Build-Depends: autotools-dev,
                debhelper (>= 9.20160709~),
                debhelper-compat (= 9),
diff --git a/debian/patches/lp-1876320-upstream-Do-not-call-process_queued_listen_addrs-for.patch b/debian/patches/lp-1876320-upstream-Do-not-call-process_queued_listen_addrs-for.patch
new file mode 100644
index 0000000..43865f5
--- /dev/null
+++ b/debian/patches/lp-1876320-upstream-Do-not-call-process_queued_listen_addrs-for.patch
@@ -0,0 +1,59 @@
+From 0a9a611619b0a1fecd0195ec86a9885f5d681c84 Mon Sep 17 00:00:00 2001
+From: "[e-mail]" <[e-mail]>
+Date: Wed, 27 May 2020 21:59:11 +0000
+Subject: [PATCH] upstream: Do not call process_queued_listen_addrs() for every
+
+included file from sshd_config; patch from Jakub Jelen
+
+OpenBSD-Commit-ID: 0ff603d6f06a7fab4881f12503b53024799d0a49
+
+Backport-Note:
+  upstreams auto-tagging at the top of the file didn't
+  match, everything else applied as-is
+
+Origin: backport, https://anongit.mindrot.org/openssh.git/commit/?id=0a9a611619b0a1fecd0195ec86a9885f5d681c84
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1876320
+Last-Update: 2020-05-29
+
+---
+ servconf.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/servconf.c
++++ b/servconf.c
+@@ -75,8 +75,8 @@ static void add_listen_addr(ServerOption
+     const char *, int);
+ static void add_one_listen_addr(ServerOptions *, const char *,
+     const char *, int);
+-void parse_server_config_depth(ServerOptions *options, const char *filename,
+-    struct sshbuf *conf, struct include_list *includes,
++static void parse_server_config_depth(ServerOptions *options,
++    const char *filename, struct sshbuf *conf, struct include_list *includes,
+     struct connection_info *connectinfo, int flags, int *activep, int depth);
+ 
+ /* Use of privilege separation or not */
+@@ -2611,7 +2611,7 @@ copy_set_server_options(ServerOptions *d
+ #undef M_CP_STRARRAYOPT
+ 
+ #define SERVCONF_MAX_DEPTH	16
+-void
++static void
+ parse_server_config_depth(ServerOptions *options, const char *filename,
+     struct sshbuf *conf, struct include_list *includes,
+     struct connection_info *connectinfo, int flags, int *activep, int depth)
+@@ -2637,7 +2637,6 @@ parse_server_config_depth(ServerOptions
+ 	if (bad_options > 0)
+ 		fatal("%s: terminating, %d bad configuration options",
+ 		    filename, bad_options);
+-	process_queued_listen_addrs(options);
+ }
+ 
+ void
+@@ -2648,6 +2647,7 @@ parse_server_config(ServerOptions *optio
+ 	int active = connectinfo ? 0 : 1;
+ 	parse_server_config_depth(options, filename, conf, includes,
+ 	    connectinfo, 0, &active, 0);
++	process_queued_listen_addrs(options);
+ }
+ 
+ static const char *
diff --git a/debian/patches/series b/debian/patches/series
index 8c1046a..e9dd67a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ debian-config.patch
 restore-authorized_keys2.patch
 conch-old-privkey-format.patch
 revert-ipqos-defaults.patch
+lp-1876320-upstream-Do-not-call-process_queued_listen_addrs-for.patch