[Pkg-apache-commits] r1270 - in /trunk/apache2: changelog patches/00list patches/042_htdigest_CAN-2005-1344 patches/047_fix_usage_message.dpatch patches/080_mod_reqtimeout_fixes.dpatch patches/083_mod_ssl_memcpy.dpatch patches/084_mod_reqtimeout_CVE-2010-1623.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Sun Feb  6 14:51:40 2011
New Revision: 1270

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1270
Log:
new upstream version

Removed:
    trunk/apache2/patches/042_htdigest_CAN-2005-1344
    trunk/apache2/patches/080_mod_reqtimeout_fixes.dpatch
    trunk/apache2/patches/083_mod_ssl_memcpy.dpatch
    trunk/apache2/patches/084_mod_reqtimeout_CVE-2010-1623.dpatch
Modified:
    trunk/apache2/changelog
    trunk/apache2/patches/00list
    trunk/apache2/patches/047_fix_usage_message.dpatch

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1270&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sun Feb  6 14:51:40 2011
@@ -1,3 +1,9 @@
+apache2 (2.2.17-1) UNRELEASED; urgency=low
+
+  * New upstream version
+
+ -- Stefan Fritsch <sf at debian.org>  Sun, 06 Feb 2011 15:23:35 +0100
+
 apache2 (2.2.16-6) unstable; urgency=low
 
   * Also add $named to the secondary-init-script example.

Modified: trunk/apache2/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/00list?rev=1270&op=diff
==============================================================================
--- trunk/apache2/patches/00list (original)
+++ trunk/apache2/patches/00list Sun Feb  6 14:51:40 2011
@@ -8,7 +8,6 @@
 033_dbm_read_hash_or_btree
 034_apxs2_libtool_fixtastic
 038_no_LD_LIBRARY_PATH
-042_htdigest_CAN-2005-1344
 045_suexec_log_cloexec.dpatch
 047_fix_usage_message.dpatch
 052_logresolve_linelength.dpatch
@@ -23,10 +22,7 @@
 076_apxs2_a2enmod.dpatch
 077_CacheIgnoreURLSessionIdentifiers.dpatch
 079_polish_translation.dpatch
-080_mod_reqtimeout_fixes.dpatch
 082_ab_num_requests
-083_mod_ssl_memcpy.dpatch
-084_mod_reqtimeout_CVE-2010-1623.dpatch
 099_config_guess_sub_update
 200_cp_suexec.dpatch
 201_build_suexec-custom.dpatch

Modified: trunk/apache2/patches/047_fix_usage_message.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/047_fix_usage_message.dpatch?rev=1270&op=diff
==============================================================================
--- trunk/apache2/patches/047_fix_usage_message.dpatch (original)
+++ trunk/apache2/patches/047_fix_usage_message.dpatch Sun Feb  6 14:51:40 2011
@@ -5,24 +5,24 @@
 ## DP: Add -X to the help message
 
 @DPATCH@
-diff -urNad apache2-2.2.4~/server/main.c apache2-2.2.4/server/main.c
---- apache2-2.2.4~/server/main.c	2006-09-15 15:19:25.000000000 +0200
-+++ apache2-2.2.4/server/main.c	2007-06-25 23:19:58.000000000 +0200
-@@ -336,7 +336,7 @@
+diff -urNad trunk~/server/main.c trunk/server/main.c
+--- trunk~/server/main.c	2011-02-06 15:33:27.000000000 +0100
++++ trunk/server/main.c	2011-02-06 15:38:54.900628737 +0100
+@@ -353,7 +353,7 @@
  #endif /* AP_MPM_WANT_SET_GRACEFUL_SHUTDOWN */
  #endif
      ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
--                 "       %s [-v] [-V] [-h] [-l] [-L] [-t] [-S]", pad);
-+                 "       %s [-v] [-V] [-h] [-l] [-L] [-t] [-S] [-X]", pad);
+-                 "       %*s [-v] [-V] [-h] [-l] [-L] [-t] [-T] [-S]",
++                 "       %*s [-v] [-V] [-h] [-l] [-L] [-t] [-T] [-S] [-X]",
+                  pad_len, " ");
      ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                   "Options:");
- 
-@@ -415,6 +415,8 @@
-                  "  -M                 : a synonym for -t -D DUMP_MODULES");
+@@ -435,6 +435,8 @@
+                  "  -t                 : run syntax check for config files");
      ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-                  "  -t                 : run syntax check for config files");
+                 "  -T                 : start without DocumentRoot(s) check");
 +    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-+                 "  -X                 : debug mode (only one worker, do not detach)");
++                "  -X                 : debug mode (only one worker, do not detach)");
  
      destroy_and_exit_process(process, 1);
  }