Request 1220 (accepted)

Overview

Request 1220 (accepted)

Check in 2.4.18

Created by vanmeeuwen over 8 years ago
In state accepted

Submit httpd

Submit package Kolab:14 / httpd to package Kolab:16:Enterprise / httpd

httpd.spec Added

@@ -0,0 +1,1226 @@
+%if 0%{?opensuse_bs}
+#!BuildIgnore: elinks
+#!BuildIgnore: links
+#!BuildIgnore: lynx
+#!BuildIgnore: systemd
+%endif
+
+%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
+%global with_systemd 0
+%else
+%global with_systemd 1
+%endif
+
+%{!?_unitdir: %global _unitdir /usr/lib/systemd/system}
+
+%define contentdir %{_datadir}/httpd
+%define docroot /var/www
+%if 0%{?rhel} > 6 || 0%{?fedora} > 17
+%define _httpdrundir /run/httpd
+%else
+%define _httpdrundir /var/run/httpd
+%endif
+%define suexec_caller apache
+%define mmn 20120211
+%define mmnisa %{mmn}-%{__isa_name}-%{__isa_bits}
+%define vstring Enterprise Linux
+
+# Drop automatic provides for module DSOs
+%{?filter_setup:
+%filter_provides_in %{_libdir}/httpd/modules/.*\.so$
+%filter_setup
+}
+
+Summary: Apache HTTP Server
+Name: httpd
+Version: 2.4.18
+Release: 1%{?dist}
+URL: http://httpd.apache.org/
+Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
+Source1: index.html
+Source2: httpd.logrotate
+Source3: httpd.sysconf
+Source4: httpd-ssl-pass-dialog
+Source5: httpd.tmpfiles
+Source6: httpd.service
+Source7: action-graceful.sh
+Source8: action-configtest.sh
+Source10: httpd.conf
+Source11: 00-base.conf
+Source12: 00-mpm.conf
+Source13: 00-lua.conf
+Source14: 01-cgi.conf
+Source15: 00-dav.conf
+Source16: 00-proxy.conf
+Source17: 00-ssl.conf
+Source18: 01-ldap.conf
+Source19: 00-proxyhtml.conf
+Source20: userdir.conf
+Source21: ssl.conf
+Source22: welcome.conf
+Source23: manual.conf
+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
+Source40: htcacheclean.service
+Source41: htcacheclean.sysconf
+Source100: httpd.init
+# build/scripts patches
+Patch1: httpd-2.4.1-apctl.patch
+Patch2: httpd-2.4.9-apxs.patch
+Patch3: httpd-2.4.1-deplibs.patch
+Patch5: httpd-2.4.3-layout.patch
+Patch6: httpd-2.4.3-apctl-systemd.patch
+# Needed for socket activation and mod_systemd patch
+Patch19: httpd-2.4.10-detect-systemd.patch
+# Features/functional changes
+Patch23: httpd-2.4.4-export.patch
+Patch24: httpd-2.4.1-corelimit.patch
+Patch25: httpd-2.4.1-selinux.patch
+Patch26: httpd-2.4.4-r1337344+.patch
+Patch27: httpd-2.4.2-icons.patch
+Patch29: httpd-2.4.10-mod_systemd.patch
+Patch30: httpd-2.4.4-cachehardmax.patch
+Patch31: httpd-2.4.18-sslmultiproxy.patch
+Patch34: httpd-2.4.17-socket-activation.patch
+Patch35: httpd-2.4.17-sslciphdefault.patch
+# Bug fixes
+Patch55: httpd-2.4.4-malformed-host.patch
+Patch56: httpd-2.4.4-mod_unique_id.patch
+Patch57: httpd-2.4.10-sigint.patch
+Patch58: httpd-2.4.17-debug-crash.patch
+# Security fixes
+License: ASL 2.0
+Group: System Environment/Daemons
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto
+BuildRequires: zlib-devel, libselinux-devel, lua-devel
+BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
+%if 0%{?with_systemd}
+BuildRequires: systemd-devel
+%endif
+Requires: /etc/mime.types
+%if 0%{?fedora} > 1 || 0%{?rhel} > 7
+BuildRequires: system-logos-httpd
+%else
+BuildRequires: system-logos
+%endif
+Provides: webserver
+Provides: mod_dav = %{version}-%{release}
+Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
+Requires: httpd-tools = %{version}-%{release}
+Requires: httpd-filesystem = %{version}-%{release}
+Requires(pre): httpd-filesystem
+%if 0%{?with_systemd}
+%if 0%{?suse_version}
+Requires(post):     systemd
+Requires(postun):   systemd
+Requires(preun):    systemd
+%else
+Requires(post):     systemd-units
+Requires(postun):   systemd-units
+Requires(preun):    coreutils
+Requires(preun):    systemd-units
+%endif
+%else
+Requires(post):     chkconfig
+Requires(post):     initscripts
+Requires(postun):   initscripts
+Requires(preun):    chkconfig
+Requires(preun):    initscripts
+%endif
+Conflicts: apr < 1.5.0-1
+Requires: apr-util >= 1.5.3
+
+%description
+The Apache HTTP Server is a powerful, efficient, and extensible
+web server.
+
+%package devel
+Group: Development/Libraries
+Summary: Development interfaces for the Apache HTTP server
+Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
+Requires: apr-devel, apr-util-devel, pkgconfig
+Requires: httpd = %{version}-%{release}
+
+%description devel
+The httpd-devel package contains the APXS binary and other files
+that you need to build Dynamic Shared Objects (DSOs) for the
+Apache HTTP Server.
+
+If you are installing the Apache HTTP server and you want to be
+able to compile or develop additional modules for Apache, you need
+to install this package.
+
+%package manual
+Group: Documentation
+Summary: Documentation for the Apache HTTP server
+Requires: httpd = %{version}-%{release}
+Obsoletes: secureweb-manual, apache-manual
+BuildArch: noarch
+
+%description manual
+The httpd-manual package contains the complete manual and
+reference guide for the Apache HTTP server. The information can
+also be found at http://httpd.apache.org/docs/2.2/.
+
+%package filesystem
+Group: System Environment/Daemons
+Summary: The basic directory layout for the Apache HTTP server
+BuildArch: noarch
+Requires(pre): /usr/sbin/useradd
+
+%description filesystem
+The httpd-filesystem package contains the basic directory layout
+for the Apache HTTP server including the correct permissions
+for the directories.
+
+%package suexec
+Group: System Environment/Daemons
+Summary: suexec for the Apache HTTP Server
+
+%description suexec
+The httpd-suexec package contains the suexec module for the
+Apache HTTP Server.
+
+%package tools
+Group: System Environment/Daemons
+Summary: Tools for use with the Apache HTTP Server
+
+%description tools
+The httpd-tools package contains tools which can be used with 
+the Apache HTTP Server.
+
+%package -n mod_ssl
+Group: System Environment/Daemons
+Summary: SSL/TLS module for the Apache HTTP Server
+Epoch: 1
+BuildRequires: openssl-devel
+Requires(post): openssl >= 1:1.0.1e, /bin/cat, /bin/hostname
+Requires(pre): httpd
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Obsoletes: stronghold-mod_ssl
+
+%description -n mod_ssl
+The mod_ssl module provides strong cryptography for the Apache Web
+server via the Secure Sockets Layer (SSL) and Transport Layer
+Security (TLS) protocols.
+
+%package -n mod_proxy_html
+Group: System Environment/Daemons
+Summary: HTML and XML content filters for the Apache HTTP Server
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+BuildRequires: libxml2-devel
+Epoch: 1
+Obsoletes: mod_proxy_html < 1:2.4.1-2
+
+%description -n mod_proxy_html
+The mod_proxy_html and mod_xml2enc modules provide filters which can
+transform and modify HTML and XML content.
+
+%package -n mod_ldap
+Group: System Environment/Daemons
+Summary: LDAP authentication modules for the Apache HTTP Server
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Requires: apr-util-ldap >= 1.5.3
+
+%description -n mod_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
+%patch2 -p1 -b .apxs
+%patch3 -p1 -b .deplibs
+%patch5 -p1 -b .layout
+%if 0%{?with_systemd}
+%patch6 -p1 -b .apctlsystemd
+%patch19 -p1 -b .detectsystemd
+%else
+# Correct the run directory patched in with patch 5
+sed -i -e 's|/run/httpd|%{_httpdrundir}|g' config.layout
+%endif
+
+%patch23 -p1 -b .export
+%patch24 -p1 -b .corelimit
+%patch25 -p1 -b .selinux
+%patch26 -p1 -b .r1337344+
+%patch27 -p1 -b .icons
+%if 0%{?with_systemd}
+%patch29 -p1 -b .systemd
+%endif
+%patch30 -p1 -b .cachehardmax
+%patch31 -p1 -b .sslmultiproxy
+%patch34 -p1 -b .socketactivation
+# This sets an incompatible default
+#%patch35 -p1 -b .sslciphdefault
+
+%patch55 -p1 -b .malformedhost
+%patch56 -p1 -b .uniqueid
+%patch57 -p1 -b .sigint
+%patch58 -p1 -b .debugcrash
+
+# Patch in the vendor string
+sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
+
+# Prevent use of setcap in "install-suexec-caps" target.
+sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
+
+# Safety check: prevent build if defined MMN does not equal upstream MMN.
+vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
+if test "x${vmmn}" != "x%{mmn}"; then
+   : Error: Upstream MMN is now ${vmmn}, packaged MMN is %{mmn}
+   : Update the mmn macro and rebuild.
+   exit 1
+fi
+
+: Building with MMN %{mmn}, MMN-ISA %{mmnisa} and vendor string '%{vstring}'
+
+%build
+# forcibly prevent use of bundled apr, apr-util, pcre
+rm -rf srclib/{apr,apr-util,pcre}
+
+# regenerate configure scripts
+autoheader && autoconf || exit 1
+
+# Before configure; fix location of build dir in generated apxs
+%{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
+	support/apxs.in
+
+export CFLAGS=$RPM_OPT_FLAGS
+export LDFLAGS="-Wl,-z,relro,-z,now"
+
+# Hard-code path to links to avoid unnecessary builddep
+export LYNX_PATH=/usr/bin/links
+
+# Build the daemon
+./configure \
+ 	--prefix=%{_sysconfdir}/httpd \
+ 	--exec-prefix=%{_prefix} \
+ 	--bindir=%{_bindir} \
+ 	--sbindir=%{_sbindir} \
+ 	--mandir=%{_mandir} \
+	--libdir=%{_libdir} \
+	--sysconfdir=%{_sysconfdir}/httpd/conf \
+	--includedir=%{_includedir}/httpd \
+	--libexecdir=%{_libdir}/httpd/modules \
+	--datadir=%{contentdir} \
+    --enable-layout=Fedora \
+    --with-installbuilddir=%{_libdir}/httpd/build \
+    --enable-mpms-shared=all \
+    --with-apr=%{_prefix} \
+    --with-apr-util=%{_prefix} \
+	--enable-suexec \
+    --with-suexec \
+    --enable-suexec-capabilities \
+	--with-suexec-caller=%{suexec_caller} \
+	--with-suexec-docroot=%{docroot} \
+	--without-suexec-logfile \
+    --with-suexec-syslog \
+	--with-suexec-bin=%{_sbindir}/suexec \
+	--with-suexec-uidmin=500 \
+    --with-suexec-gidmin=100 \
+    --enable-pie \
+    --with-pcre \
+    --enable-mods-shared=all \
+	--enable-ssl \
+    --with-ssl \
+    --disable-distcache \
+	--enable-proxy \
+    --enable-cache \
+    --enable-disk-cache \
+    --enable-ldap --enable-authnz-ldap \
+    --enable-cgid --enable-cgi \
+    --enable-authn-anon --enable-authn-alias \
+    --disable-imagemap  \
+	$*
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+%if 0%{?with_systemd}
+# Install systemd service files
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+for s in httpd.service htcacheclean.service httpd.socket; do
+  install -p -m 644 $RPM_SOURCE_DIR/${s} \
+                    $RPM_BUILD_ROOT%{_unitdir}/${s}
+done
+%else
+# install SYSV init stuff
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -m755 $RPM_SOURCE_DIR/httpd.init \
+    $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
+%endif
+
+# install conf file/directory
+mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d \
+      $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d
+install -m 644 $RPM_SOURCE_DIR/README.confd \
+    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
+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 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
+%if 0%{?with_systemd}
+install -m 644 -p $RPM_SOURCE_DIR/00-systemd.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-systemd.conf
+
+# install systemd override drop directory
+# Web application packages can drop snippets into this location if
+# they need ExecStart[pre|post].
+mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d
+mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d
+
+install -m 644 -p $RPM_SOURCE_DIR/10-listen443.conf \
+      $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf
+%endif
+
+for f in welcome.conf ssl.conf manual.conf userdir.conf; do
+  install -m 644 -p $RPM_SOURCE_DIR/$f \
+        $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f
+done
+
+sed -i -e 's|shmcb:/run/httpd|shmcb:%{_httpdrundir}|g' \
+    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ssl.conf
+
+# Split-out extra config shipped as default in conf.d:
+for f in autoindex; do
+  mv docs/conf/extra/httpd-${f}.conf \
+        $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/${f}.conf
+done
+
+# Extra config trimmed:
+rm -v docs/conf/extra/httpd-{ssl,userdir}.conf
+
+rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
+install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \
+   $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
+
+mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+for s in httpd htcacheclean; do
+  install -m 644 -p $RPM_SOURCE_DIR/${s}.sysconf \
+                    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/${s}
+done
+
+# tmpfiles.d configuration
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d 
+install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \
+   $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/httpd.conf
+
+# Other directories
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \
+         $RPM_BUILD_ROOT%{_httpdrundir}/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 \
+         $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/ssl
+
+# Make the MMN accessible to module packages
+echo %{mmnisa} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
+%if 0%{?fedora} > 19
+mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d
+cat > $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.httpd <<EOF
+%else
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.httpd <<EOF
+%endif
+%%_httpd_mmn %{mmnisa}
+%%_httpd_apxs %%{_bindir}/apxs
+%%_httpd_modconfdir %%{_sysconfdir}/httpd/conf.modules.d
+%%_httpd_confdir %%{_sysconfdir}/httpd/conf.d
+%%_httpd_contentdir %{contentdir}
+%%_httpd_moddir %%{_libdir}/httpd/modules
+EOF
+
+# Handle contentdir
+mkdir $RPM_BUILD_ROOT%{contentdir}/noindex
+install -m 644 -p $RPM_SOURCE_DIR/index.html \
+        $RPM_BUILD_ROOT%{contentdir}/noindex/index.html
+rm -rf %{contentdir}/htdocs
+
+# remove manual sources
+find $RPM_BUILD_ROOT%{contentdir}/manual $ \
+    -name \*.xml -o -name \*.xml.* -o -name \*.ent -o -name \*.xsl -o -name \*.dtd \
+    $ -print0 | xargs -0 rm -f
+
+# Strip the manual down just to English and replace the typemaps with flat files:
+set +x
+for f in `find $RPM_BUILD_ROOT%{contentdir}/manual -name \*.html -type f`; do
+   if test -f ${f}.en; then
+      cp ${f}.en ${f}
+      rm ${f}.*
+   fi
+done
+set -x
+
+# Clean Document Root
+rm -v $RPM_BUILD_ROOT%{docroot}/html/*.html \
+      $RPM_BUILD_ROOT%{docroot}/cgi-bin/*
+
+# Symlink for the powered-by-$DISTRO image:
+ln -s ../../pixmaps/poweredby.png \
+        $RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png
+
+# symlinks for /etc/httpd
+ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
+ln -s %{_httpdrundir} $RPM_BUILD_ROOT/etc/httpd/run
+ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
+
+# install http-ssl-pass-dialog
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+install -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \
+	$RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog
+
+# Install action scripts
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd
+for f in graceful configtest; do
+    install -p -m 755 $RPM_SOURCE_DIR/action-${f}.sh \
+            $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/${f}
+done
+
+# Install logrotate config
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \
+	$RPM_BUILD_ROOT/etc/logrotate.d/httpd
+
+# fix man page paths
+sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \
+    -e "s|/usr/local/apache2/conf/mime.types|/etc/mime.types|" \
+    -e "s|/usr/local/apache2/conf/magic|/etc/httpd/conf/magic|" \
+    -e "s|/usr/local/apache2/logs/error_log|/var/log/httpd/error_log|" \
+    -e "s|/usr/local/apache2/logs/access_log|/var/log/httpd/access_log|" \
+    -e "s|/usr/local/apache2/logs/httpd.pid|%{_httpdrundir}/httpd.pid|" \
+    -e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \
+  > $RPM_BUILD_ROOT%{_mandir}/man8/httpd.8
+
+# Make ap_config_layout.h libdir-agnostic
+sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \
+    $RPM_BUILD_ROOT%{_includedir}/httpd/ap_config_layout.h
+
+# Fix path to instdso in special.mk
+sed -i '/instdso/s,top_srcdir,top_builddir,' \
+    $RPM_BUILD_ROOT%{_libdir}/httpd/build/special.mk
+
+# Remove unpackaged files
+rm -vf \
+      $RPM_BUILD_ROOT%{_libdir}/*.exp \
+      $RPM_BUILD_ROOT/etc/httpd/conf/mime.types \
+      $RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.exp \
+      $RPM_BUILD_ROOT%{_libdir}/httpd/build/config.nice \
+      $RPM_BUILD_ROOT%{_bindir}/{ap?-config,dbmmanage} \
+      $RPM_BUILD_ROOT%{_sbindir}/{checkgid,envvars*} \
+      $RPM_BUILD_ROOT%{contentdir}/htdocs/* \
+      $RPM_BUILD_ROOT%{_mandir}/man1/dbmmanage.* \
+      $RPM_BUILD_ROOT%{contentdir}/cgi-bin/*
+
+rm -rf $RPM_BUILD_ROOT/etc/httpd/conf/{original,extra}
+
+%pre
+# Add the "apache" user
+/usr/sbin/useradd -c "Apache" -u 48 \
+    -s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || :
+
+%pre filesystem
+# Add the "apache" user
+/usr/sbin/useradd -c "Apache" -u 48 \
+	-s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || :
+
+%if 0%{?with_systemd}
+%post
+%systemd_post httpd.service htcacheclean.service httpd.socket
+
+%preun
+%systemd_preun httpd.service htcacheclean.service httpd.socket
+
+%postun
+%systemd_postun
+
+# Trigger for conversion from SysV, per guidelines at:
+# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
+%triggerun -- httpd < 2.2.21-5
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply httpd
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save httpd.service >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del httpd >/dev/null 2>&1 || :
+
+%posttrans
+test -f /etc/sysconfig/httpd-disable-posttrans || \
+  /bin/systemctl try-restart httpd.service htcacheclean.service >/dev/null 2>&1 || :
+
+%else
+%post
+# Register the httpd service
+/sbin/chkconfig --add httpd
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/service httpd stop > /dev/null 2>&1
+    /sbin/chkconfig --del httpd
+fi
+
+%posttrans
+/sbin/service httpd condrestart >/dev/null 2>&1 || :
+%endif
+
+%define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
+%define sslkey %{_sysconfdir}/pki/tls/private/localhost.key
+
+%post -n mod_ssl
+umask 077
+
+if [ -f %{sslkey} -o -f %{sslcert} ]; then
+   exit 0
+fi
+
+%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 2048 > %{sslkey} 2> /dev/null
+
+FQDN=`hostname`
+if [ "x${FQDN}" = "x" ]; then
+   FQDN=localhost.localdomain
+fi
+
+cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
+         -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \
+         -out %{sslcert} 2>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+${FQDN}
+root@${FQDN}
+EOF
+
+%check
+# Check the built modules are all PIC
+if readelf -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.so | grep TEXTREL; then
+   : modules contain non-relocatable code
+   exit 1
+fi
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+
+%doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
+%doc docs/conf/extra/*.conf
+
+%dir %{_sysconfdir}/httpd
+%{_sysconfdir}/httpd/modules
+%{_sysconfdir}/httpd/logs
+%{_sysconfdir}/httpd/run
+%dir %{_sysconfdir}/httpd/conf
+%config(noreplace) %{_sysconfdir}/httpd/conf/httpd.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf/magic
+
+%config(noreplace) %{_sysconfdir}/logrotate.d/httpd
+
+%dir %{_sysconfdir}/httpd/conf.d
+%{_sysconfdir}/httpd/conf.d/README
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
+%exclude %{_sysconfdir}/httpd/conf.d/ssl.conf
+%exclude %{_sysconfdir}/httpd/conf.d/manual.conf
+
+%dir %{_sysconfdir}/httpd/conf.modules.d
+%{_sysconfdir}/httpd/conf.modules.d/README
+%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/*.conf
+%exclude %{_sysconfdir}/httpd/conf.modules.d/00-ssl.conf
+%exclude %{_sysconfdir}/httpd/conf.modules.d/00-proxyhtml.conf
+%exclude %{_sysconfdir}/httpd/conf.modules.d/01-ldap.conf
+%exclude %{_sysconfdir}/httpd/conf.modules.d/01-session.conf
+
+%config(noreplace) %{_sysconfdir}/sysconfig/ht*
+%{_prefix}/lib/tmpfiles.d/httpd.conf
+
+%dir %{_libexecdir}/initscripts/legacy-actions/httpd
+%{_libexecdir}/initscripts/legacy-actions/httpd/*
+
+%{_sbindir}/ht*
+%{_sbindir}/fcgistarter
+%{_sbindir}/apachectl
+%{_sbindir}/rotatelogs
+
+%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}/error
+%dir %{contentdir}/error/include
+%dir %{contentdir}/noindex
+%{contentdir}/icons/*
+%{contentdir}/error/README
+%{contentdir}/error/*.var
+%{contentdir}/error/include/*.html
+%{contentdir}/noindex/index.html
+
+%attr(0710,root,apache) %dir %{_httpdrundir}
+%attr(0700,apache,apache) %dir %{_httpdrundir}/htcacheclean
+%attr(0700,root,root) %dir %{_localstatedir}/log/httpd
+%attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
+%attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd
+%attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd/proxy
+
+%{_mandir}/man8/*
+
+%if 0%{?with_systemd}
+%{_unitdir}/*.service
+%{_unitdir}/*.socket
+%attr(755,root,root) %dir %{_unitdir}/httpd.service.d
+%attr(755,root,root) %dir %{_unitdir}/httpd.socket.d
+%else
+%{_initrddir}/httpd
+%endif
+
+%files filesystem
+%dir %{_sysconfdir}/httpd
+%dir %{_sysconfdir}/httpd/conf.d
+%{_sysconfdir}/httpd/conf.d/README
+%dir %{docroot}
+%dir %{docroot}/cgi-bin
+%dir %{docroot}/html
+%dir %{contentdir}
+%dir %{contentdir}/icons
+
+%files suexec
+%defattr(-,root,root)
+%caps(cap_setuid,cap_setgid+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec
+
+%files tools
+%defattr(-,root,root)
+%{_bindir}/*
+%{_mandir}/man1/*
+%doc LICENSE NOTICE
+
+%files manual
+%defattr(-,root,root)
+%{contentdir}/manual
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/manual.conf
+
+%files -n mod_ssl
+%defattr(-,root,root)
+%{_libdir}/httpd/modules/mod_ssl.so
+%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/00-ssl.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/ssl.conf
+%attr(0700,apache,root) %dir %{_localstatedir}/cache/httpd/ssl
+%{_libexecdir}/httpd-ssl-pass-dialog
+%if 0%{?with_systemd}
+%{_unitdir}/httpd.socket.d/10-listen443.conf
+%endif
+
+%files -n mod_proxy_html
+%defattr(-,root,root)
+%{_libdir}/httpd/modules/mod_proxy_html.so
+%{_libdir}/httpd/modules/mod_xml2enc.so
+%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/00-proxyhtml.conf
+
+%files -n mod_ldap
+%defattr(-,root,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
+%{_libdir}/httpd/modules/mod_auth_form.so
+%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/01-session.conf
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/httpd
+%dir %{_libdir}/httpd/build
+%{_libdir}/httpd/build/*.mk
+%{_libdir}/httpd/build/*.sh
+%if 0%{?fedora} > 19
+%{_rpmconfigdir}/macros.d/macros.httpd
+%else
+%{_sysconfdir}/rpm/macros.httpd
+%endif
+
+%changelog
+* Sat Jan 16 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.18-1
+- Check in version 2.4.18
+
+* Wed Jun 03 2015 Christoph Wickert <wickert@kolabsys.com> - 2.4.10-19
+- Tighten apt-utils dependency (#5076)
+
+* Mon Jan 26 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.10-18
+- Rebuild against new OpenSSL symbols
+
+* Tue Aug 26 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.10-8
+- Rebuild for Enterprise Linux 6
+
+* Fri Aug 22 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-7
+- mod_systemd: updated to the latest version
+- use -lsystemd instead of -lsystemd-daemon (#1125084)
+- fix possible crash in SIGINT handling (#958934)
+
+* Thu Aug 21 2014 Joe Orton <jorton@redhat.com> - 2.4.10-6
+- mod_ssl: treat "SSLCipherSuite PROFILE=..." as special (#1109119)
+- switch default ssl.conf to use PROFILE=SYSTEM (#1109119)
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Aug 15 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-4
+- add /usr/bin/useradd dependency to -filesystem requires
+
+* 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)
+
+* Mon Jul 07 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-7
+- remove conf.modules.d from httpd-filesystem subpackage (#1081453)
+
+* Mon Jul 07 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-6
+- add httpd-filesystem subpackage (#1081453)
+
+* Fri Jun 20 2014 Joe Orton <jorton@redhat.com> - 2.4.9-5
+- mod_ssl: don't use the default OpenSSL cipher suite in ssl.conf (#1109119)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Mar 28 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-3
+- add support for SetHandler + proxy (#1078970)
+
+* Thu Mar 27 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-2
+- move macros from /etc/rpm to macros.d (#1074277)
+- remove unused patches
+
+* Mon Mar 17 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-1
+- update to 2.4.9
+
+* Fri Feb 28 2014 Joe Orton <jorton@redhat.com> - 2.4.7-6
+- use 2048-bit RSA key with SHA-256 signature in dummy certificate
+
+* Fri Feb 28 2014 Stephen Gallagher <sgallagh@redhat.com> 2.4.7-5
+- Create drop directory for systemd snippets
+
+* Thu Feb 27 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.7-4
+- remove provides of old MMN, because it contained double-dash (#1068851)
+
+* Thu Feb 20 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.7-3
+- fix graceful restart using legacy actions
+
+* Thu Dec 12 2013 Joe Orton <jorton@redhat.com> - 2.4.7-2
+- conflict with pre-1.5.0 APR
+- fix sslsninotreq patch
+
+* Wed Nov 27 2013 Joe Orton <jorton@redhat.com> - 2.4.7-1
+- update to 2.4.7 (#1034071)
+
+* Fri Nov 22 2013 Joe Orton <jorton@redhat.com> - 2.4.6-10
+- switch to requiring system-logos-httpd (#1031288)
+
+* Tue Nov 12 2013 Joe Orton <jorton@redhat.com> - 2.4.6-9
+- change mmnisa to drop "-" altogether
+
+* Tue Nov 12 2013 Joe Orton <jorton@redhat.com> - 2.4.6-8
+- drop ambiguous invalid "-" in RHS of httpd-mmn Provide, keeping old Provide
+  for transition
+
+* Fri Nov  1 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-7
+- systemd: use {MAINPID} notation to ensure /bin/kill has always the second arg
+
+* Thu Oct 31 2013 Joe Orton <jorton@redhat.com> - 2.4.6-6
+- mod_ssl: allow SSLEngine to override Listen-based default (r1537535)
+
+* Thu Oct 24 2013 Jan kaluza <jkaluza@redhat.com> - 2.4.6-5
+- systemd: send SIGWINCH signal without httpd -k in ExecStop
+
+* Mon Oct 21 2013 Joe Orton <jorton@redhat.com> - 2.4.6-4
+- load mod_macro by default (#998452)
+- add README to conf.modules.d
+- mod_proxy_http: add possible fix for threading issues (r1534321)
+- core: add fix for truncated output with CGI scripts (r1530793)
+
+* Thu Oct 10 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-3
+- require fedora-logos-httpd (#1009162)
+
+* Wed Jul 31 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-2
+- revert fix for dumping vhosts twice
+
+* Mon Jul 22 2013 Joe Orton <jorton@redhat.com> - 2.4.6-1
+- update to 2.4.6
+- mod_ssl: use revised NPN API (r1487772)
+
+* Thu Jul 11 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-12
+- mod_unique_id: replace use of hostname + pid with PRNG output (#976666)
+- apxs: mention -p option in manpage
+
+* Tue Jul  2 2013 Joe Orton <jorton@redhat.com> - 2.4.4-11
+- add patch for aarch64 (Dennis Gilmore, #925558)
+
+* Mon Jul  1 2013 Joe Orton <jorton@redhat.com> - 2.4.4-10
+- remove duplicate apxs man page from httpd-tools
+
+* Mon Jun 17 2013 Joe Orton <jorton@redhat.com> - 2.4.4-9
+- remove zombie dbmmanage script
+
+* Fri May 31 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-8
+- return 400 Bad Request on malformed Host header
+
+* Fri May 24 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-7
+- ignore /etc/sysconfig/httpd and document systemd way of setting env variables
+  in this file
+
+* Mon May 20 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-6
+- htpasswd/htdbm: fix hash generation bug (#956344)
+- do not dump vhosts twice in httpd -S output (#928761)
+- mod_cache: fix potential crash caused by uninitialized variable (#954109)
+
+* Thu Apr 18 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-5
+- execute systemctl reload as result of apachectl graceful
+- mod_ssl: ignore SNI hints unless required by config
+- mod_cache: forward-port CacheMaxExpire "hard" option
+- mod_ssl: fall back on another module's proxy hook if mod_ssl proxy
+  is not configured.
+
+* Tue Apr 16 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-4
+- fix service file to not send SIGTERM after ExecStop (#906321, #912288)
+
+* Tue Mar 26 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-3
+- protect MIMEMagicFile with IfModule (#893949)
+
+* Tue Feb 26 2013 Joe Orton <jorton@redhat.com> - 2.4.4-2
+- really package mod_auth_form in mod_session (#915438)
+
+* Tue Feb 26 2013 Joe Orton <jorton@redhat.com> - 2.4.4-1
+- update to 2.4.4
+- fix duplicate ownership of mod_session config (#914901)
+
+* 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
+
+* Tue Nov 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-14
+- drop patch for r1344712
+
+* Tue Nov 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-13
+- filter mod_*.so auto-provides (thanks to rcollet)
+- pull in syslog logging fix from upstream (r1344712)
+
+* Fri Oct 26 2012 Joe Orton <jorton@redhat.com> - 2.4.3-12
+- rebuild to pick up new apr-util-ldap
+
+* Tue Oct 23 2012 Joe Orton <jorton@redhat.com> - 2.4.3-11
+- rebuild
+
+* Wed Oct  3 2012 Joe Orton <jorton@redhat.com> - 2.4.3-10
+- pull upstream patch r1392850 in addition to r1387633
+
+* Mon Oct  1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-9
+- define PLATFORM in os.h using vendor string
+
+* Mon Oct  1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-8
+- use systemd script unconditionally (#850149)
+
+* Mon Oct  1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-7
+- use systemd scriptlets if available (#850149)
+- don't run posttrans restart if /etc/sysconfig/httpd-disable-posttrans exists
+
+* Mon Oct 01 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.3-6
+- use systemctl from apachectl (#842736)
+
+* Wed Sep 19 2012 Joe Orton <jorton@redhat.com> - 2.4.3-5
+- fix some error log spam with graceful-stop (r1387633)
+- minor mod_systemd tweaks
+
+* Thu Sep 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-4
+- use IncludeOptional for conf.d/*.conf inclusion
+
+* Fri Sep 07 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.3-3
+- adding mod_systemd to integrate with systemd better
+
+* Tue Aug 21 2012 Joe Orton <jorton@redhat.com> - 2.4.3-2
+- mod_ssl: add check for proxy keypair match (upstream r1374214)
+
+* Tue Aug 21 2012 Joe Orton <jorton@redhat.com> - 2.4.3-1
+- update to 2.4.3 (#849883)
+- own the docroot (#848121)
+
+* Mon Aug  6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-23
+- add mod_proxy fixes from upstream (r1366693, r1365604)
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jul  6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-21
+- drop explicit version requirement on initscripts
+
+* Thu Jul  5 2012 Joe Orton <jorton@redhat.com> - 2.4.2-20
+- mod_ext_filter: fix error_log warnings
+
+* Mon Jul  2 2012 Joe Orton <jorton@redhat.com> - 2.4.2-19
+- support "configtest" and "graceful" as initscripts "legacy actions"
+
+* Fri Jun  8 2012 Joe Orton <jorton@redhat.com> - 2.4.2-18
+- avoid use of "core" GIF for a "core" directory (#168776)
+- drop use of "syslog.target" in systemd unit file
+
+* Thu Jun  7 2012 Joe Orton <jorton@redhat.com> - 2.4.2-17
+- use _unitdir for systemd unit file
+- use /run in unit file, ssl.conf
+
+* Thu Jun  7 2012 Joe Orton <jorton@redhat.com> - 2.4.2-16
+- mod_ssl: fix NPN patch merge
+
+* Wed Jun  6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-15
+- move tmpfiles.d fragment into /usr/lib per new guidelines
+- package /run/httpd not /var/run/httpd
+- set runtimedir to /run/httpd likewise
+
+* Wed Jun  6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-14
+- fix htdbm/htpasswd crash on crypt() failure (#818684)
+
+* Wed Jun  6 2012 Joe Orton <jorton@redhat.com> - 2.4.2-13
+- pull fix for NPN patch from upstream (r1345599)
+
+* Thu May 31 2012 Joe Orton <jorton@redhat.com> - 2.4.2-12
+- update suexec patch to use LOG_AUTHPRIV facility
+
+* Thu May 24 2012 Joe Orton <jorton@redhat.com> - 2.4.2-11
+- really fix autoindex.conf (thanks to remi@)
+
+* Thu May 24 2012 Joe Orton <jorton@redhat.com> - 2.4.2-10
+- fix autoindex.conf to allow symlink to poweredby.png
+
+* Wed May 23 2012 Joe Orton <jorton@redhat.com> - 2.4.2-9
+- suexec: use upstream version of patch for capability bit support
+
+* Wed May 23 2012 Joe Orton <jorton@redhat.com> - 2.4.2-8
+- suexec: use syslog rather than suexec.log, drop dac_override capability
+
+* Tue May  1 2012 Joe Orton <jorton@redhat.com> - 2.4.2-7
+- mod_ssl: add TLS NPN support (r1332643, #809599)
+
+* Tue May  1 2012 Joe Orton <jorton@redhat.com> - 2.4.2-6
+- add BR on APR >= 1.4.0
+
+* Fri Apr 27 2012 Joe Orton <jorton@redhat.com> - 2.4.2-5
+- use systemctl from logrotate (#221073)
+
+* Fri Apr 27 2012 Joe Orton <jorton@redhat.com> - 2.4.2-4
+- pull from upstream:
+  * use TLS close_notify alert for dummy_connection (r1326980+)
+  * cleanup symbol exports (r1327036+)
+
+* Fri Apr 20 2012 Joe Orton <jorton@redhat.com> - 2.4.2-3
+- really fix restart
+
+* Fri Apr 20 2012 Joe Orton <jorton@redhat.com> - 2.4.2-2
+- tweak default ssl.conf
+- fix restart handling (#814645)
+- use graceful restart by default
+
+* Wed Apr 18 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.2-1
+- update to 2.4.2
+
+* Fri Mar 23 2012 Joe Orton <jorton@redhat.com> - 2.4.1-6
+- fix macros
+
+* Fri Mar 23 2012 Joe Orton <jorton@redhat.com> - 2.4.1-5
+- add _httpd_moddir to macros
+
+* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-4
+- fix symlink for poweredby.png
+- fix manual.conf
+
+* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-3
+- add mod_proxy_html subpackage (w/mod_proxy_html + mod_xml2enc)
+- move mod_ldap, mod_authnz_ldap to mod_ldap subpackage
+
+* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-2
+- clean docroot better
+- ship proxy, ssl directories within /var/cache/httpd
+- default config:
+ * unrestricted access to (only) /var/www
+ * remove (commented) Mutex, MaxRanges, ScriptSock
+ * split autoindex config to conf.d/autoindex.conf
+- ship additional example configs in docdir
+
+* Tue Mar  6 2012 Joe Orton <jorton@redhat.com> - 2.4.1-1
+- update to 2.4.1
+- adopt upstream default httpd.conf (almost verbatim)
+- split all LoadModules to conf.modules.d/*.conf
+- include conf.d/*.conf at end of httpd.conf
+- trim %%changelog
+
+* Mon Feb 13 2012 Joe Orton <jorton@redhat.com> - 2.2.22-2
+- fix build against PCRE 8.30
+
+* Mon Feb 13 2012 Joe Orton <jorton@redhat.com> - 2.2.22-1
+- update to 2.2.22
+
+* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 2.2.21-8
+- Rebuild against PCRE 8.30
+
+* Mon Jan 23 2012 Jan Kaluza <jkaluza@redhat.com> - 2.2.21-7
+- fix #783629 - start httpd after named
+
+* Mon Jan 16 2012 Joe Orton <jorton@redhat.com> - 2.2.21-6
+- complete conversion to systemd, drop init script (#770311)
+- fix comments in /etc/sysconfig/httpd (#771024)
+- enable PrivateTmp in service file (#781440)
+- set LANG=C in /etc/sysconfig/httpd
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.21-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 06 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.21-4
+- fix #751591 - start httpd after remote-fs
+
+* Mon Oct 24 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.21-3
+- allow change state of BalancerMember in mod_proxy_balancer web interface
+
+* Thu Sep 22 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.2.21-2
+- Make mmn available as %%{_httpd_mmn}.
+- Add .svgz to AddEncoding x-gzip example in httpd.conf.
+
+* Tue Sep 13 2011 Joe Orton <jorton@redhat.com> - 2.2.21-1
+- update to 2.2.21
+
+* Mon Sep  5 2011 Joe Orton <jorton@redhat.com> - 2.2.20-1
+- update to 2.2.20
+- fix MPM stub man page generation
+
+* Wed Aug 10 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-5
+- fix #707917 - add httpd-ssl-pass-dialog to ask for SSL password using systemd
+
+* Fri Jul 22 2011 Iain Arnell <iarnell@gmail.com> 1:2.2.19-4
+- rebuild while rpm-4.9.1 is untagged to remove trailing slash in provided
+  directory names
+
+* Wed Jul 20 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-3
+- fix #716621 - suexec now works without setuid bit
+
+* Thu Jul 14 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-2
+- fix #689091 - backported patch from 2.3 branch to support IPv6 in logresolve
+
+* Fri Jul  1 2011 Joe Orton <jorton@redhat.com> - 2.2.19-1
+- update to 2.2.19
+- enable dbd, authn_dbd in default config
+
+* Thu Apr 14 2011 Joe Orton <jorton@redhat.com> - 2.2.17-13
+- fix path expansion in service files
+
+* Tue Apr 12 2011 Joe Orton <jorton@redhat.com> - 2.2.17-12
+- add systemd service files (#684175, thanks to Jóhann B. Guðmundsson)
+
+* Wed Mar 23 2011 Joe Orton <jorton@redhat.com> - 2.2.17-11
+- minor updates to httpd.conf
+- drop old patches
+
+* Wed Mar  2 2011 Joe Orton <jorton@redhat.com> - 2.2.17-10
+- rebuild
+
+* Wed Feb 23 2011 Joe Orton <jorton@redhat.com> - 2.2.17-9
+- use arch-specific mmn
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.17-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 31 2011 Joe Orton <jorton@redhat.com> - 2.2.17-7
+- generate dummy mod_ssl cert with CA:FALSE constraint (#667841)
+- add man page stubs for httpd.event, httpd.worker
+- drop distcache support
+- add STOP_TIMEOUT support to init script
+
+* Sat Jan  8 2011 Joe Orton <jorton@redhat.com> - 2.2.17-6
+- update default SSLCipherSuite per upstream trunk
+
+* Wed Jan  5 2011 Joe Orton <jorton@redhat.com> - 2.2.17-5
+- fix requires (#667397)
+
+* Wed Jan  5 2011 Joe Orton <jorton@redhat.com> - 2.2.17-4
+- de-ghost /var/run/httpd
+
+* Tue Jan  4 2011 Joe Orton <jorton@redhat.com> - 2.2.17-3
+- add tmpfiles.d configuration, ghost /var/run/httpd (#656600)
+
+* Sat Nov 20 2010 Joe Orton <jorton@redhat.com> - 2.2.17-2
+- drop setuid bit, use capabilities for suexec binary
+
+* Wed Oct 27 2010 Joe Orton <jorton@redhat.com> - 2.2.17-1
+- update to 2.2.17
+
+* Fri Sep 10 2010 Joe Orton <jorton@redhat.com> - 2.2.16-2
+- link everything using -z relro and -z now
+
+* Mon Jul 26 2010 Joe Orton <jorton@redhat.com> - 2.2.16-1
+- update to 2.2.16
+
+* Fri Jul  9 2010 Joe Orton <jorton@redhat.com> - 2.2.15-3
+- default config tweaks:
+ * harden httpd.conf w.r.t. .htaccess restriction (#591293)
+ * load mod_substitute, mod_version by default
+ * drop proxy_ajp.conf, load mod_proxy_ajp in httpd.conf
+ * add commented list of shipped-but-unloaded modules
+ * bump up worker defaults a little
+ * drop KeepAliveTimeout to 5 secs per upstream
+- fix LSB compliance in init script (#522074)
+- bundle NOTICE in -tools
+- use init script in logrotate postrotate to pick up PIDFILE
+- drop some old Obsoletes/Conflicts
+
+* Sun Apr 04 2010 Robert Scheck <robert@fedoraproject.org> - 2.2.15-1
+- update to 2.2.15 (#572404, #579311)
+

httpd-2.4.1-apctl.patch Added

@@ -0,0 +1,94 @@
+
+- fail gracefully if links is not installed on target system
+- source sysconfig/httpd for custom env. vars etc.
+- make httpd -t work even in SELinux
+- pass $OPTIONS to all $HTTPD invocation
+
+Upstream-HEAD: vendor
+Upstream-2.0: vendor
+Upstream-Status: Vendor-specific changes for better initscript integration
+
+--- httpd-2.4.1/support/apachectl.in.apctl
++++ httpd-2.4.1/support/apachectl.in
+@@ -44,19 +44,25 @@ ARGV="$@"
+ # the path to your httpd binary, including options if necessary
+ HTTPD='@exp_sbindir@/@progname@'
+ #
+-# pick up any necessary environment variables
+-if test -f @exp_sbindir@/envvars; then
+-  . @exp_sbindir@/envvars
+-fi
+ #
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line.  Designed for lynx, however other
+ # programs may work.  
+-LYNX="@LYNX_PATH@ -dump"
++if [ -x "@LYNX_PATH@" ]; then
++  LYNX="@LYNX_PATH@ -dump"
++else
++  LYNX=none
++fi
+ #
+ # the URL to your server's mod_status status page.  If you do not
+ # have one, then status and fullstatus will not work.
+ STATUSURL="http://localhost:@PORT@/server-status"
++
++# Source /etc/sysconfig/httpd for $HTTPD setting, etc.
++if [ -r /etc/sysconfig/httpd ]; then
++   . /etc/sysconfig/httpd
++fi
++
+ #
+ # Set this variable to a command that increases the maximum
+ # number of file descriptors allowed per child process. This is
+@@ -76,9 +82,27 @@ if [ "x$ARGV" = "x" ] ; then 
+     ARGV="-h"
+ fi
+ 
++function checklynx() {
++if [ "$LYNX" = "none" ]; then
++   echo "The 'links' package is required for this functionality."
++   exit 8
++fi
++}
++
++function testconfig() {
++# httpd is denied terminal access in SELinux, so run in the
++# current context to get stdout from $HTTPD -t.
++if test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled; then
++  runcon -- `id -Z` $HTTPD $OPTIONS -t
++else
++  $HTTPD $OPTIONS -t
++fi
++ERROR=$?
++}
++
+ case $ACMD in
+ start|stop|restart|graceful|graceful-stop)
+-    $HTTPD -k $ARGV
++    $HTTPD $OPTIONS -k $ARGV
+     ERROR=$?
+     ;;
+ startssl|sslstart|start-SSL)
+@@ -88,17 +112,18 @@ startssl|sslstart|start-SSL)
+     ERROR=2
+     ;;
+ configtest)
+-    $HTTPD -t
+-    ERROR=$?
++    testconfig
+     ;;
+ status)
++    checklynx
+     $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
+     ;;
+ fullstatus)
++    checklynx
+     $LYNX $STATUSURL
+     ;;
+ *)
+-    $HTTPD "$@"
++    $HTTPD $OPTIONS "$@"
+     ERROR=$?
+ esac
+

httpd-2.4.1-corelimit.patch Added

@@ -0,0 +1,35 @@
+
+Bump up the core size limit if CoreDumpDirectory is
+configured.
+
+Upstream-Status: Was discussed but there are competing desires;
+	there are portability oddities here too.
+
+--- httpd-2.4.1/server/core.c.corelimit
++++ httpd-2.4.1/server/core.c
+@@ -4433,6 +4433,25 @@ static int core_post_config(apr_pool_t *
+     }
+     apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper,
+                               apr_pool_cleanup_null);
++
++#ifdef RLIMIT_CORE
++    if (ap_coredumpdir_configured) {
++        struct rlimit lim;
++
++        if (getrlimit(RLIMIT_CORE, &lim) == 0 && lim.rlim_cur == 0) {
++            lim.rlim_cur = lim.rlim_max;
++            if (setrlimit(RLIMIT_CORE, &lim) == 0) {
++                ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
++                             "core dump file size limit raised to %lu bytes",
++                             lim.rlim_cur);
++            } else {
++                ap_log_error(APLOG_MARK, APLOG_NOTICE, errno, NULL,
++                             "core dump file size is zero, setrlimit failed");
++            }
++        }
++    }
++#endif
++
+     return OK;
+ }
+

httpd-2.4.1-deplibs.patch Added

httpd-2.4.1-selinux.patch Added

@@ -0,0 +1,61 @@
+
+Log the SELinux context at startup.
+
+Upstream-Status: unlikely to be any interest in this upstream
+
+--- httpd-2.4.1/configure.in.selinux
++++ httpd-2.4.1/configure.in
+@@ -458,6 +458,11 @@ fopen64
+ dnl confirm that a void pointer is large enough to store a long integer
+ APACHE_CHECK_VOID_PTR_LEN
+ 
++AC_CHECK_LIB(selinux, is_selinux_enabled, [
++   AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported])
++   APR_ADDTO(AP_LIBS, [-lselinux])
++])
++
+ AC_CACHE_CHECK([for gettid()], ac_cv_gettid,
+ [AC_TRY_RUN(#define _GNU_SOURCE
+ #include <unistd.h>
+--- httpd-2.4.1/server/core.c.selinux
++++ httpd-2.4.1/server/core.c
+@@ -58,6 +58,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifdef HAVE_SELINUX
++#include <selinux/selinux.h>
++#endif
++
+ /* LimitRequestBody handling */
+ #define AP_LIMIT_REQ_BODY_UNSET         ((apr_off_t) -1)
+ #define AP_DEFAULT_LIMIT_REQ_BODY       ((apr_off_t) 0)
+@@ -4452,6 +4456,28 @@ static int core_post_config(apr_pool_t *
+     }
+ #endif
+ 
++#ifdef HAVE_SELINUX
++    {
++        static int already_warned = 0;
++        int is_enabled = is_selinux_enabled() > 0;
++        
++        if (is_enabled && !already_warned) {
++            security_context_t con;
++            
++            if (getcon(&con) == 0) {
++                
++                ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
++                             "SELinux policy enabled; "
++                             "httpd running as context %s", con);
++                
++                already_warned = 1;
++                
++                freecon(con);
++            }
++        }
++    }
++#endif
++
+     return OK;
+ }
+

httpd-2.4.10-detect-systemd.patch Added

@@ -0,0 +1,48 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index 580eb4a..bd7e2c9 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -594,6 +594,30 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[
+   fi
+ ])
+ 
++AC_DEFUN(APACHE_CHECK_SYSTEMD, [                                                                        
++dnl Check for systemd support for listen.c's socket activation.
++case $host in
++*-linux-*)
++   if test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd; then
++      SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd`
++   elif test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd-daemon; then
++      SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd-daemon`
++   else
++      AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
++   fi
++   if test -n "$SYSTEMD_LIBS"; then
++      AC_CHECK_HEADERS(systemd/sd-daemon.h)
++      if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then
++        AC_MSG_WARN([Your system does not support systemd.])
++      else
++        APR_ADDTO(LIBS, [$SYSTEMD_LIBS])
++        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is supported])
++      fi
++   fi
++   ;;
++esac
++])
++
+ dnl
+ dnl APACHE_EXPORT_ARGUMENTS
+ dnl Export (via APACHE_SUBST) the various path-related variables that
+diff --git a/configure.in b/configure.in
+index 19a5f88..f096de3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -509,6 +509,8 @@ if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
+     AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
+ fi
+ 
++APACHE_CHECK_SYSTEMD
++
+ dnl ## Set up any appropriate OS-specific environment variables for apachectl
+ 
+ case $host in

httpd-2.4.10-mod_systemd.patch Added

@@ -0,0 +1,172 @@
+diff --git a/modules/arch/unix/config5.m4 b/modules/arch/unix/config5.m4
+index 77027a8..7a13d5a 100644
+--- a/modules/arch/unix/config5.m4
++++ b/modules/arch/unix/config5.m4
+@@ -18,6 +18,16 @@ APACHE_MODULE(privileges, Per-virtualhost Unix UserIDs and enhanced security for
+   fi
+ ])
+ 
++APACHE_MODULE(systemd, Systemd support, , , all, [
++  if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then
++    AC_MSG_WARN([Your system does not support systemd.])
++    enable_systemd="no"
++  else
++    APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS])
++    enable_systemd="yes"
++  fi
++])
++
+ APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+ 
+ APACHE_MODPATH_FINISH
+diff --git a/modules/arch/unix/mod_systemd.c b/modules/arch/unix/mod_systemd.c
+new file mode 100644
+index 0000000..5381c98
+--- /dev/null
++++ b/modules/arch/unix/mod_systemd.c
+@@ -0,0 +1,145 @@
++/* Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements.  See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License.  You may obtain a copy of the License at
++ *
++ *     http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ * 
++ */
++
++#include <stdint.h>
++#include <ap_config.h>
++#include "ap_mpm.h"
++#include <http_core.h>
++#include <httpd.h>
++#include <http_log.h>
++#include <apr_version.h>
++#include <apr_pools.h>
++#include <apr_strings.h>
++#include "unixd.h"
++#include "scoreboard.h"
++#include "mpm_common.h"
++
++#include "systemd/sd-daemon.h"
++
++#if APR_HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++static int shutdown_timer = 0;
++static int shutdown_counter = 0;
++static unsigned long bytes_served;
++static pid_t mainpid;
++
++static int systemd_pre_mpm(apr_pool_t *p, ap_scoreboard_e sb_type)
++{
++    int rv;
++
++    ap_extended_status = 1;
++    mainpid = getpid();
++
++    rv = sd_notifyf(0, "READY=1\n"
++                    "STATUS=Processing requests...\n"
++                    "MAINPID=%" APR_PID_T_FMT, mainpid);
++    if (rv < 0) {
++        ap_log_perror(APLOG_MARK, APLOG_ERR, 0, p, APLOGNO(02395)
++                     "sd_notifyf returned an error %d", rv);
++    }
++
++    return OK;
++}
++
++static int systemd_monitor(apr_pool_t *p, server_rec *s)
++{
++    ap_sload_t sload;
++    apr_interval_time_t up_time;
++    char bps[5];
++    int rv;
++
++    ap_get_sload(&sload);
++    /* up_time in seconds */
++    up_time = (apr_uint32_t) apr_time_sec(apr_time_now() -
++                               ap_scoreboard_image->global->restart_time);
++
++    apr_strfsize((unsigned long)((float) (sload.bytes_served)
++                                 / (float) up_time), bps);
++
++    rv = sd_notifyf(0, "READY=1\n"
++                    "STATUS=Total requests: %lu; Idle/Busy workers %d/%d;"
++                    "Requests/sec: %.3g; Bytes served/sec: %sB/sec\n",
++                    sload.access_count, sload.idle, sload.busy,
++                    ((float) sload.access_count) / (float) up_time, bps);
++
++    if (rv < 0) {
++        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02396)
++                     "sd_notifyf returned an error %d", rv);
++    }
++
++    /* Shutdown httpd when nothing is sent for shutdown_timer seconds. */
++    if (sload.bytes_served == bytes_served) {
++        /* mpm_common.c: INTERVAL_OF_WRITABLE_PROBES is 10 */
++        shutdown_counter += 10;
++        if (shutdown_timer > 0 && shutdown_counter >= shutdown_timer) {
++            rv = sd_notifyf(0, "READY=1\n"
++                            "STATUS=Stopped as result of IdleShutdown "
++                            "timeout.");
++            if (rv < 0) {
++                ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02804)
++                            "sd_notifyf returned an error %d", rv);
++            }
++            kill(mainpid, AP_SIG_GRACEFUL);
++        }
++    }
++    else {
++        shutdown_counter = 0;
++    }
++
++    bytes_served = sload.bytes_served;
++
++    return DECLINED;
++}
++
++static void systemd_register_hooks(apr_pool_t *p)
++{
++    /* We know the PID in this hook ... */
++    ap_hook_pre_mpm(systemd_pre_mpm, NULL, NULL, APR_HOOK_LAST);
++    /* Used to update httpd's status line using sd_notifyf */
++    ap_hook_monitor(systemd_monitor, NULL, NULL, APR_HOOK_MIDDLE);
++}
++
++static const char *set_shutdown_timer(cmd_parms *cmd, void *dummy,
++                                      const char *arg)
++{
++    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
++    if (err != NULL) {
++        return err;
++    }
++
++    shutdown_timer = atoi(arg);
++    return NULL;
++}
++
++static const command_rec systemd_cmds[] =
++{
++AP_INIT_TAKE1("IdleShutdown", set_shutdown_timer, NULL, RSRC_CONF,
++     "Number of seconds in idle-state after which httpd is shutdown"),
++    {NULL}
++};
++
++AP_DECLARE_MODULE(systemd) = {
++    STANDARD20_MODULE_STUFF,
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    systemd_cmds,
++    systemd_register_hooks,
++};

httpd-2.4.10-sigint.patch Added

@@ -0,0 +1,45 @@
+From 20656c3b77cc548b59fea3bde5e2b7705d71c427 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Kalu=C5=BEa?= <jkaluza@apache.org>
+Date: Mon, 18 Aug 2014 07:43:43 +0000
+Subject: [PATCH] prefork: Ignore SIGINT in child. This fixes race-condition in
+ signals handling when httpd is runnning on foreground and user hits ctrl+c.
+ In this case, SIGINT is sent to all children followed by SIGTERM from the
+ main process, which interrupts the SIGINT handler and leads to inconsistency
+ (process freezes or crashes).
+
+git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1618555 13f79535-47bb-0310-9956-ffa450edef68
+---
+ server/mpm/prefork/prefork.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
+index 8790ec0..d6c038b 100644
+--- a/server/mpm/prefork/prefork.c
++++ b/server/mpm/prefork/prefork.c
+@@ -222,6 +222,9 @@ static void clean_child_exit(int code)
+ {
+     mpm_state = AP_MPMQ_STOPPING;
+ 
++    apr_signal(SIGHUP, SIG_IGN);
++    apr_signal(SIGTERM, SIG_IGN);
++
+     if (pchild) {
+         apr_pool_destroy(pchild);
+     }
+@@ -817,6 +820,13 @@ static int make_child(server_rec *s, int slot)
+          */
+         apr_signal(SIGHUP, just_die);
+         apr_signal(SIGTERM, just_die);
++        /* Ignore SIGINT in child. This fixes race-condition in signals
++         * handling when httpd is runnning on foreground and user hits ctrl+c.
++         * In this case, SIGINT is sent to all children followed by SIGTERM
++         * from the main process, which interrupts the SIGINT handler and
++         * leads to inconsistency.
++         */
++        apr_signal(SIGINT, SIG_IGN);
+         /* The child process just closes listeners on AP_SIG_GRACEFUL.
+          * The pod is used for signalling the graceful restart.
+          */
+-- 
+2.0.4
+

httpd-2.4.10-sslciphdefault.patch Added

httpd-2.4.17-debug-crash.patch Added

@@ -0,0 +1,42 @@
+diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
+index cd70b7d..94813af 100644
+--- a/server/mpm/event/event.c
++++ b/server/mpm/event/event.c
+@@ -3042,8 +3042,7 @@ static int event_open_logs(apr_pool_t * p, apr_pool_t * plog,
+ 
+     all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets));
+     for (i = 0; i < num_buckets; i++) {
+-        if (!one_process && /* no POD in one_process mode */
+-                (rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod))) {
++        if (rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod)) {
+             ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
+                          (startup ? NULL : s),
+                          "could not open pipe-of-death");
+diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
+index 343e51d..f4c3dbe 100644
+--- a/server/mpm/prefork/prefork.c
++++ b/server/mpm/prefork/prefork.c
+@@ -1326,8 +1326,7 @@ static int prefork_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
+     all_buckets = apr_pcalloc(pconf, num_buckets *
+                                      sizeof(prefork_child_bucket));
+     for (i = 0; i < num_buckets; i++) {
+-        if (!one_process && /* no POD in one_process mode */
+-                (rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod))) {
++        if (rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod)) {
+             ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
+                          (startup ? NULL : s),
+                          "could not open pipe-of-death");
+diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
+index 4a729c0..8a59219 100644
+--- a/server/mpm/worker/worker.c
++++ b/server/mpm/worker/worker.c
+@@ -2051,8 +2051,7 @@ static int worker_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
+ 
+     all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets));
+     for (i = 0; i < num_buckets; i++) {
+-        if (!one_process && /* no POD in one_process mode */
+-                (rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod))) {
++        if (rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod)) {
+             ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
+                          (startup ? NULL : s),
+                          "could not open pipe-of-death");

httpd-2.4.17-socket-activation.patch Added

@@ -0,0 +1,301 @@
+diff --git a/server/listen.c b/server/listen.c
+index 1d9be83..f5f7754 100644
+--- a/server/listen.c
++++ b/server/listen.c
+@@ -34,6 +34,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifdef HAVE_SYSTEMD
++#include <systemd/sd-daemon.h>
++#endif
++
+ /* we know core's module_index is 0 */
+ #undef APLOG_MODULE_INDEX
+ #define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX
+@@ -59,9 +63,12 @@ static int ap_listenbacklog;
+ static int ap_listencbratio;
+ static int send_buffer_size;
+ static int receive_buffer_size;
++#ifdef HAVE_SYSTEMD
++static int use_systemd = -1;
++#endif
+ 
+ /* TODO: make_sock is just begging and screaming for APR abstraction */
+-static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
++static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server, int do_bind_listen)
+ {
+     apr_socket_t *s = server->sd;
+     int one = 1;
+@@ -94,20 +101,6 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
+         return stat;
+     }
+ 
+-#if APR_HAVE_IPV6
+-    if (server->bind_addr->family == APR_INET6) {
+-        stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
+-        if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
+-            ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p, APLOGNO(00069)
+-                          "make_sock: for address %pI, apr_socket_opt_set: "
+-                          "(IPV6_V6ONLY)",
+-                          server->bind_addr);
+-            apr_socket_close(s);
+-            return stat;
+-        }
+-    }
+-#endif
+-
+     /*
+      * To send data over high bandwidth-delay connections at full
+      * speed we must force the TCP window to open wide enough to keep the
+@@ -169,21 +162,37 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
+     }
+ #endif
+ 
+-    if ((stat = apr_socket_bind(s, server->bind_addr)) != APR_SUCCESS) {
+-        ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, stat, p, APLOGNO(00072)
+-                      "make_sock: could not bind to address %pI",
+-                      server->bind_addr);
+-        apr_socket_close(s);
+-        return stat;
+-    }
++    if (do_bind_listen) {
++#if APR_HAVE_IPV6
++        if (server->bind_addr->family == APR_INET6) {
++            stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
++            if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
++                ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p, APLOGNO(00069)
++                              "make_sock: for address %pI, apr_socket_opt_set: "
++                              "(IPV6_V6ONLY)",
++                              server->bind_addr);
++                apr_socket_close(s);
++                return stat;
++            }
++        }
++#endif
+ 
+-    if ((stat = apr_socket_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
+-        ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_ERR, stat, p, APLOGNO(00073)
+-                      "make_sock: unable to listen for connections "
+-                      "on address %pI",
+-                      server->bind_addr);
+-        apr_socket_close(s);
+-        return stat;
++        if ((stat = apr_socket_bind(s, server->bind_addr)) != APR_SUCCESS) {
++            ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, stat, p, APLOGNO(00072)
++                          "make_sock: could not bind to address %pI",
++                          server->bind_addr);
++            apr_socket_close(s);
++            return stat;
++        }
++
++        if ((stat = apr_socket_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
++            ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_ERR, stat, p, APLOGNO(00073)
++                          "make_sock: unable to listen for connections "
++                          "on address %pI",
++                          server->bind_addr);
++            apr_socket_close(s);
++            return stat;
++        }
+     }
+ 
+ #ifdef WIN32
+@@ -277,6 +286,124 @@ static apr_status_t close_listeners_on_exec(void *v)
+     return APR_SUCCESS;
+ }
+ 
++
++#ifdef HAVE_SYSTEMD
++
++static int find_systemd_socket(process_rec * process, apr_port_t port) {
++    int fdcount, fd;
++    int sdc = sd_listen_fds(0);
++
++    if (sdc < 0) {
++        ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02486)
++                      "find_systemd_socket: Error parsing enviroment, sd_listen_fds returned %d",
++                      sdc);
++        return -1;
++    }
++
++    if (sdc == 0) {
++        ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02487)
++                      "find_systemd_socket: At least one socket must be set.");
++        return -1;
++    }
++
++    fdcount = atoi(getenv("LISTEN_FDS"));
++    for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + fdcount; fd++) {
++        if (sd_is_socket_inet(fd, 0, 0, -1, port) > 0) {
++            return fd;
++        }
++    }
++
++    return -1;
++}
++
++static apr_status_t alloc_systemd_listener(process_rec * process,
++                                           int fd, const char *proto,
++                                           ap_listen_rec **out_rec)
++{
++    apr_status_t rv;
++    struct sockaddr sa;
++    socklen_t len = sizeof(struct sockaddr);
++    apr_os_sock_info_t si;
++    ap_listen_rec *rec;
++    *out_rec = NULL;
++
++    memset(&si, 0, sizeof(si));
++
++    rv = getsockname(fd, &sa, &len);
++
++    if (rv != 0) {
++        rv = apr_get_netos_error();
++        ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, process->pool, APLOGNO(02489)
++                      "getsockname on %d failed.", fd);
++        return rv;
++    }
++
++    si.os_sock = &fd;
++    si.family = sa.sa_family;
++    si.local = &sa;
++    si.type = SOCK_STREAM;
++    si.protocol = APR_PROTO_TCP;
++
++    rec = apr_palloc(process->pool, sizeof(ap_listen_rec));
++    rec->active = 0;
++    rec->next = 0;
++
++
++    rv = apr_os_sock_make(&rec->sd, &si, process->pool);
++    if (rv != APR_SUCCESS) {
++        ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, process->pool, APLOGNO(02490)
++                      "apr_os_sock_make on %d failed.", fd);
++        return rv;
++    }
++
++    rv = apr_socket_addr_get(&rec->bind_addr, APR_LOCAL, rec->sd);
++    if (rv != APR_SUCCESS) {
++        ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, process->pool, APLOGNO(02491)
++                      "apr_socket_addr_get on %d failed.", fd);
++        return rv;
++    }
++
++    rec->protocol = apr_pstrdup(process->pool, proto);
++
++    *out_rec = rec;
++
++    return make_sock(process->pool, rec, 0);
++}
++
++static const char *set_systemd_listener(process_rec *process, apr_port_t port,
++                                        const char *proto)
++{
++    ap_listen_rec *last, *new;
++    apr_status_t rv;
++    int fd = find_systemd_socket(process, port);
++    if (fd < 0) {
++        return "Systemd socket activation is used, but this port is not "
++                "configured in systemd";
++    }
++
++    last = ap_listeners;
++    while (last && last->next) {
++        last = last->next;
++    }
++
++    rv = alloc_systemd_listener(process, fd, proto, &new);
++    if (rv != APR_SUCCESS) {
++        return "Failed to setup socket passed by systemd using socket activation";
++    }
++
++    if (last == NULL) {
++        ap_listeners = last = new;
++    }
++    else {
++        last->next = new;
++        last = new;
++    }
++
++    return NULL;
++}
++
++#endif /* HAVE_SYSTEMD */
++
+ static const char *alloc_listener(process_rec *process, char *addr,
+                                   apr_port_t port, const char* proto,
+                                   void *slave)
+@@ -479,7 +606,7 @@ static int open_listeners(apr_pool_t *pool)
+                 }
+             }
+ #endif
+-            if (make_sock(pool, lr) == APR_SUCCESS) {
++            if (make_sock(pool, lr, 1) == APR_SUCCESS) {
+                 ++num_open;
+             }
+             else {
+@@ -591,8 +718,28 @@ AP_DECLARE(int) ap_setup_listeners(server_rec *s)
+         }
+     }
+ 
+-    if (open_listeners(s->process->pool)) {
+-        return 0;
++#ifdef HAVE_SYSTEMD
++    if (use_systemd) {
++        const char *userdata_key = "ap_open_systemd_listeners";
++        void *data;
++        /* clear the enviroment on our second run
++        * so that none of our future children get confused.
++        */
++        apr_pool_userdata_get(&data, userdata_key, s->process->pool);
++        if (!data) {
++            apr_pool_userdata_set((const void *)1, userdata_key,
++                                apr_pool_cleanup_null, s->process->pool);
++        }
++        else {
++            sd_listen_fds(1);
++        }
++    }
++    else
++#endif
++    {
++        if (open_listeners(s->process->pool)) {
++            return 0;
++        }
+     }
+ 
+     for (lr = ap_listeners; lr; lr = lr->next) {
+@@ -682,7 +829,7 @@ AP_DECLARE(apr_status_t) ap_duplicate_listeners(apr_pool_t *p, server_rec *s,
+                             duplr->bind_addr);
+                 return stat;
+             }
+-            make_sock(p, duplr);
++            make_sock(p, duplr, 1);
+ #if AP_NONBLOCK_WHEN_MULTI_LISTEN
+             use_nonblock = (ap_listeners && ap_listeners->next);
+             stat = apr_socket_opt_set(duplr->sd, APR_SO_NONBLOCK, use_nonblock);
+@@ -809,6 +956,11 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
+     if (argc < 1 || argc > 2) {
+         return "Listen requires 1 or 2 arguments.";
+     }
++#ifdef HAVE_SYSTEMD
++    if (use_systemd == -1) {
++        use_systemd = sd_listen_fds(0) > 0;
++    }
++#endif
+ 
+     rv = apr_parse_addr_port(&host, &scope_id, &port, argv[0], cmd->pool);
+     if (rv != APR_SUCCESS) {
+@@ -840,6 +992,12 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
+         ap_str_tolower(proto);
+     }
+ 
++#ifdef HAVE_SYSTEMD
++    if (use_systemd) {
++        return set_systemd_listener(cmd->server->process, port, proto);
++    }
++#endif
++
+     return alloc_listener(cmd->server->process, host, port, proto, NULL);
+ }
+

httpd-2.4.17-sslciphdefault.patch Added

@@ -0,0 +1,33 @@
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1109119
+
+Don't prepend !aNULL etc if PROFILE= is used with SSLCipherSuite.
+
+--- httpd-2.4.17/modules/ssl/ssl_engine_config.c.sslciphdefault
++++ httpd-2.4.17/modules/ssl/ssl_engine_config.c
+@@ -708,8 +708,10 @@ const char *ssl_cmd_SSLCipherSuite(cmd_p
+     SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
+     SSLDirConfigRec *dc = (SSLDirConfigRec *)dcfg;
+ 
+-    /* always disable null and export ciphers */
+-    arg = apr_pstrcat(cmd->pool, arg, ":!aNULL:!eNULL:!EXP", NULL);
++    /* Disable null and export ciphers by default, except for PROFILE=
++     * configs where the parser doesn't cope. */
++    if (strncmp(arg, "PROFILE=", 8) != 0)
++        arg = apr_pstrcat(cmd->pool, arg, ":!aNULL:!eNULL:!EXP", NULL);
+ 
+     if (cmd->path) {
+         dc->szCipherSuite = arg;
+@@ -1428,8 +1430,10 @@ const char *ssl_cmd_SSLProxyCipherSuite(
+ {
+     SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
+ 
+-    /* always disable null and export ciphers */
+-    arg = apr_pstrcat(cmd->pool, arg, ":!aNULL:!eNULL:!EXP", NULL);
++    /* Disable null and export ciphers by default, except for PROFILE=
++     * configs where the parser doesn't cope. */
++    if (strncmp(arg, "PROFILE=", 8) != 0)
++        arg = apr_pstrcat(cmd->pool, arg, ":!aNULL:!eNULL:!EXP", NULL);
+ 
+     sc->proxy->auth.cipher_suite = arg;
+

httpd-2.4.18-sslmultiproxy.patch Added

@@ -0,0 +1,98 @@
+diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
+index 717a694..a3ce718 100644
+--- a/modules/ssl/mod_ssl.c
++++ b/modules/ssl/mod_ssl.c
+@@ -395,6 +395,9 @@ static SSLConnRec *ssl_init_connection_ctx(conn_rec *c)
+     return sslconn;
+ }
+ 
++static typeof(ssl_proxy_enable) *othermod_proxy_enable;
++static typeof(ssl_engine_disable) *othermod_engine_disable;
++
+ int ssl_proxy_enable(conn_rec *c)
+ {
+     SSLSrvConfigRec *sc;
+@@ -403,6 +406,12 @@ int ssl_proxy_enable(conn_rec *c)
+     sc = mySrvConfig(sslconn->server);
+ 
+     if (!sc->proxy_enabled) {
++        if (othermod_proxy_enable) {
++            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c,
++                          "mod_ssl proxy not configured, passing through to other module.");
++            return othermod_proxy_enable(c);
++        }
++
+         ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(01961)
+                       "SSL Proxy requested for %s but not enabled "
+                       "[Hint: SSLProxyEngine]", sc->vhost_id);
+@@ -422,6 +431,10 @@ int ssl_engine_disable(conn_rec *c)
+ 
+     SSLConnRec *sslconn = myConnConfig(c);
+ 
++    if (othermod_engine_disable) {
++        othermod_engine_disable(c);
++    }
++
+     if (sslconn) {
+         sc = mySrvConfig(sslconn->server);
+     }
+@@ -621,6 +634,9 @@ static void ssl_register_hooks(apr_pool_t *p)
+     ap_hook_post_read_request(ssl_hook_ReadReq, pre_prr,NULL, APR_HOOK_MIDDLE);
+ 
+     ssl_var_register(p);
++    
++    othermod_proxy_enable = APR_RETRIEVE_OPTIONAL_FN(ssl_proxy_enable);
++    othermod_engine_disable = APR_RETRIEVE_OPTIONAL_FN(ssl_engine_disable);
+ 
+     APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable);
+     APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
+diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
+index a6b0d0d..24fd8c7 100644
+--- a/modules/ssl/ssl_engine_vars.c
++++ b/modules/ssl/ssl_engine_vars.c
+@@ -54,6 +54,8 @@ static char *ssl_var_lookup_ssl_cipher(apr_pool_t *p, SSLConnRec *sslconn, char
+ static void  ssl_var_lookup_ssl_cipher_bits(SSL *ssl, int *usekeysize, int *algkeysize);
+ static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var);
+ static char *ssl_var_lookup_ssl_compress_meth(SSL *ssl);
++static APR_OPTIONAL_FN_TYPE(ssl_is_https) *othermod_is_https;
++static APR_OPTIONAL_FN_TYPE(ssl_var_lookup) *othermod_var_lookup;
+ 
+ static SSLConnRec *ssl_get_effective_config(conn_rec *c)
+ {
+@@ -68,7 +70,9 @@ static SSLConnRec *ssl_get_effective_config(conn_rec *c)
+ static int ssl_is_https(conn_rec *c)
+ {
+     SSLConnRec *sslconn = ssl_get_effective_config(c);
+-    return sslconn && sslconn->ssl;
++
++    return (sslconn && sslconn->ssl)
++        || (othermod_is_https && othermod_is_https(c));
+ }
+ 
+ static const char var_interface[] = "mod_ssl/" AP_SERVER_BASEREVISION;
+@@ -137,6 +141,9 @@ void ssl_var_register(apr_pool_t *p)
+ {
+     char *cp, *cp2;
+ 
++    othermod_is_https = APR_RETRIEVE_OPTIONAL_FN(ssl_is_https);
++    othermod_var_lookup = APR_RETRIEVE_OPTIONAL_FN(ssl_var_lookup);
++
+     APR_REGISTER_OPTIONAL_FN(ssl_is_https);
+     APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
+     APR_REGISTER_OPTIONAL_FN(ssl_ext_list);
+@@ -272,6 +279,15 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r,
+      */
+     if (result == NULL && c != NULL) {
+         SSLConnRec *sslconn = ssl_get_effective_config(c);
++
++        if (strlen(var) > 4 && strcEQn(var, "SSL_", 4)
++            && (!sslconn || !sslconn->ssl) && othermod_var_lookup) {
++            /* For an SSL_* variable, if mod_ssl is not enabled for
++             * this connection and another SSL module is present, pass
++             * through to that module. */
++            return othermod_var_lookup(p, s, c, r, var);
++        }
++
+         if (strlen(var) > 4 && strcEQn(var, "SSL_", 4)
+             && sslconn && sslconn->ssl)
+             result = ssl_var_lookup_ssl(p, sslconn, r, var+4);

httpd-2.4.2-icons.patch Added

httpd-2.4.3-apctl-systemd.patch Added

@@ -0,0 +1,45 @@
+
+Upstream-Status: vendor specific patch
+
+diff --git a/support/apachectl.in b/support/apachectl.in
+index c6ac3ea..2599386 100644
+--- a/support/apachectl.in
++++ b/support/apachectl.in
+@@ -100,9 +100,24 @@ fi
+ ERROR=$?
+ }
+ 
++if [ "x$2" != "x" ] ; then
++    echo Passing arguments to httpd using apachectl is no longer supported.
++    echo You can only start/stop/restart httpd using this script.
++    echo If you want to pass extra arguments to httpd, edit the
++    echo /etc/sysconfig/httpd config file.
++fi
++
+ case $ACMD in
+-start|stop|restart|graceful|graceful-stop)
+-    $HTTPD $OPTIONS -k $ARGV
++start|stop|restart|status)
++    /usr/bin/systemctl $ACMD httpd.service
++    ERROR=$?
++    ;;
++graceful)
++    /usr/bin/systemctl reload httpd.service
++    ERROR=$?
++    ;;
++graceful-stop)
++    /usr/bin/systemctl stop httpd.service
+     ERROR=$?
+     ;;
+ startssl|sslstart|start-SSL)
+@@ -114,10 +129,6 @@ startssl|sslstart|start-SSL)
+ configtest)
+     testconfig
+     ;;
+-status)
+-    checklynx
+-    $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
+-    ;;
+ fullstatus)
+     checklynx
+     $LYNX $STATUSURL

httpd-2.4.3-layout.patch Added

@@ -0,0 +1,33 @@
+
+Add layout for Fedora.
+
+--- httpd-2.4.3/config.layout.layout
++++ httpd-2.4.3/config.layout
+@@ -370,3 +370,27 @@
+     logfiledir:      ${localstatedir}/log/httpd
+     proxycachedir:   ${localstatedir}/cache/httpd
+ </Layout>
++
++# Fedora/RHEL layout
++<Layout Fedora>
++    prefix:        /usr
++    exec_prefix:   ${prefix}
++    bindir:        ${prefix}/bin
++    sbindir:       ${prefix}/sbin
++    libdir:        ${prefix}/lib
++    libexecdir:    ${prefix}/libexec
++    mandir:        ${prefix}/man
++    sysconfdir:    /etc/httpd/conf
++    datadir:       ${prefix}/share/httpd
++    installbuilddir: ${libdir}/httpd/build
++    errordir:      ${datadir}/error
++    iconsdir:      ${datadir}/icons
++    htdocsdir:     /var/www/html
++    manualdir:     ${datadir}/manual
++    cgidir:        /var/www/cgi-bin
++    includedir:    ${prefix}/include/httpd
++    localstatedir: /var
++    runtimedir:    /run/httpd
++    logfiledir:    ${localstatedir}/log/httpd
++    proxycachedir: ${localstatedir}/cache/httpd/proxy
++</Layout>

httpd-2.4.3-mod_systemd.patch Added

@@ -0,0 +1,163 @@
+--- httpd-2.4.3/modules/arch/unix/config5.m4.systemd
++++ httpd-2.4.3/modules/arch/unix/config5.m4
+@@ -18,6 +18,19 @@ APACHE_MODULE(privileges, Per-virtualhos
+   fi
+ ])
+ 
++
++APACHE_MODULE(systemd, Systemd support, , , $unixd_mods_enabled, [
++  AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
++  AC_CHECK_HEADERS(systemd/sd-daemon.h, [ap_HAVE_SD_DAEMON_H="yes"], [ap_HAVE_SD_DAEMON_H="no"])
++  if test $ap_HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then
++    AC_MSG_WARN([Your system does not support systemd.])
++    enable_systemd="no"
++  else
++    APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS])
++    enable_systemd="yes"
++  fi
++])
++
+ APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+ 
+ APACHE_MODPATH_FINISH
+--- httpd-2.4.3/modules/arch/unix/mod_systemd.c.systemd
++++ httpd-2.4.3/modules/arch/unix/mod_systemd.c
+@@ -0,0 +1,138 @@
++/* Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements.  See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License.  You may obtain a copy of the License at
++ *
++ *     http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ * 
++ */
++
++#include <stdint.h>
++#include <ap_config.h>
++#include "ap_mpm.h"
++#include <http_core.h>
++#include <http_log.h>
++#include <apr_version.h>
++#include <apr_pools.h>
++#include <apr_strings.h>
++#include "unixd.h"
++#include "scoreboard.h"
++#include "mpm_common.h"
++
++#include "systemd/sd-daemon.h"
++
++#if APR_HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++#define KBYTE 1024
++
++static pid_t pid;	/* PID of the main httpd instance */
++static int server_limit, thread_limit, threads_per_child, max_servers;
++static time_t last_update_time;
++static unsigned long last_update_access;
++static unsigned long last_update_kbytes;
++
++static int systemd_pre_mpm(apr_pool_t *p, ap_scoreboard_e sb_type)
++{
++    int rv;
++    last_update_time = time(0);
++
++    ap_mpm_query(AP_MPMQ_HARD_LIMIT_THREADS, &thread_limit);
++    ap_mpm_query(AP_MPMQ_HARD_LIMIT_DAEMONS, &server_limit);
++    ap_mpm_query(AP_MPMQ_MAX_THREADS, &threads_per_child);
++    /* work around buggy MPMs */
++    if (threads_per_child == 0)
++        threads_per_child = 1;
++    ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &max_servers);
++
++    pid = getpid();
++    
++    rv = sd_notifyf(0, "READY=1\n"
++                    "STATUS=Processing requests...\n"
++                    "MAINPID=%lu",
++                    (unsigned long) pid);
++    if (rv < 0) {
++        ap_log_perror(APLOG_MARK, APLOG_ERR, 0, p, 
++                     "sd_notifyf returned an error %d", rv);
++    }
++
++    return OK;
++}
++
++static int systemd_monitor(apr_pool_t *p, server_rec *s)
++{
++    int i, j, res, rv;
++    process_score *ps_record;
++    worker_score *ws_record;
++    unsigned long access = 0;
++    unsigned long bytes = 0;
++    unsigned long kbytes = 0;
++    char bps[5];
++    time_t now = time(0);
++    time_t elapsed = now - last_update_time;
++
++    for (i = 0; i < server_limit; ++i) {
++        ps_record = ap_get_scoreboard_process(i);
++        for (j = 0; j < thread_limit; ++j) {
++            ws_record = ap_get_scoreboard_worker_from_indexes(i, j);
++            if (ap_extended_status && !ps_record->quiescing && ps_record->pid) {
++                res = ws_record->status;
++                if (ws_record->access_count != 0 || 
++                    (res != SERVER_READY && res != SERVER_DEAD)) {
++                    access += ws_record->access_count;
++                    bytes += ws_record->bytes_served;
++                    if (bytes >= KBYTE) {
++                        kbytes += (bytes >> 10);
++                        bytes = bytes & 0x3ff;
++                    }
++                }
++            }
++        }
++    }
++
++    apr_strfsize((unsigned long)(KBYTE *(float) (kbytes - last_update_kbytes)
++                                 / (float) elapsed), bps);
++
++    rv = sd_notifyf(0, "READY=1\n"
++                    "STATUS=Total requests: %lu; Current requests/sec: %.3g; "
++                    "Current traffic: %sB/sec\n", access,
++                    ((float)access - last_update_access) / (float) elapsed, bps);
++    if (rv < 0) {
++        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00000)
++                     "sd_notifyf returned an error %d", rv);
++    }
++
++    last_update_access = access;
++    last_update_kbytes = kbytes;
++    last_update_time = now;
++
++    return DECLINED;
++}
++
++static void systemd_register_hooks(apr_pool_t *p)
++{
++    /* We know the PID in this hook ... */
++    ap_hook_pre_mpm(systemd_pre_mpm, NULL, NULL, APR_HOOK_LAST);
++    /* Used to update httpd's status line using sd_notifyf */
++    ap_hook_monitor(systemd_monitor, NULL, NULL, APR_HOOK_MIDDLE);
++}
++
++module AP_MODULE_DECLARE_DATA systemd_module =
++{
++    STANDARD20_MODULE_STUFF,
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    systemd_register_hooks,
++};

httpd-2.4.4-cachehardmax.patch Added

@@ -0,0 +1,82 @@
+diff --git a/modules/cache/cache_util.h b/modules/cache/cache_util.h
+index eec38f3..1a2d5ee 100644
+--- a/modules/cache/cache_util.h
++++ b/modules/cache/cache_util.h
+@@ -194,6 +194,9 @@ typedef struct {
+     unsigned int store_nostore_set:1;
+     unsigned int enable_set:1;
+     unsigned int disable_set:1;
++    /* treat maxex as hard limit */
++    unsigned int hardmaxex:1;
++    unsigned int hardmaxex_set:1;
+ } cache_dir_conf;
+ 
+ /* A linked-list of authn providers. */
+diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
+index 4f2d3e0..30c88f4 100644
+--- a/modules/cache/mod_cache.c
++++ b/modules/cache/mod_cache.c
+@@ -1299,6 +1299,11 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
+             exp = date + dconf->defex;
+         }
+     }
++    /* else, forcibly cap the expiry date if required */
++    else if (dconf->hardmaxex && (date + dconf->maxex) < exp) {
++        exp = date + dconf->maxex;
++    }        
++
+     info->expire = exp;
+ 
+     /* We found a stale entry which wasn't really stale. */
+@@ -1717,7 +1722,9 @@ static void *create_dir_config(apr_pool_t *p, char *dummy)
+ 
+     /* array of providers for this URL space */
+     dconf->cacheenable = apr_array_make(p, 10, sizeof(struct cache_enable));
+-
++    /* flag; treat maxex as hard limit */
++    dconf->hardmaxex = 0;
++    dconf->hardmaxex_set = 0;
+     return dconf;
+ }
+ 
+@@ -1767,7 +1774,10 @@ static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv) {
+     new->enable_set = add->enable_set || base->enable_set;
+     new->disable = (add->disable_set == 0) ? base->disable : add->disable;
+     new->disable_set = add->disable_set || base->disable_set;
+-
++    new->hardmaxex = 
++        (add->hardmaxex_set == 0)
++        ? base->hardmaxex
++        : add->hardmaxex;
+     return new;
+ }
+ 
+@@ -2096,12 +2106,18 @@ static const char *add_cache_disable(cmd_parms *parms, void *dummy,
+ }
+ 
+ static const char *set_cache_maxex(cmd_parms *parms, void *dummy,
+-                                   const char *arg)
++                                   const char *arg, const char *hard)
+ {
+     cache_dir_conf *dconf = (cache_dir_conf *)dummy;
+ 
+     dconf->maxex = (apr_time_t) (atol(arg) * MSEC_ONE_SEC);
+     dconf->maxex_set = 1;
++    
++    if (hard && strcasecmp(hard, "hard") == 0) {
++        dconf->hardmaxex = 1;
++        dconf->hardmaxex_set = 1;
++    }
++
+     return NULL;
+ }
+ 
+@@ -2309,7 +2325,7 @@ static const command_rec cache_cmds[] =
+                    "caching is enabled"),
+     AP_INIT_TAKE1("CacheDisable", add_cache_disable, NULL, RSRC_CONF|ACCESS_CONF,
+                   "A partial URL prefix below which caching is disabled"),
+-    AP_INIT_TAKE1("CacheMaxExpire", set_cache_maxex, NULL, RSRC_CONF|ACCESS_CONF,
++    AP_INIT_TAKE12("CacheMaxExpire", set_cache_maxex, NULL, RSRC_CONF|ACCESS_CONF,
+                   "The maximum time in seconds to cache a document"),
+     AP_INIT_TAKE1("CacheMinExpire", set_cache_minex, NULL, RSRC_CONF|ACCESS_CONF,
+                   "The minimum time in seconds to cache a document"),

httpd-2.4.4-export.patch Added

httpd-2.4.4-malformed-host.patch Added

httpd-2.4.4-mod_unique_id.patch Added

@@ -0,0 +1,239 @@
+--- trunk/modules/metadata/mod_unique_id.c	2011/12/02 23:02:04	1209766
++++ trunk/modules/metadata/mod_unique_id.c	2013/07/10 16:20:31	1501827
+@@ -31,14 +31,11 @@
+ #include "http_log.h"
+ #include "http_protocol.h"  /* for ap_hook_post_read_request */
+ 
+-#if APR_HAVE_UNISTD_H
+-#include <unistd.h>         /* for getpid() */
+-#endif
++#define ROOT_SIZE 10
+ 
+ typedef struct {
+     unsigned int stamp;
+-    unsigned int in_addr;
+-    unsigned int pid;
++    char root[ROOT_SIZE];
+     unsigned short counter;
+     unsigned int thread_index;
+ } unique_id_rec;
+@@ -64,20 +61,15 @@
+  * gethostbyname (gethostname()) is unique across all the machines at the
+  * "site".
+  *
+- * We also further assume that pids fit in 32-bits.  If something uses more
+- * than 32-bits, the fix is trivial, but it requires the unrolled uuencoding
+- * loop to be extended.  * A similar fix is needed to support multithreaded
+- * servers, using a pid/tid combo.
+- *
+- * Together, the in_addr and pid are assumed to absolutely uniquely identify
+- * this one child from all other currently running children on all servers
+- * (including this physical server if it is running multiple httpds) from each
++ * The root is assumed to absolutely uniquely identify this one child
++ * from all other currently running children on all servers (including
++ * this physical server if it is running multiple httpds) from each
+  * other.
+  *
+- * The stamp and counter are used to distinguish all hits for a particular
+- * (in_addr,pid) pair.  The stamp is updated using r->request_time,
+- * saving cpu cycles.  The counter is never reset, and is used to permit up to
+- * 64k requests in a single second by a single child.
++ * The stamp and counter are used to distinguish all hits for a
++ * particular root.  The stamp is updated using r->request_time,
++ * saving cpu cycles.  The counter is never reset, and is used to
++ * permit up to 64k requests in a single second by a single child.
+  *
+  * The 144-bits of unique_id_rec are encoded using the alphabet
+  * [A-Za-z0-9@-], resulting in 24 bytes of printable characters.  That is then
+@@ -92,7 +84,7 @@
+  * module change.
+  *
+  * It is highly desirable that identifiers exist for "eternity".  But future
+- * needs (such as much faster webservers, moving to 64-bit pids, or moving to a
++ * needs (such as much faster webservers, or moving to a
+  * multithreaded server) may dictate a need to change the contents of
+  * unique_id_rec.  Such a future implementation should ensure that the first
+  * field is still a time_t stamp.  By doing that, it is possible for a site to
+@@ -100,7 +92,15 @@
+  * wait one entire second, and then start all of their new-servers.  This
+  * procedure will ensure that the new space of identifiers is completely unique
+  * from the old space.  (Since the first four unencoded bytes always differ.)
++ *
++ * Note: previous implementations used 32-bits of IP address plus pid
++ * in place of the PRNG output in the "root" field.  This was
++ * insufficient for IPv6-only hosts, required working DNS to determine
++ * a unique IP address (fragile), and needed a [0, 1) second sleep
++ * call at startup to avoid pid reuse.  Use of the PRNG avoids all
++ * these issues.
+  */
++
+ /*
+  * Sun Jun  7 05:43:49 CEST 1998 -- Alvaro
+  * More comments:
+@@ -116,8 +116,6 @@
+  * htonl/ntohl. Well, this shouldn't be a problem till year 2106.
+  */
+ 
+-static unsigned global_in_addr;
+-
+ /*
+  * XXX: We should have a per-thread counter and not use cur_unique_id.counter
+  * XXX: in all threads, because this is bad for performance on multi-processor
+@@ -129,7 +127,7 @@
+ /*
+  * Number of elements in the structure unique_id_rec.
+  */
+-#define UNIQUE_ID_REC_MAX 5
++#define UNIQUE_ID_REC_MAX 4
+ 
+ static unsigned short unique_id_rec_offset[UNIQUE_ID_REC_MAX],
+                       unique_id_rec_size[UNIQUE_ID_REC_MAX],
+@@ -138,113 +136,32 @@
+ 
+ static int unique_id_global_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *main_server)
+ {
+-    char str[APRMAXHOSTLEN + 1];
+-    apr_status_t rv;
+-    char *ipaddrstr;
+-    apr_sockaddr_t *sockaddr;
+-
+     /*
+      * Calculate the sizes and offsets in cur_unique_id.
+      */
+     unique_id_rec_offset[0] = APR_OFFSETOF(unique_id_rec, stamp);
+     unique_id_rec_size[0] = sizeof(cur_unique_id.stamp);
+-    unique_id_rec_offset[1] = APR_OFFSETOF(unique_id_rec, in_addr);
+-    unique_id_rec_size[1] = sizeof(cur_unique_id.in_addr);
+-    unique_id_rec_offset[2] = APR_OFFSETOF(unique_id_rec, pid);
+-    unique_id_rec_size[2] = sizeof(cur_unique_id.pid);
+-    unique_id_rec_offset[3] = APR_OFFSETOF(unique_id_rec, counter);
+-    unique_id_rec_size[3] = sizeof(cur_unique_id.counter);
+-    unique_id_rec_offset[4] = APR_OFFSETOF(unique_id_rec, thread_index);
+-    unique_id_rec_size[4] = sizeof(cur_unique_id.thread_index);
++    unique_id_rec_offset[1] = APR_OFFSETOF(unique_id_rec, root);
++    unique_id_rec_size[1] = sizeof(cur_unique_id.root);
++    unique_id_rec_offset[2] = APR_OFFSETOF(unique_id_rec, counter);
++    unique_id_rec_size[2] = sizeof(cur_unique_id.counter);
++    unique_id_rec_offset[3] = APR_OFFSETOF(unique_id_rec, thread_index);
++    unique_id_rec_size[3] = sizeof(cur_unique_id.thread_index);
+     unique_id_rec_total_size = unique_id_rec_size[0] + unique_id_rec_size[1] +
+-                               unique_id_rec_size[2] + unique_id_rec_size[3] +
+-                               unique_id_rec_size[4];
++                               unique_id_rec_size[2] + unique_id_rec_size[3];
+ 
+     /*
+      * Calculate the size of the structure when encoded.
+      */
+     unique_id_rec_size_uu = (unique_id_rec_total_size*8+5)/6;
+ 
+-    /*
+-     * Now get the global in_addr.  Note that it is not sufficient to use one
+-     * of the addresses from the main_server, since those aren't as likely to
+-     * be unique as the physical address of the machine
+-     */
+-    if ((rv = apr_gethostname(str, sizeof(str) - 1, p)) != APR_SUCCESS) {
+-        ap_log_error(APLOG_MARK, APLOG_ALERT, rv, main_server, APLOGNO(01563)
+-          "unable to find hostname of the server");
+-        return HTTP_INTERNAL_SERVER_ERROR;
+-    }
+-
+-    if ((rv = apr_sockaddr_info_get(&sockaddr, str, AF_INET, 0, 0, p)) == APR_SUCCESS) {
+-        global_in_addr = sockaddr->sa.sin.sin_addr.s_addr;
+-    }
+-    else {
+-        ap_log_error(APLOG_MARK, APLOG_ALERT, rv, main_server, APLOGNO(01564)
+-                    "unable to find IPv4 address of \"%s\"", str);
+-#if APR_HAVE_IPV6
+-        if ((rv = apr_sockaddr_info_get(&sockaddr, str, AF_INET6, 0, 0, p)) == APR_SUCCESS) {
+-            memcpy(&global_in_addr,
+-                   (char *)sockaddr->ipaddr_ptr + sockaddr->ipaddr_len - sizeof(global_in_addr),
+-                   sizeof(global_in_addr));
+-            ap_log_error(APLOG_MARK, APLOG_ALERT, rv, main_server, APLOGNO(01565)
+-                         "using low-order bits of IPv6 address "
+-                         "as if they were unique");
+-        }
+-        else
+-#endif
+-        return HTTP_INTERNAL_SERVER_ERROR;
+-    }
+-
+-    apr_sockaddr_ip_get(&ipaddrstr, sockaddr);
+-    ap_log_error(APLOG_MARK, APLOG_INFO, 0, main_server, APLOGNO(01566) "using ip addr %s",
+-                 ipaddrstr);
+-
+-    /*
+-     * If the server is pummelled with restart requests we could possibly end
+-     * up in a situation where we're starting again during the same second
+-     * that has been used in previous identifiers.  Avoid that situation.
+-     *
+-     * In truth, for this to actually happen not only would it have to restart
+-     * in the same second, but it would have to somehow get the same pids as
+-     * one of the other servers that was running in that second. Which would
+-     * mean a 64k wraparound on pids ... not very likely at all.
+-     *
+-     * But protecting against it is relatively cheap.  We just sleep into the
+-     * next second.
+-     */
+-    apr_sleep(apr_time_from_sec(1) - apr_time_usec(apr_time_now()));
+     return OK;
+ }
+ 
+ static void unique_id_child_init(apr_pool_t *p, server_rec *s)
+ {
+-    pid_t pid;
+-
+-    /*
+-     * Note that we use the pid because it's possible that on the same
+-     * physical machine there are multiple servers (i.e. using Listen). But
+-     * it's guaranteed that none of them will share the same pids between
+-     * children.
+-     *
+-     * XXX: for multithread this needs to use a pid/tid combo and probably
+-     * needs to be expanded to 32 bits
+-     */
+-    pid = getpid();
+-    cur_unique_id.pid = pid;
+-
+-    /*
+-     * Test our assumption that the pid is 32-bits.  It's possible that
+-     * 64-bit machines will declare pid_t to be 64 bits but only use 32
+-     * of them.  It would have been really nice to test this during
+-     * global_init ... but oh well.
+-     */
+-    if ((pid_t)cur_unique_id.pid != pid) {
+-        ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s, APLOGNO(01567)
+-                    "oh no! pids are greater than 32-bits!  I'm broken!");
+-    }
+-
+-    cur_unique_id.in_addr = global_in_addr;
++    ap_random_insecure_bytes(&cur_unique_id.root,
++                             sizeof(cur_unique_id.root));
+ 
+     /*
+      * If we use 0 as the initial counter we have a little less protection
+@@ -253,13 +170,6 @@
+      */
+     ap_random_insecure_bytes(&cur_unique_id.counter,
+                              sizeof(cur_unique_id.counter));
+-
+-    /*
+-     * We must always use network ordering for these bytes, so that
+-     * identifiers are comparable between machines of different byte
+-     * orderings.  Note in_addr is already in network order.
+-     */
+-    cur_unique_id.pid = htonl(cur_unique_id.pid);
+ }
+ 
+ /* NOTE: This is *NOT* the same encoding used by base64encode ... the last two
+@@ -291,10 +201,8 @@
+     unsigned short counter;
+     int i,j,k;
+ 
+-    new_unique_id.in_addr = cur_unique_id.in_addr;
+-    new_unique_id.pid = cur_unique_id.pid;
++    memcpy(&new_unique_id.root, &cur_unique_id.root, ROOT_SIZE);
+     new_unique_id.counter = cur_unique_id.counter;
+-
+     new_unique_id.stamp = htonl((unsigned int)apr_time_sec(r->request_time));
+     new_unique_id.thread_index = htonl((unsigned int)r->connection->id);
+

httpd-2.4.4-r1337344+.patch Added

@@ -0,0 +1,250 @@
+# ./pullrev.sh 1337344 1341905 1342065 1341930
+
+suexec enhancements:
+
+1) use syslog for logging
+2) use capabilities not setuid/setgid root binary
+
+http://svn.apache.org/viewvc?view=revision&revision=1337344
+http://svn.apache.org/viewvc?view=revision&revision=1341905
+http://svn.apache.org/viewvc?view=revision&revision=1342065
+http://svn.apache.org/viewvc?view=revision&revision=1341930
+
+--- httpd-2.4.4/configure.in.r1337344+
++++ httpd-2.4.4/configure.in
+@@ -734,7 +734,24 @@ APACHE_HELP_STRING(--with-suexec-gidmin,
+ 
+ AC_ARG_WITH(suexec-logfile,
+ APACHE_HELP_STRING(--with-suexec-logfile,Set the logfile),[
+-  AC_DEFINE_UNQUOTED(AP_LOG_EXEC, "$withval", [SuExec log file] ) ] )
++  if test "x$withval" = "xyes"; then
++    AC_DEFINE_UNQUOTED(AP_LOG_EXEC, "$withval", [SuExec log file])
++  fi
++])
++
++AC_ARG_WITH(suexec-syslog,
++APACHE_HELP_STRING(--with-suexec-syslog,Set the logfile),[
++  if test $withval = "yes"; then
++    if test "x${with_suexec_logfile}" != "xno"; then
++      AC_MSG_NOTICE([hint: use "--without-suexec-logfile --with-suexec-syslog"])
++      AC_MSG_ERROR([suexec does not support both logging to file and syslog])
++    fi
++    AC_CHECK_FUNCS([vsyslog], [], [
++       AC_MSG_ERROR([cannot support syslog from suexec without vsyslog()])])
++    AC_DEFINE(AP_LOG_SYSLOG, 1, [SuExec log to syslog])
++  fi    
++])
++
+ 
+ AC_ARG_WITH(suexec-safepath,
+ APACHE_HELP_STRING(--with-suexec-safepath,Set the safepath),[
+@@ -744,6 +761,15 @@ AC_ARG_WITH(suexec-umask,
+ APACHE_HELP_STRING(--with-suexec-umask,umask for suexec'd process),[
+   AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )
+ 
++INSTALL_SUEXEC=setuid
++AC_ARG_ENABLE([suexec-capabilities], 
++APACHE_HELP_STRING(--enable-suexec-capabilities,Use Linux capability bits not setuid root suexec), [
++INSTALL_SUEXEC=caps
++AC_DEFINE(AP_SUEXEC_CAPABILITIES, 1, 
++          [Enable if suexec is installed with Linux capabilities, not setuid])
++])
++APACHE_SUBST(INSTALL_SUEXEC)
++
+ dnl APR should go after the other libs, so the right symbols can be picked up
+ if test x${apu_found} != xobsolete; then
+   AP_LIBS="$AP_LIBS `$apu_config --avoid-ldap --link-libtool`"
+--- httpd-2.4.4/docs/manual/suexec.html.en.r1337344+
++++ httpd-2.4.4/docs/manual/suexec.html.en
+@@ -372,6 +372,21 @@
+       together with the <code>--enable-suexec</code> option to let
+       APACI accept your request for using the suEXEC feature.</dd>
+ 
++      <dt><code>--enable-suexec-capabilities</code></dt>
++
++      <dd><strong>Linux specific:</strong> Normally,
++      the <code>suexec</code> binary is installed "setuid/setgid
++      root", which allows it to run with the full privileges of the
++      root user.  If this option is used, the <code>suexec</code>
++      binary will instead be installed with only the setuid/setgid
++      "capability" bits set, which is the subset of full root
++      priviliges required for suexec operation.  Note that
++      the <code>suexec</code> binary may not be able to write to a log
++      file in this mode; it is recommended that the
++      <code>--with-suexec-syslog --without-suexec-logfile</code>
++      options are used in conjunction with this mode, so that syslog
++      logging is used instead.</dd>
++
+       <dt><code>--with-suexec-bin=<em>PATH</em></code></dt>
+ 
+       <dd>The path to the <code>suexec</code> binary must be hard-coded
+@@ -433,6 +448,12 @@
+       "<code>suexec_log</code>" and located in your standard logfile
+       directory (<code>--logfiledir</code>).</dd>
+ 
++      <dt><code>--with-suexec-syslog</code></dt>
++
++      <dd>If defined, suexec will log notices and errors to syslog
++      instead of a logfile.  This option must be combined
++      with <code>--without-suexec-logfile</code>.</dd>
++
+       <dt><code>--with-suexec-safepath=<em>PATH</em></code></dt>
+ 
+       <dd>Define a safe PATH environment to pass to CGI
+@@ -550,9 +571,12 @@ Group webgroup
+ 
+     <p>The suEXEC wrapper will write log information
+     to the file defined with the <code>--with-suexec-logfile</code>
+-    option as indicated above. If you feel you have configured and
+-    installed the wrapper properly, have a look at this log and the
+-    error_log for the server to see where you may have gone astray.</p>
++    option as indicated above, or to syslog if <code>--with-suexec-syslog</code>
++    is used. If you feel you have configured and
++    installed the wrapper properly, have a look at the log and the
++    error_log for the server to see where you may have gone astray. 
++    The output of <code>"suexec -V"</code> will show the options
++    used to compile suexec, if using a binary distribution.</p>
+ 
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+ <div class="section">
+@@ -640,4 +664,4 @@ if (typeof(prettyPrint) !== 'undefined')
+     prettyPrint();
+ }
+ //--><!]]></script>
+-</body></html>
+\ No newline at end of file
++</body></html>
+--- httpd-2.4.4/Makefile.in.r1337344+
++++ httpd-2.4.4/Makefile.in
+@@ -238,11 +238,22 @@ install-man:
+ 	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+ 	fi
+ 
+-install-suexec:
++install-suexec: install-suexec-binary install-suexec-$(INSTALL_SUEXEC)
++
++install-suexec-binary:
+ 	@if test -f $(builddir)/support/suexec; then \
+             test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir); \
+             $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \
+-            chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
++	fi
++
++install-suexec-setuid:
++	@if test -f $(builddir)/support/suexec; then \
++	    chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
++	fi
++
++install-suexec-caps:
++	@if test -f $(builddir)/support/suexec; then \
++            setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \
+ 	fi
+ 
+ suexec:
+--- httpd-2.4.4/modules/arch/unix/mod_unixd.c.r1337344+
++++ httpd-2.4.4/modules/arch/unix/mod_unixd.c
+@@ -284,6 +284,13 @@ unixd_set_suexec(cmd_parms *cmd, void *d
+     return NULL;
+ }
+ 
++#ifdef AP_SUEXEC_CAPABILITIES
++/* If suexec is using capabilities, don't test for the setuid bit. */
++#define SETUID_TEST(finfo) (1)
++#else
++#define SETUID_TEST(finfo) (finfo.protection & APR_USETID)
++#endif
++
+ static int
+ unixd_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
+                  apr_pool_t *ptemp)
+@@ -300,7 +307,7 @@ unixd_pre_config(apr_pool_t *pconf, apr_
+     ap_unixd_config.suexec_enabled = 0;
+     if ((apr_stat(&wrapper, SUEXEC_BIN, APR_FINFO_NORM, ptemp))
+          == APR_SUCCESS) {
+-        if ((wrapper.protection & APR_USETID) && wrapper.user == 0
++        if (SETUID_TEST(wrapper) && wrapper.user == 0
+             && (access(SUEXEC_BIN, R_OK|X_OK) == 0)) {
+             ap_unixd_config.suexec_enabled = 1;
+             ap_unixd_config.suexec_disabled_reason = "";
+--- httpd-2.4.4/support/suexec.c.r1337344+
++++ httpd-2.4.4/support/suexec.c
+@@ -58,6 +58,10 @@
+ #include <grp.h>
+ #endif
+ 
++#ifdef AP_LOG_SYSLOG
++#include <syslog.h>
++#endif
++
+ #if defined(PATH_MAX)
+ #define AP_MAXPATH PATH_MAX
+ #elif defined(MAXPATHLEN)
+@@ -69,7 +73,20 @@
+ #define AP_ENVBUF 256
+ 
+ extern char **environ;
++
++#ifdef AP_LOG_SYSLOG
++/* Syslog support. */
++#if !defined(AP_LOG_FACILITY) && defined(LOG_AUTHPRIV)
++#define AP_LOG_FACILITY LOG_AUTHPRIV
++#elif !defined(AP_LOG_FACILITY)
++#define AP_LOG_FACILITY LOG_AUTH
++#endif
++
++static int log_open;
++#else
++/* Non-syslog support. */
+ static FILE *log = NULL;
++#endif
+ 
+ static const char *const safe_env_lst[] =
+ {
+@@ -137,7 +154,14 @@ static void err_output(int is_error, con
+ 
+ static void err_output(int is_error, const char *fmt, va_list ap)
+ {
+-#ifdef AP_LOG_EXEC
++#if defined(AP_LOG_SYSLOG)
++    if (!log_open) {
++        openlog("suexec", LOG_PID, AP_LOG_FACILITY);
++        log_open = 1;
++    }
++
++    vsyslog(is_error ? LOG_ERR : LOG_INFO, fmt, ap);
++#elif defined(AP_LOG_EXEC)
+     time_t timevar;
+     struct tm *lt;
+ 
+@@ -295,7 +319,9 @@ int main(int argc, char *argv[])
+ #ifdef AP_HTTPD_USER
+         fprintf(stderr, " -D AP_HTTPD_USER=\"%s\"\n", AP_HTTPD_USER);
+ #endif
+-#ifdef AP_LOG_EXEC
++#if defined(AP_LOG_SYSLOG)
++        fprintf(stderr, " -D AP_LOG_SYSLOG\n");
++#elif defined(AP_LOG_EXEC)
+         fprintf(stderr, " -D AP_LOG_EXEC=\"%s\"\n", AP_LOG_EXEC);
+ #endif
+ #ifdef AP_SAFE_PATH
+@@ -591,6 +617,12 @@ int main(int argc, char *argv[])
+ #endif /* AP_SUEXEC_UMASK */
+ 
+     /* Be sure to close the log file so the CGI can't mess with it. */
++#ifdef AP_LOG_SYSLOG
++    if (log_open) {
++        closelog();
++        log_open = 0;
++    }
++#else
+     if (log != NULL) {
+ #if APR_HAVE_FCNTL_H
+         /*
+@@ -612,6 +644,7 @@ int main(int argc, char *argv[])
+         log = NULL;
+ #endif
+     }
++#endif
+ 
+     /*
+      * Execute the command, replacing our image with its own.

httpd-2.4.7-r1537535.patch Added

@@ -0,0 +1,38 @@
+# ./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;
+         }

httpd-2.4.9-apxs.patch Added

@@ -0,0 +1,58 @@
+diff --git a/support/apxs.in b/support/apxs.in
+index ad1287f..efcfcf6 100644
+--- a/support/apxs.in
++++ b/support/apxs.in
+@@ -25,7 +25,18 @@ package apxs;
+ 
+ my %config_vars = ();
+ 
+-my $installbuilddir = "@exp_installbuilddir@";
++# Awful hack to make apxs libdir-agnostic:
++my $pkg_config = "/usr/bin/pkg-config";
++if (! -x "$pkg_config") {
++    error("$pkg_config not found!");
++    exit(1);
++}
++
++my $libdir = `pkg-config --variable=libdir apr-1`;
++chomp $libdir;
++
++my $installbuilddir = $libdir . "/httpd/build";
++
+ get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
+ 
+ # read the configuration variables once
+@@ -275,7 +286,7 @@ if ($opt_g) {
+     $data =~ s|%NAME%|$name|sg;
+     $data =~ s|%TARGET%|$CFG_TARGET|sg;
+     $data =~ s|%PREFIX%|$prefix|sg;
+-    $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
++    $data =~ s|%LIBDIR%|$libdir|sg;
+ 
+     my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
+ 
+@@ -453,11 +464,11 @@ if ($opt_c) {
+     my $ldflags = "$CFG_LDFLAGS";
+     if ($opt_p == 1) {
+         
+-        my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`;
++        my $apr_libs=`$apr_config --cflags --ldflags --link-libtool`;
+         chomp($apr_libs);
+         my $apu_libs="";
+         if ($apr_major_version < 2) {
+-            $apu_libs=`$apu_config --ldflags --link-libtool --libs`;
++            $apu_libs=`$apu_config --ldflags --link-libtool`;
+             chomp($apu_libs);
+         }
+         
+@@ -672,8 +683,8 @@ __DATA__
+ 
+ builddir=.
+ top_srcdir=%PREFIX%
+-top_builddir=%PREFIX%
+-include %INSTALLBUILDDIR%/special.mk
++top_builddir=%LIBDIR%/httpd
++include %LIBDIR%/httpd/build/special.mk
+ 
+ #   the used tools
+ APACHECTL=apachectl

httpd-2.4.9-r1573626.patch Added

@@ -0,0 +1,29 @@
+--- 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"))) {

00-base.conf Added

@@ -0,0 +1,65 @@
+#
+# This file loads most of the modules included with the Apache HTTP
+# Server itself.
+#
+
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule actions_module modules/mod_actions.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule allowmethods_module modules/mod_allowmethods.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule auth_digest_module modules/mod_auth_digest.so
+LoadModule authn_anon_module modules/mod_authn_anon.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authn_dbd_module modules/mod_authn_dbd.so
+LoadModule authn_dbm_module modules/mod_authn_dbm.so
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authn_socache_module modules/mod_authn_socache.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_dbd_module modules/mod_authz_dbd.so
+LoadModule authz_dbm_module modules/mod_authz_dbm.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_owner_module modules/mod_authz_owner.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule cache_module modules/mod_cache.so
+LoadModule cache_disk_module modules/mod_cache_disk.so
+LoadModule data_module modules/mod_data.so
+LoadModule dbd_module modules/mod_dbd.so
+LoadModule deflate_module modules/mod_deflate.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule dumpio_module modules/mod_dumpio.so
+LoadModule echo_module modules/mod_echo.so
+LoadModule env_module modules/mod_env.so
+LoadModule expires_module modules/mod_expires.so
+LoadModule ext_filter_module modules/mod_ext_filter.so
+LoadModule filter_module modules/mod_filter.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule include_module modules/mod_include.so
+LoadModule info_module modules/mod_info.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule logio_module modules/mod_logio.so
+LoadModule macro_module modules/mod_macro.so
+LoadModule mime_magic_module modules/mod_mime_magic.so
+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
+LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+LoadModule socache_dbm_module modules/mod_socache_dbm.so
+LoadModule socache_memcache_module modules/mod_socache_memcache.so
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+LoadModule status_module modules/mod_status.so
+LoadModule substitute_module modules/mod_substitute.so
+LoadModule suexec_module modules/mod_suexec.so
+LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule userdir_module modules/mod_userdir.so
+LoadModule version_module modules/mod_version.so
+LoadModule vhost_alias_module modules/mod_vhost_alias.so
+

00-dav.conf Added

00-lua.conf Added

00-mpm.conf Added

00-optional.conf Added

00-proxy.conf Added

00-proxyhtml.conf Added

00-ssl.conf Added

00-systemd.conf Added

01-cgi.conf Added

01-ldap.conf Added

01-session.conf Added

10-listen443.conf Added

README.confd Added

README.confmod Added

action-configtest.sh Added

action-graceful.sh Added

debian.changelog Added

@@ -0,0 +1,3491 @@
+apache2 (2.4.18-1) unstable; urgency=medium
+
+  * Check in 2.4.18
+
+ -- Jeroen van Meeuwen (Kolab Systems) <Vanmeeuwen@kolabsys.com>  Sat, 16 Jan 2016 14:14:14 +0200
+
+apache2 (2.4.10-1.1) unstable; urgency=medium
+
+  * Remove breaking libapache2-mod-php5, we don't ship that
+
+ -- Jeroen van Meeuwen (Kolab Systems) <Vanmeeuwen@kolabsys.com>  Thu,  3 Sep 2015 14:14:14 +0200
+
+apache2 (2.4.10-1) unstable; urgency=medium
+
+  [ Arno Töll ]
+  * New upstream version
+    + Refresh debian/patches/fhs_compliance.patch
+    + Security Fixes:
+      - CVE-2014-0117 mod_proxy: Fix DoS that could cause a crash
+      - CVE-2014-0226 Fix a race condition resulting in a heap overflow in
+        scoreboard handling
+      - CVE-2014-0118 mod_deflate: The DEFLATE input filter now limits the
+        length and compression ratio of inflated request to mitigate a
+        possible DoS
+      - CVE-2014-0231 mod_cgid: Fix a denial of service against CGI scripts
+    + Fixes SNI with certificate defined in global scope. (Closes: #751361)
+  * Warn users if they try to disable modules that we consider essential for
+    operation of the Apache web server (Closes: #709461)
+  * Drop libcap from our build-dependencies. That was needed for itk which we
+    gave source out to it's own package again.
+  * Provide apache2.2-common package to avoid upgrading problems for people
+    using --purge (apt) or --purge-unused (aptitude) even though that's
+    clearly discouraged. This caused disappearing of conffiles because we move
+    them from apache2.2-common to apache2 during the upgrade. Ugh. This was
+    not a bug in our packaging, but an unfortunately people blame us
+    nonetheless even though it's not all our fault. This alternative helps
+    those people, but at the same time means that incompatible modules aren't
+    force-removed by dpkg during the upgrade. Hopefully we catch all of them
+    with the Breaks relation coming along (Closes: #716880, #752922, #711925)
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 22 Jul 2014 23:16:20 +0200
+
+apache2 (2.4.9-2) unstable; urgency=medium
+
+  * Fix logic in postinst to detect existing index.* files in both
+    DocumentRoots, the old /var/www and the new /var/www/html. Also
+    change the compiled in default DocumentRoot to /var/www/html.
+    Closes: #743915
+  * Fix buffer overflows in suexec with very long (unix) usernames. Not
+    exploitable due to FORTIFY_SOURCE. And creating users usually requires
+    root privileges, anyway. Thanks to Luca Bruno for the report.
+  * Remove conflicts of mpm modules with mpm_itk, which isn't an mpm
+    anymore. Fixes a part of: #734865. libapache2-mpm-itk needs a fix, too.
+  * Remove obsolete warning in a2enmod about mpm-itk.
+  * Fix lintian warning: Remove image ref to w3.org, which is a privacy
+    breach.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 08 Jun 2014 10:38:04 +0200
+
+apache2 (2.4.9-1) unstable; urgency=medium
+
+  * New upstream version.
+    Security fixes:
+    - CVE-2013-6438: mod_dav: Fix DoS from crafted DAV WRITE requests.
+    - CVE-2014-0098: mod_log_config: Fix segfaults when logging truncated
+                     cookies.
+    Notable new features:
+    - Support named groups and backreferences within the LocationMatch,
+      DirectoryMatch, FilesMatch and ProxyMatch directives.
+    - mod_proxy: Added support for unix domain sockets as the backend server
+      endpoint.
+    - mod_ssl: Add support for OpenSSL configuration commands by introducing
+      the SSLOpenSSLConfCmd directive.
+    - mod_authz_user, mod_authz_host, mod_authz_groupfile, mod_authz_dbm,
+      mod_authz_dbd, mod_authnz_ldap: Support the expression parser within the
+      require directives.
+    - mod_rewrite: Add RewriteOptions InheritDown, InheritDownBefore,
+      and IgnoreInherit.
+    - Bugfix in the build system to avoid problems with patched config.m4
+      files as in LP #1251939.
+  * Make default cipher list in ssl.conf more secure:
+    - Remove 'MEDIUM'. This disables RC4 and SEED. Also remove '!MD5' because
+      'HIGH' does not include MD5.
+    - Remove the 'Speed-optimized SSL Cipher' configuration example because
+      it depends on RC4, which is considered insecure.
+  * Change init script short description to describe the service, not the
+    script.  Closes: #738315
+  * Bump Standards-Version (no changes).
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 29 Mar 2014 22:50:32 +0100
+
+apache2 (2.4.7-1) unstable; urgency=low
+
+  New upstream version
+
+  [ Stefan Fritsch ]
+  * In logrotate and init script, don't hardcode path to htcacheclean.
+    Instead, put sbin directories in PATH. Also fix one missed reference
+    to disk_cache.load, missed in 2.4.6-3. Really closes: #718909
+  * Remove possiblity to override path to apache2 executable via envvars.
+    This is no longer necessary with MPMs as modules.
+  * Fix typo in serve-cgi-bin.conf. Closes: #723196
+  * Bump Build-Depends. 2.4.7 requires apr 1.5.
+
+  [ Arno Töll ]
+  * Fix "No default site enabled after fresh install if /etc/apache2
+    exists" by using a condition in preinst which actually works as expected.
+    Thanks to Jean-Michel Vourgère for triaging the issue and providing a
+    patch (Closes: #711493).
+  * Leave a2disconf with rc=0 when purging a configuration which does not
+    exist. (Closes: #718166)
+  * Explicitly express the dependency for mod_access_compat depending on
+    authn_core. Thanks Jean-Michel Vourgère for providing a patch (Closes:
+    #710412)
+  * Allow "apache2_invoke disconf" in postinst/preinst (Closes: #717693)
+  * Rework the default index.html file. Instead of a blank, minimalistic page
+    give a quick start guide, since nobody seems to read our docs. This site
+    is hopefully explaining the most important questions.
+  * Add a virtual provides line to the itk/worker/event/prefork transitional
+    packages so that people with an unusual (unsupported) Apache setup
+    can upgrade neatless in some corner cases (Closes: #728937)
+  * Drop the Apache ITK patches. The Apache ITK MPM is a standalone package
+    now and will be provided by libapache2-mpm-itk in future. The
+    apache2-mpm-itk package depends on this package from now on. Users of itk
+    are advised to consult the itk manual.
+    This also resolves a build-system problem that caused mod_unixd to be
+    initialized twice. (LP: #1251939)
+  * Remove Steinar H. Gunderson from uploaders, he will continue to support
+    itk in his own package in future. The remaining Apache team thanks Steinar
+    for all the work in the past.
+  * Change the Default Document root directory where files are served from
+    (Closes: #730372).
+  * Add GPG support to our watch file. Thanks to Daniel Kahn Gillmor
+    for this suggestion and for providing a patch (Closes: #732450)
+  * Refresh suexec-custom.patch.
+
+ -- Arno Töll <arno@debian.org>  Thu, 02 Jan 2014 00:17:56 -1100
+
+apache2 (2.4.6-3) unstable; urgency=low
+
+  * Fix 'implicit declaration' compiler warnings.
+  * Fix module dependencies in lbmethod_*.load files. Closes: #717910
+    LP: #1205314
+  * Mark apache2-data as Multi-Arch: foreign. Closes: #718387
+  * Backport open_htaccess hook from upstream 2.4.x branch to allow
+    building mpm-itk as separate package.
+  * Improve comment for LogLevel in apache2.conf. Closes: #718677
+  * Fix comment in ports.conf. Closes: #718650
+  * Fix htcacheclean path and function name in init script. Closes: #718909
+  * Enable bindnow hardening compiler option, patch by Felix Geyer.
+    Closes: #714872
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 12 Aug 2013 20:15:38 +0200
+
+apache2 (2.4.6-2) unstable; urgency=low
+
+  [ Stefan Fritsch ]
+  * Fix watch file
+  * Don't pass --silent to libtool, allowing blhc to check the compiler
+    options in the build logs.
+
+  [ Arno Töll ]
+  * Allow third party packages to use triggers if they use them in a
+    maintainer script invoking apache2-maintscript-helper (Closes: #717610)
+
+ -- Arno Töll <arno@debian.org>  Tue, 23 Jul 2013 13:25:30 +0200
+
+apache2 (2.4.6-1) unstable; urgency=low
+
+  New upstream release:
+  * CVE-2013-1896: mod_dav: Fix a denial of service via MERGE request
+    (Closes: #717272)
+  * New modules mod_cache_socache, mod_proxy_wstunnel.
+  * mod_ssl: Add support for subjectAltName-based host name checking in proxy
+    mode (SSLProxyCheckPeerName).
+  * mod_lua: Many new functions.
+  * mod_auth_basic: Add a generic mechanism to fake basic authentication
+    using the ap_expr parser (AuthBasicFake).
+  * mod_proxy: New BalancerInherit and ProxyPassInherit options.
+  * mod_authnz_ldap: Allow using exec: calls to obtain LDAP bind password.
+
+  [ Arno Töll ]
+  * Document our security model in our NEWS file and highlight we do not allow
+    access to /srv. Thanks to joeyh for pointing this out.
+  * Allow the use of apache2-maintscript-helper from a sub-function. We rely
+    on dpkg's arguments supplied in $1, $2 etc. This clashes with function
+    arguments supplied to to sh sub-function. Allow manual override in such
+    cases.
+  * Mention that the dh_apache2 conditional must be present in postrm too
+    (Closes: #716694)
+  * Fix "dh_apache2 ignores alternative httpd on conf files" by correctly
+    checking the supplied arguments, we were off by one (Closes: #717299).
+  * Reinstall index.html also on upgrades as it is removed during upgrades.
+  * Add mod_macro transitional package as it was promoted to core and does not
+    exist as individual package anymore (Closes: #706962)
+
+  [ Stefan Fritsch ]
+  * Don't fail package upgrade or removal just because the configuration is in
+    an inconsistent state (Closes: #716921, #717343, LP: #1202653).
+  * Improve error output of init script.
+  * Fix broken dependency information in several *.load files.
+  * Add mod_authn_core as dependency of the mod_auth_* modules.
+    (Closes: #717448)
+
+ -- Arno Töll <arno@debian.org>  Sun, 21 Jul 2013 18:44:42 +0200
+
+apache2 (2.4.4-6) unstable; urgency=low
+
+  * Denote exact versions breaking gnome-user-share now that Gnome maintainers
+    have a fixed version in the works. That makes Gnome installable again.
+  * Update our gbp.conf for our big merge next -> master. The eagle has
+    landed, 2.4 is here.
+  * Push Standards version to 3.9.4 - no changes needed.
+  * Fix spelling errors in man pages.
+  * Update the git VCS pointer to its canonical location for anonymous
+    checkouts.
+  * Boost the description for the LSB init script to appease Lintian.
+  * Fix spurious warnings in the Apache2 bug report script (Closes: #711121,
+    #711480)
+  * Strip off file extensions from arguments to a2(en|dis)(site|conf|mod) so
+    that "a2ensite 000-default.conf" works, as well as "a2ensite 000-default"
+    (Closes: #711494)
+  * Fix "apache2-dev: dh-apache2 does not strip .conf extension" for modules
+    relying on the install heuristic, instead of writing an *.apache2 conf
+    file (Closes: #711483)
+  * Apply patch submitted by Robert Luberda and redirect all output of
+    apache2-maintscript-helper to stderr (Closes: #711478)
+  * Tell about essential operations in the init script (Closes: #711120)
+  * Fix indentation mess in the init script, and add modelines
+  * Make sure /etc/init.d/apache2 reload does not always return. Thanks to
+    Thorsten Glaser for suggesting a patch (Closes: #711117)
+  * Make apache2-maintscript-helper usable when sourced from weird
+    environments (e.g. Perl maintainer scripts). Thanks to Robert Luberda
+    for doing unexpected things, and providing patches for it, and to Axel
+    Beckert for demangling shell specifics (Closes: #711479)
+  * Fix "copyright file missing after upgrade (policy 12.5)" and add these for
+    MPM transitional packages (Closes: #710914)
+  * Fix "apache2.2-bin transitional package (binaries only) should not
+    depend on apache2 package (which runs a system daemon)". This happened by
+    accident added by debhelper since we are linking docs. We do to
+    apache2-bin instead (Closes: #711127)
+  * Refresh "upstream-fixes" patch
+  * Fix "Disabling strtoul violates C89 and C99 and is unnecessary" by
+    removing the symbol override in httpd.h(Closes: #711534)
+
+ -- Arno Töll <arno@debian.org>  Fri, 07 Jun 2013 19:14:36 +0200
+
+apache2 (2.4.4-5) unstable; urgency=low
+
+  [ Arno Töll ]
+  * Fix compile issue on kfreebsd.
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 31 May 2013 10:19:18 +0200
+
+apache2 (2.4.4-4) unstable; urgency=low
+
+  [ Stefan Fritsch ]
+  * Upload to unstable.
+  * Fix FTBFS on hurd caused by mpm-itk linking fix.
+  * Fix some lintian warnings:
+    - fix pod error
+    - add overrides for hardening-no-fortify-functions
+    - don't use /lib/init/vars.sh in init script
+  * Add note to README.Debian about CVE-2013-0966 if the document root is
+    on HFS+ or on ZFS with filename normalization.
+  * Add a note to README.Debian about how to change the max file limit.
+    Make apache2ctl print a message pointing to README.Debian if setting
+    the limit fails. (Closes: #706822)
+
+  [ Arno Töll ]
+  * Correct maintainer scripts by removing forgotten left-overs of our Squeeze
+    -> Wheezy renaming
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 30 May 2013 17:25:09 +0200
+
+apache2 (2.4.4-3) experimental; urgency=low
+
+  [ Arno Töll ]
+  * libapache2-mod-proxy-html is included in Apache 2.4 and not packaged
+    separately anymore. Thus, we are using the most recent version available
+    now (Closes: #695482).
+  * Fix "typo in mpm_event.load" by applying the patch provided by Bastian
+    Triller. Thanks (Closes: #704639)
+  * Replace some occurrences of "Squeeze" in our scripts. It's Wheezy time.
+  * Changes in dh_apache2:
+    + Add -e|--noenable option to dh_apache2 (Closes: #681544)
+    + Disable scripts in prerm, not postrm (Closes: #681546)
+    + However, still hook into postrm and purge state when required
+    + Call the postinst code always, not only during configure
+      (Closes: #681545)
+    + Fix "dh_apache2 postinst code needs to reload more" and reload the
+      web-server in postinst when upgrading (Closes: #702929)
+  * Let a2enmod purge state when calling -p for already disabled
+    configurations.
+  * Fix "don't assume apache2 is running 24 hours a day when rotating
+    logs": Only restart the webserver when it was previously running
+    (Closes: #707892)
+  * Properly return the conf/site configuration fragments enabled for Apache
+    when queried from a2query (Closes: #683212)
+  * Fix "/etc/init.d/apache2 start and restart need to wait until really
+    started" (Closes: #645460)
+  * Fix "apxs2 outputs "uninitialized value" warnings" by removing the double
+    declaration of variables in apxs. This problem was harmless, but noisy
+    (Closes: #707109)
+  * Make the DEBIAN_VERSION parsing in debian/rules more robust. Thanks to
+    Ondřej Surý for noticing and providing a patch.
+  * Fix "copyright file missing after upgrade (policy 12.5)" by linking to the
+    apache2 doc-dir when upgrading (Closes: #707795)
+
+  [ Stefan Fritsch ]
+  * Backport various fixes from upstream svn branch '2.4.x'. 
+  * Remove paragraph about MaxMemFree in README.Debian. The issue should be
+    fixed in 2.4.
+  * Enable mod_authn_core when upgrading from wheezy (Closes: #702866)
+  * Bump libaprutil1-dev build dependency to get support for bcrypt password
+    hashes.
+  * Fix mod_mpm_itk.so not being linked to libcap.so (Closes: #702475)
+  * Make apache2-dev not depend on apache2.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 28 May 2013 22:47:26 +0200
+
+apache2 (2.4.4-2) experimental; urgency=low
+
+  * The "let's shorten up this discussion" release, and strip changelogs which
+    are not a direct ancestor of the 2.4 branch.
+  * Restart the server on upgrades. We need to make sure the new binary is
+    loading all symbols from the core again to make sure, upgrades don't break
+    the server.
+
+ -- Arno Töll <arno@debian.org>  Sat, 09 Mar 2013 02:02:08 +0100
+
+apache2 (2.4.4-1) experimental; urgency=low
+
+  * New upstream release
+    - Fixes mod_log_forensic logging spurious '-' characters. Closes: #693292
+    - Responds with HTTP/1.0 when talking http to https port. Closes: #701117
+    - Fix various XSS flaws in modules (CVE-2012-3499, CVE-2012-4558)
+
+  [ Stefan Fritsch ]
+  * Add examples for X-Content-Type-Options and X-Frame-Options to
+    security.conf.
+  * Make dh_apache2 only accept shell function names as conditional, to avoid
+    problems with shell and sed special characters.
+  * Add Replaces for the old mpm packages to apache2-bin. Closes: #671683
+  * Add transitional package for libapache2-mod-proxy-html. Closes: #666816
+    - Override dh_gencontrol so that the package's version sorts later than
+      the existing version in Wheezy.
+  * Don't ship changelogs in the apache2.2-bin transitional package.
+  * CVE-2013-1048: Fix symlink vulnerability when creating /var/lock/apache2
+
+  [ Arno Töll ]
+  * Rewrite most parts of the init script to make it more readable and improve
+    visual feedback when fancy output is in use.
+  * Drop the dbmanage tool from apache2-utils. It is mostly unmaintained and
+    outdated. Users of mod_authn_dbm should use htdbm instead.
+  * Fix "Default /etc/apache2/mods-available/disk_cache.conf is incompatible
+    with ext3" by changing the default to more moderate values. Note, some file
+    systems have a hard limit of supported subdirectories (Closes: #682840).
+    Ported from our 2.2 tree targeted for Wheezy.
+  * Properly check return code of a2query in the apache2_invoke library
+    function. This caused reverse dependencies to fail for newly installed
+    modules previously.
+  * Implement -q (quiet) option for a2query (Closes: #681541).
+  * Properly honor -p/-N options as understood by debhelper (Closes: 681542).
+    Thanks Russ Allbery for the hint.
+  * Be more careful regarding link attacks when for the the cache disk
+    directory.
+  * Compress the data.tar in binary packages using xz to save some space on
+    installation medias (Debian only).
+  * Fix "invoke-rc.d apache2 status fails" by merging patch of Jean-Michel
+    Vourgère. Thanks! (Closes: #691365)
+  * Fix "copyright file missing after upgrade (policy 12.5)" - add link
+    manually when necessary in postinst (Closes: #691440)
+  * Document APACHE_ARGUMENTS in envvars (ported from our 2.2 branch, reported as #693299)
+  * Don't croak about lacking permissions in apache2ctl when the script is
+    executed as a non-privileged user
+
+  [ Bernhard R. Link ]
+
+  * Rearrane patches: Move all the patches or parts of patches touching non-itk
+    specific files (i.e. those from the upstream tarball) directly in the
+    debian/patches/series series.  While this seperates the itk patches into two
+    heaps, it makes both more visible what changes happen to the general code (and
+    thus are also done to the other servers generated)
+
+ -- Arno Töll <arno@debian.org>  Thu, 07 Mar 2013 01:24:51 +0100
+
+apache2 (2.4.2-2) experimental; urgency=low
+
+  [ Stefan Fritsch ]
+  * Explicitly enable mod_authz_core on upgrades. It can happen that it is
+    not pulled in by any of the enabled modules, but we need it in any case
+    for apache2.conf. Closes: #669876
+  * Don't ship the changelogs in the apache2-mpm-itk transitional package.
+
+  [ Arno Töll ]
+  * Add mode lines to various configuration files and scripts. Reformat
+    configuration files for consitency.
+  * Fix "Fix typographic errors in configuration file comments": Thanks to Oxan
+    van Leeuwen for providing a patch (Closes: #669269)
+  * Formulate several clarifications in PACKAGING, start versioning this document
+    and add normative read hints. Moreover, document the -m switch for a2enmod.
+  * Merge spelling and grammar fixes provided by Justin B Rye. Much appreciated!
+  * Change various state and run directories used by Apache from
+    /var/run/<basename> to /var/run/apache2/<basename>. This might change again
+    for Wheezy+1 to adopt /run.
+  * Use more exit status codes for a2query which allows to tell apart why a
+    module was disabled, also make its output more readable.
+  * Changes in apache2-maintscript-helper:
+    + Finally apache2_invoke may  behave correctly and catch all cases
+      including upgrades from Squeeze.
+    + apache2_invoke: accepts a third argument to override the rc.d-action now
+    + support APACHE2_MAINTSCRIPT_DEBUG: When defined in the environment or in
+      /etc/apache2/envvars, debug output is displayed.
+  * Implement a -r switch for dh_apache2 which allows to force a reload of the
+    web server if required.
+
+ -- Arno Töll <arno@debian.org>  Mon, 28 May 2012 17:36:03 +0200
+
+apache2 (2.4.2-1) experimental; urgency=low
+
+  * New upstream release
+
+  [ Arno Töll ]
+  * Drop update-alternative call in postrm. Our prerm script catches them
+    already anyway.
+  * Update my mail address.
+  * Fix "dh_apache2 does not set "x" bits on /usr/lib/apache2/modules/"
+    Set directory permissions to 755 by default (Closes: #666875). Thanks Axel
+    Beckert for the hint.
+  * Add /usr/share/doc/apache2/migrate-sites.pl, a script to assist users to
+    give sites a .conf suffix, add a hint to the NEWS file.
+  * Do stateful configuration handling by remembering who enabled when a
+    particular piece of configuration. That way in can be told under which
+    circumstances for example modules should be re-enabled. Thanks to Filip M.
+    Nowak who was providing a patch where my changes are built upon.
+  * Fix apxs to import LDFLAGS from config_vars.mk. Moreover, make it possible
+    to override LDFLAGS at compile time by defining LDLAGS in the environment,
+    just like it is possible for CFLAGS. This also means, config_vars.mk now
+    exports hardening build flags by default.
+  * Provide the virtual packages httpd and httpd-cgi again.
+
+
+  [ Stefan Fritsch ]
+  * Change default config to deny access to / in the file system and only
+    allow access to /var/www, /usr/share, and /usr/lib/cgi-bin. Closes: #341022
+  * Disable MultiViews in the default config.
+  * Update ssl default cipher config, add alternative speed optimized config.
+    Closes: #649020
+  * Move the configuration of /usr/lib/cgi-bin into a separate config file.
+    Closes: #589638
+  * Comment out per-vhost loglevel.
+  * Add section to security.conf that shows how to forbid access to VCS
+    directories. Closes: #548213
+  * Change the compiled in default of DocumentRoot to /var/www by updating
+    fhs_compliance.patch
+  * Re-add mpm_itk (version 2.4.1-pre01). This is still very experimental!
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 15 Apr 2012 20:50:28 +0200
+
+apache2 (2.4.1-3) experimental; urgency=low
+
+  [ Arno Töll ]
+  * apache2-suexec-{custom,pristine}: Fix argument order when removing
+    alternatives, do not remove alternatives on upgrades. Thanks Andreas
+    Beckmann for spotting the issue (Closes: #665002)
+  * Install suexec(8) link to /usr/share/man/man8/...
+  * Enable mod_version statically, drop associated module load file.
+  * Update PACKAGING hints and cope several questions raised among the
+    discussions with packagers. Thus, invocation of apache2-maintscript-helper
+    in maintainer scripts are covered now.
+  * Changes in dh_apache2:
+    + Invoke the maintscript helper postrm action for simple package removals,
+      too.
+    + Fix a bug which accidentally called "en{mod,site,conf}" instead of
+      "di{mod,site,conf}"
+    + Set the default conditional back to "true", now the maintainer script is
+      expected to cope itself with upgrades correctly
+  * Changes in apache2_maintscript_helper
+    + Provide apache2_action_needed, apache2_msg
+    + Parse maintainer script arguments to find out which script called us
+    + Support APACHE2_MAINTSCRIPT_HELPER_QUIET which, when set, omits any
+      visible output
+    + Break APIs: apache2_invoke accepts a single configuration file argument
+      only now. However, other than dh_apache2 no users of this feature were
+      known.
+  * Build the apache2.2-bin transitional package again, without it updates from
+    Squeeze are broken from some use cases
+  * Remove 2.2's postrm script only if we're actually upgrading.
+    This previously didn't have bad side-effects, but caused a disturbing
+    warning.
+
+  [ Stefan Fritsch ]
+  * Import lots of bug fixes from upstream svn: All code changes from branch
+    2.4.x up to r1307835, plus r1294306 and r1307067 from trunk.
+  * CVE-2012-0216: Remove /usr/share/doc alias from default virtual hosts'
+    configs.
+  * Add 'Multi-Arch: foreign' to apache2-utils
+  * Make a2enconf and a2ensite warn if dependencies are not fullfilled.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 01 Apr 2012 21:11:51 +0200
+
+apache2 (2.4.1-2) experimental; urgency=low
+
+  [ Arno Töll ]
+  * Shift convert_docs script to a arch-indep target only. Debhelper does not
+    build apache2-doc on binary only builds causing a FTBS on binary-only (-B)
+    builds
+  * Raise debhelper build-dependency to 8.9.7~ due to the use of arch-indep
+    targets
+
+  [ Stefan Fritsch ]
+  * dh_apache2: Make autoscripts only run on upgrades by default. Bump
+    debhelper dependency of apache2-dev. Escape slashes in conditionals.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 20 Mar 2012 21:32:43 +0100
+
+apache2 (2.4.1-1) experimental; urgency=low
+
+  * Package the coming up 2.4 branch of Apache by packaging the current
+    GA release 2.4.1.
+    + Fix "IndexIgnore only allowes to add in vhost context, not replace"
+     (Closes: #296886)
+    + Fix "mod_status stats are wrong." (Closes: #519322)
+    + Fix "PNG DirectoryIndex icons transparancy messed up" (Closes: #233047)
+    + Fix "apache2-common: there should be a possibility to access the
+      parsed configuration" (Closes: #350285)
+    + Fix "AddOutputFilterByType is deprecated but used in deflate.conf"
+      (Closes: #601033)
+    + Fixes "Renegotiation on POST request fails intermittently"
+      (Closes: #601606)
+    + Allows configuring source address for proxy requests. (Closes: #465283)
+    + Supports CONNECT request through https. (Closes: #307298)
+    + New Upstream (2.4). (Closes: #662115)
+
+  * Refresh patches but leave all hunks unchanged where possible. Give all
+  * patches a ".patch" suffix, drop sequence numbers as they are not needed when
+  * using quilt. Notable changes are.
+    + [AT] 202_suexec-custom: Keep functionality as is, but rewrite smaller
+      parts of the patch to build two binaries: suexec-pristine and
+      suexec-custom (see below)
+    + [AT] 201_build_suexec-custom: Patch the makefile to build
+      "suexec-pristine" instead. Aside of that, refresh hunks.
+    + [AT] 010_fhs_compliance: Drop config.layout patches. These have been
+      applied upstream
+    + [JMV] Drop patches:
+      + 004_usr_bin_perl_0wnz_j00: printenv exemple doesn't refer to
+        /usr/local/bin/perl anymore
+      + 008_make_include_safe: Include doesn't support directory anymore.
+        Include dir/*.conf must be used.
+      + 009_apache2_has_dso: Upstream is no longer testing DSO is available. So
+        we don't need to remove that test anymore.
+    + [AT] customize_apxs.patch: Aggregate changes from various apxs2 patches,
+      drop obsolete hunks
+
+  [ Arno Töll ]
+
+  * Rewrite most parts of debian/rules / debhelper configuration.
+    + move cronjob and init script to debhelper configuration files
+      (apache2.cron.daily and apache2.init respectively)
+    + move man pages to debian/manpages
+    + Remove Ubuntu hacks in debian/rules, we expect them to carry Ubuntu
+      specifics in their own patch set, as it diverges already anyway.
+    + shake-up files installed in different packages
+    + Do not copy the source tree anymore, build package in place.
+  * Push standards version to 3.9.3 - no special changes required
+  * Refactor binary packages, now as things simplified. MPMs are simple
+    modules now, they can be bundled into the same binary package which do not
+    need to conflict with each other. Thus, Apache now primarily consists of the
+    following packages:
+    + apache2 - configuration files and init scripts, Debian specific helper
+      scripts
+    + apache2-bin - binaries and modules
+    + apache2-data - error pages and images
+  * Drop the ITK MPM entirely for now
+  * Consolidate development packages. As MPM packages are gone, we do not need
+    specific development packages either. Thus, drop all MPM specific apache2
+    development packages and provide a single apache2-dev package instead.
+    (Closes: #428095)
+  * Drop debian/source/options again: We do not need to ignore .svn directories
+    anymore since the new package management system is based on git and includes
+    the full source
+  * Rework the suexec mechanism. Now there are two suexec packages providing
+    alternatives through the update-alternatives mechanism. The untouched
+    upstream "suexec" binary is provided by the apache2-suexec-pristine package,
+    whereas the configurable suexec can be found in the apache2-suexec-custom
+    package. Both are providing the "suexec" binary which are managed by the
+    update-alternatives(9) mechanism.
+    This change is transparent to users at runtime and does not need any
+    configuration changes.
+  * Remove obsolete README.source file.
+  * Update doc-base metadata for the apache2-doc package
+  * Changes in the default configuration (not specific modules):
+    + On the head of the apache2.conf configuration file, give a short summary
+      how configuration of the Apache web server works in Debian.
+    + Drop NameVirtualHost entirely. It is deprecated (Closes: #511594)
+    + Remove DefaultType. It is deprecated.
+    + Replace Allow/Deny directives in the default configuration by using the
+      new Require directive. Load mod_access_compat if you rely on the old
+      syntax
+    + Replace LockFile by Mutex which consolidates all lock file
+      synchronization files among modules
+    + Update configuration to use the new IncludeOptional syntax
+    + Enable these modules by default: authz_core authz_host alias cgi dir
+    + Move MPM specific configuration to their respective configuration files.
+      Users can just load and unload MPMs like other modules, enable the worker
+      MPM by default
+    + Move per-site global configuration from conf.d to conf-available and
+      manage it similar to modules and sites. To do so, the new tools
+      "a2enconf" and "a2disconf" are provided. Moreover, such configuration
+      files need  to have a .conf suffix now. The following configuration
+      files are enabled by default: charset localized-error-pages
+      other-vhosts-access-log  security.  These were enabled by default
+      previously, too (Closes: #620347, Closes: #605227).
+      This holds for apache2-doc as well, which is still enabled by default but
+      can be disabled easily anytime by using a2disconf (Closes: #604980).
+    + Give site configuration a .conf suffix, too. For example the default vhost
+      is called default.conf. Moreover, files without .conf suffix are ignored
+      upon startup. Please update your site links and confs. Also rename the
+      default vhost to 000-default.conf and don't do hacky things in a2enmod
+      anymore.
+  * Changes in a2enmod:
+    + Parse "Conflicts: " header to denote conflicts between modules which
+      cannot be loaded into the same Apache server.
+    + Remove dangling "module.conf" files, too. They were forgotten previously
+      if they existed and only the "module.load" file was removed.
+    + Extend the tool to support conf-available/conf-enabled directories (see
+      also configuration changes).
+    + Expect a .conf suffix for sites-enabled/sites-available configurations.
+    + Remove the default vhost special handling. Instead, we expect the default
+      host to be named appropripriately (for example 000-default.conf;
+      Closes: #605535).
+  * The following modules and associated configuration files were removed:
+    + mod_authz_default and mod_authn_default: Please use a proper
+      authentication module instead
+    + mod_mem_cache: Use mod_cache_disk instead
+  * The following modules and associated configuration files are provided (but
+    not enabled by default):
+    access_compat, allowmethods, authz_dbd, cache_disk, data, log_debug, lua
+    proxy_express, proxy_fcgi, proxy_fdpass, proxy_html, ratelimit, reflector
+    remoteip, request, session, session_cookie, session_crypto, session_dbd
+    (Closes: #400881)
+  * Provide a dh_apache2 debhelper which can be used by reverse dependencies to
+    install modules, module configuration files, site configuration files and
+    global configuration files which need to be registered to the Apache web
+    server.
+    Thus, dh_apache2 can be used for Apache web server modules and web
+    applications providing configuration files for Apache.
+  * Write apache2-maintscript-helper which packagers can use to interface in a
+    reliable way with the Apache 2 web server in maintainer scripts
+  * Document programming hints how to interface with the Apache 2 web server for
+  * packagers of web applications and module maintainer in
+    /usr/share/doc/apache2/PACKAGING.gz.
+  * Fix the watch file, thanks to Jean-Michel Vourgère for pointing out the
+    problem.
+  * Update debian/copyright and switch it to the copyright-format 1.0 (formerly
+    known as DEP5)
+
+  [ Stefan Fritsch ]
+
+  * Use "dh --with autotools_dev" instead of patching config.sub/config.guess.
+  * Only include conf.d/*.conf, not conf.d/*.
+  * Don't create httpd.conf anymore. Also, do a proper transition of existing
+    httpd.conf files to /etc/apache2/conf-available (Closes: #639383)
+  * Add "AddCharset" for .brf files in default mod_mime config.
+    (Closes: #402567)
+  * Update the README.Debian file
+
+  [ Jean-Michel Vourgère ]
+
+  * Update bash completion functions to reflect the new site setup. (Closes:
+    #657492)
+  * Migrate patches to DEP-3 format. For particular changes see the summary
+    above.
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 19 Mar 2012 10:46:02 +0100
+
+apache2 (2.2.22-3) unstable; urgency=low
+
+  * Fix "FTBFS: mkdir: cannot create directory `debian/build-tree/arch':
+    No such file or directory". Do not use internal rules targets which clash
+    with build target names ... (Closes: #667069)
+  * Drop apache2-dev virtual package. This had virtually no users but breaks our
+    experimental package in some cases (e.g. #666793)
+  * Push Standards version - no further changes
+  * Update my maintainer address
+
+ -- Arno Töll <arno@debian.org>  Thu, 05 Apr 2012 13:21:42 +0200
+
+apache2 (2.2.22-2) unstable; urgency=low
+
+  [ Arno Töll ]
+  * Fix "Incorrect debhelper build dependency" by raising the build-dependency
+    of debhelper to 8.9.7  (Closes: #659148)
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 15 Mar 2012 00:02:31 +0100
+
+apache2 (2.2.22-1) unstable; urgency=low
+
+   [ Stefan Fritsch ]
+   * New upstream release, urgency medium due to security fixes:
+     - Fix CVE-2012-0021: mod_log_config: DoS with '%{cookiename}C' log format
+     - Fix CVE-2012-0031: Unprivileged child process could cause the parent to
+       crash at shutdown
+     - Fix CVE-2012-0053: Exposure of "httpOnly" cookies in code 400 error
+       message.
+   * Move httxt2dbm to apache2-utils
+   * Adjust debian/control to point to new git repository.
+ 
+   [ Arno Töll ]
+   * Fix "typo in /etc/apache2/apache2.conf" (Closes: #653801)
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 01 Feb 2012 21:49:04 +0100 
+
+apache2 (2.2.21-5) unstable; urgency=low
+
+  [ Arno Töll ]
+  * Fix build failures introduced as regregression by the previous build. Debian
+    buildds aren't rebuilding arch:all packages which caused problems for our
+    unconditional copying into binary package. I was warned.
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 29 Dec 2011 17:36:41 +0100
+
+apache2 (2.2.21-4) unstable; urgency=low
+
+  [ Stefan Fritsch ]
+
+  * Security: Fix broken patch for CVE-2011-3607 (Integer overflow in
+    ap_pregsub).
+  * Optimize debian/rules again to improve build time by doing most work in a
+    single parallelized "build-%" target.
+
+  [ Arno Töll ]
+
+  * Fix "Suggest removing DefaultType from apache2.conf" change the DefaultType
+    from text/plain to None. This lets the browser guess a proper MIME type
+    instead of being forced to treat a given file according to our default type
+    (Closes: #440058)
+  * Fix "add pre-rotate hook to logrotate script" execute scripts in
+    /etc/logrotate.d/httpd-prerotate if available (Closes: #590096).
+  * Fix "Hide /icons index" Disables indexes on the icon directory. By upgrading
+    to Debian's 3.0/quilt source format also images don't need to be generated
+    at build time anymore. Hence, the icon date can no longer lead to
+    information disclosure (Closes: #649888).
+  * Upgrade package to 3.0/quilt.
+    + Remove uuencoded images, keep them in their binary format in debian/icons
+    + Upgrade to quilt from dpatch and refresh all patches by keeping all hunks
+      unchanged. Remove the `001_branding' patch by supplying -DPLATFORM at
+      build time where needed Move the 200_cp_suexec.dpatch patch and
+      202_suexec-custom.dpatch patch to debian/rules. 200_cp_suexec.dpatch was a
+      script, not a patch which is not supported by quilt.
+  * Rewrite debian/rules and base it on dh(1).
+    + use overrides where possible, replace some debhelper calls by our own
+      implementation where needed. That's required since the Apache package is
+      compiled in parts several times for each MPM once.
+    + move some install operations to the their respective .install files
+    + Support dpkg-buildflags now, which also enables by default hardening
+      flags. Thus, remove them from their explicit appearance in debian/rules
+    + Remove DEB_BUILD_OPTIONS legacy support. It comes for free when using
+      dh(1)/dpkg-buildflags(1).
+  * Push debhelper compatibility to 8
+  * Remove unused Lintian overrides for the Debian source package remove and
+    redundant priorities in debian/control.
+  * Add myself to Uploaders
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 29 Dec 2011 12:09:14 +0100
+
+apache2 (2.2.21-3) unstable; urgency=medium
+
+  * Fix CVE-2011-4317: Prevent unintended pattern expansion in some
+    reverse proxy configurations. (Similar to CVE-2011-3368, but different
+    attack vector.)
+  * Fix CVE-2011-3607: Integer overflow in ap_pregsub could cause segfault
+    via malicious .htaccess. 
+  * Mention dpkg-statoverride for changing permissions of suexec. LP: #897120
+  * Fix broken link in docs. Closes: #650528
+  * Remove Tollef Fog Heen, Thom May, and Peter Samuelson from uploaders.
+    Thanks for your work in the past.
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 03 Dec 2011 18:54:03 +0100
+
+apache2 (2.2.21-2) unstable; urgency=high
+
+  * Fix CVE-2011-3368: Prevent unintended pattern expansion in some
+    reverse proxy configurations by strictly validating the request-URI.
+  * Correctly set permissions of suexec.load even if umask is 0002 during
+    build. LP: #872000
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 11 Oct 2011 22:54:47 +0200
+
+apache2 (2.2.21-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixes CVE-2011-3348: Possible denial of service in mod_proxy_ajp
+      if combined with mod_proxy_balancer
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 26 Sep 2011 18:16:11 +0200
+
+apache2 (2.2.20-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix some regressions related to Range requests caused by the CVE-2011-3192
+    fix. Closes: #639825
+  * Add build-arch and build-indep rules targets to make Lintian happy.
+  * Bump Standards-Version (no changes).
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 04 Sep 2011 21:50:22 +0200
+
+apache2 (2.2.19-2) unstable; urgency=high
+
+  * Fix CVE-2011-3192: DoS by high memory usage for a large number of
+    overlapping ranges.
+  * Reduce default KeepAliveTimeout from 15 to 5 seconds. 
+  * Use "linux-any" in build-deps. Closes: #634709
+  * Improve reload message of a2enmod. Closes: #639291
+  * Improve description of the prefork MPM. Closes: #634242
+  * Mention .conf files in a2enmod man page. Closes: #634834
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 29 Aug 2011 17:08:17 +0200
+
+apache2 (2.2.19-1) unstable; urgency=low
+
+  * New upstream release.
+    - Makes apr-md5 the default algorithm for htpasswd, removing the 8
+      character limit of the crypt()-algorithm. Closes: #539246
+    - Fixes merging of IndexOptions. Closes: #394688
+    - Documents why order of ProxyPass and <Proxy> blocks matters in the
+      configuration. See "Workers" section in the mod_proxy documentation.
+      Closes: #560020
+  * For multiple instance setups, correctly determine the config dir in the
+    init script if it is called via a start/stop link. Closes: #627061
+  * Make a2enmod's restart hint more cut'n'paste friendly. LP: #770204
+  * Make it clear in README.multiple-instances that the MPMs are shipped
+    in the apache2.2-bin package.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 22 May 2011 10:21:21 +0200
+
+apache2 (2.2.17-3) unstable; urgency=low
+
+  * Fix compilation with OpenSSL without SSLv2 support. Closes: #622049
+  * Fix link errors with -no-add-needed/--no-copy-dt-needed-entries in
+    htpasswd/htdbm.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 10 Apr 2011 20:43:55 +0200
+
+apache2 (2.2.17-2) unstable; urgency=high
+
+  * New mpm_itk upstream version 2.2.17-01:
+    - Fix CVE-2011-1176: If NiceValue was set, the default with no
+      AssignUserID was to run as root:root instead of the default Apache user
+      and group, due to the configuration merger having an incorrect default
+      configuration. Closes: #618857
+  * Make exit code of '/etc/init.d/apache2 status' more LSB compatible.
+    Closes: #613969
+  * Set the default file descriptor limit to 8192 instead of whatever the
+    current limit is (usually 1024). Document how to change it in
+    /etc/apache2/envvars . Closes: #615632
+  * Fix typo in init script. Closes: #615866
+  * Add hint in README.Debian about 403 error with mod_dav PUT. Closes: #613438
+  * Remove some obsolete Depends and Replaces.
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 21 Mar 2011 23:01:17 +0100
+
+apache2 (2.2.17-1) unstable; urgency=low
+
+  * New upstream version
+  * Disable md5 in mod_ssl default cipher suite. Closes: #609126
+  * Fix order of comments in "worker" section in apache2.conf. Closes: #608488
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 15 Feb 2011 23:30:18 +0100
+
+apache2 (2.2.16-6) unstable; urgency=low
+
+  * Also add $named to the secondary-init-script example.
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 01 Jan 2011 22:55:15 +0100
+
+apache2 (2.2.16-5) unstable; urgency=medium
+
+  * Add $named to the init script dependency header, since apache depends on
+    DNS in some configurations. Closes: #608437
+  * Update outdated description of /etc/apache2/magic in README.Debian.
+    Closes: #603586
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 31 Dec 2010 01:22:19 +0100
+
+apache2 (2.2.16-4) unstable; urgency=medium
+
+  * Increase the mod_reqtimeout default timeouts to avoid potential problems
+    with CRL-requesting browsers. Also extend the comments in reqtimeout.conf.
+  * Remove bogus comment in conf.d/security about default in the "release
+    after Lenny".
+  * Clarify comments in suexec-custom's default config file. LP: #673289
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 14 Nov 2010 19:05:55 +0100
+
+apache2 (2.2.16-3) unstable; urgency=high
+
+  * CVE-2010-1623: mod_reqtimeout: Fix potential DoS by high memory usage.
+  * Fix "Could not reliably determine the server's ..." error message in
+    README.Debian, to make it easier to search for it.  Closes: #590528
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 09 Oct 2010 20:59:34 +0200
+
+apache2 (2.2.16-2) unstable; urgency=low
+
+  * Force -j1 for 'make install' to fix occasional FTBFS. Closes: #593036
+  * Add a note about the new behaviour of SSL/TLS renegotiation and the new
+    directive SSLInsecureRenegotiation to NEWS.Debian. Closes: #593334
+  * Support 'graceful' as alias for 'reload' in the init script.
+  * In README.Debian, suggest an Apache configuration change to get rid of the
+    "Could not reliably determine the server's fully qualified domain name"
+    warning, as alternative to changing DNS or /etc/hosts.  Closes: #590528
+  * Add notes to README.Debian on how to reduce memory usage.
+  * Bump Standards-Version (no changes).
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 29 Aug 2010 15:29:21 +0200
+
+apache2 (2.2.16-1) unstable; urgency=medium
+
+  * Urgency medium for security fix.
+  * New upstream release:
+    - CVE-2010-1452: mod_dav, mod_cache: Fix denial of service vulnerability
+      due to incorrect handling of requests without a path segment.
+    - mod_dir: add FallbackResource directive, to enable admin to specify
+      an action to happen when a URL maps to no file, without resorting
+      to ErrorDocument or mod_rewrite
+  * Fix mod_ssl header line corruption because of using memcpy for overlapping
+    buffers. PR 45444. LP: #609290, #589611, #595116
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 24 Jul 2010 22:18:43 +0200
+
+apache2 (2.2.15-6) unstable; urgency=low
+
+  * Fix init script not correctly killing htcacheclean. Closes: #580971
+  * Add a separate entry in README.Debian about the need to use apache2ctl
+    for starting instead of calling apache2 directly. Closes: #580445
+  * Fix debug info to allow gdb loading it automatically. Closes: #581514
+  * Fix install target in Makefile created by apxs2 -n. Closes: #588787
+  * Fix ab sending more requests than specified by the -n parameter.
+    Closes: #541158
+  * Add apache2 monit configuration to apache2.2-commons examples dir.
+    Closes: #583127
+  * Build as PIE, since gdb in squeeze now supports it.
+  * Update the postrm script to also purge the version of /var/www/index.html
+    introduced in 2.2.11-7.
+  * Bump Standards-Version (no changes).
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 16 Jul 2010 23:41:08 +0200
+
+apache2 (2.2.15-5) unstable; urgency=low
+
+  * Conflict with apache package as we now include apachectl. Closes: #579065
+  * Remove conflicts with old apache 2.0 modules. The conflicts are not
+    necessary anymore as skipping a stable release is not supported anyway.
+  * Silence the grep in preinst.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 25 Apr 2010 10:46:09 +0200
+
+apache2 (2.2.15-4) unstable; urgency=low
+
+  * Move definition of other_vhosts_access.log to new config file
+    /etc/apache2/conf.d/other-vhosts-access-log, but disable it
+    if it has been disabled by the admin. Closes: #576572. LP: #507616
+  * Comment out the contents of mods-available/proxy.conf, as it just
+    is a nuisance for use of apache2 as a reverse proxy, which is much
+    more common than the use as forward proxy. Extend the comments
+    in the file.
+  * Change defaults or add example configs for some modules:
+    status.conf:
+      - enable ExtendedStatus by default
+      - enable ProxyStatus by default
+      - document SeeRequestTail directive
+    proxy_ftp.conf:
+      - set 'ProxyFtpDirCharset UTF-8' by default
+    ldap.conf:
+      - enable /ldap-status page, allow it from localhost by default
+    proxy_balancer.conf:
+      - add (disabled) example for /balancer-manager page
+    ssl.conf:
+      - document SSLStrictSNIVHostCheck directive
+  * Add symlink from apachectl to apache2ctl to be more compatible with
+    upstream. Apache httpd 1.3 hasn't been in Debian for some time.
+  * Simplify logrotate script. Closes: #576105
+  * Remove empty directory /usr/lib/debug/usr/sbin in mpm packages.
+    Closes: #576089
+  * Fix apxs2 to work with perl 5.12rc3. Closes: #577239
+  * Add source/format file to make lintian happy.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 20 Apr 2010 23:11:09 +0200
+
+apache2 (2.2.15-3) unstable; urgency=low
+
+  * mod_reqtimeout: backport bugfixes from upstream trunk up to r928881,
+    including a fix for mod_proxy CONNECT requests.
+  * mod_dav_fs: Use correct permissions when creating new files. LP: #540747
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 29 Mar 2010 22:16:24 +0200
+
+apache2 (2.2.15-2) unstable; urgency=low
+
+  * Make the Files ~ "^\.ht" block in apache2.conf more secure by adding
+    Satisfy all. Closes: #572075
+  * mod_reqtimeout: Various bug fixes, including:
+    - Don't mess up timeouts of mod_proxy's backend connections.
+      Closes: #573163
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 10 Mar 2010 21:06:06 +0100
+
+apache2 (2.2.15-1) unstable; urgency=low
+
+  * New upstream version:
+    - CVE-2010-0408: mod_proxy_ajp: Fixes denial of service vulnerability
+    - CVE-2009-3555: mod_ssl: Improve the mitigation against SSL/TLS protocol
+      prefix injection attack.
+    - CVE-2010-0434: mod_headers: Fix potential information leak with threaded
+      MPMs.
+    - mod_reqtimeout: New module limiting the time waiting for receiving
+      a request from the client. This is a (partial) mitigation against
+      slowloris-type resource exhaustion attacks. The module is enabled by
+      default. Closes: #533661
+    - mod_ssl: Add SSLInsecureRenegotiation directive to allows insecure
+      renegotiation with clients which do not yet support the secure
+      renegotiation protocol. As this requires openssl 0.9.8m, bump
+      build dependency accordingly.
+  * Fix bash completion for a2ensite if the site name contains 'conf' or
+    'load'. Closes: #572232
+  * Do a configcheck in the init script before doing a non-graceful restart.
+    Closes: #571461
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 07 Mar 2010 23:22:56 +0100
+
+apache2 (2.2.14-7) unstable; urgency=low
+
+  * Fix potential memory leaks related to the usage of apr_brigade_destroy().
+  * Add hints about correct mod_dav_fs configuration to README.Debian.
+    Closes: #257945
+  * Fix error in Polish translation of 404 error page. Closes: #570228
+  * Document ThreadLimit in apache2.conf's comments.
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 20 Feb 2010 12:38:30 +0100
+
+apache2 (2.2.14-6) unstable; urgency=low
+
+  * Use environment variables APACHE_RUN_DIR, APACHE_LOCK_DIR, and
+    APACHE_LOG_DIR in the default configuration. If you have modified
+    /etc/apache2/envvars, make sure that these variables are set and exported.
+  * Add support for multiple apache2 instances to initscript and apache2ctl.
+    See /usr/share/doc/apache2.2-common/README.multiple-instances for details.
+    Closes: #353450
+  * Set default compiled-in ServerRoot to /etc/apache2 and make paths in
+    apache2.conf relative to ServerRoot.
+  * Move ab and logresolve from /usr/sbin to /usr/bin. Closes: #351450, #564061
+  * Fix symlinks in apache2-dbg package. Closes: #567076
+  * Fix mod_cache CacheIgnoreURLSessionIdentifiers handling. Closes: #556383
+  * Add new init script action graceful-stop (LP: #456381)
+  * Add more languages to mime.conf. To limit this to useful entries, we only
+    add those for which a translation of the Debian intaller exists. LP: #217964
+  * Unset $HOME in /etc/apache2/envvars.
+  * Change default config of mod_info and mod_status to use IP addresses
+    instead of hostnames. Otherwise the hostname is sometimes logged even with
+    'HostnameLookup Off'. Closes: #568409
+  * Add a hook to apache2.2-common's postrm script that may come in handy
+    when upgrading to 2.4.
+  * Make bug script also display php extensions.
+  * Bump Standards-Version (no changes).
+  * Remove Adam Conrad from Uploaders. Thanks for your work in the past.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 07 Feb 2010 17:29:45 +0100
+
+apache2 (2.2.14-5) unstable; urgency=low
+
+  * Security: Further mitigation for the TLS renegotation attack
+    (CVE-2009-3555): Disable keep-alive if parts of the next request have
+    already been received when doing a renegotiation. This defends against
+    some request splicing attacks.
+  * Print a useful error message if 'apache2ctl status' fails. Add a comment
+    to /etc/apache2/envvars on how to change the options for www-browser.
+    Closes: #561496, #272069
+  * Improve function to detect apache2 pid in init-script (closes: #562583).
+  * Add hint README.Debian on how to pass auth info to CGI scripts.
+    Closes: #483219
+  * Re-introduce objcopy magic to avoid dangling symlinks to the debug info
+    in the mpm packages. Closes: #563278
+  * Make apxs2 use a2enmod and /etc/apache2/mods-available. Closes: #470178,
+    LP: #500703
+  * Point to README.backtrace in apache2-dbg's description.
+  * Use more debhelper functions to simplify debian/rules.
+  * Add misc-depends to various packages to make lintian happy.
+  * Change build-dep from libcap2-dev to libcap-dev because of package rename.
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 02 Jan 2010 22:44:15 +0100
+
+apache2 (2.2.14-4) unstable; urgency=low
+
+  * Disable localized error pages again by default because they break
+    configurations with "<Location /> SetHandler ...". A workaround is
+    described in the comments in /etc/apache2/conf.d/localized-error-pages
+    (closes: #543333).
+  * mod_rewrite: Fix URLs in redirects with literal IPv6 hosts
+    (closes: #557015).
+  * Automatically listen on port 443 if mod_gnutls is loaded (closes: #558234).
+  * Add man page for split-logfile.
+  * Link with -lcrypt where necessary to fix a FTBFS with binutils-gold
+    (closes: #553946).
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 13 Dec 2009 20:05:37 +0100
+
+apache2 (2.2.14-3) unstable; urgency=low
+
+  * Backport various mod_dav/mod_dav_fs fixes from upstream trunk svn. This
+    includes:
+    - Make PUT replace files atomically (closes: #525137).
+    - Make MOVE not delete the destination if the source file disappeared in
+      the meantime (closes: #273476).
+    NOTE: The format of the DavLockDB has changed. The default DavLockDB will
+    be deleted on upgrade. Non-default DavLockDBs should be deleted manually.
+  * Fix output of "/etc/init.d/apache2 status" (closes: #555687).
+  * Update the comment about SNI in ports.conf (closes: #556932).
+  * Set redirect-carefully for Konqueror/4.
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 21 Nov 2009 10:20:54 +0100
+
+apache2 (2.2.14-2) unstable; urgency=medium
+
+  * Security:
+    Reject any client-initiated SSL/TLS renegotiations. This is a partial fix
+    for the TLS renegotiation prefix injection attack (CVE-2009-3555).
+    Any configuration which requires renegotiation for per-directory/location
+    access control is still vulnerable.
+  * Allow RemoveType to override the types from /etc/mime.types. This allows
+    to use .es and .tr for Spanish and Turkish files in mod_negotiation.
+    Closes: #496080
+  * Fix 'CacheEnable disk http://'. Closes: #442266
+  * Fix missing dependency by changing killall to pkill in the init script.
+    LP: #460692
+  * Add X-Interactive header to init script as it may ask for the ssl key
+    passphrase. Closes: #554824
+  * Move httxt2dbm man page into apache2.2-bin, which includes httxt2dbm, too.
+  * Enable keepalive for MSIE 7 and newer in default-ssl site and README.Debian
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 07 Nov 2009 14:37:37 +0100
+
+apache2 (2.2.14-1) unstable; urgency=low
+
+  * New upstream version:
+    - new module mod_proxy_scgi
+  * Disable hardening option -pie again, as gdb in Debian does not support
+    it properly and it is broken on mips*.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 29 Sep 2009 20:55:05 +0200
+
+apache2 (2.2.13-2) unstable; urgency=high
+
+  * mod_proxy_ftp security fixes (closes: #545951):
+    - DoS by malicious ftp server (CVE-2009-3094) 
+    - missing input sanitization: a user could execute arbitrary ftp commands
+      on the backend ftp server (CVE-2009-3095)
+  * Add entries to NEWS.Debian and README.Debian about Apache being stricter
+    about certain misconfigurations involving name based SSL virtual hosts.
+    Also make Apache print the location of the misconfigured VirtualHost when
+    it complains about a missing SSLCertificateFile statement. Closes: #541607
+  * Add Build-Conflicts: autoconf2.13 (closes: #541536).
+  * Adjust priority of apache2-mpm-itk to extra.
+  * Switch apache2.2-common and the four mpm packages from architecture all to
+    any. This is stupid but makes apache2 binNMUable again (closes: #544509).
+  * Bump Standards-Version (no changes).
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 16 Sep 2009 20:55:02 +0200
+
+apache2 (2.2.13-1) unstable; urgency=low
+
+  * New upstream release:
+    - Fixes segfault with mod_deflate and mod_php (closes: #542623).
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 31 Aug 2009 20:28:56 +0200
+
+apache2 (2.2.12-1) unstable; urgency=low
+
+  * New upstream release:
+    - Adds support for TLS Server Name Indication (closes: #461917 LP: #184131).
+      (The Debian default configuration will be changed to use SNI in a later
+      version.)
+    - Fixes timefmt config in SSI (closes: #363964).
+    - mod_ssl: Adds SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN directives
+      to enable stricter checking of remote server certificates.
+  * Make mod_deflate not compress the content for HEAD requests. This is a
+    similar issue as CVE-2009-1891.
+  * Enable hardening compile options.
+  * Switch default LogFormat from %b (size of file sent) to %O (bytes actually
+    sent) (closes: #272476 LP: #255124)
+  * Add the default LANG=C to /etc/apache2/envvars and document it in
+    README.Debian (closes: #511878).
+  * Enable localized error pages by default if the necessary modules are
+    loaded. Move the config for it from apache2.conf to
+    /etc/apache2/conf.d/localized-error-pages (closes: #467004). Clarify the
+    required order of the aliases in the comment (closes: #196795).
+  * Change default for ServerTokens to 'OS', to not announce the exact module
+    versions to the world (LP: #205996)
+  * Make a2ensite and friends ignore the same filenames as apache does for
+    included config files, even if LANG is not C.
+  * Merge source packages apache2 and apache2-mpm-itk (current itk version is
+    2.2.11-02). This removes the binNMU mess necessary for every apache2 upload
+    (closes: #500885, #512084). Add Steinar to Uploaders. Remove apache2-src
+    package, which is no longer necessary.
+  * Ship our own version of the magic config file (taken from file 4.17-5etch3)
+    which is still compatible with mod_mime_magic (closes: #483111).
+  * Add ThreadLimit to the default config and put ThreadsPerChild and
+    MaxClients into the correct order so that Apache does not complain
+    (closes: #495656).
+    Also add a configuration block for the event MPM in apache2.conf.
+  * Fix HTTP PUT with mod_dav failing to detect an aborted connection
+    (closes: #451563).
+  * Change references to httpd.conf in apache2-doc to apache2.conf
+    (closes: #465393).
+  * Clarify the recommended permissions for SSL certificates in README.Debian
+    (closes: #512778).
+  * Document in README.Debian how to name files in conf.d to avoid conflicts
+    with packages (closes: #493252)
+  * Remove 2.0 -> 2.2 upgrade logic from maintainer scripts.
+  * Remove other_vhosts_access.log on package purge.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 04 Aug 2009 11:02:34 +0200
+
+apache2 (2.2.11-7) unstable; urgency=low
+
+  * Security fixes:
+    - CVE-2009-1890: denial of service in mod_proxy
+    - CVE-2009-1891: denial of service in mod_deflate (closes: #534712)
+  * Add symlinks for the debug info to the mpm packages.
+  * Be slightly more informative in the default index.html without pointing
+    to Apache or Debian (LP: #89364)
+  * Remove dependency on net-tools, which is no longer necessary 
+    (closes: #535849)
+  * Bump Standards-Version (no changes)
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 10 Jul 2009 22:42:57 +0200
+
+apache2 (2.2.11-6) unstable; urgency=high
+
+  * CVE-2009-1195: mod_include allowed to bypass IncludesNoExec for Server
+    Side Includes (closes: #530834).
+  * Fix postinst scripts (closes: #532278).
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 08 Jun 2009 19:22:58 +0200
+
+apache2 (2.2.11-5) unstable; urgency=low
+
+  * Move all binaries into a new package apache2.2-bin and make
+    apache2.2-common depend on it. This allows to
+    - run apache as user process only, e.g. with gnome-user-share.
+      Closes: #468690
+    - run multiple instances of apache with different MPMs. This configuration
+      is not supported in any way, though. Closes: #517572
+  * Switch to debhelper compatibility level 7 and remove some code duplication
+    in debian/rules.
+  * Override some Lintian warnings about old autotools helper files and being
+    not binNMUable (apache2 is not binNMUable anyway, because of the
+    apache2 <-> apache2-mpm-itk dependency).
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 22 May 2009 19:30:20 +0200
+
+apache2 (2.2.11-4) unstable; urgency=low
+
+  [ Stefan Fritsch ]
+  * Disable TRACE method by default (closes: #492130).
+  * Compress some more mime types with mod_deflate by default. This may cause
+    problems with MSIE 6, but that browser should now be considered obsolete.
+    Closes: #397526, #521209
+  * Various backports from upstream svn branches/2.2.x:
+    - CVE-2009-1191: mod_proxy_ajp: Avoid delivering content from a previous
+      request which failed to send a request body
+    - Fix FollowSymlinks / SymlinksIfOwnerMatch ignored with
+      server-side-includes PR 45959 (closes: #524474)
+    - Fix mod_rewrite "B" flag breakage PR 45529 (closes: #524268)
+    - Fix mod_deflate etag handling PR 45023 (LP: #358314)
+    - Fix mod_ldap segfault if LDAP initialization failed PR 45994
+  * Allow apache2-mpm-itk as alternate dependency in apache2 meta package
+    (closes: #527225).
+  * Fix some misuse of command substitution in the init script. Thanks to
+    Jari Aalto for the patch. (Closes: #523398)
+  * Extend the gnome-vfs DAV workaround to gvfs (closes: #522845).
+  * Add more info to check_forensic man page (closes: #528424).
+  * Make "apache2ctl help" point to help on apache2 args (closes: #528425).
+  * Lintian warnings:
+    - fix spelling error in apache2-utils description
+    - tweak debian/copyright to make lintian not complain about pointers to GPL
+    - bump standards-version (no changes)
+
+  [ Peter Samuelson ]
+  * Adjust sections to match recent ftpmaster overrides.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 19 May 2009 22:55:27 +0200
+
+apache2 (2.2.11-3) unstable; urgency=low
+
+  * Rebuild against apr-util 1.3, to fix undefined symbol errors in mod_ldap
+    (see #521899). This also creates the dependencies on the new external
+    libaprutil1-dbd-* and libaprutil1-ldap packages.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 31 Mar 2009 21:07:26 +0200
+
+apache2 (2.2.11-2) unstable; urgency=low
+
+  * Report an error instead instead of segfaulting when apr_pollset_create
+    fails (PR 46467). On Linux kernels since 2.6.27.8, the value in
+    /proc/sys/fs/epoll/max_user_instances needs to be larger than twice the
+    value of MaxClients in the Apache configuration. Closes: #511103
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 16 Jan 2009 19:01:59 +0100
+
+apache2 (2.2.11-1) unstable; urgency=low
+
+  [Thom May]
+  * New Upstream Version (Closes: #508186, LP: #307397)
+    - Contains rewritten shmcb code which should fix alignment problems on
+      alpha (Closes: #419720).
+    - Notable new features: chroot support, mod_proxy improvements.
+
+  [Ryan Niebur]
+  * fix segfault in ab when being verbose on ssl sites (Closes: #495982)
+  * remove trailing slash for DocumentRoot (Closes: #495110)
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 14 Dec 2008 09:34:24 +0100
+
+apache2 (2.2.9-11) unstable; urgency=low
+
+  * Regression fix from upstream svn for mod_proxy:
+    Prevent segmentation faults by correctly adjusting the lifetime of the
+    buckets read from the proxy backend. PR 45792
+  * Fix from upstream svn for mpm_worker:
+    Crosscheck that idle workers are still available before using them and
+    thus preventing an overflow of the worker queue which causes a SegFault.
+    PR 45605
+  * Add a comment to ports.conf to point to NEWS.Debian.gz in case of
+    upgrading problems.
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 26 Nov 2008 23:10:22 +0100
+
+apache2 (2.2.9-10) unstable; urgency=low
+
+  * Regression fix from upstream svn for mod_proxy_http:
+    Don't trigger a retry by the client if a failure to read the response line
+    was the result of a timeout.
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 01 Oct 2008 11:50:18 +0200
+
+apache2 (2.2.9-9) unstable; urgency=medium
+
+  * Revert the attempted fix for #496080 because it did not work due to
+    upstream PR 38330. Instead, document the problem and possible workarounds
+    in README.Debian.
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 12 Sep 2008 11:39:15 +0200
+
+apache2 (2.2.9-8) unstable; urgency=low
+
+  * Fix Spanish language support which was broken by .es being added to
+    /etc/mime.types for application/ecmascript. (Closes: #496080)
+  * Correct description of ServerTokens in /etc/apache2/conf.d/security.
+    (Closes: #497362)
+  * Clarify how to use apache2ctl to pass arbitrary arguments to
+    apache2. (LP: #259363)
+  * Add hints to README.Debian about the messages
+    "NameVirtualHost *:80 has no VirtualHosts" and
+    "File does not exist: /htdocs".
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 11 Sep 2008 09:17:33 +0200
+
+apache2 (2.2.9-7) unstable; urgency=low
+
+  * Fix XSS in mod_proxy_ftp (CVE-2008-2939).
+  * Fix mod_proxy_http losing the query string with noescape (PR 45247).
+  * Make the balancer manager work in Opera and MSIE (PR 45578).
+  * Fix mod_headers "edit" removing multiple headers with the same name (PR
+    45333).
+  * Also describe how to get a backtrace from a running process in
+    README.backtrace.
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 08 Aug 2008 19:27:40 +0200
+
+apache2 (2.2.9-6) unstable; urgency=high
+
+  * Urgency high for RC bug fix.
+  * Fix SIGBUS on SPARC by preventing gcc from optimizing some memcpy calls
+    away. (Closes: #485525)
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 20 Jul 2008 10:17:19 +0200
+
+apache2 (2.2.9-5) unstable; urgency=medium
+
+  * Urgency medium to get this into testing before the freeze.
+  * Remove IPv6 patch that was necessary for very old kernels but creates
+    problems on systems with current kernels and net.ipv6.bindv6only = 1.
+    Apache will now always create its sockets with IPV6_V6ONLY set to 0.
+    (Closes: #391280)
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 07 Jul 2008 21:20:48 +0200
+
+apache2 (2.2.9-4) unstable; urgency=low
+
+  * Make postinst more quiet. (Closes: #489153)
+  * Add Turkish language support. (Closes: #489224)
+  * Remove duplicate comments in sites-available/default-ssl. (Closes: #489383)
+  * Describe in NEWS.Debian how to revert to the old NameVirtualHost config.
+    (Closes: #489215)
+  * Redirect apache2 bug reports to apache2.2-common, to get useful dependency
+    information.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 06 Jul 2008 10:38:37 +0200
+
+apache2 (2.2.9-3) unstable; urgency=low
+
+  [ Stefan Fritsch ]
+  * Move NameVirtualHost directive to ports.conf and switch from "*" to
+    "*:80". (Closes: #314606, #486286)
+  * Comment out the CacheEnable line in disk_cache.conf. It would have caused
+    problems with Etch to Lenny upgrades.
+  * Change the minimum user id for suexec back to 100, the new value of 1000
+    was too disruptive for existing configurations. (Closes: #488821)
+  * Add a default SSL virtual host. (Closes: #267477)
+    - Use snakeoil certificate by default (if ssl-cert is installed).
+      (Closes: #293524, #446765)
+    - Document this in README.Debian.
+      (Closes: #293469, #293519, #398520, #395823)
+    - Add MSIE workarounds. (Closes: #421802)
+    - Add ssl-cert to Recommends.
+  * Add a new config file /etc/apache2/conf.d/security with some vaguely
+    security related diectives. (Closes: #260063)
+  * Adjust mod_userdir accordingly. Also add "AllowOverride Indexes" for the
+    home directories.
+  * Disable SSLv2 by default. It is insecure. Also only enable ciphers with
+    key lengths of at least 128 bit.
+  * Make the init script complain about a missing $APACHE_PID_FILE during
+    "start", too, and not only during "stop" or "restart". This makes it more
+    obvious that /etc/apache2/envvars has to be updated. (Closes: #473982)
+  * Add hint about the "..., using 127.0.0.1 for ServerName" warning to
+    README.Debian. (Closes: #457708)
+  * Add hint about the "could not create rewrite_log_lock" error message to
+    README.Debian. (Closes: #450831)
+  * Remove empty dir from apache2-doc to fix Lintian warning.
+  * Always pass -g to gcc instead of relying on dpkg-buildpackage to set
+    CFLAGS. We always want the debug info for the apache2-dbg package.
+
+  [ Ryan Niebur ]
+  * Upgraded to policy 3.8.0
+    - added support for noopt in DEB_BUILD_OPTIONS
+    - added a README.source
+    - added support for parallel in DEB_BUILD_OPTIONS
+  * Dropped XS- from the Vcs fields in control
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 02 Jul 2008 10:15:57 +0200
+
+apache2 (2.2.9-2) unstable; urgency=low
+
+  * Make the init script use normal 'stop' instead of 'graceful-stop' again:
+    With graceful-stop, it can take a long time until all child processes have
+    closed their listening sockets and there is no way for the init script to
+    know when it is save to start apache again. This could make the restart of
+    apache fail. (Closes: #486629, #463338)
+  * Improve package descriptions, thanks to Justin B Rye. (Closes: #486855)
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 21 Jun 2008 12:22:17 +0200
+
+apache2 (2.2.9-1) unstable; urgency=low
+
+  * New upstream release. Notable changes:
+    - mod_proxy_http: Better handling of excessive interim responses from
+      origin server to prevent potential denial of service and high memory
+      usage (CVE-2008-2364).
+    - mod_proxy_balancer: Prevent CSRF attacks against the balancer-manager
+      (CVE-2007-6420).
+    - Worker / Event MPM: Fix race condition in pool recycling that leads to
+      segmentation faults under load. (Closes: #484800)
+    - mod_proxy: Keep connections to the backend persistent in the HTTPS case.
+    - mod_proxy: Support environment variable interpolation in reverse
+      proxying directives.
+    - mod_headers: Add 'merge' option to avoid duplicate values within the
+      same header.
+    - mod_substitute: The default is now flattening the buckets after each
+      substitution. The newly added 'q' flag allows for the quicker, more
+      efficient bucket-splitting.
+  * Shorten the init script's waiting period during 'restart' from 10 to 4
+    seconds. This should still be plenty to allow the apache processes to
+    close their listening sockets. Make the wait even shorter if apache dies
+    faster. (Closes: #479136)
+  * Fix some lintian warnings:
+    - Add some missing patch descriptions.
+    - Point to /usr/share/common-licenses instead of including the license in
+      the copyright file.
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 14 Jun 2008 08:29:41 +0200
+
+apache2 (2.2.8-5) unstable; urgency=low
+
+  * Replace a2{en,dis}{mod,site} by a rewritten version that
+    - supports wildcards (Closes: #373969).
+    - can be influenced with environment variables (Closes: #349716).
+    - checks existing symlinks for correctness (Closes: #409970).
+    - allows to remove dead symlinks (Closes: #480893).
+  * Move suexec suid helper program to a separate package apache2-suexec,
+    which is not installed by default. Provide an alternative version of
+    suexec, which can be customized with a config file. This can be found in
+    the apache2-suexec-custom package. Closes: #312252, #266835
+  * Some more suexec fixes:
+    - Fix race condition when changing directories.
+    - Accept only /var/www/*, and not /var/www*. The same for public_html/*
+      instead of public_html* (CVE-2007-1742).
+    - Raise the minimum userid that suexec may change to from 100 to 1000.
+  * Enable mod_deflate in new installs.
+  * Include config.nice in apache2-src. This hopefully allows apache2-mpm-itk
+    to drop the build-dependency on apache2-prefork-dev.
+  * Mention environment variables in apache2 and apache2ctl man pages and point
+    to README.Debian. (Closes: #475150)
+  * Drop unneeded build-dep on libtool.
+  * Drop obsolete apache2-mpm-perchild package (closes: #477522).
+  * Don't fail in postinst if there is a dangling symlink /var/www/index.html.
+  * Fix typo in bug number in 2.2.8-3 changelog entry.
+  * Use dh_lintian in debian/rules.
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 31 May 2008 17:02:03 +0200
+
+apache2 (2.2.8-4) unstable; urgency=high
+
+  * Urgency high for DoS vulnerability fix.
+  * Fix memory leak in mod_ssl with zlib compression.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 13 May 2008 22:31:37 +0200
+
+apache2 (2.2.8-3) unstable; urgency=low
+
+  * mod_cache: Handle If-Range correctly if the cached resource was stale
+    (closes: #470652).
+  * mod_autodindex: Use UTF-8 as character set for filenames in the default
+    configuration. Change this in autoindex.conf if you are still using
+    ISO-8859-1.
+  * Introduce APACHE_RUN_DIR and APACHE_LOCK_DIR in apache2ctl. Also, make it
+    use APACHE_RUN_USER instead of APACHE2_RUN_USER, to be consistent with
+    apache2.conf.
+  * Add 'status' function to init script (adapted from patch by Dustin
+    Kirkland).
+  * Don't build the modules three times. We are only shipping one set of them,
+    anyway. (Inspired by the Fedora package.)
+  * Remove Fabio M. Di Nitto from the uploaders field (thanks for your work).
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 14 Mar 2008 10:57:19 +0100
+
+apache2 (2.2.8-2) unstable; urgency=low
+
+  * Provide a fallback access log (other_vhosts_access.log) and a suitable
+    LogFormat (vhost_combined) for VirtualHosts that don't define their own
+    log file. (Closes: #313430)
+  * Fix broken symlink to README.Debian.gz and typos in the file
+    (closes: #461462).
+  * Improve generation of password salts in htpasswd (closes: #469271).
+  * Point VCS tags in debian control to trunk, to make them useful with
+    debcheckout.
+  * Add missing ${APACHE_ARGUMENTS} to *) case in apache2ctl.
+  * In upgrades from etch, replace /etc/apache2/default without asking also in
+    the NO_START=1 case, in order to not break piuparts (closes: #466367).
+  * Print file name where "Useless use of AllowOverride" occured.
+    (Closes: #410334)
+  * Make bugreport script source /etc/apache2/envvars before calling apache2.
+  * Add note about MSIE SSL workaround to README.Debian.
+  * Don't ship empty /var/www/apache2-default in apache2-doc.
+    (Closes: #469145)
+  * mod_autoindex: Use the bomb icon only for the name 'core', not for
+    '*core'. (Closes: #467480) 
+  * Include module name in a2enmod error messages (closes: #461341).
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 08 Mar 2008 12:28:14 +0100
+
+apache2 (2.2.8-1) unstable; urgency=low
+
+  * New upstream version:
+    - Fixes cross-site scripting issues in
+      o mod_imagemap (CVE-2007-5000)
+      o mod_status (CVE-2007-6388)
+      o mod_proxy_balancer's balancer manager (CVE-2007-6421)
+    - Fixes a denial of service issue in mod_proxy_balancer's balancer manager
+      (CVE-2007-6422).
+    - Fixes mod_proxy URL encoding in error messages (closes: #337325).
+    - Adds explicit charset to the output of various modules to work around
+      possible cross-site scripting flaws affecting web browsers that do not
+      derive the response character set as required by RFC2616. For
+      mod_proxy_ftp there is now the new ProxyFtpDirCharset directive to
+      specify something else than ISO-8859-1 (CVE-2008-0005).
+    - Adds mod_substitute which performs inline response content pattern
+      matching (including regex) and substitution (like mod_line_edit).
+    - Adds "DefaultType none" option.
+    - Adds new "B" option to RewriteRule to suppress URL unescaping.
+    - Adds an "if" directive for mod_include to test whether an URL is
+      accessible, and if so, conditionally display content.
+    - Adds support for mod_ssl to the event MPM.
+  * Move the configuration of User, Group, and PidFile to
+    /etc/apache2/envvars. This makes it easier to use these settings in
+    scripts. /etc/apache2/envvars can now also be used to influence apache2ctl
+    (inspired by Marc Haber's patch).  (Closes: #349709, #460105, #458085)
+  * Make apache2ctl check the configuration syntax before trying to restart
+    apache, to match the behaviour documented in the man page.
+    (Closes: #459236)
+  * Convert docs to be directly viewable with a browser (and not use content
+    negotiation).
+  * Add doc-base entry for the documentation. (closes: #311269)
+  * Don't ship default files in /var/www, but copy a sample file to
+    /var/www/index.html on new installs. Also remove the now unneeded
+    RedirectMatch line from sites-available/default.
+    (Closes: #411774, #458093)
+  * Add some information to README.Debian (Apache wiki, default virtual host)
+  * Build with LDFLAGS=-Wl,--as-needed to drop a lot of unnecessary
+    dependencies, easing library transitions (closes: #458857).
+  * Add icons for OpenDocuments, add sharutils to Build-Depends for uudecode.
+    Patch by Nicolas Valcárcel. (Closes: #436441)
+  * Add reportbug script to list enabled modules.
+  * Fix some lintian warnings:
+    - Pass --no-start to dh_installinit instead of omitting the debhelper token
+      in various maintainer scripts. Also move the update-rc.d call to
+      apache2.2-common.
+    - Add Short-Description to init script.
+  * Remove unused apache2-mpm-prefork.prerm from source package and clean up
+    debian/rules a bit.
+  * Don't ship NEWS.Debian with apache2-utils, as the contents are only
+    relevant for the server.
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 17 Jan 2008 20:27:56 +0100
+
+apache2 (2.2.6-3) unstable; urgency=low
+
+  * Allocate fewer bucket brigades in case of a flush bucket. This might help
+    with the memory leaks reported in #399776 and #421557.
+  * Escape the HTTP method in error messages to avoid potential cross site
+    scripting vulnerabilities (CVE-2007-6203).
+  * Update 053_bad_file_descriptor_PR42829.dpatch to avoid a race condition.
+  * Redirect /doc/apache2-doc/manual/ to /manual/ in the apache2-doc config
+    (Closes: #450867).
+  * Add icons for .ogg and .ogm (Closes: #255443).
+  * Add comment about how to log X-Forwarded-For (Closes: #425008).
+  * Make mod_proxy_balancer not depend on mod_cache.
+  * Add Homepage field to debian/control.
+  * Add/fix some lintian overrides, fix some warnings.
+  * Bump Standards-Version (no changes).
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 07 Dec 2007 22:38:59 +0100
+
+apache2 (2.2.6-2) unstable; urgency=low
+
+  * Avoid calling apr_pollset_poll() and accept_func() when the listening
+    sockets have already been closed on graceful stop or reload. This
+    hopefully fixes processes not being killed (closes: #445263, #447164)
+    and the "Bad file descriptor: apr_socket_accept: (client socket)"
+    error message (closes: #400918, #443310)
+  * Allow logresolve to process long lines (Closes: #331631)
+  * Remove duplicate config examples (Closes: #294662)
+  * Include README.backtrace describing how to create a backtrace
+  * Add CVE reference to 2.2.6-1 changelog entry
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 18 Oct 2007 19:35:40 +0200
+
+apache2 (2.2.6-1) unstable; urgency=low
+
+  * New upstream release
+    - fixes mod_proxy DoS for threaded MPMs (CVE-2007-3847)
+    - fixes spurious warning for valid wildcard certificates (Closes: #414855)
+    - adds warning that htpasswd is not setuid safe (Closes: #356285)
+    - adds Type and Charset options to IndexOptions directive,
+      allowing a workaround for buggy browsers affected by CVE-2007-4465
+    - adds new ProxyPassMatch directive
+  * Add index.htm to the default DirectoryIndex configuration
+    (Closes: #439375)
+  * Use apache2ctl in init script (Closes: #439027)
+  * make init script less noisy (Closes: #438950)
+  * improve NEWS entry (Closes: #440084)
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 06 Sep 2007 23:54:42 +0200
+
+apache2 (2.2.4-3) unstable; urgency=low
+
+  [ Stefan Fritsch ]
+  * enable default site on new installs again (Closes: #436341)
+  * make mod_authn_dbd depend on mod_dbd
+  * make a2dissite return 0 if a site is already disabled (Closes: #435398)
+  * make a2 scripts print errors to stderr (Closes: #435400)
+  * move TypesConfig directive from apache2.conf to mime.conf
+    (Closes: #434248)
+
+  [ Adam Conrad ]
+  * Special case apache2-dbg magic in debian/rules, so we don't do
+    this on Ubuntu, which has an archive of detached debug packages.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 07 Aug 2007 20:49:28 +0200
+
+apache2 (2.2.4-2) unstable; urgency=low
+
+  * Modularize config: Move module specific configuration from apache2.conf
+    to mods-available/*conf (Closes: #338472)
+  * Remove the NO_START kludge. Now you have to use rc*.d symlinks to disable
+    apache2. (Closes: #408462, #275561)
+  * Create run and lock directores in apache2ctl to make it work on fresh
+    installations before the first call of the init script. Together with
+    the previous item, this closes: #418499
+  * Disable AddDefaultCharset again (Closes: #397886)
+  * Make ports.conf, conf.d/charset, and /etc/default/apache2 conffiles
+    managed by dpkg
+  * Listen on port 443 by default if mod_ssl is loaded (Closes: #404598)
+  * Add logic to start htcacheclean as daemon or cronjob. The configuration
+    is in /etc/default/apache2
+  * Fix security issues:
+    - CVE-2007-3304: prevent parent process to send SIGUSR1 to arbitrary
+      processes
+    - CVE-2006-5752: XSS in mod_status
+  * Add init.d dependency info from insserv overrides to /etc/init.d/apache2
+  * Replace apachectl with apache2ctl in docs (Closes: #164493)
+  * Add usage message to apache2ctl (Closes: #359008)
+  * Make -dev packages priority extra
+  * Add secure example cipher/protocol configuration to ssl.conf
+  * Update watch file (Closes: #433552)
+  * Bump dh_compat to 5
+  * Add new package apache2-dbg with debugging symbols
+  * Fix mod_cache returning 304 instead of 200 on HEAD requests
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 03 Jul 2007 21:23:40 +0200
+
+apache2 (2.2.4-1) unstable; urgency=medium
+
+  [ Stefan Fritsch ]
+  * Urgency medium for security fix
+  * Fix CVE-2007-1863: DoS in mod_cache
+  * New upstream version (Closes: #427050)
+    - Fixes "proxy: error reading status line from remote server"
+      (Closes: #410331)
+  * Fix CVE-2007-1862: mod_mem_cache DoS (introduced in 2.2.4)
+  * Change logrotate script to use reload instead of restart.
+    (Closes: #298689)
+  * chmod o-rx /var/log/apache2 (Closes: #291841)
+  * chmod o-x suexec (Closes: #431048)
+  * Update patch for truncated mod_cgi 500 responses from upstream SVN
+    (Closes: #412580)
+  * Don't use AddDefaultCharset for our docs (Closes: #414429)
+  * fix options syntax in sites-available/default (Closes: #419539)
+  * Move conf.d include to the end of apache2.conf (Closes: #305933)
+  * Remove log, cache, and lock files on purge (Closes: #428887)
+  * Ship /usr/lib/cgi-bin (Closes: #415698)
+  * Add note to README.Debian how to read docs (Closes: #350822)
+  * Document pid file name (Closes: #350286)
+  * Update Standards-Version (no changes needed)
+  * Fix some lintian warnings, add some overrides
+  * Start apache when doing a "restart" even if it was not running
+    (Closes: #384682)
+  * reload config in apache2-doc postinst (Closes: #289289)
+  * don't fail in prerm if apache is not running (Closes: #418536)
+  * Suggest apache2-doc and www-browser (Closes: #399056)
+  * Make init script always display a warning if NO_START=1 since
+    VERBOSE=yes is not the default anymore (Closes: #430116)
+  * Replace apache2(8) man page with a more current version
+  * Add httxt2dbm(8) man page
+  * Show -X option in help message (Closes: #391817)
+  * remove sick-hack-to-update-modules
+  * don't depend on procps on hurd (Closes: #431125)
+
+  [ Peter Samuelson ]
+  * Add shlibs:Depends to apache2.2-common.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 01 Jul 2007 19:57:51 +0200
+
+apache2 (2.2.3-5) unstable; urgency=low
+
+  [ Tollef Fog Heen ]
+  * Fix up apache2-src so the .tar.gz contains an apache2 top level
+    directory.
+  * Make apache2 MPMs provide and conflict with apache2-mpm so other
+    packages can provide MPMs too.
+  * Get rid of 2.1 references from descriptions.  (Closes: #400981)
+
+  [ Thom May ]
+  * Let the init script cope with multiple pid files correctly. Probably we
+    shouldn't be doing this at all, but we might as well do it properly!
+    (Closes: #396162)
+  * Add a sensible autoindex default config
+  * Add patch from upstream to ensure that mod_cgi 500 responses aren't
+    truncated (Closes: #412580)
+  * Use graceful-stop to shutdown apache to ensure we cope nicely with long
+    running or blocked children
+
+  [ Peter Samuelson ]
+  * Ship apache2 manpage in apache2.2-common.  (Closes: #391813)
+  * Rearrange init script so that 'force-reload' is the same as 'reload'.
+    (Closes: #401053)
+  * Add Build-Depends: mawk.  (Closes: #403682)
+  * Add a needed <IfModule mod_include.c> guard to apache2.conf.
+    (Closes: #407307)
+  * Stop shipping /var/run/apache2/ as it is created at runtime anyway.
+  * Move the /var/lock/apache2 owner fix from the apache2.2-common
+    postinst to the init script, as /var/lock may not persist across
+    reboots.  (Closes: #420101)
+
+  [ Stefan Fritsch ]
+  * Add Build-Depends: libssl-dev, zlib1g-dev (Closes: #399043)
+  * Add XS-Vcs-* to debian/control
+  * Improve handling of empty $MODNAME in a2enmod (Closes: #422589)
+  * Treat apache2-mpm-itk as prefork in a2enmod (Closes: #412602)
+  * Re-add README.Debian and describe
+    - the config dir layout (closes: #419552)
+    - which files are ignored by Include
+    - when and how to change "restart" to "reload" in the logrotate script
+  * When purging, remove {mods,sites}-enabled symlinks and the config files
+    created by postinst (Closes: #397789)
+  * Fix suexec to log after a cgi error (Closes: #312385)
+  * Add watch file
+  * Add AddType for .bz2 (Closes: #416322)
+  * Make init script messages conform better to policy (Closes: #390348)
+    and exit with failure if called with unknown parameter (Closes: #412407)
+  * Fix segfault in mod_proxy_ftp when FTP server sends back no spaces
+    (Closes: #413727)
+  * Ship /etc/apache2/conf.d/apache2-doc (Closes: #418464)
+  * Tell the user when selecting cgid instead of cgi (Closes: #428058)
+  * Add a2ensite/a2dissite man pages (Closes: #322385)
+  * Comment out CacheEnable by default, to prevent filling up /var.
+    Document the problem in README.Debian and NEWS.Debian, point to
+    htcacheclean and give a warning when doing a2enmod disk_cache
+    (Closes: #423653).
+  * Add myself to Uploaders.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 10 Jun 2007 18:54:29 +0200
+
+apache2 (2.2.3-4) unstable; urgency=high
+
+  * High-urgency upload for RC bugfixes.
+  * Ack NMUs - thanks Andi, Steve.
+  * Add myself to Uploaders.
+  * Refactor apache2.2-common.postinst slightly, to account for sarge
+    upgrades (since it's a new package name, rather than an upgrade).
+    (Closes: #396782, #415775)
+  * If mod_proxy was configured in sarge, add proxy_http and
+    disk_cache modules, which used to be included in the mod_proxy config.
+    (Closes: #407171)
+
+ -- Peter Samuelson <peter@p12n.org>  Tue, 27 Mar 2007 07:06:49 -0500
+
+apache2 (2.2.3-3.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * apache2.2-common should depend on procps, since it will fail to create
+    httpd.conf if it's not installed.  Closes: #398535.
+
+ -- Steve Langasek <vorlon@debian.org>  Mon,  5 Feb 2007 01:55:57 -0800
+
+apache2 (2.2.3-3.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * 043_ajp_connection_reuse: Patch from upstream Bugzilla, fixing a critical
+    issue with regard to connection reuse in mod_proxy_ajp.
+    Closes: #396265
+
+ -- Andreas Barth <aba@not.so.argh.org>  Sat,  9 Dec 2006 21:05:45 +0000
+
+apache2 (2.2.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Enable authz_user by default, fix silent authentication breakage.
+    Closes: #397310
+  * Add default modules if coming from earlier than this version.
+    Closes: #392349, #392352, #392701, #393913, #396678, #395976
+  * Re-Enable modules cern_meta, dumpio and ext_filter. Closes: #391393
+
+ -- Andreas Barth <aba@not.so.argh.org>  Fri, 10 Nov 2006 15:44:33 +0100
+
+apache2 (2.2.3-3) unstable; urgency=medium
+
+  [ Peter Samuelson ]
+  * a2dismod: exit 0 if a module exists but is already disabled.
+  * Ship a2enmod.8 and a2dismod.8 again, and expand them a bit.
+    (Closes: #270551)
+
+  [ Tollef Fog Heen ]
+  * Build apache2-src package.
+  * Do not AddDefaultCharset if we are proxying.  Closes: #277526
+  * Do not forcefully link against libdb4.3 and other libs.
+  * Enable the same list of modules as we had in 2.0 (by default) and do
+    that for all older versions than 2.2.3-3 to fix upgrade issues people
+    have had.  Closes: #392349
+  * Set default IndexWidth to *.
+  * Clean up CPPFLAGS and CFLAGS, including making all of CFLAGS a
+    superset of CPPFLAGS.  Also make sure to include -I switches with
+    absolute paths so the apache headers are useful.
+  * Warn when not starting HTTPD due to missing apache binary.  
+    Closes: #384128
+  * Provide sample disk and memory cache configurations.  Closes: #278564
+  * Provide dir.conf.   Closes: #392356
+  * Add alternate dependency from apache to apache2-mpm-event
+  * On reload, make the init script exit 1 with an error message if the
+    configuration is broken.  Closes: #316858
+  * Add default deflate.conf compressing text/html, text/plain and
+    text/xml.  Closes: #349016
+  * Add { and } around the usage format in the init script to make the
+    init script bash completion happier.  Closes: #350606
+
+  [ Adam Conrad ]
+  * Update our php4 and php5 conflicts, to reflect the reality that each
+    were uploaded and built again while apache2.2 was in the new queue.
+    Closes: #392189
+  * Migrate kill symlinks from K91 to K09 (closes: #376503)
+  * Make apache2 depend on the current version of the MPMs, as it used
+    to in the 2.0.x series (and make it binNMU-safe) (closes: #394658)
+  * Make sure that the RedirectMatch in sites-available/default continues
+    to be commented out for Ubuntu, while having it uncommented for Debian.
+
+  [ Thom May ]
+  * Fix permissions on suexec (Closes: #391918)
+  * This is Debian, not Ubuntu (Closes: #393277)
+
+ -- Adam Conrad <adconrad@0c3.net>  Sat,  7 Oct 2006 17:57:04 +1000
+
+apache2 (2.2.3-2) unstable; urgency=low
+
+  * Make sure to ship /var/log/apache2 in the apache2.2-common package.
+    Closes: #390786
+  * Install suexec.8 as suexec2.8.  Closes: #390774
+  * Make sure that we never ship .svn directories in any binary packages.
+    Closes: #390785
+  * Not only chmod -x /usr/sbin/apache2 in apache2.2-common.preinst, chmod
+    +x it in same's postinst too.  Closes: #390794
+  * We now ship htcacheclean in apache2-utils.  Closes: #376680
+  * Try to stop old apaches in preinst of the mpms.  Closes:  #390893
+  * Make apache2-mpm-{worker,prefork} conflict with apache2-mpm-event and
+    apache2-common.
+  * rm -f /var/lib/dpkg/info/apache2-common.postrm.  So apache2-common can
+    be purged. Yes, we're on crack.  Closes: #390823
+  * Make apache2-utils's Replaces on apache2-common be unversioned.
+    Closes: #391018
+  * Stop shipping cern_meta.load, dumpio.load and ext_filter.load.  Thanks
+    to Stephane Chazelas for noticing.  Closes: #391393
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Tue,  3 Oct 2006 10:03:48 +0200
+
+apache2 (2.2.3-1) unstable; urgency=low
+
+  * Remove mention of AddDefaultCharset from apache2.conf as this is now
+    in /etc/apache2/conf.d/charset.
+  * Rename apache2-common to apache2.2-common.  Conflict and replace old
+    version.  This is to force modules to be uninstalled until versions
+    compiled against 2.2 are provided.
+  * Remove Daniel Stone from list of uploaders.
+  * We no longer ship 035_HEAD_Content-Length_Fix_From_CVS.  Closes: #298143
+  * Don't start the server on reload.  Closes: #316321
+  * Install S91/K09 links, not S91/K91, also only support not starting
+    through defaults file to cover upgrades from old
+    installations. Closes: #359977, #349655
+  * Big cleanup by using dh_install properly rather than loads of hacks in
+    debian/rules.
+  * No longer ship compat symlinks for ab, etc.  Those are installed as
+    ab, htpasswd and similar.
+  * Remove apache2-mpm-{event,worker}-{prerm,preinst,postinst} in clean,
+    as those are copies of other files.
+  * Add build-depends for libapr1-dev (>= 1.2.7-6) to make sure we get a
+    version which ships a useful apr-config --apr-libtool.
+  * chmod -x /usr/sbin/apache2 on upgrades from before 2.2 to avoid
+    problems stopping apache due to some dpkg bug.
+  * Add Conflicts for broken modules which didn't depend on
+    apache2-common.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Thu, 17 Aug 2006 14:02:58 +0200
+
+apache2 (2.2.3-1~exp.r170) experimental; urgency=low
+
+  [ Jeroen van Wolffelaar ]
+  * Staging upload to experimental of subversion revision r170
+
+  [ Thom May, Tollef Fog Heen, Fabio M. Di Nitto and Adam Conrad ]
+  * New Upstream Release.  Closes: #344072
+    http://httpd.apache.org/docs/2.2/new_features_2_2.html has a list of
+    new features and changes.
+    - Fixes LFS support. Closes: #341460, #285337, #241223
+    - Fixes off-by-one error in mod_rewrite ldap schema handling
+      (CVE-2006-3747)
+    - Fixes XSS issue in mod_imap/mod_imagemap (CVE-2005-3352).  
+      Closes: #343467.
+    - mpm_perchild no longer exists, so closing bugs for perchild.
+      Closes: #236193, #238586
+    - Fixes PHP POST with SSLVerifyClient. Closes: 353443
+  * Build-depend on lsb-release and pick up the branding from there.
+  * Build-depend on apr-util 1.0 which is now in a separate source
+    package.
+  * Mangle the Debian layout to be more FHS compatible
+  * No longer build-conflict with libgdbm-dev
+  * Use external PCRE  
+  * Make apache2-utils stop providing apache2-utils.  Also make it stop
+    conflicting with itself.
+  * Rename default site from default-site to just default.
+  * Try to migrate modules which used to be built-in:, alias, mime,
+    authz_host, autoindex, dir, env, negotiation, setenvif, status.
+  * Mod imap has been renamed to imagemap, ditto for auth_ldap =>
+    authnz_ldap.  Cope with that in postinst.
+  * Stop globbing in apache2.conf.  
+    Closes: #337817, #340955, #348189, #379015, #368497
+  * Don't install CHANGES into the apache2 package.  It's just a
+    metapackage.
+  * Add rudimentary rdeps handling to a2dismod.  Closes: #273929
+  * Stop providing apache-utils.
+  * Cope with /var/run and /var/lock on tmpfs.
+  * Remove all subdirs in srclib as we are using external libraries for
+    those anyway.  Also remove test/zb.c.  Closes: 340538
+  * Make ssl.conf not block on /dev/random, but rather use /dev/urandom.
+  * Make apache2-common depend on lsb-base, thanks to Gleb Arshinov
+
+ -- Jeroen van Wolffelaar <jeroen@wolffelaar.nl>  Tue, 15 Aug 2006 16:17:33 +0200
+
+apache2 (2.0.55-4.1) unstable; urgency=high
+
+  * Non-maintainer upload.  Urgency set to high due to security fixes.
+  * Added '052_mod_rewrite_CVE-2006-3747' to fix the off-by-one bug in
+    mod_rewrite.
+    [CVE-2006-3747].  (Closes: #380182)
+  * Added '053_restore_prefix_fix' to allow rebuilding from source.
+    (Closes: #374160)
+  * Added '054_apr_sendfile' to allow building for Hurd.
+    (Closes: #349416)
+  * Added '055_expect_CVE-2006-3918' to fix XSS attack in Expect headers.
+    [CVE-2006-3918].  (Closes: #381376)
+  * Added bash-completion script from Guillaume Rousse.
+    (Closes: #299855)
+
+ -- Steve Kemp <skx@debian.org>  Sat, 5 Aug 2006 21:35:53 +0000
+
+apache2 (2.2.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Fabio M. Di Nitto <fabbione@fabbione.net>  Thu, 26 Jan 2006 13:46:08 +0100
+
+apache2 (2.0.55-4) unstable; urgency=low
+
+  * Add 050_mod_imap_CVE-2005-3352 to escape untrusted referer headers in
+    mod_imap before outputting HTML to avoid XSS attacks; see CVE-2005-3352
+  * Add 051_mod_ssl_CVE-2005-3357 to avoid a remote denial of service in
+    threaded MPMs when making a non-SSL connection to an SSL-enabled port
+    on a server with a custom 400 error document defined; see CVE-2005-3357
+  * Clean up our use of trailing slashes on directories in debian/rules, so
+    the newer, pickier, obviously very improved coreutils doesn't bite us.
+  * Remove some cruft from apache2-common's postinst, dealing with upgrade
+    scenarios from versions older than those released in Sarge or Warty.
+  * Use "SHELL := sh -e" in debian/rules, so the build will stop on shell
+    errors, instead of blundering on to later make targets (closes: #340761)
+  * Recreate /var/run/apache2 and /var/lock/apache2 in our init script, in
+    case the user has /var/run and /var/lock on tmpfs, which is fasionable.
+  * Make our init script a /bin/bash script instead of a /bin/sh script, so
+    we can abuse it with regex globbing (#348189, #347962, #340955, #342008)
+  * Take patch from Adrian Bridgett to output errors from our config test
+    in the init script, but only do so when we're VERBOSE (closes: #339323)
+  * In the spirit of the LSB, make our init script exit 2 when called with
+    incorrect arguments, and exit 4 when asked for status (closes: #330275)
+  * Fix the default site to not mix configuration syntax (closes: #345922)
+  * Mention apxs2 in the apache2-*-dev long descriptions (closes: #307921)
+
+ -- Adam Conrad <adconrad@0c3.net>  Sat, 26 Nov 2005 19:06:32 +1100
+
+apache2 (2.0.55-3) unstable; urgency=low
+
+  * Brown paper bag release: Tidy up CFLAGS and APR configure call to make
+    sure that what we link to agrees with what apu-config tells others to do.
+
+ -- Adam Conrad <adconrad@0c3.net>  Mon, 24 Oct 2005 13:02:52 +1000
+
+apache2 (2.0.55-2) unstable; urgency=low
+
+  * Mess with 010_more_fhs_compliancy to nail down the compiled default for
+    cgisock to match with the default shipped in the config file, so people
+    don't get confused if they miss including cgid.conf (closes: #316477)
+  * Make the compiled-in PidFile match the config file for similar reasons.
+  * Add 049_apr_tables_HEAD_cleanup, resolving an issue where merging two
+    tables from different resource pools would leave you with the contents
+    of only one, rather than both.  This patch also cleans up some broken
+    pointer arithmetic and type casting along the way (closes: #251800)
+  * Specify the DocumentRoot without a trailing slash (closes: #311317)
+  * Fix the manpage to point at proper locations (closes: #307665, #332619)
+
+ -- Adam Conrad <adconrad@0c3.net>  Sun, 23 Oct 2005 13:24:39 +1000
+
+apache2 (2.0.55-1) unstable; urgency=low
+
+  * New upstream bugfix and security release, superseding these patches:
+    - Drop 041_util_ldap_fix.patch, util_ldap seems to be unbroken.
+    - Drop 043_ssl_off_by_one_CAN-2005-1268, fixed upstream.
+    - Drop 044_content_length_CAN-2005-2088, fixed upstream.
+    - Drop 045_byterange_CAN-2005-2728, fixed upstream.
+    - Drop 046_verify_client_CAN-2005-2700, fixed upstream.
+    - Resolves a serious memory leak in the worker MPM; see CVE-2005-2970
+    - Add 048_reverse_proxy_fix, to resolve a regression in 2.0.55 with
+      mod_proxy, mod_ssl and HTTP POST requests (upstream bug #37145)
+  * New release builds cleanly with OpenSSL 0.9.8 (closes: #332791, #333363)
+  * Fix up our built-in version of DBS to use find's -{max,min}depth
+    arguments in a way that doesn't make find whine like a spoiled child.
+  * Merge Ubuntu and Debian packaging, bringing in patch 047 (closes: #327269)
+    - Comment out the / -> /apache2-default/ redirect, as user feedback seems
+      to indicate that it's just too bloody confusing for most people.
+    - New installations (only) now get an AddDefaultCharset UTF-8 directive.
+  * Build-depend on lsb-release, and use it in debian/rules to determine which
+    distribution we're building on, dropping the 007_debian_advertising patch.
+  * Drop debconf dependency entirely; we don't even use it (closes: #331741)
+  * Finally support DEB_BUILD_OPTIONS="noopt debug" properly in debian/rules.
+  * Adjust mime_magic.conf to point at the new FHS location of magic.mime.
+  * Drop the apache2-mpm-threadpool transitional package; Sarge is released.
+  * Try a bit harder to find the *CORRECT* PidFile directive in the init
+    script, instead of the old "rgrep and pray" method (closes: #303076)
+  * Make init script to always use apache2ctl consistently (closes: #316303)
+  * Build (and have -dev packages depend on) libdb4.3 instead of libdb4.2.
+
+ -- Adam Conrad <adconrad@0c3.net>  Mon, 17 Oct 2005 13:00:13 +1000
+
+apache2 (2.0.54-5ubuntu2) breezy; urgency=low
+
+  * Add 047_ssl_reneg_with_body, which adds a (bounded) buffer of request
+    body data to provide a limited but safe fix for the mod_ssl renegotiation
+    vs requests-with-bodies bug, as occurs with POST and SVN (Ubuntu #14991)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue,  4 Oct 2005 11:53:01 +1000
+
+apache2 (2.0.54-5ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian, bringing in several security patches.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon,  5 Sep 2005 20:40:31 +1000
+
+apache2 (2.0.54-5) stable-security; urgency=high
+
+  * Add 043_ssl_off_by_one_CAN-2005-1268, fixing an off-by-one error in SSL
+    certificate validation; see CAN-2005-1268 (closes: #320048, #320063)
+  * Add 044_content_length_CAN-2005-2088, resolving an issue in mod_proxy
+    where, when a response contains both Transfer-Encoding and Content-Length
+    headers, the connection can be used for HTTP request smuggling and HTTP
+    request spoofing attacks; see CAN-2005-2088 (closes: #316173)
+  * Add 045_byterange_CAN-2005-2728, to resolve a denial of service in apache
+    when large byte ranges are requested; see CAN-2005-2728 (closes: #326435)
+  * Add 046_verify_client_CAN-2005-2700, resolving an issue where the context
+    of the SSLVerifyClient directive is not honoured within a <Location>
+    nested in a <VirtualHost>, and is left unenforced; see CAN-2005-2700
+
+ -- Adam Conrad <adconrad@0c3.net>  Fri,  2 Sep 2005 22:26:28 +1000
+
+apache2 (2.0.54-4) unstable; urgency=low
+
+  * Alter 041_util_ldap_fix.patch to revert util_ldap.c to the known
+    good version from 2.0.53 (closes: #308648, and re-fixes #307567)
+
+ -- Adam Conrad <adconrad@0c3.net>  Wed, 11 May 2005 20:15:38 -0600
+
+apache2 (2.0.54-3) unstable; urgency=medium
+
+  * Add 042_htdigest_CAN-2005-1344 to fix a buffer overflow in
+    htdigest, which is described in CAN-2005-1344 (closes: #307134)
+  * Add 041_util_ldap_fix.patch from upstream bug #34618 to fix
+    issues with mod_auth_ldap sometimes segfaulting and sometimes
+    locking up and spinning the CPU to oblivion (closes: #307567)
+  * Alter 011_fix_ap-config to make apr-config point us at the system
+    libtool, and make libapr0-dev depend on libtool (closes: #306481)
+  * Alter 008_make_include_safe to prevent apache2 from including dpkg
+    conffile leftovers (.dpkg-old et al) (closes: #304786, #296728)
+
+ -- Adam Conrad <adconrad@0c3.net>  Thu,  5 May 2005 03:45:24 -0600
+
+apache2 (2.0.54-2) unstable; urgency=low
+
+  * Set suexec2's ownership properly, so it's actually executable by
+    apache2 with the newly-restrictive permissions (closes: #305242)
+
+ -- Adam Conrad <adconrad@0c3.net>  Mon, 18 Apr 2005 22:09:42 -0600
+
+apache2 (2.0.54-1) unstable; urgency=low
+
+  * New upstream bugfix-only release (closes: #305121)
+  * Fix debian/watch file to only look at apache 2.0.x, so we stop being
+    told about the 2.1 beta releases (and I'll notice new 2.0.x releases)
+  * Drop o+rx permissions from suexec2; while it has code in place to
+    make sure the caller is www-data, if that code should be buggy,
+    filesystem permissions will help mitigate fallout (closes: #301045)
+  * Update the 003_build_with_autoconf_2.5 patch to make sure both
+    apr and apr-util have an AC_PREREQ for autoconf 2.50, so we don't get
+    weird autoconf mix-and-match FTBFS issues (closes: #301819)
+
+ -- Adam Conrad <adconrad@0c3.net>  Sun, 17 Apr 2005 23:10:18 -0600
+
+apache2 (2.0.53-5ubuntu5) hoary; urgency=low
+
+  * Fix the init script to not exit with an error when asked to
+    stop a daemon that isn't running (Was the root cause of #8374)
+
+ -- Adam Conrad <adconrad@0c3.net>  Fri,  1 Apr 2005 16:30:56 +0000
+
+apache2 (2.0.53-5ubuntu4) hoary; urgency=low
+
+  * Make sure package removals don't fail even if the init script
+    doesn't stop apache2 (Ubuntu #8374)
+
+ -- Adam Conrad <adconrad@0c3.net>  Fri,  1 Apr 2005 15:07:20 +0000
+
+apache2 (2.0.53-5ubuntu3) hoary; urgency=low
+
+  * Add dependency on lsb-base (>= 1.3-9ubuntu2) to guarantee
+    availability of lsb init functions (Ubuntu #7765)
+
+ -- Adam Conrad <adconrad@0c3.net>  Sun, 27 Mar 2005 21:55:41 -0700
+
+apache2 (2.0.53-5ubuntu2) hoary; urgency=low
+
+  * Really remove /etc/apache2/conf.d/charset on purge, rather
+    than just writing about it in the changelog.
+
+ -- Adam Conrad <adconrad@0c3.net>  Sun, 27 Mar 2005 08:32:39 -0700
+
+apache2 (2.0.53-5ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian, resolving minor conflicts.
+  * Remove /etc/apache2/conf.d/charset on purge.
+
+ -- Adam Conrad <adconrad@0c3.net>  Sun, 27 Mar 2005 15:15:44 +0000
+
+apache2 (2.0.53-5) unstable; urgency=high
+
+  * Update 040_link_external_pcre to require autoconf 2.50, so it
+    doesn't fail when autoconf2.13 is installed (closes: #295428)
+  * Further mangle the apache_stop function in the init script so it
+    attempts as hard as possible to make sure apache2 is stopped before
+    it tries to restart.  Thanks to Andre Tomt <andre@tomt.net> for
+    the bug and patch this fix was based on (closes: #295915, #281557)
+
+ -- Adam Conrad <adconrad@0c3.net>  Fri, 25 Feb 2005 00:51:13 -0700
+
+apache2 (2.0.53-4) unstable; urgency=low
+
+  * Add 040_link_external_pcre to allow us to link to an external libpcre
+    rather than statically compiling the bundled version.
+  * Add --with-external-pcre to the configure flags in debian/rules
+    (closes: #294673, #294675, #282606, #294740)
+  * Stop hardcoding the path to netstat in postinst (closes: #294737)
+
+ -- Adam Conrad <adconrad@loki.0c3.net>  Mon, 14 Feb 2005 01:45:08 +0000
+
+apache2 (2.0.53-3) unstable; urgency=medium
+
+  * Drop Andres Salomon's PCRE manglig patch in favour of hand-merging
+    Joe Orton's patch against head to completely internalise apache's
+    copy of PCRE, only exposing a wrapper API.  (closes: #294395)
+
+ -- Adam Conrad <adconrad@0c3.net>  Wed,  9 Feb 2005 11:30:21 -0700
+
+apache2 (2.0.53-2) unstable; urgency=low
+
+  * Make apache2-threaded-dev and apache2-prefork-dev both arch:any
+    as they contain architecture-dependant defines (closes: #294257)
+
+ -- Adam Conrad <adconrad@0c3.net>  Wed,  9 Feb 2005 04:20:07 -0700
+
+apache2 (2.0.53-1) unstable; urgency=low
+
+  * New upstream release
+    - Remove 036_HEAD_CAN-2004-0942, integrated upstream
+    - Remove 037_HEAD_CAN-2004-0885, integrated upstream
+  * Drop support for the threadpool MPM, as it's abandoned upstream.
+    - Make apache2-mpm-threadpool an empty package depending on
+      apache2-mpm-worker, and make worker replace the old threadpool
+  * Make SYSCONFDIR configurable at the top of a2{en,dis}{mod,site}
+  * Drop the build-conflict on gawk, and use ac_cv_prog_AWK=mawk
+    instead (closes: #283396)
+  * Make the apache_stop() function stop trying to do the equivalent
+    of "killall apache2", and instead issue a nasty warning if it can't
+    stop apache2 on its own
+  * Make "restart" an alias for "force-reload" in the init script, as
+    apache2ctl restart doesn't match policy's requirements for restart
+  * Swapping between threaded and unthreaded MPMs could leave one with
+    both mod_cgi and mod_cgid enabled.  Fixed the postinsts so that
+    no longer happens
+  * Update 021-pcre_mangle_symbols.patch from Andres Salomon, now also
+    mangling typedefs, which should fix PHP (closes: #280823)
+  * Hardcode a dependency on libgcc1 (>= 1:3.3.5) so pthread_cancel
+    will work correctly with partial upgrades (closes: #287033)
+  * When removing ssl_scache, make sure to remove its db transation logs
+    and other garbage as well (closes: #293831)
+  * Remove duplicate /icons/ from the default site (closes: #291856)
+  * Yank 039_fix_forensic_tmpfiles from Ubuntu's apache2 packages
+  * Split out utils into seperate apache2-utils.  This will also
+    supercede the apache-utils package (closes: #285219)
+  * Add split-logfile to apache2-utils (closes: #290814)
+  * Make the MPM postinsts scream loudly, but not fail, if you've
+    deleted cgi{,d}.load before swapping MPMs (closes: #283141)
+
+ -- Adam Conrad <adconrad@0c3.net>  Mon,  7 Feb 2005 07:54:12 -0700
+
+apache2 (2.0.52-3) unstable; urgency=high
+
+  * Brown paper bag release to fix apache2-common's postinst, by judiciously
+    sprinkling ||true in a couple of needed places (closes: #280527)
+  * While hunting for unclean uses of VAR=`command` in the package, found
+    the cause of the "can't purge with broken config" bugs and fixed that
+    too with yet another ||true (closes: #263511, #273759, #279875)
+
+ -- Adam Conrad <adconrad@0c3.net>  Wed, 10 Nov 2004 01:32:16 -0700
+
+apache2 (2.0.52-2) unstable; urgency=high
+
+  * Include two patches, 036_HEAD_CAN-2004-0942 and 037_HEAD_CAN-2004-0885
+    - CAN-2004-0942: Memory leak in header parsing in server/protocol.c
+    - CAN-2004-0885: Incorrect SSLCipherSuite selection in mod_ssl
+  * Fix up our use of netstat in apache2-common's postinst to clean up some
+    unnecessary output to stderr, as well as detect when netstat believes
+    we don't have AF_INET support.  This should allow for installation in
+    chroots where the /proc filesystem isn't mounted (closes: #245487)
+  * Add 035_HEAD_Content-Length_Fix_From_CVS, which should solve problems
+    with Content-Length being set incorrectly on proxied HEAD requests,
+    breaking Windows Update from proxied machines (closes: #277787)
+  * Take out the reload/start magic in the postinst, and just call start in
+    all cases, as we stop the daemon in the prerm (closes: #275175, #222786)
+  * Copy config.guess/config.sub/ltmain.sh in from /usr/share/libtool at
+    build time. (closes: #257228, #263101)
+  * Clean up the clean target in debian/rules to remove some duplicate
+    maintainer scripts from the debian/ directory that we don't need to be
+    shipping in the source package.
+  * Move envvars to /etc/apache2/ and add patch 038_no_LD_LIBRARY_PATH to
+    remove the extraneous LD_LIBRARY_PATH from envvars (closes: #276670)
+
+ -- Adam Conrad <adconrad@0c3.net>  Sun,  7 Nov 2004 04:09:46 -0700
+
+apache2 (2.0.52-1) unstable; urgency=high
+
+  * New upstream bugfix/security release:
+    - Fixes CAN-2004-0811: Satisfy directive bypass (closes: #273412)
+  * Add '|| true' to a2enmod to stop it from dying when the installed MPM
+    isn't prefork (closes: #273017, #273019, #272865, #273021, #273258)
+  * Touch /var/log/apache2/error.log on new installs to ensure that our log
+    directory isn't removed until the package is purged, so logrotate doesn't
+    complain about its inability to find it (closes: #239571)
+  * Add 032_suexec_is_shared, which makes sure suEXEC is only searched for
+    and enabled when mod_suexec is loaded (closes: #227653)
+  * Use '$APACHE2CTL startssl' consistently in init script to make sure the
+    SSL define doesn't disappear on force-reload (closes: #272531)
+  * Add 033_dbm_read_hash_or_btree to allow apr-util and dbmmanage to open
+    and manipulate DB_BTREE databases, while still defaulting to creating
+    DB_HASH databases as before.  This should clear up incompatibilities
+    with other applications (such as PHP) which default to DB_BTREE.
+  * Moved dbmmanage2 to /usr/bin, instead of /usr/sbin, as it's a user tool.
+  * Added 034_ab2_has_openssl, thanks to 2.1-cvs, Fedora, thom, and a bit
+    of munging, to compile a working ab2 with SSL support (closes: #261820)
+
+ -- Adam Conrad <adconrad@0c3.net>  Tue, 28 Sep 2004 10:21:20 -0600
+
+apache2 (2.0.51-2) unstable; urgency=high
+
+  * Test for the existence of /usr/sbin/apache2 before we go trying to invoke
+    it to determine what MPM we have installed (closes: #272103, #272207)
+  * Make the default httpd.conf created in apache2-common's postinst contain
+    a fake LoadModule line (commented out), and make apxs2 default to
+    installing modules to /etc/apache2/httpd.conf, so people using apxs2
+    rather than the mods-{enabled,available} directories get the expected
+    behaviour, rather than obscure errors (closes: #167552, #231134)
+  * apxs2 now writes the correct path to modules in httpd.conf, including
+    the mysteriously missing slash (closes: #231450, #167557)
+  * Make apxs2 install modules with mode 644, since 755 makes no sense.
+  * Added a bit of magic to a2{en,dis}site to treat the default site as a
+    special case and add a "000-" priority to the beginning of its symlink.
+    Patches welcome to turn this into something robust, like update-rc.d.
+
+ -- Adam Conrad <adconrad@0c3.net>  Sat, 18 Sep 2004 07:12:12 -0600
+
+apache2 (2.0.51-1) unstable; urgency=high
+
+  * New upstream release, including the following security fixes:
+    - CAN-2004-0747: ap_resolve_env buffer overflow
+    - CAN-2004-0786: apr_uri_parse segfault in memcpy
+    - CAN-2004-0809: mod_dav crash/DoS via NULL pointer dereference
+  * Drop the following patches which are now included upstream:
+    - 025_CAN-2004-0748.patch
+    - 026_CAN-2004-0751.patch
+    - 027_autoindex_ignore_bad_files.patch
+    - 028_apr_sticky_bits.patch
+  * Install a properly sanitised config_vars.mk so that apxs2 behaves in
+    a reasonably sane way (closes: #243340, #270768)
+  * Relax www-browser dependency to a Suggests, as the mod_status dump from
+    apache2ctl is a pretty minor (and oft unused) feature (closes: #269309)
+  * init script now allows you to stop (but not start, restart, etc) the web
+    server, even if NO_START is set to 1 (closes: #269398)
+  * Make the apache2 -> apache2-mpm-* dependency tighter, so it does what
+    one expects when installing it (closes: #269580)
+  * Remove the ^/doc/apache2-doc/manual(.*)$ /manual$1 RedirectMatch from
+    the default site which was confusing and useless (closes: #270216)
+  * Add debian/watch file to track upstream versions.
+  * Add some magic to a2enmod to map cgi to cgid if using a threaded MPM.
+  * Add a2ensite and a2dissite which do the same thing as a2{en,dis}mod,
+    but for sites rather than modules (closes: #269251)
+
+ -- Adam Conrad <adconrad@0c3.net>  Wed, 15 Sep 2004 00:09:39 -0600
+
+apache2 (2.0.50-12) unstable; urgency=high
+
+  * Build-depend on mawk, and build-conflict with gawk, as we're only
+    guaranteed of having one or the other installed at any given time
+    and GNU awk seems to royally mess up the build with regards to which
+    external symbols get exported by httpd (closes: #268155)
+  * Add myself to the Uploaders field as it seems that, for better or
+    worse, I have become a co-maintainer of apache2.
+  * Drop the :80 from the default site config, so changing ports in
+    ports.conf now Just Works (closes: #253271)
+  * Added 029_docroot_manual.patch, which corrects the links in the start
+    page to point to /manual/ instead of manual/, so the link actually
+    works when apache2-doc is installed (closes: #232954)
+  * Add a postrm to apache2-common, implementing a policy-compliant purge
+    process (closes: #237030, #252254, #197986)
+  * Add a simple RedirectMatch to the "default" site, so that fresh
+    installations see the default start page, rather than a directory
+    listing (closes: #240772, #255974, #264070)
+  * Add 030_www-browser_apachectl.patch, and make apache2-common depend
+    on www-browser, so 'apache2ctl status' works (closes: #266724)
+  * Move apache2's (re)start from the apache2-common postinst to the MPM
+    postinsts, so we're not trying to start the old binary if apache2-common
+    is configured before apache2-mpm-* is unpacked (closes: #268936)
+  * Enable CGI on initial installation, as packages depending on httpd-cgi
+    require it to be running to work (closes: #267547, #263038)
+  * Only enable userdir on upgrades from older versions where it was
+    built-in, or on fresh installs.
+
+ -- Adam Conrad <adconrad@0c3.net>  Mon, 30 Aug 2004 17:40:47 -0600
+
+apache2 (2.0.50-11) unstable; urgency=high
+
+  * Add two patches from upstream to address two vulnerabilities in mod_ssl:
+    - CAN-2004-0748 is a potential infinite loop in the SSL input filter
+      which can be triggered by an aborted connection.
+    - CAN-2004-0751 is a potential segfault in the SSL input filter which
+      can be triggered by the response to request which is proxied to a
+      remote SSL server.
+  * Changed the ownership of /var/cache/apache2 to allow mod_proxy to
+    actually cache files (closes: #264622)
+  * Added a patch from upstream to make mod_autoindex skip over files that
+    it can't stat() (closes: #264645)
+  * New installations now get an /etc/default/apache2 file with a moderately
+    informative comment, and the default set sanely (closes: #263515)
+  * Added a patch from upstream to make APR stop creating directories with
+    the sticky bit set (closes: #266198)
+  * Remove the bogus "-e" from the echo that creates httpd.conf, so people
+    installing with ash/dash don't get a broken file (closes: #267693)
+
+ -- Adam Conrad <adconrad@0c3.net>  Mon, 23 Aug 2004 19:25:50 -0600
+
+apache2 (2.0.50-10) unstable; urgency=high
+
+  * Roll back the libapr0 ABI changes introduced in 2.0.50-9.  We were
+    hopeful that we could hunt down and fix any fallout from this change
+    before release, and we were, apparently, wrong.
+    (closes: #266211, #266145, #266165, #266330, #266230, #266279, #266736)
+
+ -- Adam Conrad <adconrad@0c3.net>  Thu, 19 Aug 2004 03:46:11 -0600
+
+apache2 (2.0.50-9) unstable; urgency=medium
+
+  * Enable LFS properly. (Closes: #264645, #244897)
+    - Added 023_largefiles_upstream_fixes which makes the upstream configure
+      script a bit smarter and fixes some misuses of size_t/off_t.
+    - Added 024_largefiles_debian_hacks which adds some hideous hackery to
+      work around a bug in glibc where sendfile64 is used in place of sendfile
+      with no fallback even if the current kernel doesn't support it.
+    - Add note to README.Debian noting that while we can now read, write, and
+      list large files, SERVING large files is kernel-dependant.
+  * Bump libapr0 shlibs to (>= 2.0.50-9), since we're introducing
+    some serious ABI breakage with the above changes.
+  * Fix up the PATH in apache2's init script to list /usr/local, /usr, /
+    in the standard order.
+  * Change misleading return messages for a2{en,dis}mod, to reflect
+    the reality that some modules just won't load/unload properly
+    without a full stop/start server cycle.
+
+ -- Adam Conrad <adconrad@0c3.net>  Sun, 15 Aug 2004 07:41:19 -0600
+
+apache2 (2.0.50-8) unstable; urgency=high
+
+  * Ensure we link against the correct version of DB42
+
+ -- Thom May <thom@debian.org>  Mon,  9 Aug 2004 14:37:38 +0100
+
+apache2 (2.0.50-7) unstable; urgency=high
+
+  * Fix up linking of apr-util (Closes: #262009)
+
+ -- Thom May <thom@debian.org>  Tue,  3 Aug 2004 12:42:53 +0100
+
+apache2 (2.0.50-6) unstable; urgency=high
+
+  * use 'env -i' rather than trying to parse env (Closes: #261558, #258713)
+  * revert to old build process (Closes: #260756, #259693)
+  * Reflect changes in ssl setup - Thanks, Björn Wiberg (Closes: #259414)
+  * Remove userdir config from main config file (Closes: #260058)
+
+ -- Thom May <thom@debian.org>  Tue, 27 Jul 2004 10:31:46 +0100
+
+apache2 (2.0.50-5) unstable; urgency=high
+  
+  * Add necessary suexec information to central build
+    (Closes: #258453, #258772)
+  * Exclude lines starting with a space from removal from the env
+    (Closes: #258713)
+
+ -- Thom May <thom@debian.org>  Mon, 12 Jul 2004 17:30:59 +0100
+
+apache2 (2.0.50-4) unstable; urgency=high
+
+  * Fix dependencies so the MPMs don't conflict with the metapackages *g*
+    Thanks to Adam Conrad for this catch
+
+ -- Thom May <thom@debian.org>  Fri,  9 Jul 2004 00:55:19 +0100
+
+apache2 (2.0.50-3) unstable; urgency=high
+
+  * Brown paper bag of epic proportion. Build all mpms with the proper
+    collection of libraries. (Closes: #258217, #258202)
+  * Clean up environment (Closes: #241579)
+  * Clarify prefork description (Closes: #252918)
+  * Make apache2-default/manual DTRT (Closes: #244847)
+  * Note that we don't ship INSTALL or README.platforms (Closes: #232956)
+
+ -- Thom May <thom@debian.org>  Thu,  8 Jul 2004 16:04:31 +0100
+
+apache2 (2.0.50-2) unstable; urgency=high
+
+  * Make a2enmod a bit more robust (Closes: #258149, #258145)
+  * Should really be urgency=high to get into testing quick
+
+ -- Thom May <thom@debian.org>  Wed,  7 Jul 2004 23:03:36 +0100
+
+apache2 (2.0.50-1) unstable; urgency=medium
+
+  * New upstream release, fixes [CAN-2004-0493] and [CAN-2004-0488]
+  * The "I can't believe you're late to your own raid" release
+  * Check whether verbose is on or off in rcS's config (Closes: #242351)
+  * Add an apache2 metapackage (Closes: #234955)
+  * Specifically disable /~root (Closes: #246139)
+  * Stop the daemon in prerm (Closes: #245488)
+  * Redirect /doc/apache2-doc/manual to /manual so the correct magic happens
+    (Closes: #248038)
+  * Update SSL config to current upstream (Closes: #234591,#231147)
+  * No longer install default cgis - they're already shipped in -doc as
+    examples. (Closes: #231665)
+  * Tighten regex for Include (Closes: #234489)
+  * Remove ext-filter.load since we ship ext_filter.load too (Closes: #249268)
+  * Enable userdir as a shared module (Closes: #251102, #246134)
+  * OSKURO SUCKS (otherwise known as: not a bug) (Closes: #208569)
+  * Create /var/lib/apache2 (Closes: #242169)
+  * Remove 'AddDefaultCharset' line from apache2.conf (Suggestion from Marco
+    D'Itri)
+
+ -- Thom May <thom@debian.org>  Tue,  6 Jul 2004 18:45:35 +0100
+
+apache2 (2.0.49-1) unstable; urgency=high
+
+  * New Upstream release. (Closes: #240100)
+  * Add missing $ to init-script (closes: #240301) 
+  * Provides: httpd-cgi in reference to #117916 
+
+ -- Thom May <thom@debian.org>  Sun,  4 Apr 2004 11:32:20 +0100
+
+apache2 (2.0.48-8) unstable; urgency=low
+
+  * Fix typo in debian/rules (closes: #230760)
+  * Added patch 021-pcre_mangle_symbols.patch (closes: #235810)
+  * Fixed typo in the init scripts (closes: #230263)
+  * Changed a bunch of mv's to cp's in rules (closes: #228840)
+  * Change mime_magic to use magic from libmagic1 (closes: #236509)
+  * Disable ssl-cert until it sucks less. related to 230791 (closes: #231726)
+  * update descriptions (closes: #234543, #234538, #234542)
+  * Nuke /etc/vhosts and all associated cruft (closes: #235029)
+
+ -- Thom May <thom@debian.org>  Mon,  2 Feb 2004 12:47:10 +0000
+
+apache2 (2.0.48-7) unstable; urgency=low
+
+  * Brown paper bag release.  Refix the nonfixed libapr0 which built
+    without linking information.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 30 Jan 2004 18:25:12 +0100
+
+apache2 (2.0.48-6) unstable; urgency=low
+
+  * Build-Conflict with gdbm (closes: #230226, #230175, #204672)
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 30 Jan 2004 12:24:09 +0100
+
+apache2 (2.0.48-5) unstable; urgency=low
+
+  * (Daniel Stone)
+    - Bump Standards-Version to 3.6.1.0.
+    - init-script: Print a small warning when NO_START=1. (closes: #178431)
+    - default site: Enable FollowSymLinks. (closes: #200829)
+  * (Thom May)
+    - Permanently kill the ErrorLog directive from ssl.conf
+    - Call ssl-cert to generate an SSL cert using debconf (closes: #178322)
+    - Allow /usr/share/doc/ to be viewable from localhost (closes: #222551)
+    - Set the default DocumentRoot to be /var/www (closes: #222552)
+    - Change where the init script is installed to (Closes: #223417)
+    - Upgrade to DB4.2
+  * (Tollef Fog Heen)
+    - handle building out of the SVN checkout.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 28 Jan 2004 00:13:13 +0100
+
+apache2 (2.0.48-4) unstable; urgency=medium
+
+  * (Daniel Stone)
+    - Change apache2-threaded-dev's Conflicts from apache2-perfork-dev to
+      apache2-prefork-dev. Learn how to type, dude (thanks to Grzegorz
+      Prokopski for spotting this one).
+
+ -- Daniel Stone <daniels@debian.org>  Mon, 17 Nov 2003 12:00:11 +1100
+
+apache2 (2.0.48-3) unstable; urgency=medium
+
+  * Grmmp. stuffed the upload  
+
+ -- Thom May <thom@debian.org>  Wed, 12 Nov 2003 18:18:54 +0000
+
+apache2 (2.0.48-2) unstable; urgency=high
+
+  * (Thom May)
+    - Fix locking busted by NPTL (Closes: #220299)
+    - Fix IPv6 weirdness (thanks to Jordi/Fabio) (Closes: #220334)
+    
+ -- Thom May <thom@debian.org>  Wed, 12 Nov 2003 13:04:04 +0000
+
+apache2 (2.0.48-1) unstable; urgency=low
+
+  * (Thom May)
+    - New Upstream Release (Closes: #202094)
+    - Fix i18n autonegotiation for the manual (Closes: #201648)
+    - Add deb.{gif,png} (Closes: #199454)
+    - Explicitly link against libdl (Closes: #195968)
+    - Add dependency on ssl-cert (Closes: #177837)
+    - Take preventative action against SCTP
+    - Add apache2-prefork-dev to work around PHP.
+    - Shut Oskuro up - startup time changed to 91 (Closes: #208569)
+    - Install README.etc into apache2-common's doc dir 
+      (Closes: #208751,#177941)
+    - Auth_LDAP loads mod_ldap as well. (Closes: #217795)
+    - Make sure /var/lock/apache2 has correct ownership (Closes: #206375)
+    - Fix for SSL enabled virtual hosts (Closes: #202925)
+    - Steal new apr_threads.m4 from upstream to deal with -lpthread better
+      (Closes: #197685)
+  * (Fabio M. Di Nitto)
+    - Fixed init script (Closes: #203093)
+
+ -- Thom May <thom@debian.org>  Sat, 16 Aug 2003 00:13:20 +0100
+
+apache2 (2.0.47-2) unstable; urgency=low
+
+  * Move dav.conf to dav_fs.conf (Closes: #201530) 
+  * Fix the manual, and only ship it once. (Closes: #201648)
+  * Enable SymLinksIfOwnerMatch for cgi-bin (Closes: #200829)
+
+ -- Thom May <thom@debian.org>  Wed, 16 Jul 2003 10:24:28 +0100
+
+apache2 (2.0.47-1) unstable; urgency=high
+
+  * New Upstream Release. Bunch of security fixes (Closes: #200593)
+  * Add asis.load, auth_ldap.load, cache.load, dav_fs.load, disk_cache.load, 
+    ext_filter.load, file_cache.load, imap.load, ldap.load, mem_cache.load, 
+    include.load (Closes: #197152, #198389, #196115)
+    Note that dav_fs was previously loaded by dav.load, and is now broken out
+    into a seperate file.
+  * Patch apxs2 to use datadir rather than prefix for top_builddir. 
+    (Closes: #198607)
+  * Kill a couple of pointless conflicts. (Closes: #197242)
+  * Change suexec docroot from /var/www/apache2-default to /var/www 
+    (Closes: #198981)
+  * Make sure we use Expat rather than xmltok (Closes: #197020)
+  * Ship find_ap{r,u}.m4 (per Nuutti Kotivuori)
+
+ -- Thom May <thom@debian.org>  Fri,  4 Jul 2003 13:40:37 +0100
+
+apache2 (2.0.46-3) unstable; urgency=low
+
+  * Clean up the proxy config although it's not enabled by default. 
+    (Closes: #195187)
+  * Remove all traces of gdbm. (Closes: #196231)
+  * Re-enable ldap support (Closes: #190092)
+  * This changelog should be policy compliant. Any whingers can take a long
+    hike off a short pier.
+  * use printf rather than echo to work round weird shells. (Closes: #196230)
+
+ -- Thom May <thom@debian.org>  Thu,  5 Jun 2003 19:26:21 +0100
+
+apache2 (2.0.46-2) unstable; urgency=critical
+
+  * Fix config_vars.mk creation and installation (Closes: #195141, #195190)
+
+ -- Thom May <thom@debian.org>  Thu, 29 May 2003 11:47:13 +0100
+
+apache2 (2.0.46-1) unstable; urgency=critical
+
+  * The "David Welton is my hero" release
+  * New upstream release, numerous security vulns fixed.
+  * Oh the pain.
+  * Move ScriptSocket to /var/run/apache2 (Closes: #188655)
+  * Restore mod_include (Closes: #188483)
+  * Move the virtual hosts config to the end of the config file 
+    (Closes:  #188584)
+  * Add Mod-Ext-Filter (Closes: #182770)
+  * Add actions.load (Closes: #178087, #179571, #181527)
+  * Add a dependency on net-tool (Closes: #190663)
+  * Clean up FHS compliancy and fix up a typo in apachectl (Closes: #187723)
+  * Fix for the apxs -q APR_BINDIR doesn't work problem (Closes: #188278)
+  * Special case the install of special.mk (Closes: #179776)
+  * Make apache2-dev and apache-dev not conflict. (This renames apxs back to
+    apxs2)
+  * Add README for /etc/apache2 written by David.
+  * Add auth_digest.load courtesy of Amelia A Lewis <amyzing@talsever.com>
+    (Closes: #194111)
+
+ -- Thom May <thom@debian.org>  Wed, 28 May 2003 14:17:21 +0100
+
+apache2 (2.0.45-3) unstable; urgency=critical
+
+  * another "stupid freaking sasl" release. the series is on!
+
+ -- Thom May <thom@debian.org>  Tue,  8 Apr 2003 17:13:09 +0100
+
+apache2 (2.0.45-2) unstable; urgency=critical
+
+  * the "stupid freaking sasl" release.
+  * fix override disparities too.
+  * fix dulpicate dependency on libssl0.9.7 (Closes: #179598)
+
+ -- Thom May <thom@debian.org>  Tue,  8 Apr 2003 13:34:44 +0100
+
+apache2 (2.0.45-1) unstable; urgency=critical
+
+  * New upstream release (Closes: #187502)
+  * Fix korean language type, thanks to Donggyoo Lee
+    <donggyoo@kmaritime.ac.kr> (Closes: #179542) 
+  * Add explicit dependency to libsasl-dev (Closes: #179674)
+  * Remove ErrorLog from ssl.conf
+  * forward ported patches courtesy of Roberto Moreda <moreda@debian.org>; big
+    thanks!
+
+ -- Thom May <thom@debian.org>  Sat,  5 Apr 2003 14:35:58 +0100
+
+apache2 (2.0.44-6) unstable; urgency=low
+
+  * Make APR's postinst idempotent (Closes: #178105, #178141)
+  * Make Apache2-common's postinst non interactive (Closes: #178551)
+  * People filing bugs after they're fixed should be shot (Closes: #178244)
+  * Build Logio into the core, apparently.
+
+ -- Thom May <thom@debian.org>  Mon, 27 Jan 2003 20:47:28 +0000
+
+apache2 (2.0.44-5) unstable; urgency=low
+
+  * The "someone should take my compiler away from me" release
+  * Depend on openssl as well. Grrr. (Closes: #177985)
+  * Clean up the last of the section mismatches
+
+ -- Thom May <thom@debian.org>  Thu, 23 Jan 2003 15:04:20 +0000
+
+apache2 (2.0.44-4) unstable; urgency=low
+
+  * The "going for broke" release.
+  * Enable Logio, suggested by Roberto Moreda
+  * Stop force loading of cgi modules. (until we can do it cleanly)
+    (Closes: #177876, #177795)
+  * Restore symlink for libapr.so.0 (Closes: #177792)
+  * Apache2-common must depend on libssl0.9.7 (Closes: #177845)
+  * Rename ssl-certificate so we don't conflict with apache-ssl 
+    (Closes: #177881)
+  * Only create the certificate if it's not there already (Duh!)
+
+ -- Thom May <thom@debian.org>  Wed, 22 Jan 2003 09:59:11 +0000
+
+apache2 (2.0.44-3) unstable; urgency=low
+
+  * The "This one goes out wearing a brown paper bag" release
+  * Fix apxs to correctly return the header locations (Closes: #177729) 
+
+ -- Thom May <thom@debian.org>  Tue, 21 Jan 2003 16:35:14 +0000
+
+apache2 (2.0.44-2) unstable; urgency=low
+
+  * The "Ooops, I did it again" release
+  * Fixup of sections and priorities. 
+  * Add dependency of libldap2-dev to libapr0-dev
+  * Correct dependencies to be db4.1 not db4.0
+
+ -- Thom May <thom@debian.org>  Tue, 21 Jan 2003 13:26:57 +0000
+
+apache2 (2.0.44-1) unstable; urgency=low
+
+  * Conform to 10.4 of policy re init scripts, (Closes: #165693)
+  * Be more selective about filenames when doing Include
+    Patch - 008_make_include_safe (Closes: #161512)
+  * Make HTMLTable validate, and add a note recommending its use.
+    (Patch submitted upstream and will be in 2.0.44)
+    Patch - 010_fix_html_table (Closes: #153593)
+  * Make apr have correct library versioning
+    Patch committed upstream
+    Patch - 011_make_apr_versioned (Closes: #162775)
+  * Placed packaging code under subversion change management
+    http://svn.positive-internet.com/svn/apache2/trunk
+  * Changed some bash scripts to use #!/bin/bash rather than #!/bin/sh
+    (Closes: #168338)
+  * Changed apache2-common to merely suggest apache2-doc (Closes: #167595)
+  * Patch from David Kimdon to clean up debian/scripts/*
+  * Rename apxs2 to apxs; conflict with apache-dev (Closes: #167550)
+  * Upstream fix for AllowOverride documentation (Closes: #169431)
+  * Tighter build dependency on debhelper (Closes: #170803)
+  * Only reload in logrotate if apache2 is actually running (Closes: #171095)
+  * Upstream Fix for AddOutputFilterByType documentation (Closes: #172294)
+  * Add robots.txt to apache2-common (Closes: #172592)
+  * Enable cgi in postinst (Closes:  #168709)
+  * Create an SSL Certificate on install (Closes: #168109)
+  * Fix a couple of typos in debian/ssl-certificate, with thanks to Nuutti
+    Kotivuori
+  * Change to restart rather than reload in logrotate, to work round a nasty
+    PHP bug (PHP has bugs? *gasp* I thought it was perfect!) with thanks to 
+    Adam Conrad for the suggestion
+  * Clarify what needs to be installed for a working system (Thanks to Sean
+    Abrahams)
+  * Support debug DEB_BUILD_OPTIONS setting, thanks to Karl Hegbloom 
+    (Closes: #174221)
+  * Add -pipe to the CFLAGS, thanks to Karl Hegbloom
+  * Force apr-util to build against db4
+  * add OSX finder to the list of things that needs to be redirect-carefully'd
+  * s/enabled/disabled in debian/a2-scripts/a2dismod (Closes: #173956)
+  * enable auth-ldap, auth-anon, auth-dbm, auth-digest, and action as shared
+    modules (Closes: #172044, #174583, #172093)
+  * Upgrade to Berkely DB 4.1
+  * Upgrade to OpenSSL 0.9.7
+  * Add patch to ensure DB4.1 --with-unique-names is picked up. (Committed
+    upstream)
+  * Add local apache2 and apache2ctl manpages, since upstream have removed
+    them.
+
+ -- Thom May <thom@debian.org>  Mon, 20 Jan 2003 11:14:43 +0000
+
+apache2 (2.0.43-1) unstable; urgency=medium
+
+  * New Upstream Release; Fixes: CVE: CAN-2002-0840 CERT: VU#240329
+  * Add extra config to unfuck perchild. hopefully.
+  * Rejig Proxy Config some. With thanks to: Emmanuel Chantreau (Closes: #163124)
+  * Fix cgi install. Thanks to: Bastian Kleineidam (Closes: #162791)
+  * Fix postinst to check installation type and behave accordingly (Closes: #162627)
+  * Bring product version into line with RFC2616 (Closes: #151384)
+  * Add allow line for ipv6 localhost (Closes: #163533)
+  * Make more of the modules modular.
+  * Set UseCanonicalName off
+  * Added index.xhtml to DirectoryIndex settings
+  * Enabled MultiViews in the default site, and for the manual (Closes: #160367)
+  * Removed Unnecessary cgi.conf (Closes: #163842)
+
+ -- Thom May <thom@debian.org>  Fri,  4 Oct 2002 21:47:18 +0100
+
+apache2 (2.0.42-2) unstable; urgency=low
+
+  * Tighten dependencies yet more
+  * Restart in postinst. don't stop in prerm and start in postinst (Closes: #162344, #162350, #162537)
+  * Fix dh_shlibdeps up
+  * PERCHILD IS NOT WORKING IN THIS RELEASE. DON'T EXPECT IT TO. BUGS ABOUT
+    THIS WILL BE CLOSED WITH EXTREME PREJUDICE.
+
+ -- Thom May <thom@debian.org>  Fri, 27 Sep 2002 13:06:59 +0100
+
+apache2 (2.0.42-1) unstable; urgency=low
+
+  * "Pretty. What shall we blow up?"
+  * New Upstream Version (Closes: #160364)
+  * Fix man names and sections (Closes: #157113)
+  * Correct the regex for netstat checking of ports, thanks to Matthew Hambley
+    for this.
+  * Correct dependencies for apache2-common. (Closes: #161793)
+  * Applied patch from Stefan Gybas to fix a2enmod (Closes: #159459)
+  * Added BrowserMatch directives for microsoft's bodgy DAV implementations
+    and also for gnome-vfs (Closes: #155097)
+  * Loosened the config for home directories (Closes: #153599)
+  * Updated to latest standards version
+  * Drop priority to extra to bring it in line with libdb4.0
+  * Added logrotate script - Thanks to Phil Edwards for the basic version, and
+    the apache package that I ripped the rest off from (Closes: #155488)
+  * Tighten up what the Include lines load some. This is related to #161512
+    but doesn't completely close it.
+
+ -- Thom May <thom@debian.org>  Sat, 21 Sep 2002 22:14:22 +0100
+
+apache2 (2.0.40-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Correct dependencies. (Closes: #156959)
+  * Code to check for something else listening on 80 (Closes: #156129)
+  * correct permissions on suexec2 man page (Closes: #157005)
+  * Make the start and stop targets use apache2 directly rather than
+    apache2ctl.
+  * Check for the existence of apache2 and exit if it's not there (Closes: #156640)
+  * Nuke ssl_scache on startup (Closes: #157445)
+  * patch apxs to not need an mpm installed. Correct dependencies for -dev. 
+    Stop messing around with ap_config_auto.h. 
+    This hopefully resolves James Troup's objections to apache2. (Closes: #157895)
+  * Add code to check for a 2.2 based kernel and set up the Scoreboard
+    accordingly. (Closes: #156899)
+  * make sure i only have to update one init.d script, rather than 4.
+  * make apxs return a correctly formatted response on queries.
+
+ -- Thom May <thom@debian.org>  Wed, 21 Aug 2002 14:21:14 +0100
+
+apache2 (2.0.39+cvs.1028741220-2) unstable; urgency=low
+
+  * Rebuild against new libc6. Grr. (Closes: #155865)
+  * Actually create /etc/apache2/httpd.conf
+  * Propagate init.d changes through the other MPMs.
+
+ -- Thom May <thom@debian.org>  Thu,  8 Aug 2002 09:19:49 +0100
+
+apache2 (2.0.39+cvs.1028741220-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Make a versioned depends on libapr0 (Closes: #154879, #155400)
+  * Ensure that /etc/init.d/apache2 is registered properly.
+  * Added a conf.d directory for random conf snippets
+  * Ensure that the /manual/ alias is setup by the correct package (Closes: #155179)
+  * Ensure that DAVLockDB is created in the right directory (Closes: #155096)
+  * Now Building in a pbuilder chroot environment. 
+  * Perchild is now pseudo working (Closes: #154148)
+  * Cumulatively (note to Lazarus Long: this means all the things in this
+    changelog added together) (Closes: #155297, #155307, #155317, #155717, #155363, #155719, #155801)
+  * Note that preceeding changelog entry may not be parseable by strict grammar 
+    checks. Thanks to Jamie Wilkinson for pointing this out.
+  * Turn MultiViews back on for the default site (Closes: #155450)
+    checks. Thanks to Jamie Wilkinson for pointing this out.
+  * Turn MultiViews back on for the default site (Closes: #155450)
+  * Removed all CVS directories (Closes: #155602, #155393, #155402)
+  * SSI has been fixed upstream (Closes: #151744)
+  * Removed SSLLog directives (Closes: #152940)
+  * Put icons in the right place (Closes: #155178)
+  * Fixed build-dep on libgdbmg1-dev (Closes: #155412)
+  * Get correct information into config_vars.mk (Closes: #151712)
+  * Removed 'ServerName localhost' line (Closes: #155359)
+  * Placed apr-util headers in correct package
+  * Ensured that the init.d script restarts apache properly
+  
+ -- Thom May <thom@debian.org>  Tue, 30 Jul 2002 22:37:52 +0100
+
+apache2 (2.0.39+cvs.1027964860-1) unstable; urgency=low
+
+  * New Upstream Source
+  * Correct Icons path (Closes: #151314)
+  * Add missing dep on mime-support (Closes: #151848, #152220, #152221, #151772)
+  * Fixup suexec2, thanks to Masahito Omote (Closes: #151422)
+  * Mark Brown
+    - Remove spurious claim that apache2 hasn't been uploaded (Closes: #151433)
+    - Bring apache2 in line with policy on /usr/share/doc/ (Closes: #151459)
+    - Make reload behave the same as force-reload (Closes: #151432)
+  * place the manual in the right place, thanks to Md  (Closes: #151766)
+  * David Kimdon
+    - add build depends on zlib1g-dev (Closes: #151286)
+    
+ -- Thom May <thom@debian.org>  Fri, 29 Jul 2002 19:12:56 +0100
+
+apache2 (2.0.39-1) unstable; urgency=low
+
+  * New Upstream Version, fixing a denial of service attack.
+  * Fix installation of icons and manual.
+  * David Kimdon
+    - fix path for envvars in apxs2
+    - use generalized directives in ssl.conf ( SSLLog -> ErrorLog,
+      SSLLogLevel -> LogLevel ), this allows server to load ssl 
+      module
+
+ -- Thom May <thom@debian.org>  Fri, 14 Jun 2002 17:29:59 -0700
+
+apache2 (2.0.37-2) unstable; urgency=low
+
+  * Updated Copyright file to actually contain a copy of the various licenses.
+
+ -- Thom May <thom@debian.org>  Fri, 14 Jun 2002 15:41:41 +0100
+
+apache2 (2.0.37-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Thom May <thom@debian.org>  Thu, 13 Jun 2002 17:47:12 +0100
+
+apache2 (2.0.37+cvs.JCW_PRE2_2037-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thom May <thom@debian.org>  Wed,  5 Jun 2002 12:42:34 +0100
+
+apache2 (2.0.36-2) unstable; urgency=low
+
+  * debian/control - Correct provides, conflicts and depends, especially for
+    the mpms.
+  * build-dep doesn't work with provides, which makes sense. Need to make a
+    note of this in the policy.
+  * debian/rules - ensure that the mpm specific header file is installed into
+    the right place
+
+ -- Thom May <thom@debian.org>  Fri, 31 May 2002 14:54:39 +0100
+
+apache2 (2.0.36-1) unstable; urgency=low
+
+  * The "The obviously begging in a changelog works" release.
+  * New Upstream release
+  * Vpath Builds now work, giving the ability to select which MPM you require
+  * Changed vhost base to only be a Recommends: as I'm not happy that it's
+    currently in a properly releasable state.
+  * New enhost script courtesy of DannyS.
+  * David Kimdon
+    - make apxs2 find envvars properly
+    - use libtool to install apache2 binaries for different mpm's
+    - fix dependancies for apache2-dev (we can't do a versioned 'Provides'
+      so we need to list all the packages that provide apache2 along
+      with their version)
+  * Implemented a long overdue suggestion to only create ports.conf if it's
+    not in existance already, rather than to add a command to listen on 80 iff
+    that didn't exist. The person who suggested it is lost in the mists of my
+    mailbox. If it was you, please email me!
+  * debian/vhost-base/add.d/apache2 - apply patch from "Omniflux"
+    <josh@nebonet.com> to fix some brainos 
+
+ -- Thom May <thom@debian.org>  Mon,  6 May 2002 16:39:18 +0100
+
+apache2 (2.0.35+cvs.20020420-1) unstable; urgency=low
+
+  * The "finding myself standing on the corner staring into a different world"
+    release. Will someone please give me a job?
+  * Resync with upstream CVS. lots and lots of bug fixes since the last
+    release.
+  * Attempting to build with multiple MPMs, so speedfreaks can have a threaded
+    MPM. (Available MPMs are: prefork, worker, threadpool, and
+    leader/follower).
+  * Now sedding ap{r,u}-config in the install target. 
+  * vpath build evilness suggested by Andrew Suffield and others. I hate them
+    all. :) 
+
+ -- Thom May <thom@debian.org>  Sat, 20 Apr 2002 17:04:46 +0100
+
+apache2 (2.0.35-2) unstable; urgency=low
+
+  * The "Apache2 isn't released, therefore the Bug Tracking System doesn't
+    bloody well work" release
+  * Fixes a bug in add host, due to the change from Port to Listen.
+    (Reported by numerous people, patch more or less from Esteve Fernandez
+    <esteve@sindominio.net>.
+  * Attempt to fix apu-config, suggestion and patch from David Kimdon, if it's
+    wrong, I broke it. (Changed it to apply pre-build, rather than post build.
+    Yes, it's the lazy approach. It's also the right one :) )
+  * THE BUG TRACKING SYSTEM IS NOT THE RIGHT PLACE TO SEND BUG REPORTS FOR
+    APACHE2.
+  * REALLY.
+
+ -- Thom May <thom@debian.org>  Sat,  6 Apr 2002 21:04:16 +0100
+
+apache2 (2.0.35-1) unstable; urgency=low
+
+  * WOOOOOOOOOOOHOOOOOOOOO! Apache2's first General Availability release!
+  * Various bug fixes, suggestions and so on.
+  * Built with db3 for the time being.
+
+ -- Thom May <thom@debian.org>  Sat,  6 Apr 2002 03:01:24 +0100
+
+apache2 (2.0.34+retag-1) unstable; urgency=low
+
+  * Resync with upstream release.
+  * Fix packaging-fus (Hi Marcello!)
+  * Upstream have fixed cgi probs.
+
+ -- Thom May <thom@debian.org>  Mon,  1 Apr 2002 14:50:12 +0100
+
+apache2 (2.0.34-1) unstable; urgency=low
+
+  * New upstream release
+  * added mod_deflate as a shared library
+  * bashed on apache2.conf some.
+
+ -- Thom May <thom@debian.org>  Tue, 26 Mar 2002 23:23:09 +0000
+
+apache2 (2.0.33-1) unstable; urgency=low
+
+  * New upstream.
+  * Unfucked all code, include init.d and /etc/vhosts.
+  * FHS'ified, more or less
+  * Some debconf, but not much.
+  * Merged more patches upstream
+
+ -- Thom May <thom@debian.org>  Sat,  9 Mar 2002 23:33:09 +0000
+
+apache2 (2.0.32+cvs.20020228-1) unstable; urgency=low
+  
+  * The "bathwater, no baby" release.
+  * Submitted patches upstream like crazy.
+  * Tossed the insanely bogus apachectl patch
+  * Debconf not included here. Want to get everything else right, and a
+    release out.
+  * Boom!
+
+ -- Thom May <thom@debian.org>  Thu, 28 Feb 2002 21:07:24 +0000
+
+apache2 (2.0.32-1) unstable; urgency=low
+
+  * The "Throwing stuff away like mad and seeing if it still builds" release. 
+  * Ditched apache2-modules* on the principle of least surprise - the deb
+    layouts now pretty closely follow apache.
+  * Trying to triage away patches that have been fixed upstream.
+  * Major attack on debconfiscation starts here -> .
+
+ -- Thom May <thom@debian.org>  Tue, 19 Feb 2002 20:37:58 +0000
+
+apache2 (2.0.31+cvs.20020217-1) unstable; urgency=low
+
+  * New CVS snapshot from HEAD to benefit Subversion for the impending 0.9
+    release. Enjoy! 81 lines in the last couple of days ... :)
+  * debian/patches/005_more_hardcoded_paths:
+    - Regenerated diff against newer version of mpm_default.h.
+  * debian/patches/008_apr-config_sucks
+    - Regenerated apr-util part of diff against newer version of
+      apu-config.in.
+  * debian/apache2.{config,templates,postinst},
+    debian/vhost-base/add.d/apache2,
+    debian/vhost-base/templates.d/apache2{,.in}, debian/rules:
+    - Debconfage asking which port to run on, and make the vhost-base script
+      only list the current ports; ports stuff moved to
+      /etc/apache2/ports.conf - re-enable dh_installdebconf in debian/rules.
+    - Moved templates.d/apache2 to templates.d/apache2.in so we can do some
+      nifty inplace regexps.
+  * debian/apache2.init.d:
+    - Bail out of the init script if there aren't any sites enabled.
+  * debian/{rules,control}:
+    - Get rid of apache2-modules; move its contents to apache2.
+  * debian/config-mods/cgid.conf:
+    - Get rid of redundant <IfModule> wrapper around ScriptSock, so it
+      actually loads. Thanks to Pieter "Pitr" Jansen for this one.
+
+ -- Daniel Stone <daniel@sfarc.net>  Sun, 17 Feb 2002 01:23:43 +1100
+
+apache2 (2.0.31+cvs.20020207-1) unstable; urgency=low
+
+  * The one-big-happy-apache2-bug-squashing-family release.
+  * Update to latest CVS; hopefully this won't mean that piro deadlocks every
+    time dpkg goes to read its database. Hopefully this gets rid of the bugs.
+    Yes, all of them.
+  * debian/patches/004a_srclib_layout_support:
+    - Updated a touch to fit in with .32-dev.
+  * debian/patches/008_stuff_in_sbin_not_bin:
+    - Removed; obsoleted by upstream discovering sanity.
+  * debian/patches/008_apr-config_sucks:
+    - Fix problem whereby @prefix@ would sub to $(prefix), but $(prefix)
+      wouldn't sub to the prefix, or ${prefix}, thus screwing up the running
+      of apr-config ... ditto for apu-config (from apr-util).
+  * debian/patches/009_apxs:
+    - Reworked to make it actually work, and apply cleanly.
+    - Fix libtool breakage once again, thanks David Kimdon.
+  * debian/patches/010_shmget:
+    - Hack to srclib/apr/apr.h.in to make it prefer shmget over everything
+      else, to make it 2.2/non-tmpfs safe. (Thanks Ben Collins).
+  * debian/patches/012_debian_version:
+    - Minor update (include a space in front of "Debian", change it to
+      "Debian GNU/Linux" to clarify things, and before the the Hurd [happy
+      now, you crack junkies?] people complain, it's not released as a Debian
+      port yet, so feh).
+  * debian/vhost-base/add.d/apache2:
+    - Change sites to sites-available, in line with the previous change.
+  * debian/config/mods-available:
+    - Move to debian/config-mods to make life easier with the move to
+      apache2-modules (see below).
+  * debian/config-mods/auth_dbm.load:
+    - New file, in line with introducing mod_auth_dbm; thanks again to David
+      Kimdon.
+  * debian/a2-scripts/a2{en,dis}mod:
+    - Rewritten to be much cleaner and cool. (Thanks to Ben Collins for
+      pointing out that the permissions were screwed).
+  * debian/apache2.postinst:
+    - New file, no #DEBHELPER# token so that we don't care if postinst fails;
+      this way it won't bail if you're already running another web server.
+      Thanks to David Kimdon for pointing out an error.
+  * debian/vhost-base/{enable,disable}.d/apache2:
+    - Fixed! Woot! The code isn't the best you'll see, but now *WORKS*. Whoo!
+  * debian/control:
+    - Extend libapr-dev's Depends to include libapr0 (duh).
+    - Remove apache2-modules-dev as modules are no longer built both shared
+      and static, IMHO this was quite braindead behavior. Upstream's change,
+      not mine.
+    - Remove apache2-support as apxs2 requred apache2 anyway. Chalk one (more)
+      down for "failed experiments".
+    - Removed redundant libssl0.9.6 and libxmltok1 build-deps; we already
+      build-depped on the relevant -dev packages; thanks Ben Collins.
+  * debian/rules:
+    - Modules are no longer built statically as well as dynamically (upstream
+      change), so stop trying to move the files around.
+    - Sort out the libapr0/libapr-dev mess once and for all; thanks to Matt
+      Wilcox and Ben Collins for patiently talking me through it.
+    - Move *contents* of mods-available to apache2-modules, but keep the
+      directory itself as part of apache2, to keep the addons happy; thanks
+      David Kimdon.
+    - s/apache2-support/apache2/, see debian/control entry.
+    - Remove extraneous LICENSE file from the vhost manual.
+    - Remove *.exp files, because they're unneeded.
+  * debian/apache2.docs:
+    - Remove KEYS from the list of docs because this is crap and no longer
+      distributed. w00t!
+
+ -- Daniel Stone <daniel@sfarc.net>  Thu,  7 Feb 2002 20:39:44 +1100
+
+apache2 (2.0.28-3) unstable; urgency=low
+
+  * Enabled mod_auth_dbm for Subversion. (thanks David Kimdon).
+
+ -- Daniel Stone <daniel@sfarc.net>  Thu, 29 Nov 2001 23:25:53 +1100
+
+apache2 (2.0.28-2) unstable; urgency=low
+
+  * Fixed up a couple of things,
+    /etc/apache2/modules->/etc/apache2/mods-available, etc.
+  * Included mod_dav, so Subversion can be built.
+  * New package: apache2-modules-dev, containing all
+    /usr/lib/apache2/modules/*a. (Thanks Adam Heath).
+  * Moved libapr.so.* symlinks to libapr-dev (Thanks again to doogie).
+
+ -- Daniel Stone <daniel@sfarc.net>  Sun, 25 Nov 2001 19:00:19 +1100
+
+apache2 (2.0.28-1) unstable; urgency=low
+
+  * Updated to 2.0.28, which they actually managed to agree on calling a beta.
+  * debian/apache2.init.d:
+    - Stripped of almost all its functionality. Now just touches httpd.conf if
+      we're starting and it doesn't exist, and then calls apache2ctl with all
+      our options, whatever they may be - it can error out if it wants.
+  * Removed patches:
+    - 010_index.html.it_typo - merged upstream.
+  * Updated patches:
+    - 009_apxs: make it actually find libtool. Thanks to David Kimdon.
+    - 002_apache2ctl: really fix apache2ctl graceful.
+
+ -- Daniel Stone <daniel@sfarc.net>  Sun, 18 Nov 2001 15:29:43 +1100
+
+apache2 (2.0.26+cvs.20011028-2) unstable; urgency=low
+
+  * Added vhost-base support. 
+    - Removed Debconfage and moved all the templates to
+      debian/vhost-base/templates.d (/etc/vhosts/templates.d).
+      Removed apache2.postinst and apache2.config.
+    - Removed a2{dis,en}host.
+  * /usr/lib/cgi-bin will now be /cgi-bin, /var/vhosts/hostname/cgi-bin will be
+    /cgi-local.
+
+ -- Daniel Stone <daniel@sfarc.net>  Fri,  9 Nov 2001 21:53:27 +1100
+
+apache2 (2.0.26+cvs.20011028-1) unstable; urgency=low
+
+  * Resync with HEAD (another coming to fix segfaults, but no net connectivity
+    at the moment - 4-11-2001, 2:12pm. Grrr).
+  * New patches:
+    - 011_mod_autoindex-symlink: make icons for symlinks to files and dirs 
+                                 special cases.
+      + Touches modules/generators/mod_autoindex.c
+      + Special cases: ^^SYMDIR^^ and ^^SYMLINK^^.
+    - 012_debian_version: adds "Debian" to the Apache version string.
+      + Touches include/ap_release.h - this patch has *no* context. Please
+        don't give it any, I don't want to have to rediff every version.
+  * debian/config/httpd.conf, debian/config/apache2.conf:
+    - Move main config file to apache2.conf, made it much more bare-bones.
+      + User (or package) config should be done in httpd.conf.
+  * apache2.conf:
+    - s/Port/Listen/ - booya! Finally they cleaned it up.
+    - Add (commented-out) icon entries for ^^SYMDIR^^ and ^^SYMLINK^^.
+      Anyone volunteer to create icons?
+  * debian/apache2.postinst:
+    - Minor cleanups.
+    - And later: Made it just call ap2addhost --default. (and a2enhost).
+  * debian/config/modules/ssl.conf, debian/config/sites/default-443:
+    - Put only generic SSL stuff in ssl.conf, split SSL support out into
+      a new virtual host thingy in accordance with dealing with ports.
+  * debian/config/sites/default, debian/config/sites/default-443,
+    debian/patches/004b_debian_layout:
+    - Add a new alias /cgi-pub/ to /usr/lib/cgi-bin. Packages should put
+      scripts here.
+  * debian/control: 
+    - changed the Suggests: on apache2-doc to a Recommends:
+      + otherwise /manual/ will be a broken alias, as it points to 
+        /usr/share/doc/apache2-doc/manual.
+    - changed libapr-dev to Architecture: all (from Arch: any) - whoops.
+  * Added support for multiple ports on the one virtual host. At the moment
+    it's one gigantic, ugly, kludge. *sigh*. Format:
+    - /var/vhosts/site.name/htdocs-PORT
+    - /var/vhosts/site.name/logs/(access|error).log-PORT
+    - /var/vhosts/site.name/cgi-bin-PORT
+  * debian/apache2.postinst, debian/config/sites/default, etc:
+    - s#/var/www#/var/vhosts#;
+    - s#htdocs#htdocs-$PORT#;
+  * More Debconfage - it now asks if you want SSL support in the default
+    virtual host, and which port number you want (default 81 so it sits
+    side-by-side with apache).
+  * Major change to postinst, a2addhost, et al:
+    - It's all now done in Perl, and postinst is no longer a special case.
+      The standalones call Debconf for what they need to do, calling it as a
+      standalone. This way, postinst just calls a2addhost, etc, and it also
+      smooths the path for me to do the vhost-base stuff.
+  * No, this migration path probably won't be smooth (between apache2
+    versions). Sorry.
+  * Last release before I make it vhost-base compliant.
+
+ -- Daniel Stone <daniel@sfarc.net>  Sun, 28 Oct 2001 20:33:18 +1100
+
+apache2 (2.0.26+cvs.20011023-1) unstable; urgency=low
+
+  * Damnit, resync with HEAD (2_0_26 was unstable). 
+
+ -- Daniel Stone <daniel@sfarc.net>  Tue, 23 Oct 2001 18:36:42 +1000
+
+apache2 (2.0.26-1) unstable; urgency=low
+
+  * Resync with upstream CVS (but only as far as the APACHE_2_0_26 tag).
+    Essentially, this gives all the coolness of a CVS tree, but all the
+    stability of a release. I may start tracking HEAD later, we'll just
+    have to see.
+  * Changed libapr->libapr0.
+  * Fixed a couple of typo's in index.html.it (thanks Md, via Joey).
+  * 22nd October, 7:51pm: Resync again as they added a couple of files
+    and bumped the tag to fix segfaults.
+
+ -- Daniel Stone <daniel@sfarc.net>  Wed, 17 Oct 2001 23:50:39 +1000
+
+apache2 (2.0.25+cvs.20011001-1) unstable; urgency=low
+
+  * More CVS resyncing joy.
+  * Silly stupid evil poo bum hack to apachectl. I don't like this.
+    Please, help.
+  * Got rid of a few lintian warnings.
+  * Install build stuff to /etc/apache2/build, adjust apxs accordingly.
+  * Agreed on policy with madduck. This is a MAJOR CHANGE, people.
+    A lot of stuff has changed around, so you'll need to change your
+    packages.
+    apache2 now treats everything as a virtual host (even when you only
+    have one host). This allows us to skirt around FHS and do our own
+    thing. ("Thpthpthpthpthpthpt, we're using vhosts. FHS doesn't say
+    anything about that.")
+    Please see README.Debian for more details.
+  * More fun with virtual hosts. Migrated their configuration files to
+    /etc/apache2/virtuals/<name>. This will allow for easy adding and
+    removal, via the new tools /usr/sbin/ap2(add|del)vh.
+    apache2's postinst touches /etc/apache2/POSTINST_CONFED, and will refuse
+    to re-run the postinst config stuff if it's there already.
+  * Module fun - /usr/sbin/ap2mod(en|dis). Modules put their loading line in
+    /etc/apache2/modules/foo.load, config in /etc/apache2/modules/foo.conf.
+    Enabled module stuff gets symlinked into /etc/apache2/mods-enabled.
+  * Move APR stuff to /usr/lib, not /usr/lib/libapr. Whoops, should've done
+    this a *long* *time* *ago*.
+  * More silly APR hacks: Move /usr/include/libapr to /usr/include/apache2, as
+    silly things like php4 don't get the fact that APR and apache2 can indeed
+    have different include directories. Grrr.
+  * Juggled script names - it's now a2(en|dis)(host|mod).
+  * I don't care, I'm uploading. No, really (closes: #103471).
+    It's been 93 days since I first did dh_make and ITPed it. :)
+
+ -- Daniel Stone <daniel@sfarc.net>  Thu,  4 Oct 2001 20:15:31 +1000
+
+apache2 (2.0.25+cvs.20010923-1) unstable; urgency=low
+
+  * Another resync with upstream CVS; most of the changes below were made
+    between then and now.
+  * Also added apache2-support - everything from support/*, so php4, et al
+    don't need to Build-Depend on apache2 itself.
+
+ -- Daniel Stone <DanielS@esd.nec.com.au>  Sun, 23 Sep 2001 13:21:16 +1000
+
+apache2 (2.0.25+cvs.20010908-1) unstable; urgency=low
+
+  * Synched everything with CVS; it works now. 
+  * We now build with ./buildconf due to the above; redo all the patches
+    against configure.in. I swear this will be the last change, and that I'll
+    test it.
+  * Removed php4 and modperl-2.0 from the tree. I should keep the changelogs 
+    internal, as this is now getting not only very silly, but very embarassing.
+  * I corrected myself in the ITP that it was licensed under the Apache
+    Software License, not GPLed, but forgot to do that in debian/copyright.
+    Whoops. Feel free to LART.
+  * Lintian cleanups:
+  	- Remove extra LICENSE files.
+  	- Stop stuff calling -rpath.
+  	- Change printenv to call /usr/bin/perl, not /usr/local/bin/perl - wtf?
+  	- Move manpages to the right directory.
+  * Minor merge from Thom courtesy of some stuff being stored on pandora:~thom.
+    - Use buildprogs.pl to parse stuff like apache2ctl, apxs2, etc.
+  * Hopefully I'm only one CVS sync away from an upload.
+  * Moved some stuff over to /usr/sbin, fixed apache2ctl once and for all.
+    Hopefully.
+
+ -- Daniel Stone <daniel@sfarc.net>  Sun,  9 Sep 2001 00:05:03 +1000
+
+apache2 (2.0.24-2) unstable; urgency=low
+
+  * The "Farewell Buddha" Release.
+  * Or, alternatively: The "Darren Milburn is an Idiot for Inciting Crowds"
+    Release.
+  * Yes, it's the height of evil, I know: modperl-2.0 goes into the source 
+    tree. (from CVS).
+    Separate tarballs, thanks to DBS, but still, yeah.
+  * Ditto php4.
+  * Still no Thom's laptop; hence no merges, and I'm not going to duplicate
+    work. 
+
+ -- Daniel Stone <daniel@sfarc.net>  Sun,  2 Sep 2001 21:50:59 +1000
+
+apache2 (2.0.24-1) unstable; urgency=low
+
+  * New upstream version.
+  * Use prefork, not threaded, MPM. (threaded is currently broken).
+  * Update example httpd.conf for mod_ssl and have lines for all the modules. 
+  * Build-Depends, all the Build-Depends!
+  * Update maintainer email address (thanks Joey).
+  * Turns out using buildconf was what broke modules. I swear I won't do
+    anything like that again. Promise! (thanks Thom for pointing this out)
+  * Implied by the above, rediff all patches against configure, not 
+    configure.in.
+  * Also, don't copy configure.{guess,sub} over anymore, because we don't need
+    them.
+  * More Thom merges:
+    - debian/patches/003_apache2ctl - rewritten apache2ctl to actually work.
+  * Return of debian/patches/006_dont_install_build_crap. GAH!
+
+ -- Daniel Stone <daniel@sfarc.net>  Sat, 18 Aug 2001 17:01:19 +1000
+
+apache2 (2.0.23-2) unstable; urgency=low
+  * SSL finally works, and beat instructions on how to get it going out
+    of someone on new-httpd. Moved SSL stuff to apache2-modules. 
+  * Disabled TLS, because it's unstable and unnecessary.
+  * Merge from Thom May's tree:
+      005b_debian_layout - The Debian layout for stuff
+    - Move APR stuff to /usr/lib/libapr and /usr/include/libapr.
+    - Clean up debian/rules, largely thanks to the two new patches.
+  * General cleanups, resulting from running lintian:
+    - Chuck #DEBHELPER# in postinst, which also fixes the /usr/doc
+      and init.d problems (due to debhelper now doing its postinst
+      thing).
+    - Remove LICENSE files from apache2-doc and the default document
+      root.
+    - Remove man/ and build/ top-level dirs, install manpages correctly.
+    - Updated 004_perl_in_usr_bin to include the manual search CGI.
+  * Remove all evil, ugly, patches to configure in debian/patches/*, instead,
+    diff against configure.in, because autoconf gets run in the configure
+    stage every time.
+  * Copy config.{guess,sub} from /usr/share/misc (provided by autotools-dev) at
+    runtime, thus eliminating debian/patches/002_config_guess_and_sub.
+  * Reshuffled patch numbers to cope with the above.
+  * I give up on this DBM crap. Disable mod_auth_dbm for now.
+
+ -- Daniel Stone <daniel@sfarc.net>  Wed, 15 Aug 2001 18:27:23 +1000
+
+apache2 (2.0.23-1) unstable; urgency=low
+
+  * New upstream - 2.0.23.
+  * New patches:
+    004_conffile_in_etc_apache2 - Make an ugly init.d hack unnecessary.
+    005_perl_in_usr_bin - Make example CGI scripts use /usr/bin/perl.
+  * Fix mime_magic stuff by copying magic to /etc/apache2. 
+  * Remove debian/patches/003_cgisock_in_var_log_apache2, instead found a new
+    conffile directive, put this into the default distributed conffile.
+
+ -- Daniel Stone <daniel@sfarc.net>  Sun, 12 Aug 2001 18:05:32 +1000
+
+apache2 (2.0.22-2) unstable; urgency=low
+
+  * Aargh, I'm an idiot. Fix a bug in mod_cgid.c that had a hardcoded path.
+    That's now debian/pactches/003*. 
+
+ -- Daniel Stone <daniel@sfarc.net>  Sat, 11 Aug 2001 08:04:13 +1000
+
+apache2 (2.0.22-1) unstable; urgency=low
+
+  * Updated to 2.0.22, started using a form of DBS.
+  * Merge from Thom May's 2.0.20 tree - new libapr-dev package.
+  * Backed out the old mod_(tls|ssl) hacks, see if 2.0.23 is any better
+    (apparently it is, thank god).
+
+ -- Daniel Stone <daniel@sfarc.net>  Wed,  8 Aug 2001 15:13:09 +1000
+
+apache2 (2.0.20-2) unstable; urgency=low
+
+  * New SSL fixes from new-httpd. Apparently, this (generally) works. 
+
+ -- Daniel Stone <daniels@yakko.doogie.org>  Fri, 13 Jul 2001 07:57:18 -0500
+
+apache2 (2.0.20-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Daniel Stone <daniel@kabuki.sfarc.net>  Mon,  9 Jul 2001 18:41:04 +1000
+
+apache2 (2.0.18-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Daniel Stone <daniel@sfarc.net>  Wed,  4 Jul 2001 21:29:29 +1000

debian.control Added

@@ -0,0 +1,340 @@
+Source: apache2
+Section: httpd
+Priority: optional
+Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
+Uploaders: Stefan Fritsch <sf@debian.org>, Arno Töll <arno@debian.org>
+Build-Depends: debhelper (>= 8.9.7~), bzip2, lsb-release, dpkg-dev (>= 1.16.1~),
+ libaprutil1-dev (>= 1.5.0), libapr1-dev (>= 1.5.0), libpcre3-dev, zlib1g-dev,
+ libssl-dev (>= 0.9.8m), perl,
+ liblua5.1-0-dev, libxml2-dev, autotools-dev, gawk | awk
+Build-Conflicts: autoconf2.13
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-apache/apache2.git
+Vcs-Git: git://anonscm.debian.org/pkg-apache/apache2.git
+Homepage: http://httpd.apache.org/
+
+Package: apache2
+Architecture: any
+Depends: ${misc:Depends}, lsb-base, procps [!hurd-i386],
+ perl, mime-support, apache2-bin (= ${binary:Version}),
+ apache2-data (= ${source:Version}), ${perl:Depends}
+Replaces: apache2.2-common
+Conflicts: apache2.2-common (<< 2.3~)
+Recommends: ssl-cert
+Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom,
+ apache2-utils
+Description: Apache HTTP Server
+ The Apache Software Foundation's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package contains the configuration files, init scripts and support
+ scripts. It does not install the actual apache2 binaries.
+
+Package: apache2-data
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: apache2.2-common
+Conflicts: apache2.2-common (<< 2.3~)
+Multi-Arch: foreign
+Description: Apache HTTP Server (common files)
+ The Apache Software Foundation's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package contains architecture-independent common files such as icons,
+ error pages and static index files.
+
+Package: apache2-bin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+# MODULE_MAGIC_NUMBER_MAJOR from apache2/include/ap_mmn.h
+Provides: ${apache2:API}, httpd, httpd-cgi
+Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
+Replaces: apache2.2-bin (<< 2.3~), apache2.2-common (<< 2.3~), apache2-mpm-prefork (<< 2.3~),
+ apache2-mpm-itk (<< 2.3~), apache2-mpm-worker (<< 2.3~), apache2-mpm-event (<< 2.3~),
+ libapache2-mod-proxy-html (<< 1:2.4.4-2~), libapache2-mod-macro (<< 1:2.4.6-1~)
+Conflicts: apache2.2-bin (<< 2.3~), apache2.2-common (<< 2.3~)
+Breaks: libapache2-mod-proxy-html (<< 1:2.4.4-2~), libapache2-mod-macro (<< 1:2.4.6-1~)
+Description: Apache HTTP Server (binary files and modules)
+ The Apache Software Foundation's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package contains the binaries only and does not set up a working
+ web-server instance. Install the "apache2" package to get a fully working
+ instance. Do not install this package unless you want to set-up the Apache
+ HTTP server entirely on your own.
+
+Package: apache2-mpm-worker
+Architecture: any
+Section: oldlibs
+Priority: extra
+Provides: httpd, httpd-cgi
+Depends: ${misc:Depends}, apache2 (= ${binary:Version})
+Description: transitional worker MPM package for apache2
+ This is a transitional package to apache2 for users of apache2-mpm-worker and
+ can be safely removed after the installation is complete.
+
+Package: apache2-mpm-prefork
+Architecture: any
+Section: oldlibs
+Priority: extra
+Provides: httpd, httpd-cgi
+Depends: ${misc:Depends}, apache2 (= ${binary:Version})
+Description: transitional prefork MPM package for apache2
+ This is a transitional package to apache2 for users of apache2-mpm-prefork and
+ can be safely removed after the installation is complete.
+
+Package: apache2-mpm-event
+Architecture: any
+Section: oldlibs
+Priority: extra
+Provides: httpd, httpd-cgi
+Depends: ${misc:Depends}, apache2 (= ${binary:Version})
+Description: transitional event MPM package for apache2
+ This is a transitional package to apache2 for users of apache2-mpm-event and
+ can be safely removed after the  installation is complete.
+
+Package: apache2-mpm-itk
+Architecture: any
+Section: oldlibs
+Priority: extra
+Provides: httpd, httpd-cgi
+Depends: ${misc:Depends}, apache2 (= ${binary:Version}), libapache2-mpm-itk
+Description: transitional itk MPM package for apache2
+ This is a transitional package to apache2 for users of apache2-mpm-itk and
+ can be safely removed after the installation is complete.
+
+Package: apache2.2-bin
+Architecture: any
+Section: oldlibs
+Priority: extra
+Breaks: gnome-user-share (<< 3.8.0-2~), libapache2-mod-dnssd (<< 0.6-3.1~)
+Depends: ${misc:Depends}, apache2-bin (>= 2.3~)
+Description: Transitional package for apache2-bin
+ This is a transitional package for apache2-bin, and can be safely removed
+ after the installation is complete.
+
+Package: apache2.2-common
+Architecture: any
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, apache2 (>= 2.3~)
+Description: Transitional package for apache2
+ This is a transitional package for apache2-bin, and can be safely removed
+ after the installation is complete.
+Breaks: libapache2-mod-apparmor (<< 2.8.0-1),
+  libapache2-mod-auth-pam (<< 1.1.1-9+deb8),
+  libapache2-mod-auth-sys-group (<< 1.1.1-9+deb8),
+  libapache2-mod-layout (<< 5.1-1+deb8),
+  libapache2-mod-random (<< 2.1-1+deb8),
+  libapache2-mod-speedycgi (<< 2.22-13+deb8),
+  libapache2-mod-vhost-hash-alias (<< 1.0-2+deb8),
+  libapache2-mod-spamhaus (<< 0.7-1.1),
+  libapache2-mod-auth-mysql (<< 4.3.9-13.1+deb8),
+  libapache2-mod-scgi (<< 1.13-1.1),
+  libapache2-mod-auth-pgsql (<< 2.0.3-6),
+  libapache2-mod-php5filter (<< 5.5.0~beta4-3),
+  libapache2-mod-encoding (<< 20040616-5.2),
+  libapache2-mod-perl2 (<< 2.0.8+httpd24-r1449661-2),
+  libapache2-mod-auth-ntlm-winbind (<< 0.0.0.lorikeet+svn+801-2),
+  libapache-singleton-perl (<< 0.15-2),
+  libapache2-mod-fastcgi (<< 2.4.7~0910052141-1.1),
+  libapache2-mod-authn-yubikey (<< 1.0-1.1),
+  libapache2-mod-neko (<< 2.0.0-1),
+  libapache2-mod-authz-unixgroup (<< 1.1.0-0.1),
+  libapache2-mod-auth-openid (<< 0.7-1),
+  libapache2-mod-python (<< 3.3.1-11),
+  libapache2-mod-fcgid (<< 1:2.3.6-1.3),
+  libapache2-mod-gnutls (<< 0.5.10-2),
+  libapache2-mod-auth-pubtkt (<< 0.8-2),
+  libapache2-mod-auth-plain (<< 2.0.52),
+  libapache2-mod-wsgi (<< 3.4-2),
+  libapache2-mod-wsgi-py3 (<< 3.4-2),
+  libapache2-mod-jk (<< 1:1.2.37-2),
+  libapache2-mod-uwsgi (<< 1.9.13-1),
+  libapache2-mod-ruwsgi (<< 1.9.13-1),
+  libapache2-mod-authnz-external (<< 3.3.1-0.1),
+  libapache2-svn (<< 1.7.9-1+nmu3),
+  libapache2-mod-vhost-ldap  (<< 2.4.0-1),
+  libapache2-mod-nss (<< 1.0.8-3),
+  libapache2-mod-rpaf (<< 0.6-11),
+  libapache2-mod-lisp (<< 1.3.1-1.3),
+  gridsite (<< 1.7.21-2),
+  libapache2-mod-suphp (<< 0.7.1-3.1+deb8),
+  libapache2-mod-rivet (<< 2.1.1-3),
+  libapache2-mod-authn-sasl (<< 1.2-2),
+  libapache2-mod-auth-radius (<< 1.5.8-1.2),
+  libapache2-mod-auth-memcookie (<< 1.0.2-8),
+  libapache2-reload-perl (<< 0.12-2),
+  libapache2-mod-macro (<< 1.2.1-1),
+  libapache2-mod-ruid2 (<< 0.9.8-3),
+  libapache2-mod-auth-cas (<< 1.0.9.1-3),
+  libapache2-mod-geoip (<< 1.2.8-1),
+  libapache2-mod-authn-webid (<< 0~20110301-2),
+  libapache2-modsecurity  (<< 2.6.6-7),
+  libapache2-mod-upload-progress (<< 0.2-1),
+  libapache-authenhook-perl (<< 2.00-04+pristine-5),
+  libapache2-authcookie-perl (<< 3.19-2),
+  libapache2-mod-shib2 (<< 2.5.2+dfsg-2),
+  libapache2-mod-removeip (<< 1.0b-5.1),
+  libapache2-mod-bw (<< 0.92-9),
+  libapache2-mod-log-sql (<< 1.100-15),
+  libapache2-mod-xsendfile (<< 0.12-2),
+  libapache2-mod-qos (<< 10.15-3),
+  libapache2-mod-musicindex (<< 1.4.1-1),
+  libapache2-mod-apreq2 (<< 2.13-2),
+  libapache2-request-perl (<< 2.13-2),
+  libapache2-mod-parser3 (<< 3.4.2-7),
+  libapache2-mod-evasive (<< 1.10.1-2),
+  libapache2-mod-auth-kerb (<< 5.4-2.1),
+  libapache2-mod-dacs (<< 1.4.28b-2),
+  libapache2-mod-auth-tkt (<< 2.1.0-7),
+  libapache2-webauth (<< 4.2.0-1),
+  libapache2-webkdc (<< 4.2.0-1),
+  libapache2-mod-dnssd (<< 0.6-3.1~),
+  ikiwiki-hosting-web (<< 0.20140419),
+  libapache2-mod-passenger (<< 3.0.13debian-1.1),
+  libapache2-mod-mono (<< 2.11+git20130708.6b73e85-2),
+  libapache2-mod-mime-xattr (<< 0.4-5),
+  libapache2-mod-defensible (<< 1.4-3.1),
+  libapache2-mod-ldap-userdir (<< 1.1.19-2),
+  libapache2-mod-ocamlnet (<< 3.5.1-1+deb8),
+  libapache2-mod-proxy-html (<< 1:2.4.9-2),
+  libapache2-mod-ruby (<< 1.2.6-2+deb8),
+  libapache2-mod-axis2c (<< 1.6.0-6),
+  libapache2-modsecurity (<< 2.8.0-1),
+  libapache2-mod-chroot (<< 0.5-7+deb8),
+  libapache2-mod-annodex (<< 0.2.2-6+deb8),
+  libapache2-mod-line-edit (<< 1.0.0-1+deb8)
+Conflicts: libapache2-mod-bt,
+  libapache2-mod-cband,
+  libapache2-mod-php4,
+  libapache2-mod-shib
+
+Package: libapache2-mod-proxy-html
+Architecture: any
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, apache2-bin (>= 2.3~)
+Description: Transitional package for apache2-bin
+ This is a transitional package for apache2-bin, and can be safely removed
+ after the installation is complete.
+
+Package: libapache2-mod-macro
+Architecture: any
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, apache2-bin (>= 2.3~)
+Description: Transitional package for apache2-bin
+ This is a transitional package for apache2-bin, and can be safely removed
+ after the installation is complete.
+
+
+Package: apache2-utils
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}
+Description: Apache HTTP Server (utility programs for web servers)
+ Provides some add-on programs useful for any web server.  These include:
+  - ab (Apache benchmark tool)
+  - fcgistarter (Start a FastCGI program)
+  - logresolve (Resolve IP addresses to hostname in logfiles)
+  - htpasswd (Manipulate basic authentication files)
+  - htdigest (Manipulate digest authentication files)
+  - htdbm (Manipulate basic authentication files in DBM format, using APR)
+  - htcacheclean (Clean up the disk cache)
+  - rotatelogs (Periodically stop writing to a logfile and open a new one)
+  - split-logfile (Split a single log including multiple vhosts)
+  - checkgid (Checks whether the caller can setgid to the specified group)
+  - check_forensic (Extract mod_log_forensic output from Apache log files)
+  - httxt2dbm (Generate dbm files for use with RewriteMap)
+
+Package: apache2-suexec
+Architecture: any
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends},
+ apache2-suexec-pristine (= ${binary:Version})
+Description: transitional package for apache2-suexec-pristine
+ This is a transitional package for apache2-suexec-pristine, and can be safely
+ removed after the installation is complete.
+
+Package: apache2-suexec-pristine
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, apache2-bin
+Replaces: apache2-suexec (<< 2.3~)
+Breaks: apache2-suexec (<< 2.3~)
+Provides: apache2-suexec
+Description: Apache HTTP Server standard suexec program for mod_suexec
+ Provides the standard suexec helper program for mod_suexec. This version is
+ compiled with document root /var/www and userdir suffix public_html. If you
+ need different settings, use the package apache2-suexec-custom.
+
+Package: apache2-suexec-custom
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, apache2-bin
+Replaces: apache2-suexec (<< 2.3~)
+Breaks: apache2-suexec (<< 2.3~)
+Provides: apache2-suexec
+Description: Apache HTTP Server configurable suexec program for mod_suexec
+ Provides a customizable version of the suexec helper program for mod_suexec.
+ This is not the version from upstream, but can be configured with a
+ configuration file.
+ .
+ If you do not need non-standard document root or userdir settings, it is
+ recommended that you use the standard suexec helper program from the
+ apache2-suexec-pristine package instead.
+
+Package: apache2-doc
+Section: doc
+Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
+Recommends: apache2
+Depends: ${misc:Depends}
+Description: Apache HTTP Server (on-site documentation)
+ The Apache Software Foundation's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package provides the documentation for the Apache 2 HTTP server. The
+ documentation is shipped in HTML format and can be accessed from a local
+ running Apache HTTP server instance or by browsing the file system directly.
+
+Package: apache2-dev
+Architecture: any
+Depends: ${misc:Depends}, openssl,
+ libapr1-dev, libaprutil1-dev, debhelper (>= 9), ${perl:Depends}
+Provides: apache2-prefork-dev, apache2-threaded-dev, dh-apache2
+Replaces: apache2-prefork-dev, apache2-threaded-dev
+Conflicts: apache2-prefork-dev, apache2-threaded-dev
+Description: Apache HTTP Server (development headers)
+ The Apache Software Foundation's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package provides development headers and the apxs2 binary for the Apache 2
+ HTTP server useful to develop and link third party additions to the Debian
+ Apache HTTP server package.
+ .
+ It also provides dh_apache2 and dh sequence addons useful to install various
+ Debian Apache2 extensions with debhelper. It supports
+  - Apache 2 module configurations and shared objects
+  - Site configuration files
+  - Global configuration files
+
+Package: apache2-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, apache2-bin (= ${binary:Version})
+Description: Apache debugging symbols
+ The Apache Software Foundation's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package includes the debugging symbols. It can be used to debug
+ crashing server instances and modules.  See
+ /usr/share/doc/apache2/README.backtrace for more information.

debian.rules Added

@@ -0,0 +1,164 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+DEB_BUILD_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
+include /usr/share/dpkg/buildflags.mk
+
+LSB_RELEASE := $(shell lsb_release -i -s)
+SERVER_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if m/Version:\s*([\d\.]+)/')
+DEBIAN_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if m/Version:\s*(.+)/')
+MODULE_DIR := /usr/lib/apache2/modules/
+API = $(shell perl -ne 'print $$1 if m/define\s+MODULE_MAGIC_NUMBER_MAJOR\s+?(.*)$$/' < include/ap_mmn.h)
+AP2_CFLAGS = -pipe $(CFLAGS)
+AP2_LDFLAGS = -Wl,--as-needed $(LDFLAGS)
+AP2_CPPFLAGS = -DPLATFORM='\"$(LSB_RELEASE)\"' $(CPPFLAGS)
+AP2_LTFLAGS = --no-silent
+
+
+support/suexec-custom.c: support/suexec.c debian/patches/suexec-custom.patch
+	cp support/suexec.c support/suexec-custom.c
+	patch -p1 -i debian/patches/suexec-custom.patch
+
+prebuild-checks:
+	ERRS="" ;\
+	for a in $$(find debian/config-dir/ -type f) ; do \
+		t="$$a.$$$$" ;\
+		unexpand < "$$a" > "$$t" ;\
+		cmp -s "$$a" "$$t" || ERRS="$$ERRS $$a" ;\
+		rm "$$t" ;\
+	done ;\
+	if [ -n "$$ERRS" ] ; then \
+		echo 'ERROR: The following files contain spaces instead of tabs. Run through unexpand!' ;\
+		ls -1 $$ERRS ;\
+		false ;\
+	fi
+
+clean-config-vars:
+	# Clean up config_vars.mk
+	# FIXME: Maybe someone could document here why we actually need to
+	# cleanup some stuff here
+	perl ./debian/clean_config_vars '$(AP2_CFLAGS)' '$(AP2_CPPFLAGS)' '$(AP2_LDFLAGS)'
+
+%: %.in
+	sed 's#__SERVER_VERSION__#$(SERVER_VERSION)#; s#__MODULE_DIR__#$(MODULE_DIR)#; s#__API__#$(API)#;' $< > $@
+	chmod `/usr/bin/stat -c '%a' "$<"` $@
+
+prepare-scripts: debian/a2query debian/debhelper/dh_apache2
+	(grep -s -v apache2:API debian/apache2-bin.substvars; echo apache2:API=apache2-api-$(API)) > debian/apache2-bin.substvars.new
+	mv debian/apache2-bin.substvars.new debian/apache2-bin.substvars
+
+generate-maintainer-scripts:
+	set -e ; \
+	for type in custom pristine ; do \
+		for f in postinst preinst prerm links dirs lintian-overrides postrm; do \
+			if [ -e debian/apache2-suexec.$$f.in ] ; then \
+				perl -pe "s{__TYPE__}{$$type}g" < debian/apache2-suexec.$$f.in > debian/apache2-suexec-$$type.$$f ;\
+				chmod `/usr/bin/stat -c '%a' "debian/apache2-suexec.$$f.in"` debian/apache2-suexec-$$type.$$f ;\
+			fi ;\
+		done ;\
+	done
+	set -e ; \
+	for type in worker itk prefork event ; do \
+		for f in postinst preinst prerm links dirs lintian-overrides postrm; do \
+			if [ -e debian/apache2-mpm.$$f.in ] ; then \
+				perl -pe "s{__TYPE__}{$$type}g" < debian/apache2-mpm.$$f.in > debian/apache2-mpm-$$type.$$f ;\
+				chmod `/usr/bin/stat -c '%a' "debian/apache2-mpm.$$f.in"` debian/apache2-mpm-$$type.$$f ;\
+			fi ;\
+		done ;\
+	done
+
+
+clean build build-arch build-indep binary binary-arch binary-indep: %:
+	dh $@ --parallel --with autotools_dev
+
+override_dh_auto_configure: generate-maintainer-scripts prebuild-checks support/suexec-custom.c
+	./configure --enable-layout=Debian --enable-so --with-program-name=apache2 \
+		--enable-suexec --with-suexec-caller=www-data \
+		--with-suexec-bin=/usr/lib/apache2/suexec --with-suexec-docroot=/var/www \
+		--with-suexec-userdir=public_html --with-suexec-logfile=/var/log/apache2/suexec.log \
+		--with-suexec-uidmin=100 --enable-suexec=shared --enable-log-config=static \
+		--with-apr=/usr/bin/apr-1-config --with-apr-util=/usr/bin/apu-1-config \
+		--with-pcre=yes \
+		--enable-pie \
+		--enable-mpms-shared=all \
+		--enable-mods-shared="all cgi" \
+		--enable-mods-static="unixd logio watchdog version" \
+		CFLAGS="$(AP2_CFLAGS)" CPPFLAGS="$(AP2_CPPFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" \
+		LTFLAGS="$(AP2_LTFLAGS)"
+
+
+override_dh_install: clean-config-vars prepare-scripts
+	dh_install --list-missing
+
+override_dh_fixperms-arch:
+	# standard suexec
+	chmod 4754 debian/apache2-suexec-pristine/usr/lib/apache2/suexec-pristine
+	chgrp www-data debian/apache2-suexec-pristine/usr/lib/apache2/suexec-pristine
+	# configurable suexec
+	chmod 4754 debian/apache2-suexec-custom/usr/lib/apache2/suexec-custom
+	chgrp www-data debian/apache2-suexec-custom/usr/lib/apache2/suexec-custom
+	dh_fixperms -a -Xusr/lib/apache2/suexec-custom -Xusr/lib/apache2/suexec-pristine
+	chown -R www-data:www-data debian/apache2/var/cache/apache2/mod_cache_disk
+	chown root:adm debian/apache2/var/log/apache2
+	chmod o-rx debian/apache2/var/log/apache2
+
+override_dh_fixperms-indep:
+	dh_fixperms -i
+
+override_dh_installinit:
+	dh_installinit --restart-after-upgrade --error-handler=true -- defaults 91 09
+
+override_dh_installdocs-indep:
+	# TODO: So, did anyone check convert_docs needs an update? ;)
+	perl debian/convert_docs debian/apache2-doc/usr/share/doc/apache2-doc/manual
+	dh_installdocs -i
+
+override_dh_installdocs-arch:
+	dh_installdocs --link-doc=apache2 -papache2 -papache2-dbg \
+		-papache2-mpm-worker -papache2-mpm-prefork -papache2-mpm-event \
+		-papache2-mpm-itk
+	dh_installdocs --link-doc=apache2-bin -papache2.2-bin -plibapache2-mod-proxy-html \
+	    -plibapache2-mod-macro
+	dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec
+	dh_installdocs -a
+
+override_dh_installchangelogs:
+	# Do not install changelogs for transitional packages and the -data
+	# package not to trash the disk at the installation site. Together with
+	# dh_installdocs this means that changelogs are installed in a few
+	# packages only.
+	dh_installchangelogs -Napache2-suexec -Napache2-mpm-worker \
+		-Napache2-mpm-prefork -Napache2-mpm-event -Napache2-mpm-itk \
+		-Napache2-data -Nlibapache2-mod-proxy-html -Napache2.2-bin \
+		-Nlibapache2-mod-macro
+
+override_dh_installman:
+	mv debian/tmp/usr/share/man/man8/suexec.8 debian/tmp/usr/share/man/man8/suexec-pristine.8
+	pod2man debian/debhelper/dh_apache2 > debian/manpages/dh_apache2.1
+	pod2man debian/a2query.in > debian/manpages/a2query.8
+	dh_installman
+
+override_dh_strip:
+	dh_strip --dbg-package=apache2-dbg
+
+override_dh_auto_install:
+	dh_auto_install -- -j1
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
+
+override_dh_auto_clean:
+	dh_auto_clean
+
+override_dh_gencontrol:
+	dh_gencontrol  -p libapache2-mod-proxy-html -- -v1:$(DEBIAN_VERSION)
+	dh_gencontrol  -p libapache2-mod-macro -- -v1:$(DEBIAN_VERSION)
+	dh_gencontrol --remaining-packages
+
+.PHONY: generate-maintainer-scripts clean-config-vars prepare-scripts prebuild-checks
+.PHONY: clean build build-arch build-indep binary binary-arch binary-indep

debian.tar.gz Added

htcacheclean.service Added

htcacheclean.sysconf Added

httpd-2.4.18.tar.bz2 Added

httpd-ssl-pass-dialog Added

httpd.conf Added

@@ -0,0 +1,353 @@
+#
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# In particular, see 
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so 'log/access_log'
+# with ServerRoot set to '/www' will be interpreted by the
+# server as '/www/log/access_log', where as '/log/access_log' will be
+# interpreted as '/log/access_log'.
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to specify a local disk on the
+# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
+#
+ServerRoot "/etc/httpd"
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses.
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+Include conf.modules.d/*.conf
+
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User apache
+Group apache
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin root@localhost
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+#ServerName www.example.com:80
+
+#
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other 
+# <Directory> blocks below.
+#
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/var/www/html"
+
+#
+# Relax access to content within /var/www.
+#
+<Directory "/var/www">
+    AllowOverride None
+    # Allow open access:
+    Require all granted
+</Directory>
+
+# Further relax access to the default document root:
+<Directory "/var/www/html">
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.4/mod/core.html#options
+    # for more information.
+    #
+    Options Indexes FollowSymLinks
+
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   Options FileInfo AuthConfig Limit
+    #
+    AllowOverride None
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Require all granted
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ".ht*">
+    Require all denied
+</Files>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog "logs/error_log"
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    #CustomLog "logs/access_log" common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    CustomLog "logs/access_log" combined
+</IfModule>
+
+<IfModule alias_module>
+    #
+    # Redirect: Allows you to tell clients about documents that used to 
+    # exist in your server's namespace, but do not anymore. The client 
+    # will make a new request for the document at its new location.
+    # Example:
+    # Redirect permanent /foo http://www.example.com/bar
+
+    #
+    # Alias: Maps web paths into filesystem paths and is used to
+    # access content that does not live under the DocumentRoot.
+    # Example:
+    # Alias /webpath /full/filesystem/path
+    #
+    # If you include a trailing / on /webpath then the server will
+    # require it to be present in the URL.  You will also likely
+    # need to provide a <Directory> section to allow access to
+    # the filesystem path.
+
+    #
+    # ScriptAlias: This controls which directories contain server scripts. 
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the target directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the
+    # client.  The same rules about trailing "/" apply to ScriptAlias
+    # directives as to Alias.
+    #
+    ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
+
+</IfModule>
+
+#
+# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/var/www/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig /etc/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    AddType text/html .shtml
+    AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# Specify a default charset for all content served; this enables
+# interpretation of all content as UTF-8 by default.  To use the 
+# default browser choice (ISO-8859-1), or to allow the META tags
+# in HTML content to override this choice, comment out this
+# directive:
+#
+AddDefaultCharset UTF-8
+
+<IfModule mime_magic_module>
+    #
+    # The mod_mime_magic module allows the server to use various hints from the
+    # contents of the file itself to determine its type.  The MIMEMagicFile
+    # directive tells the module where the hint definitions are located.
+    #
+    MIMEMagicFile conf/magic
+</IfModule>
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it, 
+# memory-mapping or the sendfile syscall may be used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted 
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+# Defaults if commented: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+EnableSendfile on
+
+# Supplemental configuration
+#
+# Load config files in the "/etc/httpd/conf.d" directory, if any.
+IncludeOptional conf.d/*.conf

httpd.dsc Added

@@ -0,0 +1,35 @@
+Format: 1.0
+Source: apache2
+Binary: apache2, apache2-data, apache2-bin, apache2-mpm-worker, apache2-mpm-prefork, apache2-mpm-event, apache2-mpm-itk, apache2.2-bin, apache2.2-common, libapache2-mod-proxy-html, libapache2-mod-macro, apache2-utils, apache2-suexec, apache2-suexec-pristine, apache2-suexec-custom, apache2-doc, apache2-dev, apache2-dbg
+Architecture: any all
+Version: 2.4.18-1
+Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
+Uploaders: Stefan Fritsch <sf@debian.org>, Arno Töll <arno@debian.org>
+Homepage: http://httpd.apache.org/
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-apache/apache2.git
+Vcs-Git: git://anonscm.debian.org/pkg-apache/apache2.git
+Build-Depends: debhelper (>= 8.9.7~), bzip2, lsb-release, dpkg-dev (>= 1.16.1~), libaprutil1-dev (>= 1.5.0), libapr1-dev (>= 1.4.0), libpcre3-dev, zlib1g-dev, libssl-dev (>= 0.9.8m), perl, liblua5.1-0-dev, libxml2-dev, autotools-dev, gawk | awk
+Build-Conflicts: autoconf2.13
+Package-List:
+ apache2 deb httpd optional arch=any
+ apache2-bin deb httpd optional arch=any
+ apache2-data deb httpd optional arch=all
+ apache2-dbg deb debug extra arch=any
+ apache2-dev deb httpd optional arch=any
+ apache2-doc deb doc optional arch=all
+ apache2-mpm-event deb oldlibs extra arch=any
+ apache2-mpm-itk deb oldlibs extra arch=any
+ apache2-mpm-prefork deb oldlibs extra arch=any
+ apache2-mpm-worker deb oldlibs extra arch=any
+ apache2-suexec deb oldlibs extra arch=any
+ apache2-suexec-custom deb httpd extra arch=any
+ apache2-suexec-pristine deb httpd optional arch=any
+ apache2-utils deb httpd optional arch=any
+ apache2.2-bin deb oldlibs extra arch=any
+ apache2.2-common deb oldlibs extra arch=any
+ libapache2-mod-macro deb oldlibs extra arch=any
+ libapache2-mod-proxy-html deb oldlibs extra arch=any
+Files:
+ 00000000000000000000000000000000 0 httpd-2.4.18.tar.bz2
+ 00000000000000000000000000000000 0 debian.tar.gz

httpd.init Added

@@ -0,0 +1,124 @@
+#!/bin/bash
+#
+# httpd        Startup script for the Apache HTTP Server
+#
+# chkconfig: - 85 15
+# description: The Apache HTTP Server is an efficient and extensible  \
+#	       server implementing the current HTTP standards.
+# processname: httpd
+# config: /etc/httpd/conf/httpd.conf
+# config: /etc/sysconfig/httpd
+# pidfile: /var/run/httpd/httpd.pid
+#
+### BEGIN INIT INFO
+# Provides: httpd
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network
+# Should-Start: distcache
+# Short-Description: start and stop Apache HTTP Server
+# Description: The Apache HTTP Server is an extensible server 
+#  implementing the current HTTP standards.
+### END INIT INFO
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+if [ -f /etc/sysconfig/httpd ]; then
+        . /etc/sysconfig/httpd
+fi
+
+# Start httpd in the C locale by default.
+HTTPD_LANG=${HTTPD_LANG-"C"}
+
+# This will prevent initlog from swallowing up a pass-phrase prompt if
+# mod_ssl needs a pass-phrase from the user.
+INITLOG_ARGS=""
+
+# Set HTTPD=/usr/sbin/httpd.worker in /etc/sysconfig/httpd to use a server
+# with the thread-based "worker" MPM; BE WARNED that some modules may not
+# work correctly with a thread-based MPM; notably PHP will refuse to start.
+
+# Path to the apachectl script, server binary, and short-form for messages.
+apachectl=/usr/sbin/apachectl
+httpd=${HTTPD-/usr/sbin/httpd}
+prog=httpd
+pidfile=${PIDFILE-/var/run/httpd/httpd.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/httpd}
+RETVAL=0
+STOP_TIMEOUT=${STOP_TIMEOUT-10}
+
+# The semantics of these two functions differ from the way apachectl does
+# things -- attempting to start while running is a failure, and shutdown
+# when not running is also a failure.  So we just do it the way init scripts
+# are expected to behave here.
+start() {
+        echo -n $"Starting $prog: "
+        LANG=$HTTPD_LANG daemon --pidfile=${pidfile} $httpd $OPTIONS
+        RETVAL=$?
+        echo
+        [ $RETVAL = 0 ] && touch ${lockfile}
+        return $RETVAL
+}
+
+# When stopping httpd, a delay (of default 10 second) is required
+# before SIGKILLing the httpd parent; this gives enough time for the
+# httpd parent to SIGKILL any errant children.
+stop() {
+	echo -n $"Stopping $prog: "
+	killproc -p ${pidfile} -d ${STOP_TIMEOUT} $httpd
+	RETVAL=$?
+	echo
+	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+reload() {
+    echo -n $"Reloading $prog: "
+    if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then
+        RETVAL=6
+        echo $"not reloading due to configuration syntax error"
+        failure $"not reloading $httpd due to configuration syntax error"
+    else
+        # Force LSB behaviour from killproc
+        LSB=1 killproc -p ${pidfile} $httpd -HUP
+        RETVAL=$?
+        if [ $RETVAL -eq 7 ]; then
+            failure $"httpd shutdown"
+        fi
+    fi
+    echo
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  status)
+        status -p ${pidfile} $httpd
+	RETVAL=$?
+	;;
+  restart)
+	stop
+	start
+	;;
+  condrestart|try-restart)
+	if status -p ${pidfile} $httpd >&/dev/null; then
+		stop
+		start
+	fi
+	;;
+  force-reload|reload)
+        reload
+	;;
+  graceful|help|configtest|fullstatus)
+	$apachectl $@
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|status|fullstatus|graceful|help|configtest}"
+	RETVAL=2
+esac
+
+exit $RETVAL

httpd.logrotate Added

httpd.service Added

@@ -0,0 +1,37 @@
+# It's not recommended to modify this file in-place, because it will be
+# overwritten during package upgrades.  If you want to customize, the best
+# way is to create a file "/etc/systemd/system/httpd.service",
+# containing
+#   .include /lib/systemd/system/httpd.service
+#   ...make your changes here...
+# For more info about custom unit files, see
+# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
+
+# For example, to pass additional options (for instance, -D definitions) to the
+# httpd binary at startup, you need to create a file named
+# "/etc/systemd/system/httpd.service" containing:
+#	.include /lib/systemd/system/httpd.service
+#	[Service]
+#	Environment=OPTIONS=-DMY_DEFINE
+
+[Unit]
+Description=The Apache HTTP Server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=notify
+Environment=LANG=C
+
+ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND
+ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
+ExecStop=/bin/kill -WINCH ${MAINPID}
+# We want systemd to give httpd some time to finish gracefully, but still want
+# it to kill httpd after TimeoutStopSec if something went wrong during the
+# graceful stop. Normally, Systemd sends SIGTERM signal right after the
+# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give
+# httpd time to finish.
+KillSignal=SIGCONT
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

httpd.socket Added

httpd.sysconf Added

@@ -0,0 +1,30 @@
+#
+# This file is no longer used to configure additional environment variables
+# for the httpd process.
+#
+# It has been replaced by systemd. If you want to customize, the best
+# way is to create a file "/etc/systemd/system/httpd.service",
+# containing
+#   .include /lib/systemd/system/httpd.service
+#   ...make your changes here...
+# For more info about custom unit files, see
+# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
+
+
+# To set OPTIONS environment variable which was set in this file
+# in older versions, you need to create a file named
+# "/etc/systemd/system/httpd.service" containing:
+#	.include /lib/systemd/system/httpd.service
+#	[Service]
+#	#
+#	# To pass additional options (for instance, -D definitions) to the
+#	# httpd binary at startup, set OPTIONS here.
+#	#
+#	Environment=OPTIONS=-DMY_DEFINE
+
+# Note: With previous versions of httpd, the MPM could be changed by
+# editing an "HTTPD" variable here.  With the current version, that
+# variable is now ignored.  The MPM is a loadable module, and the
+# choice of MPM can be changed by editing the configuration file
+# /etc/httpd/conf.modules.d/00-mpm.conf.
+#

httpd.tmpfiles Added

index.html Added

@@ -0,0 +1,130 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+	<head>
+		<title>Test Page for the Apache HTTP Server on Fedora</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<style type="text/css">
+			/*<![CDATA[*/
+			body {
+				background-color: #fff;
+				color: #000;
+				font-size: 0.9em;
+				font-family: sans-serif,helvetica;
+				margin: 0;
+				padding: 0;
+			}
+			:link {
+				color: #c00;
+			}
+			:visited {
+				color: #c00;
+			}
+			a:hover {
+				color: #f50;
+			}
+			h1 {
+				text-align: center;
+				margin: 0;
+				padding: 0.6em 2em 0.4em;
+				background-color: #22437f;
+				color: #fff;
+				font-weight: normal;
+				font-size: 1.75em;
+				border-bottom: 2px solid #000;
+			}
+			h1 strong {
+				font-weight: bold;
+			}
+			h2 {
+				font-size: 1.1em;
+				font-weight: bold;
+			}
+			hr {
+				display: none;
+			}
+			.content {
+				padding: 1em 5em;
+			}
+			.content-columns {
+				/* Setting relative positioning allows for 
+				absolute positioning for sub-classes */
+				position: relative;
+				padding-top: 1em;
+			}
+			.content-column-left {
+				/* Value for IE/Win; will be overwritten for other browsers */
+				width: 47%;
+				padding-right: 3%;
+				float: left;
+				padding-bottom: 2em;
+			}
+			.content-column-left hr {
+				display: none;
+			}
+			.content-column-right {
+				/* Values for IE/Win; will be overwritten for other browsers */
+				width: 47%;
+				padding-left: 3%;
+				float: left;
+				padding-bottom: 2em;
+			}
+			.content-columns>.content-column-left, .content-columns>.content-column-right {
+				/* Non-IE/Win */
+			}
+			img {
+				border: 2px solid #fff;
+				padding: 2px;
+				margin: 2px;
+			}
+			a:hover img {
+				border: 2px solid #f50;
+			}
+			/*]]>*/
+		</style>
+	</head>
+
+	<body>
+		<h1>Fedora <strong>Test Page</strong></h1>
+
+		<div class="content">
+			<div class="content-middle">
+				<p>This page is used to test the proper operation of the Apache HTTP server after it has been installed. If you can read this page, it means that the web server installed at this site is working properly, but has not yet been configured.</p>
+			</div>
+			<hr />
+
+			<div class="content-columns">
+				<div class="content-column-left">
+					<h2>If you are a member of the general public:</h2>
+
+					<p>The fact that you are seeing this page indicates that the website you just visited is either experiencing problems, or is undergoing routine maintenance.</p>
+
+					<p>If you would like to let the administrators of this website know that you've seen this page instead of the page you expected, you should send them e-mail. In general, mail sent to the name "webmaster" and directed to the website's domain should reach the appropriate person.</p>
+
+					<p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p>
+
+					<p>Fedora is a distribution of Linux, a popular computer operating system. It is commonly used by hosting companies because it is free, and includes free web server software. Many times, they do not set up their web server correctly, and it displays this "test page" instead of the expected website. 
+
+					<p>Accordingly, please keep these facts in mind:
+					<li>Neither the Fedora Project or Red Hat has any affiliation with any website or content hosted from this server (unless otherwise explicitly stated).</li>
+					<li>Neither the Fedora Project or Red Hat has "hacked" this webserver, this test page is an included component of Apache's httpd webserver software.</li>
+
+					<p>For more information about Fedora, please visit the <a href="http://fedoraproject.org/">Fedora Project website</a>.</p>
+					<hr />
+				</div>
+
+				<div class="content-column-right">
+					<h2>If you are the website administrator:</h2>
+
+					<p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p>
+
+					<div class="logos">
+						<p>You are free to use the images below on Apache and Fedora powered HTTP servers. Thanks for using Apache and Fedora!</p>
+
+						<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedoraproject.org/"><img src="/icons/poweredby.png" alt="[ Powered by Fedora ]" width="88" height="31" /></a></p>
+					</div>
+				</div>
+			</div>
+		</div>
+	</body>
+</html>

manual.conf Added

mkstatus.sh Added

pullrev.sh Added

@@ -0,0 +1,54 @@
+#!/bin/sh -e
+
+if [ $# -lt 1 ]; then
+    echo "What?"
+    exit 1
+fi
+
+repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk"
+repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
+ver=2.4.6
+prefix="httpd-${ver}"
+suffix="r$1${2:++}"
+fn="${prefix}-${suffix}.patch"
+vcurl="http://svn.apache.org/viewvc?view=revision&revision="
+
+if test -f ${fn}; then
+    mv -v -f ${fn} ${fn}\~
+    echo "# $0 $*" > ${fn}
+    sed '1{/#.*pullrev/d;};/^--- /,$d' < ${fn}\~ >> ${fn}
+else
+    echo "# $0 $*" > ${fn}
+fi
+
+new=0
+for r in $*; do
+   if ! grep -q "${vcurl}${r}" ${fn}; then
+       echo "${vcurl}${r}"
+       new=1
+   fi
+done >> ${fn}
+
+[ $new -eq 0 ] || echo >> ${fn}
+
+prev=/dev/null
+for r in $*; do
+    echo "+ fetching ${r}"
+    this=`mktemp /tmp/pullrevXXXXXX`
+    svn diff -c ${r} ${repo} | filterdiff --remove-timestamps -x 'CHANGES' -x 'next-number' -x 'STATUS' \
+        --addprefix="${prefix}/" > ${this}
+    next=`mktemp /tmp/pullrevXXXXXX`
+    combinediff --quiet ${prev} ${this} > ${next}
+    rm -f "${this}"
+    [ "${prev}" = "/dev/null" ] || rm -f "${prev}"
+    prev=${next}
+done
+
+cat ${prev} >> ${fn}
+
+vi "${fn}"
+echo "+ git add ${fn}" 
+git add "${fn}"
+echo "+ spec template:"
+echo "PatchN: ${fn}"
+echo "%patchN -p1 -b .${suffix}"

ssl.conf Added

@@ -0,0 +1,229 @@
+#
+# When we also provide SSL we have to listen to the 
+# the HTTPS port in addition.
+#
+Listen 443 https
+
+##
+##  SSL Global Context
+##
+##  All SSL configuration in this context applies both to
+##  the main server and all SSL-enabled virtual hosts.
+##
+
+#   Pass Phrase Dialog:
+#   Configure the pass phrase gathering process.
+#   The filtering dialog program (`builtin' is a internal
+#   terminal dialog) has to provide the pass phrase on stdout.
+SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog
+
+#   Inter-Process Session Cache:
+#   Configure the SSL Session Cache: First the mechanism 
+#   to use and second the expiring timeout (in seconds).
+SSLSessionCache         shmcb:/run/httpd/sslcache(512000)
+SSLSessionCacheTimeout  300
+
+#   Pseudo Random Number Generator (PRNG):
+#   Configure one or more sources to seed the PRNG of the 
+#   SSL library. The seed data should be of good random quality.
+#   WARNING! On some platforms /dev/random blocks if not enough entropy
+#   is available. This means you then cannot use the /dev/random device
+#   because it would lead to very long connection times (as long as
+#   it requires to make more entropy available). But usually those
+#   platforms additionally provide a /dev/urandom device which doesn't
+#   block. So, if available, use this one instead. Read the mod_ssl User
+#   Manual for more details.
+SSLRandomSeed startup file:/dev/urandom  256
+SSLRandomSeed connect builtin
+#SSLRandomSeed startup file:/dev/random  512
+#SSLRandomSeed connect file:/dev/random  512
+#SSLRandomSeed connect file:/dev/urandom 512
+
+#
+# Use "SSLCryptoDevice" to enable any supported hardware
+# accelerators. Use "openssl engine -v" to list supported
+# engine names.  NOTE: If you enable an accelerator and the
+# server does not start, consult the error logs and ensure
+# your accelerator is functioning properly. 
+#
+SSLCryptoDevice builtin
+#SSLCryptoDevice ubsec
+
+##
+## SSL Virtual Host Context
+##
+
+<VirtualHost _default_:443>
+
+# General setup for the virtual host, inherited from global configuration
+#DocumentRoot "/var/www/html"
+#ServerName www.example.com:443
+
+# Use separate log files for the SSL virtual host; note that LogLevel
+# is not inherited from httpd.conf.
+ErrorLog logs/ssl_error_log
+TransferLog logs/ssl_access_log
+LogLevel warn
+
+#   SSL Engine Switch:
+#   Enable/Disable SSL for this virtual host.
+SSLEngine on
+
+#   SSL Protocol support:
+# List the enable protocol levels with which clients will be able to
+# connect.  Disable SSLv2 access by default:
+SSLProtocol all -SSLv2
+
+#   SSL Cipher Suite:
+# List the ciphers that the client is permitted to negotiate.
+# See the mod_ssl documentation for a complete list.
+# The OpenSSL system profile is configured by default.  See
+# update-crypto-policies(8) for more details.
+SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 \
+        EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 \
+        EECDH EDH+aRSA !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS"
+
+#SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 \
+#        EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 \
+#        EECDH EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS"
+#
+#SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
+#
+#SSLCipherSuite PROFILE=DEFAULT
+
+#   Speed-optimized SSL Cipher configuration:
+#   If speed is your main concern (on busy HTTPS servers e.g.),
+#   you might want to force clients to specific, performance
+#   optimized ciphers. In this case, prepend those ciphers
+#   to the SSLCipherSuite list, and enable SSLHonorCipherOrder.
+#   Caveat: by giving precedence to RC4-SHA and AES128-SHA
+#   (as in the example below), most connections will no longer
+#   have perfect forward secrecy - if the server's key is
+#   compromised, captures of past or future traffic must be
+#   considered compromised, too.
+#SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5
+#SSLHonorCipherOrder on 
+
+#   Server Certificate:
+# Point SSLCertificateFile at a PEM encoded certificate.  If
+# the certificate is encrypted, then you will be prompted for a
+# pass phrase.  Note that a kill -HUP will prompt again.  A new
+# certificate can be generated using the genkey(1) command.
+SSLCertificateFile /etc/pki/tls/certs/localhost.crt
+
+#   Server Private Key:
+#   If the key is not combined with the certificate, use this
+#   directive to point at the key file.  Keep in mind that if
+#   you've both a RSA and a DSA private key you can configure
+#   both in parallel (to also allow the use of DSA ciphers, etc.)
+SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
+
+#   Server Certificate Chain:
+#   Point SSLCertificateChainFile at a file containing the
+#   concatenation of PEM encoded CA certificates which form the
+#   certificate chain for the server certificate. Alternatively
+#   the referenced file can be the same as SSLCertificateFile
+#   when the CA certificates are directly appended to the server
+#   certificate for convinience.
+#SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt
+
+#   Certificate Authority (CA):
+#   Set the CA certificate verification path where to find CA
+#   certificates for client authentication or alternatively one
+#   huge file containing all of them (file must be PEM encoded)
+#SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt
+
+#   Client Authentication (Type):
+#   Client certificate verification type and depth.  Types are
+#   none, optional, require and optional_no_ca.  Depth is a
+#   number which specifies how deeply to verify the certificate
+#   issuer chain before deciding the certificate is not valid.
+#SSLVerifyClient require
+#SSLVerifyDepth  10
+
+#   Access Control:
+#   With SSLRequire you can do per-directory access control based
+#   on arbitrary complex boolean expressions containing server
+#   variable checks and other lookup directives.  The syntax is a
+#   mixture between C and Perl.  See the mod_ssl documentation
+#   for more details.
+#<Location />
+#SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
+#            and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
+#            and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
+#            and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
+#            and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20       ) \
+#           or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
+#</Location>
+
+#   SSL Engine Options:
+#   Set various options for the SSL engine.
+#   o FakeBasicAuth:
+#     Translate the client X.509 into a Basic Authorisation.  This means that
+#     the standard Auth/DBMAuth methods can be used for access control.  The
+#     user name is the `one line' version of the client's X.509 certificate.
+#     Note that no password is obtained from the user. Every entry in the user
+#     file needs this password: `xxj31ZMTZzkVA'.
+#   o ExportCertData:
+#     This exports two additional environment variables: SSL_CLIENT_CERT and
+#     SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+#     server (always existing) and the client (only existing when client
+#     authentication is used). This can be used to import the certificates
+#     into CGI scripts.
+#   o StdEnvVars:
+#     This exports the standard SSL/TLS related `SSL_*' environment variables.
+#     Per default this exportation is switched off for performance reasons,
+#     because the extraction step is an expensive operation and is usually
+#     useless for serving static content. So one usually enables the
+#     exportation for CGI and SSI requests only.
+#   o StrictRequire:
+#     This denies access when "SSLRequireSSL" or "SSLRequire" applied even
+#     under a "Satisfy any" situation, i.e. when it applies access is denied
+#     and no other module can change it.
+#   o OptRenegotiate:
+#     This enables optimized SSL connection renegotiation handling when SSL
+#     directives are used in per-directory context. 
+#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+<Files ~ "\.(cgi|shtml|phtml|php3?)$">
+    SSLOptions +StdEnvVars
+</Files>
+<Directory "/var/www/cgi-bin">
+    SSLOptions +StdEnvVars
+</Directory>
+
+#   SSL Protocol Adjustments:
+#   The safe and default but still SSL/TLS standard compliant shutdown
+#   approach is that mod_ssl sends the close notify alert but doesn't wait for
+#   the close notify alert from client. When you need a different shutdown
+#   approach you can use one of the following variables:
+#   o ssl-unclean-shutdown:
+#     This forces an unclean shutdown when the connection is closed, i.e. no
+#     SSL close notify alert is send or allowed to received.  This violates
+#     the SSL/TLS standard but is needed for some brain-dead browsers. Use
+#     this when you receive I/O errors because of the standard approach where
+#     mod_ssl sends the close notify alert.
+#   o ssl-accurate-shutdown:
+#     This forces an accurate shutdown when the connection is closed, i.e. a
+#     SSL close notify alert is send and mod_ssl waits for the close notify
+#     alert of the client. This is 100% SSL/TLS standard compliant, but in
+#     practice often causes hanging connections with brain-dead browsers. Use
+#     this only for browsers where you know that their SSL implementation
+#     works correctly. 
+#   Notice: Most problems of broken clients are also related to the HTTP
+#   keep-alive facility, so you usually additionally want to disable
+#   keep-alive for those clients, too. Use variable "nokeepalive" for this.
+#   Similarly, one has to force some clients to use HTTP/1.0 to workaround
+#   their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
+#   "force-response-1.0" for this.
+BrowserMatch "MSIE [2-5]" \
+         nokeepalive ssl-unclean-shutdown \
+         downgrade-1.0 force-response-1.0
+
+#   Per-Server Logging:
+#   The home of a custom SSL log file. Use this when you want a
+#   compact non-error SSL logfile on a virtual host basis.
+CustomLog logs/ssl_request_log \
+          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+
+</VirtualHost>                                  
+

userdir.conf Added

@@ -0,0 +1,36 @@
+#
+# UserDir: The name of the directory that is appended onto a user's home
+# directory if a ~user request is received.
+#
+# The path to the end user account 'public_html' directory must be
+# accessible to the webserver userid.  This usually means that ~userid
+# must have permissions of 711, ~userid/public_html must have permissions
+# of 755, and documents contained therein must be world-readable.
+# Otherwise, the client will only receive a "403 Forbidden" message.
+#
+<IfModule mod_userdir.c>
+    #
+    # UserDir is disabled by default since it can confirm the presence
+    # of a username on the system (depending on home directory
+    # permissions).
+    #
+    UserDir disabled
+
+    #
+    # To enable requests to /~user/ to serve the user's public_html
+    # directory, remove the "UserDir disabled" line above, and uncomment
+    # the following line instead:
+    # 
+    #UserDir public_html
+</IfModule>
+
+#
+# Control access to UserDir directories.  The following is an example
+# for a site where these directories are restricted to read-only.
+#
+<Directory "/home/*/public_html">
+    AllowOverride FileInfo AuthConfig Limit Indexes
+    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+    Require method GET POST OPTIONS
+</Directory>
+

welcome.conf Added

Build Results
RPM Lint

Refresh

Comments for request 1220 0

Request History

vanmeeuwen created request over 8 years ago

Check in 2.4.18

vanmeeuwen accepted request over 8 years ago