Merge 2.4.4 changes.

3 files changed, 31 insertions, 3 deletions

diff --git a/00-base.conf b/00-base.conf
index 32d9567..31d979f 100644
--- a/00-base.conf
+++ b/00-base.conf
@@ -61,7 +61,6 @@ LoadModule userdir_module modules/mod_userdir.so
 LoadModule version_module modules/mod_version.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
 
-#LoadModule auth_form_module modules/mod_auth_form.so
 #LoadModule buffer_module modules/mod_buffer.so
 #LoadModule watchdog_module modules/mod_watchdog.so
 #LoadModule heartbeat_module modules/mod_heartbeat.so
@@ -75,3 +74,4 @@ LoadModule vhost_alias_module modules/mod_vhost_alias.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/01-session.conf b/01-session.conf
new file mode 100644
index 0000000..f8d4d92
--- /dev/null
+++ b/01-session.conf
@@ -0,0 +1,6 @@
+LoadModule session_module modules/mod_session.so
+LoadModule session_cookie_module modules/mod_session_cookie.so
+LoadModule session_dbd_module modules/mod_session_dbd.so
+LoadModule auth_form_module modules/mod_auth_form.so
+
+#LoadModule session_crypto_module modules/mod_session_crypto.so
diff --git a/httpd.spec b/httpd.spec
index 39c7a7e..f192bb0 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -40,6 +40,7 @@ Source21: ssl.conf
 Source22: welcome.conf
 Source23: manual.conf
 Source24: 00-systemd.conf
+Source25: 01-session.conf
 # Documentation
 Source30: README.confd
 Source40: htcacheclean.service
@@ -155,6 +156,15 @@ Requires: apr-util-ldap
 The mod_ldap and mod_authnz_ldap modules add support for LDAP
 authentication to the Apache HTTP Server.
 
+%package -n mod_session
+Group: System Environment/Daemons
+Summary: Session interface for the Apache HTTP Server
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+
+%description -n mod_session
+The mod_session module and associated backends provide an abstract
+interface for storing and accessing per-user session data.
+
 %prep
 %setup -q
 %patch1 -p1 -b .apctl
@@ -241,7 +251,6 @@ export LYNX_PATH=/usr/bin/links
         --enable-cgid --enable-cgi \
         --enable-authn-anon --enable-authn-alias \
         --disable-imagemap  \
-        --disable-session
 	$*
 make %{?_smp_mflags}
 
@@ -264,7 +273,7 @@ install -m 644 $RPM_SOURCE_DIR/README.confd \
     $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.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; do
+         01-ldap.conf 00-systemd.conf 01-session.conf; do
   install -m 644 -p $RPM_SOURCE_DIR/$f \
         $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
 done
@@ -513,10 +522,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/httpd
 %dir %{_libdir}/httpd/modules
 %{_libdir}/httpd/modules/mod*.so
+%exclude %{_libdir}/httpd/modules/mod_auth_form.so
 %exclude %{_libdir}/httpd/modules/mod_ssl.so
 %exclude %{_libdir}/httpd/modules/mod_*ldap.so
 %exclude %{_libdir}/httpd/modules/mod_proxy_html.so
 %exclude %{_libdir}/httpd/modules/mod_xml2enc.so
+%exclude %{_libdir}/httpd/modules/mod_session*.so
 
 %dir %{contentdir}
 %dir %{contentdir}/icons
@@ -575,6 +586,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/modules/mod_*ldap.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/01-ldap.conf
 
+%files -n mod_session
+%defattr(-,root,root)
+%{_libdir}/httpd/modules/mod_session*.so
+%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/01-session.conf
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/httpd
@@ -589,6 +605,12 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 26 2013 Joe Orton <jorton@redhat.com> - 2.4.4-1
 - update to 2.4.4
 
+* Fri Feb 22 2013 Joe Orton <jorton@redhat.com> - 2.4.3-17
+- add mod_session subpackage, move mod_auth_form there (#894500)
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.3-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Tue Jan  8 2013 Joe Orton <jorton@redhat.com> - 2.4.3-15
 - add systemd service for htcacheclean