[apache2] 03/13: Remove two unused patch files

[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 c8da784a64a4372de3583c9644cb33429514212b
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Fri Mar 30 18:57:37 2018 +0200

    Remove two unused patch files
---
 debian/patches/CVE-2017-9798.diff     | 34 ----------------------------------
 debian/patches/suexec_is_shared.patch | 20 --------------------
 2 files changed, 54 deletions(-)

diff --git a/debian/patches/CVE-2017-9798.diff b/debian/patches/CVE-2017-9798.diff
deleted file mode 100644
index 43a5aa8..0000000
--- a/debian/patches/CVE-2017-9798.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-#https://svn.apache.org/r1807754
-#
-#commit 40e03b310047418c1339823c981182eb36a60e85
-#Author: Yann Ylavic <ylavic at apache.org>
-#Date:   Fri Sep 8 13:13:11 2017 +0000
-#
-#    Merge r1807655 from trunk:
-#    
-#    core: Disallow Methods' registration at run time (.htaccess), they may be
-#    used only if registered at init time (httpd.conf).
-#    
-#    Calling ap_method_register() in children processes is not the right scope
-#    since it won't be shared for all requests.
-#    
-#    Reviewed by: ylavic, covener, icing
-#    
-#    
-#    git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807754 13f79535-47bb-0310-9956-ffa450edef68
-#
---- apache2.orig/server/core.c
-+++ apache2/server/core.c
-@@ -2262,6 +2262,12 @@ AP_CORE_DECLARE_NONSTD(const char *) ap_
-             /* method has not been registered yet, but resource restriction
-              * is always checked before method handling, so register it.
-              */
-+            if (cmd->pool == cmd->temp_pool) {
-+                /* In .htaccess, we can't globally register new methods. */
-+                return apr_psprintf(cmd->pool, "Could not register method '%s' "
-+                                   "for %s from .htaccess configuration",
-+                                    method, cmd->cmd->name);
-+            }
-             methnum = ap_method_register(cmd->pool,
-                                          apr_pstrdup(cmd->pool, method));
-         }
diff --git a/debian/patches/suexec_is_shared.patch b/debian/patches/suexec_is_shared.patch
deleted file mode 100644
index 43b0ef1..0000000
--- a/debian/patches/suexec_is_shared.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 032_suexec_is_shared by Adam Conrad <adconrad at 0c3.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to allow suEXEC as shared.
-
- at DPATCH@
---- a/os/unix/unixd.c
-+++ b/os/unix/unixd.c
-@@ -266,6 +266,10 @@
- 
-     /* Check for suexec */
-     unixd_config.suexec_enabled = 0;
-+    /* If mod_suexec isn't linked in, we shouldn't test for the binary */
-+    if (ap_find_linked_module("mod_suexec.c") == NULL) {
-+	return;
-+    }
-     if ((apr_stat(&wrapper, SUEXEC_BIN,
-                   APR_FINFO_NORM, ptemp)) != APR_SUCCESS) {
-         return;

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