[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.2-2-57-gcf8ee5c
Arno Töll
arno at debian.org
Thu Feb 28 22:02:05 UTC 2013
The following commit has been merged in the next branch:
commit cf8ee5cbd59ea9c5fd488aabbfc92af28c4dfc13
Author: Arno Töll <arno at debian.org>
Date: Thu Feb 28 23:01:55 2013 +0100
Refresh patches
diff --git a/debian/patches/build_suexec-custom.patch b/debian/patches/build_suexec-custom.patch
index 351fe23..13d0b5a 100644
--- a/debian/patches/build_suexec-custom.patch
+++ b/debian/patches/build_suexec-custom.patch
@@ -2,11 +2,9 @@ Description: add suexec-custom to the build system
Forwarded: not-needed
Author: Stefan Fritsch <sf at debian.org>
Last-Update: 2012-02-25
-Index: apache2/Makefile.in
-===================================================================
---- apache2.orig/Makefile.in
-+++ apache2/Makefile.in
-@@ -237,14 +237,16 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -239,14 +239,16 @@
fi
install-suexec:
@@ -27,10 +25,8 @@ Index: apache2/Makefile.in
x-local-distclean:
@rm -rf autom4te.cache
-Index: apache2/support/Makefile.in
-===================================================================
---- apache2.orig/support/Makefile.in
-+++ apache2/support/Makefile.in
+--- a/support/Makefile.in
++++ b/support/Makefile.in
@@ -1,7 +1,7 @@
DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
@@ -40,7 +36,7 @@ Index: apache2/support/Makefile.in
bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
-@@ -65,9 +65,13 @@
+@@ -72,9 +72,13 @@
checkgid: $(checkgid_OBJECTS)
$(LINK) $(checkgid_LTFLAGS) $(checkgid_OBJECTS) $(PROGRAM_LDADD)
diff --git a/debian/patches/fhs_compliance.patch b/debian/patches/fhs_compliance.patch
index c46b951..644a933 100644
--- a/debian/patches/fhs_compliance.patch
+++ b/debian/patches/fhs_compliance.patch
@@ -4,7 +4,7 @@ Author: Adam Conrad <adconrad at 0c3.net>
Last-Update: 2012-02-25
--- a/configure
+++ b/configure
-@@ -31912,17 +31912,17 @@
+@@ -32270,17 +32270,17 @@
cat >>confdefs.h <<_ACEOF
@@ -27,7 +27,7 @@ Last-Update: 2012-02-25
--- a/configure.in
+++ b/configure.in
-@@ -801,11 +801,11 @@
+@@ -818,11 +818,11 @@
echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
APR_EXPAND_VAR(ap_prefix, $prefix)
diff --git a/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch b/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
index 892b672..ea7b724 100644
--- a/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
+++ b/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
@@ -4,10 +4,8 @@ This would particularly hit people with reverse proxies, since these
have a higher tendency of accessing things from different vhosts in
the same connection.
-Index: apache2/server/config.c
-===================================================================
---- apache2.orig/server/config.c 2013-01-27 22:24:26.815647076 +0100
-+++ apache2/server/config.c 2013-01-27 22:24:26.799646996 +0100
+--- a/server/config.c
++++ b/server/config.c
@@ -69,6 +69,8 @@
AP_DECLARE_DATA ap_directive_t *ap_conftree = NULL;
@@ -17,7 +15,7 @@ Index: apache2/server/config.c
APR_HOOK_STRUCT(
APR_HOOK_LINK(header_parser)
APR_HOOK_LINK(pre_config)
-@@ -2131,6 +2133,32 @@
+@@ -2139,6 +2141,32 @@
else {
if (!APR_STATUS_IS_ENOENT(status)
&& !APR_STATUS_IS_ENOTDIR(status)) {
diff --git a/debian/patches/itk-rerun-configure.patch b/debian/patches/itk-rerun-configure.patch
index e935ce5..fd43208 100644
--- a/debian/patches/itk-rerun-configure.patch
+++ b/debian/patches/itk-rerun-configure.patch
@@ -1,11 +1,9 @@
# the analogon of running autoheader; autoconf, which is a pain to clean up
-Index: apache2/configure
-===================================================================
---- apache2.orig/configure 2013-01-27 22:24:48.027752260 +0100
-+++ apache2/configure 2013-01-27 22:24:48.019752226 +0100
-@@ -1964,8 +1964,8 @@
+--- a/configure
++++ b/configure
+@@ -1970,8 +1970,8 @@
--with-lua=PATH Path to the Lua 5.1 prefix
- --with-ssl=DIR OpenSSL base directory
+ --with-ssl=PATH OpenSSL installation directory
--with-mpm=MPM Choose the process model for Apache to use by
- default. MPM={event|worker|prefork|winnt} This will
- be statically linked as the only available MPM
@@ -14,7 +12,7 @@ Index: apache2/configure
unless --enable-mpms-shared is also specified.
--with-module=module-type:module-file
Enable module-file in the modules/<module-type>
-@@ -25131,6 +25131,27 @@
+@@ -25426,6 +25426,27 @@
fi
@@ -42,7 +40,7 @@ Index: apache2/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if mpmt_os2 MPM supports this platform" >&5
$as_echo_n "checking if mpmt_os2 MPM supports this platform... " >&6; }
case $host in
-@@ -26708,6 +26729,53 @@
+@@ -27011,6 +27032,53 @@
else
as_fn_error $? "MPM $i is not supported on this platform." "$LINENO" 5
fi
@@ -96,7 +94,7 @@ Index: apache2/configure
done
if test $mpm_build = "shared"; then
-@@ -26828,6 +26896,77 @@
+@@ -27131,6 +27199,77 @@
@@ -174,7 +172,7 @@ Index: apache2/configure
if ap_mpm_is_enabled prefork; then
if test -z ""; then
objects="prefork.lo"
-@@ -27066,6 +27205,7 @@
+@@ -27372,6 +27511,7 @@
if ap_mpm_is_enabled "worker" \
|| ap_mpm_is_enabled "event" \
@@ -182,11 +180,9 @@ Index: apache2/configure
|| ap_mpm_is_enabled "prefork"; then
unixd_mods_enable=yes
else
-Index: apache2/include/ap_config_auto.h.in
-===================================================================
---- apache2.orig/include/ap_config_auto.h.in 2013-01-27 22:24:48.027752260 +0100
-+++ apache2/include/ap_config_auto.h.in 2013-01-27 22:24:48.019752226 +0100
-@@ -100,6 +100,9 @@
+--- a/include/ap_config_auto.h.in
++++ b/include/ap_config_auto.h.in
+@@ -103,6 +103,9 @@
/* Define to 1 if you have the `kqueue' function. */
#undef HAVE_KQUEUE
diff --git a/debian/patches/suexec-CVE-2007-1742.patch b/debian/patches/suexec-CVE-2007-1742.patch
index c17d3c7..62e6239 100644
--- a/debian/patches/suexec-CVE-2007-1742.patch
+++ b/debian/patches/suexec-CVE-2007-1742.patch
@@ -4,10 +4,8 @@ Description: Fix race condition with chdir
Author: Stefan Fritsch <sf at debian.org>
Last-Update: 2012-02-25
Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=44752
-Index: apache2/support/suexec.c
-===================================================================
---- apache2.orig/support/suexec.c
-+++ apache2/support/suexec.c
+--- a/support/suexec.c
++++ b/support/suexec.c
@@ -42,6 +42,7 @@
#if APR_HAVE_UNISTD_H
#include <unistd.h>
@@ -16,7 +14,7 @@ Index: apache2/support/suexec.c
#include <stdio.h>
#include <stdarg.h>
-@@ -251,6 +252,7 @@
+@@ -257,6 +258,7 @@
struct group *gr; /* group entry holder */
struct stat dir_info; /* directory info holder */
struct stat prg_info; /* program info holder */
@@ -24,7 +22,7 @@ Index: apache2/support/suexec.c
/*
* Start with a "clean" environment
-@@ -485,11 +487,16 @@
+@@ -491,11 +493,16 @@
exit(111);
}
@@ -42,7 +40,7 @@ Index: apache2/support/suexec.c
log_err("cannot get docroot information (%s)\n", target_homedir);
exit(112);
}
-@@ -497,12 +504,18 @@
+@@ -503,12 +510,18 @@
else {
if (((chdir(AP_DOC_ROOT)) != 0) ||
((getcwd(dwd, AP_MAXPATH)) == NULL) ||
--
Debian packaging for apache2
More information about the Pkg-apache-commits
mailing list