Bug#833634: jessie-pu: package apache2/2.4.10-10+deb8u6

[Julien Cristau <jcristau@debian.org>]

On Thu, Sep 15, 2016 at 19:44:44 +0100, Adam D. Barratt wrote:

> On Sat, 2016-09-03 at 19:11 +0100, Adam D. Barratt wrote:
> > Uploaded and flagged for acceptance.
> 
> It was pointed out on IRC that the installation change for forking.conf
> is broken. This:
> 
> +debian/forking.conf				/lib/systemd/system/apache2.service.d/forking.conf
> 
> results
> in /lib/systemd/system/apache2.service.d/forking.conf/forking.conf,
> which systemd doesn't like:
> 
> "
> Configuration file /lib/systemd/system/apache2.service.d/forking.conf is
> marked executable. Please remove executable permission bits. Proceeding
> anyway.
> Failed to read configuration file
> '/lib/systemd/system/apache2.service.d/forking.conf': Is a directory
> "
> 
> If you can get a fix for that uploaded asap then I'll look at getting it
> through stable-new in time for Saturday morning.
> 
I'm about to upload with this diff:

diff -Nru apache2-2.4.10/debian/apache2.install apache2-2.4.10/debian/apache2.install
--- apache2-2.4.10/debian/apache2.install	2016-08-07 12:56:37.000000000 +0200
+++ apache2-2.4.10/debian/apache2.install	2016-09-15 22:41:39.000000000 +0200
@@ -5,4 +5,4 @@
 debian/a2query					/usr/sbin
 debian/ask-for-passphrase			/usr/share/apache2/
 debian/debhelper/apache2-maintscript-helper	/usr/share/apache2/
-debian/forking.conf				/lib/systemd/system/apache2.service.d/forking.conf
+debian/forking.conf				/lib/systemd/system/apache2.service.d
diff -Nru apache2-2.4.10/debian/changelog apache2-2.4.10/debian/changelog
--- apache2-2.4.10/debian/changelog	2016-08-07 13:02:55.000000000 +0200
+++ apache2-2.4.10/debian/changelog	2016-09-15 22:42:20.000000000 +0200
@@ -1,3 +1,9 @@
+apache2 (2.4.10-10+deb8u7) jessie; urgency=medium
+
+  * Fix installation of /lib/systemd/system/apache2.service.d/forking.conf.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 15 Sep 2016 22:42:19 +0200
+
 apache2 (2.4.10-10+deb8u6) jessie; urgency=medium
 
   * Fix race condition and logical error in init script. Thanks to Thomas

Cheers,
Julien