diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2008-06-15 15:54:10 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2008-06-15 15:54:10 +0000 |
| commit | 3e422b32b34ef3431f9df9e01cf975260a3ce7ec (patch) | |
| tree | cf50955e6fbc35ccb78beda7bbc7a3b96e59cb0c /2.2 | |
| parent | add mod_ssl patch wrt security #222643; add configdump to init script (diff) | |
| download | apache-3e422b32b34ef3431f9df9e01cf975260a3ce7ec.tar.gz apache-3e422b32b34ef3431f9df9e01cf975260a3ce7ec.tar.bz2 apache-3e422b32b34ef3431f9df9e01cf975260a3ce7ec.zip | |
update patches for 2.2.9
Diffstat (limited to '2.2')
| -rw-r--r-- | 2.2/patches/02_all_libtool22.patch | 13 | ||||
| -rw-r--r-- | 2.2/patches/05_all_mod_ssl_cleanup.patch | 26 |
2 files changed, 13 insertions, 26 deletions
diff --git a/2.2/patches/02_all_libtool22.patch b/2.2/patches/02_all_libtool22.patch new file mode 100644 index 0000000..69f1a21 --- /dev/null +++ b/2.2/patches/02_all_libtool22.patch @@ -0,0 +1,13 @@ +Index: configure.in +=================================================================== +--- configure.in (revision 647627) ++++ configure.in (working copy) +@@ -237,7 +237,7 @@ + LIBTOOL="$my_libtool \$(LTFLAGS)" + libtoolversion=`$my_libtool --version` + case $libtoolversion in +- *1.[[45]]*) ++ *1.[[45]]* | *[[2-9]].[[0-9]]*) + SH_LIBTOOL='$(LIBTOOL)' + SHLTCFLAGS="-prefer-pic" + LTCFLAGS="-prefer-non-pic -static" diff --git a/2.2/patches/05_all_mod_ssl_cleanup.patch b/2.2/patches/05_all_mod_ssl_cleanup.patch deleted file mode 100644 index b296ada..0000000 --- a/2.2/patches/05_all_mod_ssl_cleanup.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- httpd/httpd/trunk/modules/ssl/mod_ssl.c 2008/05/07 14:16:38 654118 -+++ httpd/httpd/trunk/modules/ssl/mod_ssl.c 2008/05/07 14:17:31 654119 -@@ -218,17 +218,18 @@ - #if HAVE_ENGINE_LOAD_BUILTIN_ENGINES - ENGINE_cleanup(); - #endif --#ifdef HAVE_OPENSSL --#if OPENSSL_VERSION_NUMBER >= 0x00907001 -- CRYPTO_cleanup_all_ex_data(); --#endif --#endif - ERR_remove_state(0); - - /* Don't call ERR_free_strings here; ERR_load_*_strings only - * actually load the error strings once per process due to static - * variable abuse in OpenSSL. */ - -+ /* Also don't call CRYPTO_cleanup_all_ex_data here; any registered -+ * ex_data indices may have been cached in static variables in -+ * OpenSSL; removing them may cause havoc. Notably, with OpenSSL -+ * versions >= 0.9.8f, COMP_CTX cleanups would not be run, which -+ * could result in a per-connection memory leak (!). */ -+ - /* - * TODO: determine somewhere we can safely shove out diagnostics - * (when enabled) at this late stage in the game: |