- update to 2.2.9 (#454100)httpd-2_2_9-1_fc8

5 files changed, 20 insertions, 126 deletions

diff --git a/httpd-2.0.45-deplibs.patch b/httpd-2.0.45-deplibs.patch
deleted file mode 100644
index 8fd05cf..0000000
--- a/httpd-2.0.45-deplibs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-apr and apr-util are patched to correctly depend on their deps, so
-it's sufficient to just link httpd against the .la file.
-
-Upstream-HEAD: needed
-Upstream-2.0: omit
-Upstream-Status: apr-util still to be fixed properly on HEAD
-
---- httpd-2.0.45/configure.in.deplibs	2003-04-29 10:27:05.000000000 +0100
-+++ httpd-2.0.45/configure.in	2003-04-29 10:26:45.000000000 +0100
-@@ -455,7 +455,7 @@
- AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $AP_LIBS"
- 
- dnl APR should go after the other libs, so the right symbols can be picked up
--AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`"
-+AP_LIBS="$AP_LIBS `$apu_config --link-libtool` `$apr_config --link-libtool`"
- APACHE_SUBST(AP_LIBS)
- APACHE_SUBST(AP_BUILD_SRCLIB_DIRS)
- APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS)
diff --git a/httpd-2.2.6-ssllibver.patch b/httpd-2.2.6-ssllibver.patch
deleted file mode 100644
index 5281793..0000000
--- a/httpd-2.2.6-ssllibver.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- httpd-2.2.6/modules/ssl/mod_ssl.c.ssllibver
-+++ httpd-2.2.6/modules/ssl/mod_ssl.c
-@@ -500,7 +500,7 @@ static void ssl_register_hooks(apr_pool_
-     ap_hook_insert_filter (ssl_hook_Insert_Filter, NULL,NULL, APR_HOOK_MIDDLE);
- /*    ap_hook_handler       (ssl_hook_Upgrade,       NULL,NULL, APR_HOOK_MIDDLE); */
- 
--    ssl_var_register();
-+    ssl_var_register(p);
- 
-     APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable);
-     APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
---- httpd-2.2.6/modules/ssl/ssl_engine_vars.c.ssllibver
-+++ httpd-2.2.6/modules/ssl/ssl_engine_vars.c
-@@ -58,12 +58,32 @@ static int ssl_is_https(conn_rec *c)
-     return sslconn && sslconn->ssl;
- }
- 
--void ssl_var_register(void)
-+static const char var_interface[] = "mod_ssl/" MOD_SSL_VERSION;
-+static char var_library_interface[] = SSL_LIBRARY_TEXT;
-+static char *var_library = NULL;
-+
-+void ssl_var_register(apr_pool_t *p)
- {
-+    char *cp, *cp2;
-+
-     APR_REGISTER_OPTIONAL_FN(ssl_is_https);
-     APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
-     APR_REGISTER_OPTIONAL_FN(ssl_ext_lookup);
--    return;
-+
-+    /* Perform once-per-process library version determination: */
-+    var_library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
-+    
-+    if ((cp = strchr(var_library, ' ')) != NULL) {
-+        *cp = '/';
-+        if ((cp2 = strchr(cp, ' ')) != NULL)
-+                *cp2 = NUL;
-+    }
-+
-+    if ((cp = strchr(var_library_interface, ' ')) != NULL) {
-+        *cp = '/';
-+        if ((cp2 = strchr(cp, ' ')) != NULL)
-+            *cp2 = NUL;
-+    }
- }
- 
- /* This function must remain safe to use for a non-SSL connection. */
-@@ -635,39 +655,17 @@ static void ssl_var_lookup_ssl_cipher_bi
- 
- static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
- {
--    static char interface[] = "mod_ssl/" MOD_SSL_VERSION;
--    static char library_interface[] = SSL_LIBRARY_TEXT;
--    static char *library = NULL;
--    char *result;
--  
--    if (!library) {
--        char *cp, *cp2;
--        library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
--        if ((cp = strchr(library, ' ')) != NULL) {
--            *cp = '/';
--            if ((cp2 = strchr(cp, ' ')) != NULL)
--                *cp2 = NUL;
--        }
--        if ((cp = strchr(library_interface, ' ')) != NULL) {
--            *cp = '/';
--            if ((cp2 = strchr(cp, ' ')) != NULL)
--                *cp2 = NUL;
--        }
--    }
--
-     if (strEQ(var, "INTERFACE")) {
--        result = apr_pstrdup(p, interface);
-+        return apr_pstrdup(p, var_interface);
-     }
-     else if (strEQ(var, "LIBRARY_INTERFACE")) {
--        result = apr_pstrdup(p, library_interface);
-+        return apr_pstrdup(p, var_library_interface);
-     }
-     else if (strEQ(var, "LIBRARY")) {
--        result = apr_pstrdup(p, library);
--    }
--    else {
--        result = NULL;
-+        return apr_pstrdup(p, var_library);
-     }
--    return result;
-+
-+    return NULL;
- }
-   
- 
---- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
-+++ httpd-2.2.6/modules/ssl/ssl_private.h
-@@ -648,7 +648,7 @@ void         ssl_die(void);
- void         ssl_log_ssl_error(const char *, int, int, server_rec *);
- 
- /**  Variables  */
--void         ssl_var_register(void);
-+void         ssl_var_register(apr_pool_t *p);
- char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
- const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
- 
diff --git a/httpd-2.2.9-deplibs.patch b/httpd-2.2.9-deplibs.patch
new file mode 100644
index 0000000..def61ed
--- /dev/null
+++ b/httpd-2.2.9-deplibs.patch
@@ -0,0 +1,14 @@
+--- httpd-2.2.9/configure.in.deplibs
++++ httpd-2.2.9/configure.in
+@@ -588,9 +588,8 @@ APACHE_HELP_STRING(--with-suexec-umask,u
+   AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )
+ 
+ dnl APR should go after the other libs, so the right symbols can be picked up
+-apulinklibs="`$apu_config --avoid-ldap --link-libtool --libs`" \
+- || apulinklibs="`$apu_config --link-libtool --libs`"
+-AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool --libs`" 
++apulinklibs="`$apu_config --link-libtool`"
++AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool`" 
+ APACHE_SUBST(AP_LIBS)
+ APACHE_SUBST(AP_BUILD_SRCLIB_DIRS)
+ APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS)
diff --git a/httpd.spec b/httpd.spec
index c320d87..1c48dd6 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -5,7 +5,7 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.8
+Version: 2.2.9
 Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -23,7 +23,7 @@ Source33: README.confd
 # build/scripts patches
 Patch1: httpd-2.1.10-apctl.patch
 Patch2: httpd-2.1.10-apxs.patch
-Patch3: httpd-2.0.45-deplibs.patch
+Patch3: httpd-2.2.9-deplibs.patch
 Patch4: httpd-2.1.10-disablemods.patch
 Patch5: httpd-2.1.10-layout.patch
 # Features/functional changes
@@ -474,6 +474,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Mon Jul 14 2008 Joe Orton <jorton@redhat.com> 2.2.9-1.fc8
+- update to 2.2.9 (#454100)
+
 * Mon Jan 28 2008 Joe Orton <jorton@redhat.com> 2.2.8-1.fc8
 - update to 2.2.8 (#430465)
 
diff --git a/sources b/sources
index b9b71ca..f5c84d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39a755eb0f584c279336387b321e3dfc  httpd-2.2.8.tar.gz
+80d3754fc278338033296f0d41ef2c04  httpd-2.2.9.tar.gz