[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#806529: marked as done (jessie-pu: package apache2/2.4.10-10+deb8u4)

Your message dated Sat, 23 Jan 2016 13:57:15 +0000
with message-id <1453557435.1835.52.camel@adam-barratt.org.uk>
and subject line 8.3 point release cleanup
has caused the Debian Bug report #806529,
regarding jessie-pu: package apache2/2.4.10-10+deb8u4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
806529: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=806529
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

please review apache2/2.4.10-10+deb8u4 for inclusion in s-p-u. It
includes a fixed version of the deferred mpm switch patch that was
pulled from the last s-p-u upload due to a bug. It also fixes some other
annoying but easy to fix issues.

Changelog:

 * Add versioned replaces/breaks for libapache2-mod-macro to apache2,
   for the config files in /etc. Closes: #806326
 * Fix split-logfile to work with current perl. Closes: #803472
 * Fix tests on deferred mpm switch. Add special casing for mpm_itk,
   which is not an mpm anymore, despite the name. Closes: #789914
   Closes: #791902
 * Fix secondary-init-script to not source the main init script with
   'set -e'. Closes: #803177

Debdiff is attached.

Cheers,
Stefan

diff -Nru apache2-2.4.10/debian/a2enmod apache2-2.4.10/debian/a2enmod
--- apache2-2.4.10/debian/a2enmod	2015-08-27 23:03:43.000000000 +0200
+++ apache2-2.4.10/debian/a2enmod	2015-11-28 14:08:16.000000000 +0100
@@ -430,7 +430,7 @@
     if ( $? != 0 ) {
 
         # config doesn't work
-        if ( -e "$enabldir/mpm_prefork.load" || -e "$enabldir/mpm_itk.load" )
+        if ( -e "$enabldir/mpm_prefork.load" )
         {
             return 0;
         }
diff -Nru apache2-2.4.10/debian/a2query.in apache2-2.4.10/debian/a2query.in
--- apache2-2.4.10/debian/a2query.in	2015-08-07 23:33:37.000000000 +0200
+++ apache2-2.4.10/debian/a2query.in	2015-11-28 14:07:43.000000000 +0100
@@ -209,10 +209,10 @@
 		my $file = $_;
 		next if $file !~ m/\.load$/;
 		$file =~ s/\.load//;
-		if ($file =~ /mpm_(\w+)/ && $file ne 'mpm_itk')
+		if ($file =~ /mpm_(?:event|worker|prefork)/)
 		{
 			$MPM = $1 if $MPM eq 'invalid';
-			if(grep { $_ =~ m/^mpm_/ } @MODULES)
+			if(grep { $_ =~ m/^mpm_(?:event|worker|prefork)/ } @MODULES)
 			{
 				fail("There is more than one MPM loaded. Do not proceed due to undefined results", 1);
 			}
diff -Nru apache2-2.4.10/debian/apache2.postinst apache2-2.4.10/debian/apache2.postinst
--- apache2-2.4.10/debian/apache2.postinst	2015-08-28 18:11:59.000000000 +0200
+++ apache2-2.4.10/debian/apache2.postinst	2015-11-28 14:08:41.000000000 +0100
@@ -432,21 +432,21 @@
 			esac
 			;;
 		apache2_switch_mpm)
-			local MPM="mpm_$ARG1"
-			local CUR_MPM="$(ls /etc/apache2/mods-enabled/mpm_*.load)"
+			local MPM="$ARG1"
+			local CUR_MPM="$(ls /etc/apache2/mods-enabled/mpm_*.load | grep -e event -e prefork -e worker)"
 			CUR_MPM="${CUR_MPM##*/mpm_}"
 			CUR_MPM="${CUR_MPM%.load}"
-			if [ ! -e /etc/apache2/mods-available/$MPM.load ] ; then
-				msg "error" "$MPM not found in 'apache2_switch_mpm $ARG1' for package $PACKAGE"
+			if [ ! -e /etc/apache2/mods-available/mpm_$MPM.load ] ; then
+				msg "error" "mpm $MPM not found in 'apache2_switch_mpm $ARG1' for package $PACKAGE"
 				error=true
-			elif [ ! -e /etc/apache2/mods-enabled/$MPM.load ] ; then
-				msg "info" "$MPM: No action required"
+			elif [ -e /etc/apache2/mods-enabled/mpm_$MPM.load ] ; then
+				msg "info" "Switch to mpm $MPM for package $PACKAGE: No action required"
 			else
-				msg "info" "Switch to $MPM for package $PACKAGE"
+				msg "info" "Switch to mpm $MPM for package $PACKAGE"
 				if ! a2dismod -m -q "mpm_$CUR_MPM" ||
 				   ! a2enmod -m -q "mpm_$MPM"
 				then
-					msg "error" "Switching to $MPM failed"
+					msg "error" "Switching to mpm $MPM failed"
 					error=true
 				fi
 			fi
diff -Nru apache2-2.4.10/debian/changelog apache2-2.4.10/debian/changelog
--- apache2-2.4.10/debian/changelog	2015-08-28 18:26:05.000000000 +0200
+++ apache2-2.4.10/debian/changelog	2015-11-28 15:02:23.000000000 +0100
@@ -1,3 +1,16 @@
+apache2 (2.4.10-10+deb8u4) jessie; urgency=medium
+
+  * Add versioned replaces/breaks for libapache2-mod-macro to apache2,
+    for the config files in /etc. Closes: #806326
+  * Fix split-logfile to work with current perl. Closes: #803472
+  * Fix tests on deferred mpm switch. Add special casing for mpm_itk,
+    which is not an mpm anymore, despite the name. Closes: #789914
+    Closes: #791902
+  * Fix secondary-init-script to not source the main init script with 'set -e'.
+    Closes: #803177
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 28 Nov 2015 15:02:23 +0100
+
 apache2 (2.4.10-10+deb8u3) jessie; urgency=medium
 
   * Revert fix for deferred mpm switch for now, because it is at least not
diff -Nru apache2-2.4.10/debian/control apache2-2.4.10/debian/control
--- apache2-2.4.10/debian/control	2015-08-27 23:03:43.000000000 +0200
+++ apache2-2.4.10/debian/control	2015-11-28 13:59:22.000000000 +0100
@@ -20,7 +20,8 @@
  perl, mime-support, apache2-bin (= ${binary:Version}),
  apache2-utils (>= 2.4), apache2-data (= ${source:Version}),
  ${perl:Depends}
-Replaces: apache2.2-common
+Replaces: apache2.2-common, libapache2-mod-macro (<< 1:2.4.6-1~)
+Breaks: libapache2-mod-macro (<< 1:2.4.6-1~)
 Conflicts: apache2.2-common (<< 2.3~)
 Provides: httpd, httpd-cgi
 Recommends: ssl-cert
diff -Nru apache2-2.4.10/debian/patches/series apache2-2.4.10/debian/patches/series
--- apache2-2.4.10/debian/patches/series	2015-08-27 23:03:43.000000000 +0200
+++ apache2-2.4.10/debian/patches/series	2015-11-28 13:59:22.000000000 +0100
@@ -17,3 +17,4 @@
 define_restarts.diff
 mpm_event_graceful_restart_deadlock.diff
 mpm_event_crash.diff
+split_logfile-strict.patch
diff -Nru apache2-2.4.10/debian/patches/split_logfile-strict.patch apache2-2.4.10/debian/patches/split_logfile-strict.patch
--- apache2-2.4.10/debian/patches/split_logfile-strict.patch	1970-01-01 01:00:00.000000000 +0100
+++ apache2-2.4.10/debian/patches/split_logfile-strict.patch	2015-11-28 13:59:22.000000000 +0100
@@ -0,0 +1,34 @@
+# Fix for 'use strict' in current perl versions
+# https://svn.apache.org/viewvc?view=revision&revision=1651095
+--- apache2.orig/support/split-logfile.in
++++ apache2/support/split-logfile.in
+@@ -29,7 +29,7 @@
+ use strict;
+ use warnings;
+ 
+-my %is_open = ();
++my %log_file = ();
+ 
+ while (my $log_line = <STDIN>) {
+     #
+@@ -54,10 +54,9 @@ while (my $log_line = <STDIN>) {
+     # If the log file for this virtual host isn't opened
+     # yet, do it now.
+     #
+-    if (! $is_open{$vhost}) {
+-        open $vhost, ">>${vhost}.log"
++    if (! $log_file{$vhost}) {
++        open $log_file{$vhost}, ">>${vhost}.log"
+             or die ("Can't open ${vhost}.log");
+-        $is_open{$vhost} = 1;
+     }
+     #
+     # Strip off the first token (which may be null in the
+@@ -65,6 +64,6 @@ while (my $log_line = <STDIN>) {
+     # record to the current log file.
+     #
+     $log_line =~ s/^\S*\s+//;
+-    printf $vhost "%s", $log_line;
++    print {$log_file{$vhost}} $log_line;
+ }
+ exit 0;
diff -Nru apache2-2.4.10/debian/secondary-init-script apache2-2.4.10/debian/secondary-init-script
--- apache2-2.4.10/debian/secondary-init-script	2015-08-02 00:21:24.000000000 +0200
+++ apache2-2.4.10/debian/secondary-init-script	2015-11-28 14:15:20.000000000 +0100
@@ -9,8 +9,6 @@
 # Short-Description: Start/stop apache2 web server (config /etc/apache2-XXX)
 ### END INIT INFO
 
-set -e
-
 #
 # this init script can be installed as /etc/init.d/apache2-XXX
 #

--- End Message ---
--- Begin Message --- 
Version: 8.3

Hi,

The updates referred to in these bugs were included in today's 8.3
Jessie point release.

Regards,

Adam

--- End Message ---
Reply to: