[apache2] 02/04: Remove conflicts of mpm modules with mpm_itk

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit ac64b0208c2fcf529e0577f9ed65d909d62592e6
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Jun 8 10:22:48 2014 +0200

    Remove conflicts of mpm modules with mpm_itk
---
 debian/changelog                                  | 4 +++-
 debian/config-dir/mods-available/mpm_event.load   | 2 +-
 debian/config-dir/mods-available/mpm_prefork.load | 2 +-
 debian/config-dir/mods-available/mpm_worker.load  | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c28ce4..e20bc2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,9 @@ apache2 (2.4.9-2) UNRELEASED; urgency=medium
     Closes: #743915
   * Fix buffer overflows in suexec with very long (unix) usernames. Not
     exploitable due to FORTIFY_SOURCE. And creating users usually requires
-    root, anyway. Thanks to Luca Bruno for the report.
+    root privileges, anyway. Thanks to Luca Bruno for the report.
+  * Remove conflicts of mpm modules with mpm_itk, which isn't an mpm
+    anymore. Fixes a part of: #734865. libapache2-mpm-itk needs a fix, too.
 
  -- Stefan Fritsch <sf at debian.org>  Sun, 27 Apr 2014 22:15:58 +0200
 
diff --git a/debian/config-dir/mods-available/mpm_event.load b/debian/config-dir/mods-available/mpm_event.load
index 141d7a1..00d970b 100644
--- a/debian/config-dir/mods-available/mpm_event.load
+++ b/debian/config-dir/mods-available/mpm_event.load
@@ -1,2 +1,2 @@
-# Conflicts: mpm_worker mpm_prefork mpm_itk
+# Conflicts: mpm_worker mpm_prefork
 LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so
diff --git a/debian/config-dir/mods-available/mpm_prefork.load b/debian/config-dir/mods-available/mpm_prefork.load
index 3142c44..05da7a3 100644
--- a/debian/config-dir/mods-available/mpm_prefork.load
+++ b/debian/config-dir/mods-available/mpm_prefork.load
@@ -1,2 +1,2 @@
-# Conflicts: mpm_event mpm_worker mpm_itk
+# Conflicts: mpm_event mpm_worker
 LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so
diff --git a/debian/config-dir/mods-available/mpm_worker.load b/debian/config-dir/mods-available/mpm_worker.load
index 6357ab9..f9d0c4d 100644
--- a/debian/config-dir/mods-available/mpm_worker.load
+++ b/debian/config-dir/mods-available/mpm_worker.load
@@ -1,2 +1,2 @@
-# Conflicts: mpm_event mpm_prefork mpm_itk
+# Conflicts: mpm_event mpm_prefork
 LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git