[apache2] 01/01: remove 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 8c6a4f9c28a3a7c89c2843d694237e5e3ad7173e
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Jan 4 18:57:50 2014 +0100

    remove patch files
    
    these are not applied anymore, anyway
---
 debian/patches/add-itk-to-build-system.patch | 34 --------------
 debian/patches/make_include_safe.patch       | 67 ----------------------------
 2 files changed, 101 deletions(-)

diff --git a/debian/patches/add-itk-to-build-system.patch b/debian/patches/add-itk-to-build-system.patch
deleted file mode 100644
index 4f21460..0000000
--- a/debian/patches/add-itk-to-build-system.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Add the new MPM to the build system as an alternative to the other MPMs
-and add itk's dependency to libcap.
-
---- a/server/mpm/config2.m4
-+++ b/server/mpm/config2.m4
-@@ -1,7 +1,7 @@
- AC_MSG_CHECKING(which MPM to use by default)
- AC_ARG_WITH(mpm,
- APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use by default.
--                          MPM={event|worker|prefork|winnt}
-+                          MPM={event|worker|prefork|winnt|itk}
-                           This will be statically linked as the only available MPM unless
-                           --enable-mpms-shared is also specified.
- ),[
-@@ -66,6 +66,9 @@
-     else
-         AC_MSG_ERROR([MPM $i is not supported on this platform.])
-     fi
-+    if test "$i" = "itk" ; then
-+        AC_CHECK_LIB(cap, cap_init)
-+    fi
- done
- 
- if test $mpm_build = "shared"; then
---- a/modules/arch/unix/config5.m4
-+++ b/modules/arch/unix/config5.m4
-@@ -3,6 +3,7 @@
- 
- if ap_mpm_is_enabled "worker" \
-    || ap_mpm_is_enabled "event" \
-+   || ap_mpm_is_enabled "itk" \
-    || ap_mpm_is_enabled "prefork"; then
-     unixd_mods_enable=yes
- else
diff --git a/debian/patches/make_include_safe.patch b/debian/patches/make_include_safe.patch
deleted file mode 100644
index 736943a..0000000
--- a/debian/patches/make_include_safe.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: Avoid including dpkg droppings in globbed includes.
- Include /dir/* will ignore /dir/*.dpkg* files
-Forwarded: not-needed
-Author: Adam Conrad <adconrad at 0c3.net>
-Last-Update: 2012-02-25
-Index: apache2/server/config.c
-===================================================================
---- apache2.orig/server/config.c
-+++ apache2/server/config.c
-@@ -34,6 +34,7 @@
- #include "apr_portable.h"
- #include "apr_file_io.h"
- #include "apr_fnmatch.h"
-+#include "apr_lib.h"
- 
- #define APR_WANT_STDIO
- #define APR_WANT_STRFUNC
-@@ -1787,6 +1788,29 @@
-     return NULL;
- }
- 
-+static int fname_valid(const char *fname) {
-+    const unsigned char *c = fname;
-+    unsigned char bad_dpkg[] = "*.dpkg*";
-+
-+    if (!apr_isalnum(*c)) {
-+        return 0;
-+    }
-+    ++c;
-+
-+    while (*c) {
-+        if (!apr_isalnum(*c) && *c!='_' && *c!='-' && *c!='.') {
-+            return 0;
-+        }
-+        ++c;
-+    }
-+
-+    if (!apr_fnmatch(bad_dpkg, fname, 0)) {
-+        return 0;
-+    }
-+
-+    return 1;
-+}
-+
- static const char *process_resource_config_nofnmatch(server_rec *s,
-                                                      const char *fname,
-                                                      ap_directive_t **conftree,
-@@ -1829,7 +1853,8 @@
-         while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
-             /* strip out '.' and '..' */
-             if (strcmp(dirent.name, ".")
--                && strcmp(dirent.name, "..")) {
-+                && strcmp(dirent.name, "..")
-+                && fname_valid(dirent.name)) {
-                 fnew = (fnames *) apr_array_push(candidates);
-                 fnew->fname = ap_make_full_path(ptemp, path, dirent.name);
-             }
-@@ -1918,7 +1943,8 @@
-         if (strcmp(dirent.name, ".")
-             && strcmp(dirent.name, "..")
-             && (apr_fnmatch(fname, dirent.name,
--                            APR_FNM_PERIOD) == APR_SUCCESS)) {
-+                            APR_FNM_PERIOD) == APR_SUCCESS)
-+            && fname_valid(dirent.name)) {
-             const char *full_path = ap_make_full_path(ptemp, path, dirent.name);
-             /* If matching internal to path, and we happen to match something
-              * other than a directory, skip it

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