fix creating apache user in pre script (#1128328)

7 files changed, 42 insertions, 90 deletions

diff --git a/.gitignore b/.gitignore
index dbc83cb..def012c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ x86_64
 /httpd-2.4.6.tar.bz2
 /httpd-2.4.7.tar.bz2
 /httpd-2.4.9.tar.bz2
+/httpd-2.4.10.tar.bz2
diff --git a/00-base.conf b/00-base.conf
index 4242d12..964de69 100644
--- a/00-base.conf
+++ b/00-base.conf
@@ -46,6 +46,7 @@ LoadModule mime_module modules/mod_mime.so
 LoadModule negotiation_module modules/mod_negotiation.so
 LoadModule remoteip_module modules/mod_remoteip.so
 LoadModule reqtimeout_module modules/mod_reqtimeout.so
+LoadModule request_module modules/mod_request.so
 LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule setenvif_module modules/mod_setenvif.so
 LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
@@ -62,17 +63,3 @@ LoadModule userdir_module modules/mod_userdir.so
 LoadModule version_module modules/mod_version.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
 
-#LoadModule buffer_module modules/mod_buffer.so
-#LoadModule watchdog_module modules/mod_watchdog.so
-#LoadModule heartbeat_module modules/mod_heartbeat.so
-#LoadModule heartmonitor_module modules/mod_heartmonitor.so
-#LoadModule usertrack_module modules/mod_usertrack.so
-#LoadModule dialup_module modules/mod_dialup.so
-#LoadModule charset_lite_module modules/mod_charset_lite.so
-#LoadModule log_debug_module modules/mod_log_debug.so
-#LoadModule ratelimit_module modules/mod_ratelimit.so
-#LoadModule reflector_module modules/mod_reflector.so
-#LoadModule request_module modules/mod_request.so
-#LoadModule sed_module modules/mod_sed.so
-#LoadModule speling_module modules/mod_speling.so
-
diff --git a/00-optional.conf b/00-optional.conf
new file mode 100644
index 0000000..b8c43c6
--- /dev/null
+++ b/00-optional.conf
@@ -0,0 +1,17 @@
+#
+# This file lists modules included with the Apache HTTP Server
+# which are not enabled by default.
+# 
+
+#LoadModule buffer_module modules/mod_buffer.so
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule heartbeat_module modules/mod_heartbeat.so
+#LoadModule heartmonitor_module modules/mod_heartmonitor.so
+#LoadModule usertrack_module modules/mod_usertrack.so
+#LoadModule dialup_module modules/mod_dialup.so
+#LoadModule charset_lite_module modules/mod_charset_lite.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
+#LoadModule reflector_module modules/mod_reflector.so
+#LoadModule sed_module modules/mod_sed.so
+#LoadModule speling_module modules/mod_speling.so
diff --git a/httpd-2.4.7-r1537535.patch b/httpd-2.4.7-r1537535.patch
deleted file mode 100644
index 8e51302..0000000
--- a/httpd-2.4.7-r1537535.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# ./pullrev.sh 1537535
-
-http://svn.apache.org/viewvc?view=revision&revision=1537535
-
---- httpd-2.4.7/modules/ssl/ssl_engine_config.c.r1537535
-+++ httpd-2.4.7/modules/ssl/ssl_engine_config.c
-@@ -196,7 +196,7 @@ static SSLSrvConfigRec *ssl_config_serve
-     SSLSrvConfigRec *sc = apr_palloc(p, sizeof(*sc));
- 
-     sc->mc                     = NULL;
--    sc->enabled                = SSL_ENABLED_FALSE;
-+    sc->enabled                = SSL_ENABLED_UNSET;
-     sc->proxy_enabled          = UNSET;
-     sc->vhost_id               = NULL;  /* set during module init */
-     sc->vhost_id_len           = 0;     /* set during module init */
---- httpd-2.4.7/modules/ssl/ssl_engine_init.c.r1537535
-+++ httpd-2.4.7/modules/ssl/ssl_engine_init.c
-@@ -115,13 +115,16 @@ int ssl_init_Module(apr_pool_t *p, apr_p
-         sc->vhost_id = ssl_util_vhostid(p, s);
-         sc->vhost_id_len = strlen(sc->vhost_id);
- 
--        if (ap_get_server_protocol(s) &&
--            strcmp("https", ap_get_server_protocol(s)) == 0) {
-+        /* Default to enabled if SSLEngine is not set explicitly, and
-+         * the protocol is https. */
-+        if (ap_get_server_protocol(s) 
-+            && strcmp("https", ap_get_server_protocol(s)) == 0
-+            && sc->enabled == SSL_ENABLED_UNSET) {
-             sc->enabled = SSL_ENABLED_TRUE;
-         }
- 
--        /* If sc->enabled is UNSET, then SSL is optional on this vhost  */
--        /* Fix up stuff that may not have been set */
-+        /* Fix up stuff that may not have been set.  If sc->enabled is
-+         * UNSET, then SSL is disabled on this vhost.  */
-         if (sc->enabled == SSL_ENABLED_UNSET) {
-             sc->enabled = SSL_ENABLED_FALSE;
-         }
diff --git a/httpd-2.4.9-r1573626.patch b/httpd-2.4.9-r1573626.patch
deleted file mode 100644
index 58d116b..0000000
--- a/httpd-2.4.9-r1573626.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/modules/proxy/mod_proxy.c	2014/03/03 17:28:10	1573625
-+++ b/modules/proxy/mod_proxy.c	2014/03/03 17:28:17	1573626
-@@ -927,8 +927,25 @@
-     struct dirconn_entry *list = (struct dirconn_entry *)conf->dirconn->elts;
- 
-     /* is this for us? */
--    if (!r->proxyreq || !r->filename || strncmp(r->filename, "proxy:", 6) != 0)
-+    if (!r->filename) {
-         return DECLINED;
-+    }
-+
-+    if (!r->proxyreq) {
-+        /* We may have forced the proxy handler via config or .htaccess */
-+        if (r->handler &&
-+            strncmp(r->handler, "proxy:", 6) == 0 &&
-+            strncmp(r->filename, "proxy:", 6) != 0) {
-+            r->proxyreq = PROXYREQ_REVERSE;
-+            r->filename = apr_pstrcat(r->pool, r->handler, r->filename, NULL);
-+            apr_table_setn(r->notes, "rewrite-proxy", "1");
-+        }
-+        else {
-+            return DECLINED;
-+        }
-+    } else if (strncmp(r->filename, "proxy:", 6) != 0) {
-+        return DECLINED;
-+    }
- 
-     /* handle max-forwards / OPTIONS / TRACE */
-     if ((str = apr_table_get(r->headers_in, "Max-Forwards"))) {
diff --git a/httpd.spec b/httpd.spec
index 58a9144..dfadc67 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,8 +13,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.4.9
-Release: 9%{?dist}
+Version: 2.4.10
+Release: 3%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -43,6 +43,7 @@ Source24: 00-systemd.conf
 Source25: 01-session.conf
 Source26: 10-listen443.conf
 Source27: httpd.socket
+Source28: 00-optional.conf
 # Documentation
 Source30: README.confd
 Source31: README.confmod
@@ -63,8 +64,6 @@ Patch27: httpd-2.4.2-icons.patch
 Patch29: httpd-2.4.3-mod_systemd.patch
 Patch30: httpd-2.4.4-cachehardmax.patch
 Patch31: httpd-2.4.6-sslmultiproxy.patch
-Patch32: httpd-2.4.7-r1537535.patch
-Patch33: httpd-2.4.9-r1573626.patch
 Patch34: httpd-2.4.9-socket-activation.patch
 # Bug fixes
 Patch55: httpd-2.4.4-malformed-host.patch
@@ -201,8 +200,6 @@ interface for storing and accessing per-user session data.
 %patch29 -p1 -b .systemd
 %patch30 -p1 -b .cachehardmax
 %patch31 -p1 -b .sslmultiproxy
-%patch32 -p1 -b .r1537535
-%patch33 -p1 -b .r1573626
 %patch34 -p1 -b .socketactivation
 
 %patch55 -p1 -b .malformedhost
@@ -300,7 +297,7 @@ install -m 644 $RPM_SOURCE_DIR/README.confmod \
     $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README
 for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
          00-proxy.conf 00-ssl.conf 01-ldap.conf 00-proxyhtml.conf \
-         01-ldap.conf 00-systemd.conf 01-session.conf; do
+         01-ldap.conf 00-systemd.conf 01-session.conf 00-optional.conf; do
   install -m 644 -p $RPM_SOURCE_DIR/$f \
         $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
 done
@@ -347,6 +344,15 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \
          $RPM_BUILD_ROOT/run/httpd/htcacheclean
 
+# Substitute in defaults which are usually done (badly) by "make install"
+sed -i \
+   "s,@@ServerRoot@@/var,%{_localstatedir}/lib/dav,;
+    s,@@ServerRoot@@/user.passwd,/etc/httpd/conf/user.passwd,;
+    s,@@ServerRoot@@/docs,%{docroot},;
+    s,@@ServerRoot@@,%{docroot},;
+    s,@@Port@@,80,;" \
+    docs/conf/extra/*.conf
+
 # Create cache directory
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
          $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \
@@ -652,9 +658,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
-* Thu Aug 14 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-9
+* Thu Aug 14 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-3
 - fix creating apache user in pre script (#1128328)
 
+* Thu Jul 31 2014 Joe Orton <jorton@redhat.com> - 2.4.10-2
+- enable mod_request by default for mod_auth_form
+- move disabled-by-default modules from 00-base.conf to 00-optional.conf
+
+* Mon Jul 21 2014 Joe Orton <jorton@redhat.com> - 2.4.10-1
+- update to 2.4.10
+- expand variables in docdir example configs
+
 * Tue Jul 08 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-8
 - add support for systemd socket activation (#1111648)
 
diff --git a/sources b/sources
index 43c32ab..7b8acca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ef4e65353497606b24fa9bb3e5a3c40  httpd-2.4.9.tar.bz2
+44543dff14a4ebc1e9e2d86780507156  httpd-2.4.10.tar.bz2