Merge ~bryce/ubuntu/+source/apache2:sru-lp1565744-apache-lock-dir into ubuntu/+source/apache2:ubuntu/xenial-devel

[Bryce Harrington]

PPA: https://launchpad.net/~bryce/+archive/ubuntu/apache2-sru-lp1899611-conf-in/

Backports a Debian fix for installation of config files, so can avoid installing *.in templates. Fixes an issue from an earlier SRU that causes an apache2.conf.in file to get installed.

I plan to include this SRU with the xenial fix for lp #1832182 (see https://code.launchpad.net/~bryce/ubuntu/+source/apache2/+git/apache2/+merge/393678), but am MP'ing this separately for review convenience.

I haven't filled in the SRU text yet, but the bug report is pretty clear and the test case obvious. I do plan to fill in a proper SRU before upload.

[Christian Ehrhardt  (paelzer)]

Straightforward case and fix, I found no issues other than "on its own" it would be debatable if it is worth an update. But since you plan to upload the fixes together that is ok.

One question thou, since we have placed things in /etc/ they will be config files.
Therefore "not delivering" them will not remove them from disk.

Is there a chance that people started to (wrongly) use that file and it would be active?

If not I think we should we also add an rm_conffile along the fix.

review: Needs Information

[Bryce Harrington (bryce)]

It couldn't be active because it's not a validly formatted config file so would generate an error.

Apache by default uses apache2.conf, not apache2.conf.in. You'd really need to go out of your way to make Apache read apache2.conf.in instead. So I think the utility of removing the file is going to be pretty low. And yeah, I wouldn't have bothered with this as SRU except that I have another one it can easily ride in on.

Unmerged commits

a49d30c... by Bryce Harrington on 2020-11-17

changelog

0ef095b... by Bryce Harrington on 2020-11-16

* d/apache2.install: List confdir contents explicitly. Avoids installing *.in templates. (LP: #1899611)

diff --git a/debian/apache2.install b/debian/apache2.install
index 9ef8ca9..8941658 100644
--- a/debian/apache2.install
+++ b/debian/apache2.install
@@ -1,5 +1,8 @@
 debian/bash_completion/a2enmod			/usr/share/bash-completion/completions/
-debian/config-dir/*				/etc/apache2
+debian/config-dir/*-available			/etc/apache2
+debian/config-dir/*.conf			/etc/apache2
+debian/config-dir/envvars			/etc/apache2
+debian/config-dir/magic				/etc/apache2
 debian/a2enmod					/usr/sbin
 debian/apache2ctl				/usr/sbin
 debian/a2query					/usr/sbin
diff --git a/debian/changelog b/debian/changelog
index 659f7b8..6a9da9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apache2 (2.4.18-2ubuntu3.18) xenial; urgency=medium
+
+  * d/apache2.install: List confdir contents explicitly. Avoids
+    installing *.in templates.
+    (LP: #1899611)
+
+ -- Bryce Harrington <[e-mail]>  Mon, 16 Nov 2020 16:23:23 -0800
+
 apache2 (2.4.18-2ubuntu3.17) xenial-security; urgency=medium
 
   * SECURITY UPDATE: mod_rewrite redirect issue