--- apache2-2.2.11.orig/debian/apache2-mpm-event.dirs
+++ apache2-2.2.11/debian/apache2-mpm-event.dirs
@@ -0,0 +1 @@
+usr/sbin
--- apache2-2.2.11.orig/debian/apache2.2-common.manpages
+++ apache2-2.2.11/debian/apache2.2-common.manpages
@@ -0,0 +1,7 @@
+debian/a2enmod.8
+debian/a2dismod.8
+debian/apache2.8
+debian/apache2ctl.8
+debian/a2ensite.8
+debian/a2dissite.8
+debian/httxt2dbm.8
--- apache2-2.2.11.orig/debian/apache2-suexec-custom.manpages
+++ apache2-2.2.11/debian/apache2-suexec-custom.manpages
@@ -0,0 +1 @@
+debian/suexec.8
--- apache2-2.2.11.orig/debian/convert_docs
+++ apache2-2.2.11/debian/convert_docs
@@ -0,0 +1,93 @@
+#!/usr/bin/perl -w
+
+use strict;
+use File::Path;
+use Fatal qw/mkpath symlink open close/;
+
+scalar @ARGV == 2 or die;
+
+my $SRC=$ARGV[0];
+my $TGT=$ARGV[1];
+
+# list of languages
+my @lang = glob("$SRC/index.html.*") or die;
+map { s{^.*html\.}{} }  @lang;
+
+# map "ja.euc-jp" to "ja/", ...
+my %lpath;
+foreach my $l (@lang) {
+	my $t=$l;
+	$t =~ s{\..*$}{};
+	$lpath{$l}="$t/";
+}
+
+
+my @html=`find $SRC -name *.html` or die;
+chomp(@html);
+map { s{^$SRC/}{} } @html;
+
+foreach my $h (@html) {
+	my $dir="";
+	if ($h =~ m{^(.*/)}) {
+		$dir=$1;
+	}
+	
+	for my $l (@lang) {
+		my $tdir="$TGT/$lpath{$l}";
+		-d "$tdir$dir" || mkpath("$tdir$dir");
+		
+		my $updir=$dir;
+		$updir =~ s{[^/]+}{..}g;
+		
+		if ($l eq "en") {
+			conv("$SRC/$h.en", "$tdir$h", $h);
+		}
+		elsif ( -f "$SRC/$h.$l" ) {
+			conv("$SRC/$h.$l", "$tdir$h", $h);
+		}
+		else {
+			symlink("${updir}../en/$h", "$tdir$h");
+		}
+		
+	}
+}
+
+open(my $out, ">", "$TGT/index.html");
+print $out '<html><head>',
+	   '<meta http-equiv="refresh" content="0; URL=en/index.html">',
+	   "</head>\n<body>\n<table>";
+foreach my $l (sort values %lpath) {
+	print $out qq{<tr><td><a href="${l}index.html">$l</a></td></tr>\n};
+}
+print $out '</table></body></html>';
+
+
+### END
+
+
+sub conv {
+	my ($old, $new, $name) = @_;
+	
+	open(my $in, "<", $old);
+	local $/;
+	my $file = <$in>;
+	close($in);
+
+	# /mod/ -> /mod/index.html
+	$file =~ s{href="([^:"]*/)"}{href="${1}index.html"}g;
+
+	# style and images now one level up
+	$file =~ s{(src|href)="../(style|images)}{$1="../../$2}g;
+	$file =~ s{(src|href)="./(style|images)}{$1="../$2}g;
+
+	foreach my $l (values %lpath) {
+		# language directories one level up
+		$file =~ s{href="\.\./$l}{href="../../$l}g;
+		$file =~ s{href="\./$l}{href="../$l}g;
+	}
+	
+
+	open(my $out, ">", $new);
+	print $out $file;
+	close($out);
+}
--- apache2-2.2.11.orig/debian/NEWS
+++ apache2-2.2.11/debian/NEWS
@@ -0,0 +1,78 @@
+apache2 (2.2.9-3) unstable; urgency=low
+
+  * The directive "NameVirtualHost *" has been changed to "NameVirtualHost
+    *:80". It has also been moved from sites-available/default to ports.conf.
+    This allows to ship a proper SSL default virtual host config in
+    sites-available/default-ssl, but it means that if you use several name
+    based virtual hosts:
+    
+    - you will have to change <VirtualHost *> to <VirtualHost *:80> in your
+      name based virtual hosts
+
+    - you need to add more NameVirtualHost directives if you use other ports
+      than 80 with name based virtual hosts. You may also have to add these
+      ports to the default virtual host in /etc/apache2/sites-available/default
+      (like this: "<VirtualHost *:80 *:81>").
+    
+    If you prefer to revert to the old setup instead (and don't need the
+    default-ssl host), just change "NameVirtualHost *:80" back to
+    "NameVirtualHost *" in ports.conf and "<VirtualHost *:80>" to
+    "<VirtualHost *>" in sites-available/default.
+
+  * For mod_disk_cache, caching is again disabled in disk_cache.conf by
+    default. It usually makes more sense to enable this on a per-virtual host
+    basis.
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 30 Jun 2008 19:47:52 +0200
+
+apache2 (2.2.8-5) unstable; urgency=low
+
+  * The suexec helper program needed for mod_suexec is now shipped in a
+    separate package, apache2-suexec, which is not installed by default.
+    You need to install this package manually if you are using mod_suexec.
+
+    There is now also the apache2-suexec-custom package, which contains a
+    customizable version of suexec which can be used with different document
+    roots than /var/www.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 04 May 2008 20:24:00 +0200
+
+apache2 (2.2.8-1) unstable; urgency=low
+
+  * The Apache User and Group and the PidFile path are now configured in
+    /etc/apache2/envvars, to make it easier to use them in scripts
+    (like the init and logrotate scripts, and apache2ctl).
+    If you have changed these settings from their default values, you need to
+    adjust /etc/apache2/envvars.
+    This also means that starting apache2 with "apache2 -k start" is no longer
+    possible, you have to use /etc/init.d/apache2 or apache2ctl.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 15 Jan 2008 21:41:23 +0100
+
+apache2 (2.2.4-2) unstable; urgency=low
+
+  * This version introduces some changes in the configuration layout and
+    defaults. You will probably have to adjust your configuration accordingly.
+
+    - Module specific configuration has been moved from 
+      /etc/apache2/apache2.conf to /etc/apache2/mods-available/*.conf for the
+      following modules: 
+        actions          alias              autoindex
+        info             mime               negotiation
+        setenvif         status
+
+    - AddDefaultCharset is again disabled by default. See
+      /etc/apache2/conf.d/charset
+
+    - "Listen 443" is automatically enabled in /etc/apache2/ports.conf if
+      mod_ssl is enabled.
+
+  * The NO_START functionality from /etc/default/apache2 has been removed. If
+    you don't want to start apache2 on boot, rename the S*apache2 start
+    symlinks as usual.
+
+  * To ensure that the disk cache does not grow indefinitely, htcacheclean is
+    now started when mod_disk_cache is enabled. The details can be configured
+    in /etc/default/apache2 .
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 09 Jul 2007 21:50:58 +0200
--- apache2-2.2.11.orig/debian/rules
+++ apache2-2.2.11/debian/rules
@@ -0,0 +1,352 @@
+#! /usr/bin/make -f 
+
+# Code for httpd 2.1, based on apache2 and others.
+# Copyright (C) Canonical Ltd, 2005
+
+export DEB_BUILD_HARDENING=1
+export DEB_BUILD_OPTIONS
+export DH_OPTIONS
+
+SHELL := sh -e
+
+#enable dpatch
+include /usr/share/dpatch/dpatch.make
+
+# These are used for cross-compiling and for saving the configure script
+# # from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+LSB_RELEASE := $(shell lsb_release -i -s)
+
+CONFFLAGS += ac_cv_prog_AWK=mawk ac_cv_prog_LYNX_PATH=www-browser
+
+AP2_COMMON_CONFARGS = --enable-layout=Debian --enable-so \
+                      --with-program-name=apache2  \
+		      --with-ldap=yes --with-ldap-include=/usr/include \
+		      --with-ldap-lib=/usr/lib \
+		      --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 --enable-logio=static \
+		      --with-apr=/usr/bin/apr-1-config \
+		      --with-apr-util=/usr/bin/apu-1-config \
+		      --with-pcre=yes
+
+AP2_MODS_CONFARGS =   --enable-authn-alias=shared --enable-authnz-ldap=shared  \
+		      --enable-disk-cache=shared --enable-cache=shared \
+		      --enable-mem-cache=shared --enable-file-cache=shared \
+		      --enable-cern-meta=shared --enable-dumpio=shared --enable-ext-filter=shared \
+		      --enable-charset-lite=shared --enable-cgi=shared \
+		      --enable-dav-lock=shared --enable-log-forensic=shared \
+		      --enable-ldap=shared --enable-proxy=shared \
+		      --enable-proxy-connect=shared --enable-proxy-ftp=shared \
+		      --enable-proxy-http=shared --enable-proxy-ajp=shared \
+		      --enable-proxy-balancer=shared --enable-ssl=shared \
+		      --enable-authn-dbm=shared --enable-authn-anon=shared \
+		      --enable-authn-dbd=shared --enable-authn-file=shared \
+		      --enable-authn-default=shared --enable-authz-host=shared \
+		      --enable-authz-groupfile=shared --enable-authz-user=shared \
+		      --enable-authz-dbm=shared --enable-authz-owner=shared \
+		      --enable-authnz-ldap=shared --enable-authz-default=shared \
+		      --enable-auth-basic=shared --enable-auth-digest=shared \
+		      --enable-dbd=shared --enable-deflate=shared \
+		      --enable-include=shared --enable-filter=shared \
+		      --enable-env=shared --enable-mime-magic=shared \
+		      --enable-expires=shared --enable-headers=shared \
+		      --enable-ident=shared --enable-usertrack=shared \
+		      --enable-unique-id=shared --enable-setenvif=shared \
+		      --enable-version=shared --enable-status=shared \
+		      --enable-autoindex=shared --enable-asis=shared \
+		      --enable-info=shared --enable-cgid=shared \
+		      --enable-dav=shared --enable-dav-fs=shared \
+		      --enable-vhost-alias=shared --enable-negotiation=shared \
+		      --enable-dir=shared --enable-imagemap=shared \
+		      --enable-actions=shared --enable-speling=shared \
+		      --enable-userdir=shared --enable-alias=shared \
+		      --enable-rewrite=shared --enable-mime=shared \
+		      --enable-substitute=shared
+
+AP2_CFLAGS = $(CFLAGS) -g -pipe -I/usr/include/xmltok -I/usr/include/openssl -Wall
+AP2_LDFLAGS = -Wl,--as-needed
+
+#support noopt building
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  AP2_CFLAGS += -O0
+else
+  AP2_CFLAGS += -O2
+endif
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+DEB_BUILD_STRIP = yes
+endif
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+BUILD=debian/build-tree
+REALCURDIR=$(CURDIR)
+INSTALL=/usr/bin/install
+
+clean: unpatch
+	dh_testdir
+	dh_clean
+	rm -rf $(BUILD) mpm-worker mpm-prefork mpm-event install build-mpms
+	rm -f debian/apache2-mpm-worker.postinst debian/apache2-mpm-worker.preinst debian/apache2-mpm-worker.prerm
+	rm -f debian/apache2-mpm-event.postinst debian/apache2-mpm-event.preinst debian/apache2-mpm-event.prerm
+	rm -f debian/apache2-mpm-prefork.prerm
+	for i in `ls debian/icons/ | cut -d. -f1,2`; do \
+		rm -f debian/tmp/usr/share/apache2/icons/$$i; \
+	done
+
+build: patch-stamp build-mpms 
+build-mpms: mpm-worker mpm-prefork mpm-event
+	for mpm in prefork event ; do \
+		if ! diff -u $(BUILD)/$$mpm/mods.list $(BUILD)/worker/mods.list ; then \
+			echo Different modules built into httpd binaries, will not proceed ;\
+			exit 1 ;\
+		fi \
+	done
+	touch $@
+
+
+mpm-worker: patch-stamp
+	dh_testdir
+	mkdir -p $(BUILD)/worker
+	cd $(BUILD)/worker ;\
+	CFLAGS="$(AP2_CFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" $(CONFFLAGS) $(REALCURDIR)/configure --srcdir=$(REALCURDIR) $(AP2_COMMON_CONFARGS) $(AP2_MODS_CONFARGS) --with-mpm=worker  ;\
+	$(MAKE) ;\
+	./apache2 -l |grep -v worker > mods.list
+	touch $@
+
+mpm-%: patch-stamp
+	dh_testdir
+	mkdir -p $(BUILD)/$*
+	cd $(BUILD)/$* ;\
+	CFLAGS="$(AP2_CFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" $(CONFFLAGS) $(REALCURDIR)/configure --srcdir=$(REALCURDIR) $(AP2_COMMON_CONFARGS) --enable-modules=none --with-mpm=$*  ;\
+	$(MAKE) ;\
+	./apache2 -l |grep -v $* > mods.list
+	touch $@
+
+install-%: mpm-%
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	cd $(BUILD)/$* ;\
+	$(MAKE) DESTDIR=$(REALCURDIR)/debian/apache2-mpm-$* install
+
+install-common: install-worker
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	cd $(BUILD)/worker ;\
+	$(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp install
+
+install-dev: install-worker install-prefork
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+
+	for i in worker prefork; do \
+		if [ "$$i" = "prefork" ]; then \
+			TARGET=prefork ;\
+		else \
+			TARGET=threaded ;\
+		fi ;\
+		cp debian/apache2-mpm-$$i/usr/include/apache2/* debian/apache2-$$TARGET-dev/usr/include/apache2/ ;\
+		cp debian/apache2-mpm-$$i/usr/share/apache2/build/* debian/apache2-$$TARGET-dev/usr/share/apache2/build/ ;\
+		cp $(BUILD)/$$i/support/apxs debian/apache2-$$TARGET-dev/usr/bin/apxs2 ;\
+	done
+# Clean up config_vars.mk
+	set -x ; for i in threaded prefork; do \
+		( cd debian/apache2-$$i-dev/usr/share/apache2/build/ ; \
+		grep -v -E '(^|_)(CPP|C)FLAGS' config_vars.mk > tmp_config_vars.mk ; \
+		printf "CPPFLAGS = %s\n" "`grep -E '(^|_)(CPPFLAGS|INCLUDES)' config_vars.mk | cut -d= -f 2- | tr ' ' '\n' | grep -E '^-([DI]|pthread)' | sort | uniq | tr '\n' ' '`" >> tmp_config_vars.mk ; \
+		printf "CFLAGS = %s\n" "`grep -E '(^|_)(CPPFLAGS|CFLAGS|INCLUDES)' config_vars.mk | cut -d= -f 2- | tr ' ' '\n' | grep -E '^-(D|I/|pthread)'  | sort | uniq | tr '\n' ' '`" >> tmp_config_vars.mk ; \
+		printf "NOTEST_CPPFLAGS = \n" >> tmp_config_vars.mk ; \
+		printf "EXTRA_CPPFLAGS = \n" >> tmp_config_vars.mk ; \
+		printf "EXTRA_CFLAGS = \n" >> tmp_config_vars.mk ; \
+		mv tmp_config_vars.mk config_vars.mk ) ; \
+	done
+
+install-src: build-mpms
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	mkdir -p debian/apache2-src/tmp/apache2
+	find -mindepth 1 -maxdepth 1 -not -name debian -print0 | tar cf - --null -T - | (cd debian/apache2-src/tmp/apache2 && tar xf -)
+	for i in prefork worker event; do \
+	  cp debian/build-tree/$$i/config.nice debian/apache2-src/tmp/apache2/config.nice.$$i ; \
+	done
+	cd debian/apache2-src/tmp/ && tar czf ../usr/src/apache2.tar.gz apache2
+	rm -rf debian/apache2-src/tmp
+
+install: build install-worker install-prefork install-common install-dev install-src
+	dh_testroot
+	dh_testdir
+
+	#cleanup of death
+	rm -rf debian/tmp/etc/apache2/original
+	rm -rf debian/tmp/usr/include
+	rm -rf debian/tmp/usr/share/apache2/build
+	rm -f debian/tmp/usr/share/man/man8/httpd.8 # We install our own
+	rm -f debian/tmp/usr/sbin/apxs debian/tmp/usr/sbin/apache2
+
+	# DO NOT FALL FOR THE TEMPTATION TO MV INTO PACKAGES OR DOOM
+	# WILL FIND YOU.  Use dh_install, this is just because dh_install
+	# can't rename files
+
+	mv debian/tmp/usr/share/man/man8/apxs.8 debian/tmp/usr/share/man/man8/apxs2.8
+	mv debian/tmp/usr/sbin/apachectl debian/tmp/usr/sbin/apache2ctl
+	mv debian/tmp/usr/share/man/man8/apachectl.8 debian/tmp/usr/share/man/man8/apache2ctl.8
+	mkdir -p debian/tmp/usr/share/apache2/icons/
+	for i in `ls debian/icons/ | cut -d. -f1,2`; do \
+		uudecode -o debian/tmp/usr/share/apache2/icons/$$i debian/icons/$$i".uue"; \
+	done
+
+	dh_install --list-missing --sourcedir=debian/tmp
+# --sourcedir=$(REALCURDIR)/debian/apache2.2-common
+
+	cp debian/bash_completion debian/apache2.2-common/etc/bash_completion.d/apache2.2-common
+	install -m755 debian/apache2.2-common.bug.script debian/apache2.2-common/usr/share/bug/apache2.2-common/script
+	install -m644 debian/apache2.2-common.bug.control debian/apache2.2-common/usr/share/bug/apache2.2-common/control
+	install -m644 debian/apache2.2-common.ufw.profile debian/apache2.2-common/etc/ufw/applications.d/apache2.2-common
+
+	# standard suexec
+	chmod 4754 debian/apache2-suexec/usr/lib/apache2/suexec 
+	chgrp www-data debian/apache2-suexec/usr/lib/apache2/suexec
+
+	chmod 644 debian/apache2.2-common/usr/lib/apache2/modules/mod_suexec.so
+
+	# configurable suexec
+	mkdir -p debian/apache2-suexec-custom/usr/lib/apache2 debian/apache2-suexec-custom/etc/apache2/suexec
+	cp debian/build-tree/worker/support/suexec-custom debian/apache2-suexec-custom/usr/lib/apache2/suexec
+	cp debian/suexec-custom.config debian/apache2-suexec-custom/etc/apache2/suexec/www-data
+	chmod 4754 debian/apache2-suexec-custom/usr/lib/apache2/suexec 
+	chgrp www-data debian/apache2-suexec-custom/usr/lib/apache2/suexec
+
+	cp debian/apache2-doc.conf debian/apache2-doc/etc/apache2/conf.d/apache2-doc
+	grep -rl apachectl debian/apache2-doc/usr/share/doc/apache2-doc/manual | xargs perl -p -i -e 's/apachectl(?!\.html)/apache2ctl/g'
+	# remove content negotiation
+	mv debian/apache2-doc/usr/share/doc/apache2-doc/manual \
+		debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig
+	perl debian/convert_docs debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig \
+		debian/apache2-doc/usr/share/doc/apache2-doc/manual
+	mv debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig/images \
+		debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig/style \
+		debian/apache2-doc/usr/share/doc/apache2-doc/manual
+	rmdir debian/apache2-doc/usr/share/doc/apache2-doc/manual/style/lang
+	rmdir debian/apache2-doc/usr/share/doc/apache2-doc/manual/style/xsl/util
+	rmdir debian/apache2-doc/usr/share/doc/apache2-doc/manual/style/xsl
+	rm -r debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig
+
+	#apache2-utils extras
+	cp support/check_forensic debian/apache2-utils/usr/sbin/check_forensic
+	cp debian/check_forensic.8 debian/apache2-utils/usr/share/man/man8/check_forensic.8
+	cp debian/checkgid.8 debian/apache2-utils/usr/share/man/man8/checkgid.8
+	cp $(BUILD)/worker/support/split-logfile debian/apache2-utils/usr/sbin/split-logfile
+	chmod 755 debian/apache2-utils/usr/sbin/split-logfile
+
+	cp -a debian/config-dir/* debian/apache2.2-common/etc/apache2
+	cp debian/logrotate debian/apache2.2-common/etc/logrotate.d/apache2
+	
+	install -m755 debian/a2enmod debian/apache2.2-common/usr/sbin
+	ln -s a2enmod debian/apache2.2-common/usr/sbin/a2dismod
+	ln -s a2enmod debian/apache2.2-common/usr/sbin/a2ensite
+	ln -s a2enmod debian/apache2.2-common/usr/sbin/a2dissite
+	cp debian/default-index.html debian/apache2.2-common/usr/share/apache2/default-site/index.html
+	for i in worker event; do \
+		install -m755 debian/mpm-postinst-threaded debian/apache2-mpm-$$i.postinst ;\
+		install -m755 debian/mpm-preinst-threaded debian/apache2-mpm-$$i.preinst;\
+		install -m755 debian/mpms.prerm debian/apache2-mpm-$$i.prerm ;\
+	done
+	install -m755 debian/mpms.prerm debian/apache2-mpm-prefork.prerm
+
+	for i in worker prefork event; do \
+		rm -rf debian/apache2-mpm-$$i/ ;\
+		mkdir -p debian/apache2-mpm-$$i/usr/sbin ;\
+		mkdir -p debian/apache2-mpm-$$i/usr/share/lintian/overrides ;\
+		mkdir -p debian/apache2-mpm-$$i/usr/share/bug/apache2-mpm-$$i ;\
+		install -m 755 $(BUILD)/$$i/apache2 debian/apache2-mpm-$$i/usr/sbin/apache2 ;\
+		if [ "$(LSB_RELEASE)" != "Ubuntu" ] && [ -n "$(DEB_BUILD_STRIP)" ] ; then \
+			objcopy --only-keep-debug debian/apache2-mpm-$$i/usr/sbin/apache2 debian/apache2-dbg/usr/lib/debug/usr/sbin/apache2-mpm-$$i ;\
+			chmod 644 debian/apache2-dbg/usr/lib/debug/usr/sbin/apache2-mpm-$$i ;\
+			dh_strip -papache2-mpm-$$i ;\
+			objcopy --add-gnu-debuglink=debian/apache2-dbg/usr/lib/debug/usr/sbin/apache2-mpm-$$i debian/apache2-mpm-$$i/usr/sbin/apache2 ;\
+		fi ;\
+		perl -p -e "s/^/apache2-mpm-$$i: /" < debian/mpms.lintian-overrides > debian/apache2-mpm-$$i/usr/share/lintian/overrides/apache2-mpm-$$i ;\
+		ln -s ../apache2.2-common/script debian/apache2-mpm-$$i/usr/share/bug/apache2-mpm-$$i ;\
+	done
+
+	for pkg in `awk '/^Package:/ { print $$2 }' debian/control`; do \
+		find debian/$$pkg/ -name .svn -exec rm -rf {} + ; \
+	done
+
+	touch $@
+
+binary-indep: install
+	dh_testdir -i
+	dh_testroot -i 
+	dh_installdirs -i
+	dh_installdocs -i
+	ln -sf ../apache2.2-common/README.Debian.gz debian/apache2/usr/share/doc/apache2/
+	mkdir -p debian/apache2/usr/share/bug/apache2
+	ln -sf ../apache2.2-common/script debian/apache2/usr/share/bug/apache2
+	install -m644 debian/apache2.bug.control debian/apache2/usr/share/bug/apache2/control
+	cp debian/README.Debian debian/apache2-doc/usr/share/doc/apache2-doc/
+	dh_installchangelogs -i CHANGES -Napache2 -Napache2-suexec -Napache2-suexec-custom
+	dh_installchangelogs -papache2 -papache2-suexec -papache2-suexec-custom
+	dh_lintian -i
+	dh_compress -i
+	dh_fixperms -i -Xsuexec
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: install
+	dh_testdir -a
+	dh_testroot -a 
+	dh_installdirs -a
+	dh_installdocs -a debian/README.backtrace
+	# always compress to make the symlink work
+	gzip -9 debian/apache2.2-common/usr/share/doc/apache2.2-common/README.Debian
+	dh_installman -a
+	dh_installchangelogs -a CHANGES
+	dh_lintian -a
+	rm -f debian/apache2-dbg/usr/share/doc/apache2-dbg/changelog
+	rm -f debian/apache2-dbg/usr/share/doc/apache2-dbg/NEWS.Debian
+	rm -f debian/apache2-utils/usr/share/doc/apache2-utils/NEWS.Debian
+	dh_installinit -a --no-start -r --name=apache2 -- defaults 91 09
+	dh_installcron -a -r --name=apache2
+	if [ "$(LSB_RELEASE)" = "Ubuntu" ]; then \
+		dh_strip -a; \
+	else \
+		dh_strip -a --dbg-package=apache2-dbg -Napache2-mpm-worker -Napache2-mpm-event -Napache2-mpm-prefork -Napache2-dbg; \
+	fi
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a -Xsuexec
+	chown -R www-data:www-data debian/apache2.2-common/var/cache/apache2
+	chown root:adm debian/apache2.2-common/var/log/apache2
+	chmod o-rx debian/apache2.2-common/var/log/apache2
+	dh_makeshlibs -a -V
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	if [ "$(LSB_RELEASE)" = "Ubuntu" ]; then \
+		rm -rf debian/apache2-dbg; \
+		sed -i '/apache2-dbg/d' debian/files; \
+		dh_builddeb -a -Napache2-dbg; \
+	else \
+		dh_builddeb -a; \
+	fi
+
+binary: binary-arch binary-indep
--- apache2-2.2.11.orig/debian/apache2.bug.control
+++ apache2-2.2.11/debian/apache2.bug.control
@@ -0,0 +1 @@
+Submit-As: apache2.2-common
--- apache2-2.2.11.orig/debian/check_forensic.8
+++ apache2-2.2.11/debian/check_forensic.8
@@ -0,0 +1,15 @@
+.TH check_forensic 8
+.SH NAME
+check_forensic \- tool to extract mod_log_forensic output from apache log files
+.SH SYNOPSIS
+.B check_forensic
+<log_file>
+.SH "DESCRIPTION"
+chech_forensic is a simple shell script designed to help apache administrators
+to extract mod_log_forensic output from apache, apache-ssl and apache-perl
+log files.
+.PP
+.SH AUTHOR
+This manual page was written by Fabio M. Di Nitto
+<fabbione@fabbione.net>, for the Debian GNU/Linux system
+(but may be used by others).
--- apache2-2.2.11.orig/debian/apache2-mpm-prefork.dirs
+++ apache2-2.2.11/debian/apache2-mpm-prefork.dirs
@@ -0,0 +1 @@
+usr/sbin
--- apache2-2.2.11.orig/debian/compat
+++ apache2-2.2.11/debian/compat
@@ -0,0 +1 @@
+5
--- apache2-2.2.11.orig/debian/checkgid.8
+++ apache2-2.2.11/debian/checkgid.8
@@ -0,0 +1,36 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH CHECKGID 8 "November 3rd, 2001"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+checkgid \- checks the gid 
+.SH SYNOPSIS
+.B checkgid group 
+.SH DESCRIPTION
+This manual page documents briefly the
+.B checkgid 
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBcheckgid\fP is a program that checks whether it can setgid to the group
+specified. This is to see if it is a valid group for apache2 to use at runtime.
+If the user (should be run as superuser) is in that group, or can setgid to it,
+it will return 0.
+.SH AUTHOR
+This manual page was written by Daniel Stone <daniel@sfarc.net> for the Debian
+GNU/Linux distribution, as the original did not have a manpage.
--- apache2-2.2.11.orig/debian/apache2.2-common.apache2.init
+++ apache2-2.2.11/debian/apache2.2-common.apache2.init
@@ -0,0 +1,235 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides:          apache2
+# Required-Start:    $local_fs $remote_fs $network $syslog
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/stop apache2 web server
+### END INIT INFO
+#
+# apache2		This init.d script is used to start apache2.
+#			It basically just calls apache2ctl.
+
+ENV="env -i LANG=C PATH=/usr/local/bin:/usr/bin:/bin"
+
+#[ `ls -1 /etc/apache2/sites-enabled/ | wc -l | sed -e 's/ *//;'` -eq 0 ] && \
+#echo "You haven't enabled any sites yet, so I'm not starting apache2." && \
+#echo "To add and enable a host, use addhost and enhost." && exit 0
+
+#edit /etc/default/apache2 to change this.
+HTCACHECLEAN_RUN=auto
+HTCACHECLEAN_MODE=daemon
+HTCACHECLEAN_SIZE=300M
+HTCACHECLEAN_DAEMON_INTERVAL=120
+HTCACHECLEAN_PATH=/var/cache/apache2/mod_disk_cache
+HTCACHECLEAN_OPTIONS=""
+
+set -e
+if [ -x /usr/sbin/apache2 ] ; then
+	HAVE_APACHE2=1
+else
+	echo "No apache MPM package installed"
+	exit 0
+fi
+
+. /lib/lsb/init-functions
+
+test -f /etc/default/rcS && . /etc/default/rcS
+test -f /etc/default/apache2 && . /etc/default/apache2
+
+APACHE2CTL="$ENV /usr/sbin/apache2ctl"
+HTCACHECLEAN="$ENV /usr/sbin/htcacheclean"
+
+PIDFILE=`. /etc/apache2/envvars ; echo $APACHE_PID_FILE`
+if [ -z "$PIDFILE" ] ; then
+	echo ERROR: APACHE_PID_FILE needs to be defined in /etc/apache2/envvars >&2
+	exit 2
+fi
+
+
+check_htcacheclean() {
+	[ "$HTCACHECLEAN_MODE" = "daemon" ] || return 1
+
+	[ "$HTCACHECLEAN_RUN"  = "yes"    ] && return 0
+
+	[ "$HTCACHECLEAN_RUN"  = "auto" \
+	  -a -e /etc/apache2/mods-enabled/disk_cache.load ] && return 0
+	
+	return 1
+}
+
+start_htcacheclean() {
+	$HTCACHECLEAN $HTCACHECLEAN_OPTIONS -d$HTCACHECLEAN_DAEMON_INTERVAL \
+			-i -p$HTCACHECLEAN_PATH -l$HTCACHECLEAN_SIZE
+				
+}
+
+stop_htcacheclean() {
+	killall htcacheclean 2> /dev/null || echo ...not running
+}
+
+pidof_apache() {
+    # if pidof is null for some reasons the script exits automagically
+    # classified as good/unknown feature
+    PIDS=`pidof apache2` || true
+
+    [ -e $PIDFILE ] && PIDS2=`cat $PIDFILE`
+    
+    # if there is a pid we need to verify that belongs to apache2
+    # for real
+    for i in $PIDS; do
+    	if [ "$i" = "$PIDS2" ]; then
+            # in this case the pid stored in the
+            # pidfile matches one of the pidof apache
+            # so a simple kill will make it
+            echo $i
+            return 0
+        fi
+    done
+    return 1
+}
+
+apache_stop() {
+	if `$APACHE2CTL configtest > /dev/null 2>&1`; then
+		# if the config is ok than we just stop normaly
+                $APACHE2CTL stop 2>&1 | grep -v 'not running' >&2 || true
+	else
+		# if we are here something is broken and we need to try
+		# to exit as nice and clean as possible
+		PID=$(pidof_apache)
+
+		if [ "${PID}" ]; then
+			# in this case it is everything nice and dandy
+			# and we kill apache2
+			log_warning_msg "We failed to correctly shutdown apache, so we're now killing all running apache processes. This is almost certainly suboptimal, so please make sure your system is working as you'd expect now!"
+                        kill $PID
+		elif [ "$(pidof apache2)" ]; then
+			if [ "$VERBOSE" != no ]; then
+                                echo " ... failed!"
+			        echo "You may still have some apache2 processes running.  There are"
+ 			        echo "processes named 'apache2' which do not match your pid file,"
+			        echo "and in the name of safety, we've left them alone.  Please review"
+			        echo "the situation by hand."
+                        fi
+                        return 1
+		fi
+	fi
+}
+
+apache_wait_stop() {
+	# running ?
+	PIDTMP=$(pidof_apache)
+	if $(kill -0 "${PIDTMP:-}" 2> /dev/null); then
+	    PID=$PIDTMP
+	fi
+
+	apache_stop
+
+	# wait until really stopped
+	if [ -n "${PID:-}" ]; then
+		i=0
+		while $(kill -0 "${PID:-}" 2> /dev/null);  do
+        		if [ $i = '60' ]; then
+        			break;
+        	 	else
+        			if [ $i = '0' ]; then
+                			echo -n " ... waiting "
+        			else
+                	      		echo -n "."
+        		 	fi
+        			i=$(($i+1))
+        			sleep 1
+        	      fi
+		 done
+	fi
+}
+
+case $1 in
+	start)
+		log_daemon_msg "Starting web server" "apache2"
+		if $APACHE2CTL start; then
+			if check_htcacheclean ; then
+				log_progress_msg htcacheclean
+				start_htcacheclean || log_end_msg 1
+			fi
+                        log_end_msg 0
+                else
+                        log_end_msg 1
+                fi
+	;;
+	stop)
+		if check_htcacheclean ; then
+			log_daemon_msg "Stopping web server" "htcacheclean"
+			stop_htcacheclean
+			log_progress_msg "apache2"
+		else
+			log_daemon_msg "Stopping web server" "apache2"
+		fi
+		if apache_wait_stop; then
+                        log_end_msg 0
+                else
+                        log_end_msg 1
+                fi
+	;;
+	reload | force-reload)
+		if ! $APACHE2CTL configtest > /dev/null 2>&1; then
+                    $APACHE2CTL configtest || true
+                    log_end_msg 1
+                    exit 1
+                fi
+                log_daemon_msg "Reloading web server config" "apache2"
+		if pidof_apache > /dev/null ; then
+                    if $APACHE2CTL graceful $2 ; then
+                        log_end_msg 0
+                    else
+                        log_end_msg 1
+                    fi
+                fi
+	;;
+	restart)
+		if check_htcacheclean ; then
+			log_daemon_msg "Restarting web server" "htcacheclean"
+			stop_htcacheclean
+			log_progress_msg apache2
+		else
+			log_daemon_msg "Restarting web server" "apache2"
+		fi
+		PID=$(pidof_apache) || true
+		if ! apache_wait_stop; then
+                        log_end_msg 1 || true
+                fi
+		if $APACHE2CTL start; then
+			if check_htcacheclean ; then
+				start_htcacheclean || log_end_msg 1
+			fi
+                        log_end_msg 0
+                else
+                        log_end_msg 1
+                fi
+	;;
+	start-htcacheclean)
+		log_daemon_msg "Starting htcacheclean"
+		start_htcacheclean || log_end_msg 1
+		log_end_msg 0
+	;;
+	stop-htcacheclean)
+		log_daemon_msg "Stopping htcacheclean"
+			stop_htcacheclean
+			log_end_msg 0
+	;;
+	status)
+		PID=$(pidof_apache)
+		if [ -n "$PID" ]; then
+			log_success_msg "Apache is running (pid $PID)."
+			exit 0
+		else
+			log_failure_msg "Apache is not running."
+			exit 1
+		fi
+	;;
+	*)
+		log_success_msg "Usage: /etc/init.d/apache2 {start|stop|restart|reload|force-reload|start-htcacheclean|stop-htcacheclean|status}"
+		exit 1
+	;;
+esac
--- apache2-2.2.11.orig/debian/apache2-doc.dirs
+++ apache2-2.2.11/debian/apache2-doc.dirs
@@ -0,0 +1,2 @@
+etc/apache2/conf.d
+usr/share/doc/apache2-doc
--- apache2-2.2.11.orig/debian/bash_completion
+++ apache2-2.2.11/debian/bash_completion
@@ -0,0 +1,54 @@
+# bash completion for Debian apache2 configuration tools
+# $Id: apache2,v 1.1 2005/03/16 22:51:19 guillaume Exp $
+
+_apache2_modsites()
+{
+       COMPREPLY=( $( compgen -W '$( command ls /etc/apache2/$1 2>/dev/null \
+               | sed -e 's/\.load//' -e 's/\.conf//' )' -- $cur  ) )
+}
+
+_a2enmod()
+{
+       local cur
+
+       COMPREPLY=()
+       cur=${COMP_WORDS[COMP_CWORD]}
+
+       _apache2_modsites mods-available
+}
+complete -F _a2enmod a2enmod
+
+_a2ensite()
+{
+       local cur
+
+       COMPREPLY=()
+       cur=${COMP_WORDS[COMP_CWORD]}
+
+       _apache2_modsites sites-available
+
+}
+complete -F _a2ensite a2ensite
+
+_a2dismod()
+{
+       local cur
+
+       COMPREPLY=()
+       cur=${COMP_WORDS[COMP_CWORD]}
+
+       _apache2_modsites mods-enabled
+}
+complete -F _a2dismod a2dismod
+
+_a2dissite()
+{
+       local cur
+
+       COMPREPLY=()
+       cur=${COMP_WORDS[COMP_CWORD]}
+
+       _apache2_modsites sites-enabled
+
+}
+complete -F _a2dissite a2dissite
--- apache2-2.2.11.orig/debian/logrotate
+++ apache2-2.2.11/debian/logrotate
@@ -0,0 +1,15 @@
+/var/log/apache2/*.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	create 640 root adm
+	sharedscripts
+	postrotate
+		if [ -f "`. /etc/apache2/envvars ; echo ${APACHE_PID_FILE:-/var/run/apache2.pid}`" ]; then
+			/etc/init.d/apache2 reload > /dev/null
+		fi
+	endscript
+}
--- apache2-2.2.11.orig/debian/default-index.html
+++ apache2-2.2.11/debian/default-index.html
@@ -0,0 +1 @@
+<html><body><h1>It works!</h1></body></html>
--- apache2-2.2.11.orig/debian/mpms.lintian-overrides
+++ apache2-2.2.11/debian/mpms.lintian-overrides
@@ -0,0 +1 @@
+binary-without-manpage usr/sbin/apache2
--- apache2-2.2.11.orig/debian/apache2-dbg.dirs
+++ apache2-2.2.11/debian/apache2-dbg.dirs
@@ -0,0 +1 @@
+usr/lib/debug/usr/sbin
--- apache2-2.2.11.orig/debian/apache2-mpm-worker.dirs
+++ apache2-2.2.11/debian/apache2-mpm-worker.dirs
@@ -0,0 +1 @@
+usr/sbin
--- apache2-2.2.11.orig/debian/apache2-doc.postinst
+++ apache2-2.2.11/debian/apache2-doc.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ -x "/etc/init.d/apache2" ]; then
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+                invoke-rc.d apache2 reload ||true
+        else
+                /etc/init.d/apache2 reload ||true
+        fi
+fi
+
+#DEBHELPER#
--- apache2-2.2.11.orig/debian/a2ensite.8
+++ apache2-2.2.11/debian/a2ensite.8
@@ -0,0 +1,70 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH A2ENSITE 8 "8 June 2007"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+a2ensite, a2dissite \- enable or disable an apache2 site / virtual host
+.SH SYNOPSIS
+.B a2ensite
+.RI [ site ]
+.PP
+.B a2dissite
+.RI [ site ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B a2ensite
+and
+.B a2dissite
+commands.
+.PP
+.B a2ensite
+is a script that enables the specified site (which contains a <VirtualHost> block) within the
+.B apache2
+configuration.  It does this by creating symlinks within
+.BR /etc/apache2/sites-enabled .
+Likewise,
+.B a2dissite
+disables a site by removing those symlinks.  It is not an error to
+enable a site which is already enabled, or to disable one which is
+already disabled.
+.PP
+The
+.B default
+site is handled specially: The resulting symlink will be called
+.B 000-default
+in order to be loaded first.
+.SH EXAMPLES
+.RS
+.B "a2dissite default"
+.RE
+.PP
+Disables the
+.B default
+site.
+.SH FILES
+.TP
+.B /etc/apache2/sites-available
+Directory with files giving information on available sites.
+.TP
+.B /etc/apache2/sites-enabled
+Directory with links to the files in
+.B sites-available
+for enabled sites.
+.SH "SEE ALSO"
+.BR apache2ctl (8).
+.SH AUTHOR
+This manual page was written by Stefan Fritsch <sf@debian.org> (based on the a2enmod manual
+page by Daniel Stone <daniel@sfarc.net>) for the Debian GNU/Linux distribution.
--- apache2-2.2.11.orig/debian/apache2-prefork-dev.install
+++ apache2-2.2.11/debian/apache2-prefork-dev.install
@@ -0,0 +1 @@
+usr/share/man/man8/apxs2.8
--- apache2-2.2.11.orig/debian/httxt2dbm.8
+++ apache2-2.2.11/debian/httxt2dbm.8
@@ -0,0 +1,41 @@
+.TH "HTTXT2DBM" 8 "2007-06-26" "Apache HTTP Server" "httxt2dbm"
+
+.SH NAME
+httxt2dbm - Generate dbm files for use with RewriteMap
+
+.SH "SYNOPSIS"
+ 
+.PP
+\fBhttxt2dbm\fR [ \fB\-v\fR ] [ \fB\-f\fR \fIDBM_TYPE\fR ] \fB\-i\fR \fISOURCE_TXT\fR \fB\-o\fR \fIOUTPUT_DBM\fR 
+
+.SH "SUMMARY"
+ 
+.PP
+\fBhttxt2dbm\fR is used to generate dbm files from text input, for use in RewriteMap with the dbm map type.
+
+.SH "OPTIONS"
+ 
+.TP
+\-v
+More verbose output
+.TP
+\-f \fIDBM_TYPE\fR
+Specify the DBM type to be used for the output. If not specified, will use the APR Default. Available types are:
+ GDBM for GDBM files
+ SDBM for SDBM files
+ DB for berkeley DB files
+ NDBM for NDBM files
+ default for the default DBM type 
+.TP
+\-i \fISOURCE_TXT\fR
+Input file from which the dbm is to be created. The file should be formated with one record per line, of the form:
+ key value
+See the documentation for RewriteMap for further details of this file's format and meaning. 
+.TP
+\-o \fIOUTPUT_DBM\fR
+Name of the output dbm files.
+
+.SH "EXAMPLES"
+httxt2dbm \-i rewritemap.txt \-o rewritemap.dbm
+
+httxt2dbm \-f SDBM \-i rewritemap.txt \-o rewritemap.dbm
--- apache2-2.2.11.orig/debian/mpm-preinst-threaded
+++ apache2-2.2.11/debian/mpm-preinst-threaded
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+
+#Debian preinstall handling for apache2
+# Thom May <thom@debian.org>
+
+if [ "$2" ] && dpkg --compare-versions "$2" lt 2.2; then
+    if [ -x "/etc/init.d/apache2" ]; then
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+                invoke-rc.d apache2 stop || true
+        else
+                /etc/init.d/apache2 stop || true
+        fi
+    fi
+    chmod -x /usr/sbin/apache2
+fi
+
+case "$1" in
+	install)
+		rm -f /var/cache/apache2/reload
+		;;
+	upgrade)
+		if [ -d /var/cache/apache2 ]; then
+			touch /var/cache/apache2/reload
+		fi
+		;;
+	*)
+		;;
+esac
+
+#DEBHELPER#
--- apache2-2.2.11.orig/debian/a2dissite.8
+++ apache2-2.2.11/debian/a2dissite.8
@@ -0,0 +1 @@
+.so man8/a2ensite.8
--- apache2-2.2.11.orig/debian/apache2-suexec-custom.dirs
+++ apache2-2.2.11/debian/apache2-suexec-custom.dirs
@@ -0,0 +1,2 @@
+usr/lib/apache2
+etc/apache2/suexec
--- apache2-2.2.11.orig/debian/apache2.2-common.dirs
+++ apache2-2.2.11/debian/apache2.2-common.dirs
@@ -0,0 +1,15 @@
+etc/apache2/mods-enabled
+etc/apache2/sites-enabled
+etc/apache2/conf.d
+etc/bash_completion.d
+etc/logrotate.d
+usr/lib/cgi-bin
+usr/share/apache2/build
+usr/share/apache2/default-site
+usr/share/bug/apache2.2-common
+usr/share/lintian/overrides
+var/cache/apache2
+var/cache/apache2/mod_disk_cache
+var/log/apache2
+var/www
+etc/ufw/applications.d
--- apache2-2.2.11.orig/debian/apache2ctl.8
+++ apache2-2.2.11/debian/apache2ctl.8
@@ -0,0 +1,176 @@
+.TH apache2ctl 8 "April 2008"
+.\" The Apache Software License, Version 1.1
+.\"
+.\" Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+.\" reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. The end-user documentation included with the redistribution,
+.\"    if any, must include the following acknowledgment:
+.\"       "This product includes software developed by the
+.\"        Apache Software Foundation (http://www.apache.org/)."
+.\"    Alternately, this acknowledgment may appear in the software itself,
+.\"    if and wherever such third-party acknowledgments normally appear.
+.\"
+.\" 4. The names "Apache" and "Apache Software Foundation" must
+.\"    not be used to endorse or promote products derived from this
+.\"    software without prior written permission. For written
+.\"    permission, please contact apache@apache.org.
+.\"
+.\" 5. Products derived from this software may not be called "Apache",
+.\"    nor may "Apache" appear in their name, without prior written
+.\"    permission of the Apache Software Foundation.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+.\" DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" This software consists of voluntary contributions made by many
+.\" individuals on behalf of the Apache Software Foundation.  For more
+.\" information on the Apache Software Foundation, please see
+.\" <http://www.apache.org/>.
+.\"
+.SH NAME
+apache2ctl \- Apache HTTP server control interface
+.SH SYNOPSIS
+When acting in SysV init mode, apache2ctl takes simple, one-word commands,
+defined below.
+.PP
+.B apache2ctl 
+.I command
+.PP
+When acting in pass-through mode, apache2ctl can take all the arguments available
+for the httpd binary.
+.PP
+.B apache2ctl 
+.RI [ httpd-argument ]
+.PP
+.SH DESCRIPTION
+.B apache2ctl
+is a front end to the Apache HyperText Transfer Protocol (HTTP) 
+server.  It is designed to help the administrator control the 
+functioning of the Apache 
+.B apache2
+daemon.  
+.PP
+.B NOTE: 
+The default Debian configuration requires the environment variables
+.BR APACHE_RUN_USER ,
+.BR APACHE_RUN_GROUP ,
+and
+.B APACHE_PID_FILE
+to be set in 
+.BR /etc/apache2/envvars .
+.PP
+The 
+.B apache2ctl
+script returns a 0 exit value on success, and >0 if an error 
+occurs.  For more details, view the comments in the script.
+.PP
+.SH OPTIONS
+The \fIcommand\fP can be any one or more of the following options:
+.TP 14
+.BI start
+Start the Apache daemon.  Gives an error if it is already running.
+.TP
+.BI stop
+Stops the Apache daemon.
+.TP
+.BI restart
+Restarts the Apache daemon by sending it a SIGHUP.  If the daemon
+is not running, it is started.
+This command automatically checks the configuration files via 
+.BI configtest
+before initiating the restart to to catch  the  most obvious  errors.
+However, it is still possible for the daemon to die because of problems
+with the configuration.
+.TP
+.BI fullstatus
+Displays a full status report from 
+.B mod_status. 
+For this to work, you need to have mod_status enabled on your server 
+and a text-based browser such as \fIlynx\fP available on your system.  The
+URL used to access the status report can be set by setting the
+.B APACHE_STATUSURL
+variable in 
+.BR /etc/apache2/envvars .
+.TP
+.BI status
+Displays a brief status report. Similar to the fullstatus option,
+except that the list of requests currently being served is omitted.
+.TP
+.BI graceful
+Gracefully restarts the Apache daemon by sending it a SIGUSR1.  If
+the daemon is not running, it is started.  This differs from a
+normal restart in that currently open connections are not aborted.
+A side effect is that old log files will not be closed immediately.
+This means that if used in a log rotation script, a substantial delay may be
+necessary to ensure that the old log files are closed before processing them.
+This command automatically checks the configuration files via apache2ctl
+configtest before initiating the restart to to catch the most obvious errors.
+However, it is still possible for the daemon to die because of problems with
+the configuration.
+.TP
+.BI graceful-stop
+Gracefully stops the Apache httpd daemon.
+This differs from a normal stop in that currently open connections are not
+aborted.
+A side effect is that old log files will not be closed immediately.
+.TP
+.BI configtest
+Run a configuration file syntax test. It parses the configuration
+files and either reports 
+.B "Syntax Ok"
+or information about the particular syntax error. This test does not catch
+all errors.
+.TP
+.BI help
+Displays a short help message.
+.TP
+The following option was available in earlier versions but has been removed.
+.TP
+.BI startssl
+To start httpd with SSL support, you should edit your configuration file to
+include the relevant directives and then use the normal apache2ctl start.
+.SH ENVIRONMENT
+The behaviour of
+.B apache2ctl
+can be influenced with these environment variables:
+.BR APACHE_HTTPD ,
+.BR APACHE_LYNX ,
+.BR APACHE_STATUSURL ,
+.BR APACHE_ULIMIT_MAX_FILES ,
+.BR APACHE_RUN_DIR ,
+.BR APACHE_LOCK_DIR ,
+.BR APACHE_RUN_USER ,
+.BR APACHE_ARGUMENTS ,
+.BR APACHE_ENVVARS .
+See the comments in the script for details.
+These variables (except 
+.BR APACHE_ENVVARS )
+can be set in
+.BR /etc/apache2/envvars .
+.SH SEE ALSO
+.BR apache2(8) ,
+.BR /usr/share/doc/apache2.2-common/README.Debian.gz
+.
--- apache2-2.2.11.orig/debian/apache2-suexec-custom.lintian-overrides
+++ apache2-2.2.11/debian/apache2-suexec-custom.lintian-overrides
@@ -0,0 +1 @@
+setuid-binary usr/lib/apache2/suexec 4754 root/www-data
--- apache2-2.2.11.orig/debian/control
+++ apache2-2.2.11/debian/control
@@ -0,0 +1,183 @@
+Source: apache2
+Section: web
+Priority: optional
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
+Uploaders: Tollef Fog Heen <tfheen@debian.org>, Thom May <thom@debian.org>, Adam Conrad <adconrad@0c3.net>, Peter Samuelson <peter@p12n.org>, Stefan Fritsch <sf@debian.org>
+Build-Depends: debhelper (>=6.0.7), dpatch, lsb-release, libaprutil1-dev, libapr1-dev (>= 1.2.7-6), openssl, libpcre3-dev, mawk, zlib1g-dev, libssl-dev, sharutils, hardening-wrapper
+Standards-Version: 3.8.0
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2
+Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apache2
+Homepage: http://httpd.apache.org/
+
+Package: apache2.2-common
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-utils, net-tools, libmagic1, mime-support, lsb-base, procps [!hurd-i386], perl
+Recommends: ssl-cert
+Suggests: www-browser, apache2-doc, apache2-suexec | apache2-suexec-custom, ufw
+Conflicts: apache2-common, libapache2-mod-php5 (<= 5.1.6-3), libapache2-mod-php4 (<= 4:4.4.4-2), libapache2-mod-mime-xattr (<= 0.3-2), libapache2-mod-mono (<= 1.1.17-3), libapache2-mod-proxy-html (<= 2.4.3-2), libapache2-mod-scgi (<= 1.11-1), libapache2-mod-speedycgi (<= 2.22-3), libapache2-modxslt (<= 2005072700-1), libapache2-redirtoservername (<= 0.1-1), libapache2-webauth (<= 3.5.3-1), libapache2-webkdc (<= 3.5.3-1)
+Replaces: apache2-common
+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 all the standard apache2 modules, including SSL support.
+ However, it does *not* include the server itself; for this you need to
+ install one of the apache2-mpm-* packages, such as worker or prefork.
+
+Package: apache2-mpm-worker
+Architecture: any
+Depends: ${shlibs:Depends}, apache2.2-common (= ${binary:Version})
+Provides: apache2-mpm, apache2, httpd, httpd-cgi
+Conflicts: apache2-mpm, apache2-common
+Replaces: apache2-mpm-threadpool (<< 2.0.53), apache2-mpm-perchild (<< 2.2.0)
+Description: Apache HTTP Server - high speed threaded model
+ Each Apache Multi-Processing Module provides a different "flavor" of
+ web server binary, compiled with a different processing model.
+ .
+ The worker MPM provides the default threaded implementation. It is
+ recommended especially for high-traffic sites because it is faster
+ and has a smaller memory footprint than the traditional prefork MPM.
+
+Package: apache2-mpm-prefork
+Architecture: any
+Depends: ${shlibs:Depends}, apache2.2-common (= ${binary:Version})
+Provides: apache2-mpm, apache2, httpd, httpd-cgi
+Conflicts: apache2-mpm, apache2-common
+Description: Apache HTTP Server - traditional non-threaded model
+ Each Apache Multi-Processing Module provides a different "flavor" of
+ web server binary, compiled with a different processing model.
+ .
+ The prefork MPM provides a non-threaded, pre-forking implementation
+ that handles requests in a manner similar to Apache 1.3. It is not as
+ fast as threaded models, but is considered to be more stable. It is
+ appropriate for sites that need to maintain compatibility with
+ non-thread-safe libraries, and is the best MPM for isolating each
+ request, so that a problem with a single request will not affect any
+ other.
+
+Package: apache2-mpm-event
+Architecture: any
+Depends: ${shlibs:Depends}, apache2.2-common (= ${binary:Version})
+Provides: apache2-mpm, apache2, httpd, httpd-cgi
+Conflicts: apache2-mpm, apache2-common
+Description: Apache HTTP Server - event driven model
+ Each Apache Multi-Processing Module provides a different "flavor" of
+ web server binary, compiled with a different processing model.
+ .
+ The event MPM is designed to allow more requests to be served
+ simultaneously by passing off some processing work to supporting
+ threads, freeing up the main threads to work on new requests. It is
+ especially suitable for sites that see extensive KeepAlive traffic.
+ .
+ This MPM is experimental and less tested than the worker and prefork MPMs.
+ 
+Package: apache2-utils
+Architecture: any
+Replaces: apache2-common, apache-utils (<< 1.3.33-4)
+Conflicts: apache-common (<< 1.3.28.0.1-1)
+Depends: ${shlibs:Depends}
+Description: utility programs for webservers
+ Provides some add-on programs useful for any webserver.  These include:
+  - ab (Apache benchmark tool)
+  - logresolve (Resolve IP addresses to hostname in logfiles)
+  - htpasswd (Manipulate basic authentication files)
+  - htdigest (Manipulate digest authentication files)
+  - dbmmanage (Manipulate basic authentication files in DBM format, using perl)
+  - htdbm (Manipulate basic authentication files in DBM format, using APR)
+  - 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)
+
+Package: apache2-suexec
+Section: web
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, apache2.2-common
+Conflicts: apache2-suexec, apache-common
+Replaces: apache2-suexec
+Description: Standard suexec program for Apache 2 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
+Section: web
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, apache2.2-common
+Provides: apache2-suexec
+Conflicts: apache2-suexec, apache-common
+Replaces: apache2-suexec
+Description: Configurable suexec program for Apache 2 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 package instead.
+
+Package: apache2
+Architecture: all
+Depends: apache2-mpm-worker (>= ${source:Version}) | apache2-mpm-prefork (>= ${source:Version}) | apache2-mpm-event (>= ${source:Version})
+Section: web
+Description: Apache HTTP Server metapackage         
+ 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.
+ .
+ It features support for HTTPS, virtual hosting, CGI, SSI, IPv6, easy
+ scripting and database integration, request/response filtering, many
+ flexible authentication schemes, and more.
+
+Package: apache2-doc
+Section: doc
+Architecture: all
+Description: Apache HTTP Server documentation
+ This package provides the documentation for Apache 2. For more details
+ see the apache2 package description.
+
+Package: apache2-prefork-dev
+Section: devel
+Architecture: any
+Depends: apache2.2-common (= ${binary:Version}), openssl, libaprutil1-dev
+Conflicts: apache2-threaded-dev
+Priority: extra
+Description: Apache development headers - non-threaded MPM
+ This package provides the development headers and apxs2 binary for
+ apache2-mpm-prefork; see the apache2 package description for more details.
+ .
+ This should only be used when you absolutely *must* support a non-threaded
+ environment (for PHP, for example).
+
+Package: apache2-threaded-dev
+Section: devel
+Architecture: any
+Depends: apache2.2-common (= ${binary:Version}), openssl, libaprutil1-dev
+Conflicts: apache2-prefork-dev
+Provides: apache2-dev
+Priority: extra
+Description: Apache development headers - threaded MPM
+ This package provides the development headers and apxs2 binary for
+ threaded versions of apache2; see the apache2 package description
+ for more details.
+
+Package: apache2-src
+Section: devel
+Priority: extra
+Architecture: all
+Description: Apache source code
+ This package includes the complete and patched source code for the
+ Apache HTTPD.  It is useful for other packages to build-depend on in
+ order to build custom MPMs.
+
+Package: apache2-dbg
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: apache2.2-common (= ${binary:Version})
+Description: Apache debugging symbols
+ This package includes the debugging symbols for Apache 2.
--- apache2-2.2.11.orig/debian/source.lintian-overrides
+++ apache2-2.2.11/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+apache2 source: outdated-autotools-helper-file srclib/apr-util/xml/expat/conftools/config.guess 2002-03-20
+apache2 source: outdated-autotools-helper-file srclib/apr-util/xml/expat/conftools/config.sub 2002-03-07
--- apache2-2.2.11.orig/debian/suexec-custom.config
+++ apache2-2.2.11/debian/suexec-custom.config
@@ -0,0 +1,5 @@
+/var/www
+public_html/cgi-bin
+# The first two lines contain the suexec document root and the suexec userdir
+# suffix. Both features can be disabled separately by prepending a # character.
+# This config file is only used by the apache2-suexec-custom package.
--- apache2-2.2.11.orig/debian/apache2-mpm-prefork.postinst
+++ apache2-2.2.11/debian/apache2-mpm-prefork.postinst
@@ -0,0 +1,32 @@
+#!/bin/sh
+set -e
+
+if [ "$1" != "configure" ]; then
+        exit 0
+fi
+
+#enable cgi, but only on new installs.
+if [ -z "$2" ]; then
+	a2dismod cgid >/dev/null || true
+        a2enmod cgi >/dev/null || echo "It looks like you've deleted /etc/apache2/mods-available/cgi.load, so cgi can not be enabled.  To fix this, please purge and reinstall apache2.2-common."
+fi
+
+# Migrate our kill symlinks, including ones the user may have done an s/S/K/ to:
+for i in `seq 0 6`; do
+	if [ -L /etc/rc"$i".d/K91apache2 ]; then
+		mv /etc/rc"$i".d/K91apache2 \
+		   /etc/rc"$i".d/K09apache2
+	fi
+done
+
+if [ -x "/etc/init.d/apache2" ]; then
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+                invoke-rc.d apache2 start ||true
+        else
+                /etc/init.d/apache2 start ||true
+        fi
+fi
+
+#DEBHELPER#
+
+exit 0
--- apache2-2.2.11.orig/debian/apache2-threaded-dev.dirs
+++ apache2-2.2.11/debian/apache2-threaded-dev.dirs
@@ -0,0 +1,4 @@
+usr/include/apache2
+usr/bin
+usr/share/apache2/build
+usr/share/man/man8
--- apache2-2.2.11.orig/debian/apache2-doc.install
+++ apache2-2.2.11/debian/apache2-doc.install
@@ -0,0 +1,3 @@
+usr/share/apache2/default-site/htdocs/manual usr/share/doc/apache2-doc
+usr/lib/cgi-bin/printenv usr/share/doc/apache2-doc/cgi-examples
+usr/lib/cgi-bin/test-cgi usr/share/doc/apache2-doc/cgi-examples
--- apache2-2.2.11.orig/debian/apache2.8
+++ apache2-2.2.11/debian/apache2.8
@@ -0,0 +1,81 @@
+.TH "APACHE2" 8 "2008-04-05" "Apache HTTP Server" "apache2"
+
+.SH NAME
+apache2 \- Apache Hypertext Transfer Protocol Server
+.SH "SYNOPSIS"
+.PP
+\fBapache2\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop|graceful-stop ] [ -\fBR\fR \fIdirectory\fR ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ]
+.SH "SUMMARY"
+.PP
+apache2 is the Apache HyperText Transfer Protocol (HTTP) server program\&. It is designed to be run as a standalone daemon process\&. When used like this it will create a pool of child processes or threads to handle requests\&.
+.PP
+In general, apache2 should not be invoked directly, but rather should be
+invoked via /etc/init.d/apache2 or apache2ctl\&. The default Debian
+configuration requires environment variables that are defined in
+/etc/apache2/envvars and are not available if apache2 is started directly.
+However, apache2ctl can be used to pass arbitrary arguments to apache2.
+.SH "DOCUMENTATION"
+.PP
+The full documentation is available in the apache2-doc package or at
+http://httpd.apache.org/docs/2.2/ . Information about Debian specific changes
+and configuration can be found in
+/usr/share/doc/apache2.2-common/README.Debian.gz .
+.SH "OPTIONS"
+.TP
+-d \fIserverroot\fR
+Set the initial value for the ServerRoot directive to \fIserverroot\fR\&. This can be overridden by the ServerRoot directive in the configuration file\&.
+.TP
+-f \fIconfig\fR
+Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is /etc/apache2/apache2\&.conf\&.  
+.TP
+-k start|restart|graceful|stop|graceful-stop
+Signals apache2 to start, restart, or stop\&. See Stopping Apache for more information\&.  
+.TP
+-C \fIdirective\fR
+Process the configuration \fIdirective\fR before reading config files\&.  
+.TP
+-c \fIdirective\fR
+Process the configuration \fIdirective\fR after reading config files\&.  
+.TP
+-D \fIparameter\fR
+Sets a configuration \fIparameter \fRwhich can be used with <IfDefine> sections in the configuration files to conditionally skip or process commands at server startup and restart\&.  
+.TP
+-e \fIlevel\fR
+Sets the LogLevel to \fIlevel\fR during server startup\&. This is useful for temporarily increasing the verbosity of the error messages to find problems during startup\&.  
+.TP
+-E \fIfile\fR
+Send error messages during server startup to \fIfile\fR\&.  
+.TP
+-R \fIdirectory\fR
+When the server is compiled using the SHARED_CORE rule, this specifies the \fIdirectory\fR for the shared object files\&.  
+.TP
+-h
+Output a short summary of available command line options\&.  
+.TP
+-l
+Output a list of modules compiled into the server\&. This will \fBnot\fR list dynamically loaded modules included using the LoadModule directive\&.  
+.TP
+-L
+Output a list of directives together with expected arguments and places where the directive is valid\&.  
+.TP
+-M
+Dump a list of loaded Static and Shared Modules\&.  
+.TP
+-S
+Show the settings as parsed from the config file (currently only shows the virtualhost settings)\&.  
+.TP
+-t
+Run syntax tests for configuration files only\&. The program immediately exits after these syntax parsing tests with either a return code of 0 (Syntax OK) or return code not equal to 0 (Syntax Error)\&. If -D \fIDUMP\fR_\fIVHOSTS \fRis also set, details of the virtual host configuration will be printed\&. If -D \fIDUMP\fR_\fIMODULES \fR is set, all loaded modules will be printed\&.  
+.TP
+-v
+Print the version of apache2, and then exit\&.  
+.TP
+-V
+Print the version and build parameters of apache2, and then exit\&.  
+.TP
+-X
+Run apache2 in debug mode\&. Only one worker will be started and the server will not detach from the console\&.  
+.SH SEE ALSO
+.BR apache2ctl (8),
+.BR /usr/share/doc/apache2.2-common/README.Debian.gz
+
--- apache2-2.2.11.orig/debian/apache2.2-common.postinst
+++ apache2-2.2.11/debian/apache2.2-common.postinst
@@ -0,0 +1,120 @@
+#!/bin/sh -e
+
+if [ "$1" != "configure" ]; then
+        exit 0
+fi
+
+NETSTAT=netstat
+
+if [ -e /usr/sbin/apache2 ]; then
+    if [ "`dpkg-statoverride --list /usr/sbin/apache2`" = "" ]; then
+        chmod +x /usr/sbin/apache2
+    else
+        chmod `dpkg-statoverride --list /usr/sbin/apache2 | cut -f 3` /usr/sbin/apache2
+    fi
+fi
+
+mod_is_enabled() {
+    test -L /etc/apache2/mods-enabled/$1.load
+}
+
+# Detect whether this is a new install or an upgrade.
+# Ordinarily one just checks $2, but since we renamed apache2-common to
+# apache2.2-common, we have to be more devious.
+if [ -n "$2" ]; then
+	UPGRADE=from_2_2
+elif [ -e /etc/apache2/ports.conf.dpkg-apache2.2-common.existed ] ||
+     [ -n "$(ls /etc/apache2/sites-enabled/)" ]; then
+	UPGRADE=from_2_0
+else
+	UPGRADE=new_install
+fi
+
+
+
+#set up default site and dummy error and access logs
+if [ $UPGRADE = new_install ]; then
+        if [ ! -L /etc/apache2/sites-enabled/000-default -a \
+             ! -f /etc/apache2/sites-enabled/000-default ]; then
+                a2ensite -q default
+        fi
+        touch /var/log/apache2/error.log /var/log/apache2/access.log
+        chown root:adm /var/log/apache2/error.log /var/log/apache2/access.log
+        chmod 0640 /var/log/apache2/error.log /var/log/apache2/access.log
+fi
+
+# Note, this line catches new installs as well as upgrades
+if dpkg --compare-versions "$2" lt 2.2.3-3.1; then
+	a2enmod -q alias
+	a2enmod -q autoindex
+	a2enmod -q dir
+	a2enmod -q env
+	a2enmod -q mime
+	a2enmod -q negotiation
+	a2enmod -q setenvif
+	a2enmod -q status
+	a2enmod -q auth_basic
+	a2enmod -q deflate
+
+        # Those come from mod_auth:
+	a2enmod -q authz_default
+	a2enmod -q authz_user
+	a2enmod -q authz_groupfile
+	a2enmod -q authn_file
+        
+	# This comes from mod_access:
+	a2enmod -q authz_host
+
+fi
+if [ $UPGRADE = from_2_0 ]; then
+        # Module replacements from previous versions of apache2
+	if mod_is_enabled proxy; then
+		a2enmod -q proxy_http
+		a2enmod -q disk_cache
+	fi
+	if mod_is_enabled imap; then
+		a2dismod -q imap
+		a2enmod -q imagemap
+	fi
+	if mod_is_enabled auth_ldap; then
+		a2dismod -q auth_ldap
+		a2enmod -q authnz_ldap
+	fi
+fi
+
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.4-2; then
+	echo -n activating new config files ...
+	for a in actions alias autoindex info mime negotiation setenvif status ; do 
+		if mod_is_enabled $a && [ ! -e /etc/apache2/mods-enabled/$a.conf ] ; then
+			ln -sf 	../mods-available/$a.conf /etc/apache2/mods-enabled/$a.conf
+			echo -n " $a.conf"
+		fi
+	done
+	echo " done."
+fi
+
+# Note, this line catches new installs as well as upgrades
+if dpkg --compare-versions "$2" lt 2.2.7-1~0; then
+	if [ ! -e /var/www/index.html  -a \
+	     ! -h /var/www/index.html  -a \
+	     ! -e /var/www/index.cgi   -a \
+	     ! -e /var/www/index.pl    -a \
+	     ! -e /var/www/index.php   -a \
+	     ! -e /var/www/index.xhtml -a \
+	     ! -e /var/www/index.htm ] ; then
+		cp /usr/share/apache2/default-site/index.html /var/www/index.html
+	fi
+fi
+
+
+rm -f /etc/apache2/ports.conf.dpkg-apache2.2-common.old
+rm -f /etc/default/apache2.dpkg-apache2.2-common.old
+rm -f /etc/apache2/conf.d/charset.dpkg-apache2.2-common.old
+rm -f /etc/apache2/ports.conf.dpkg-apache2.2-common.existed
+
+[ -f /etc/apache2/httpd.conf ] || touch /etc/apache2/httpd.conf
+
+#DEBHELPER#
+
+exit 0
+
--- apache2-2.2.11.orig/debian/mpm-postinst-threaded
+++ apache2-2.2.11/debian/mpm-postinst-threaded
@@ -0,0 +1,32 @@
+#!/bin/sh
+set -e
+
+if [ "$1" != "configure" ]; then
+        exit 0
+fi
+
+#enable cgid, but only on new installs.
+if [ -z "$2" ]; then
+	a2dismod cgi >/dev/null || true
+        a2enmod cgid >/dev/null || echo "It looks like you've deleted /etc/apache2/mods-available/cgid.load, so mod_cgid cannot be enabled.  To fix this, please purge and reinstall apache2.2-common."
+fi
+
+# Migrate our kill symlinks, including ones the user may have done an s/S/K/ to:
+for i in `seq 0 6`; do
+	if [ -L /etc/rc"$i".d/K91apache2 ]; then
+		mv /etc/rc"$i".d/K91apache2 \
+		   /etc/rc"$i".d/K09apache2
+	fi
+done
+
+if [ -x "/etc/init.d/apache2" ]; then
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+                invoke-rc.d apache2 start ||true
+        else
+                /etc/init.d/apache2 start ||true
+        fi
+fi
+
+#DEBHELPER#
+
+exit 0
--- apache2-2.2.11.orig/debian/copyright
+++ apache2-2.2.11/debian/copyright
@@ -0,0 +1,504 @@
+This package was debianized by Thom May <thom@ubuntu.com> on
+Tues, 8 Feb 2005 16:00:00 +0000.
+
+It was downloaded from http://httpd.apache.org/download.cgi
+
+Upstream Authors: The Apache Software Foundation - http://httpd.apache.org
+
+Copyright:
+
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. The ASF licenses this work to You under the Apache License,
+Version 2.0 (the "License"); you may not use this work except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+On a Debian system, the license can be found at
+/usr/share/common-licenses/Apache-2.0 .
+
+
+APACHE HTTP SERVER SUBCOMPONENTS: 
+
+The Apache HTTP Server includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+For the mod_mime_magic component:
+
+/*
+ * mod_mime_magic: MIME type lookup via file magic numbers
+ * Copyright (c) 1996-1997 Cisco Systems, Inc.
+ *
+ * This software was submitted by Cisco Systems to the Apache Group in July
+ * 1997.  Future revisions and derivatives of this source code must
+ * acknowledge Cisco Systems as the original contributor of this module.
+ * All other licensing and usage conditions are those of the Apache Group.
+ *
+ * Some of this code is derived from the free version of the file command
+ * originally posted to comp.sources.unix.  Copyright info for that program
+ * is included below as required.
+ * ---------------------------------------------------------------------------
+ * - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
+ *
+ * This software is not subject to any license of the American Telephone and
+ * Telegraph Company or of the Regents of the University of California.
+ *
+ * Permission is granted to anyone to use this software for any purpose on any
+ * computer system, and to alter it and redistribute it freely, subject to
+ * the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of this
+ * software, no matter how awful, even if they arise from flaws in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either by
+ * explicit claim or by omission.  Since few users ever read sources, credits
+ * must appear in the documentation.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.  Since few users ever read
+ * sources, credits must appear in the documentation.
+ *
+ * 4. This notice may not be removed or altered.
+ * -------------------------------------------------------------------------
+ *
+ */
+
+
+For the  modules\mappers\mod_imap.c component:
+
+  "macmartinized" polygon code copyright 1992 by Eric Haines, erich@eye.com
+
+For the  server\util_md5.c component:
+
+/************************************************************************
+ * NCSA HTTPd Server
+ * Software Development Group
+ * National Center for Supercomputing Applications
+ * University of Illinois at Urbana-Champaign
+ * 605 E. Springfield, Champaign, IL 61820
+ * httpd@ncsa.uiuc.edu
+ *
+ * Copyright  (C)  1995, Board of Trustees of the University of Illinois
+ *
+ ************************************************************************
+ *
+ * md5.c: NCSA HTTPd code which uses the md5c.c RSA Code
+ *
+ *  Original Code Copyright (C) 1994, Jeff Hostetler, Spyglass, Inc.
+ *  Portions of Content-MD5 code Copyright (C) 1993, 1994 by Carnegie Mellon
+ *     University (see Copyright below).
+ *  Portions of Content-MD5 code Copyright (C) 1991 Bell Communications 
+ *     Research, Inc. (Bellcore) (see Copyright below).
+ *  Portions extracted from mpack, John G. Myers - jgm+@cmu.edu
+ *  Content-MD5 Code contributed by Martin Hamilton (martin@net.lut.ac.uk)
+ *
+ */
+
+
+/* these portions extracted from mpack, John G. Myers - jgm+@cmu.edu */
+/* (C) Copyright 1993,1994 by Carnegie Mellon University
+ * All Rights Reserved.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of Carnegie
+ * Mellon University not be used in advertising or publicity
+ * pertaining to distribution of the software without specific,
+ * written prior permission.  Carnegie Mellon University makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+/*
+ * Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ *
+ * Permission to use, copy, modify, and distribute this material
+ * for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice and this permission notice
+ * appear in all copies, and that the name of Bellcore not be
+ * used in advertising or publicity pertaining to this
+ * material without the specific, prior written permission
+ * of an authorized representative of Bellcore.  BELLCORE
+ * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
+ * OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
+ * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.  
+ */
+
+For the  srclib\apr\include\apr_md5.h component: 
+/*
+ * This is work is derived from material Copyright RSA Data Security, Inc.
+ *
+ * The RSA copyright statement and Licence for that original material is
+ * included below. This is followed by the Apache copyright statement and
+ * licence for the modifications made to that material.
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+   rights reserved.
+
+   License to copy and use this software is granted provided that it
+   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+   Algorithm" in all material mentioning or referencing this software
+   or this function.
+
+   License is also granted to make and use derivative works provided
+   that such works are identified as "derived from the RSA Data
+   Security, Inc. MD5 Message-Digest Algorithm" in all material
+   mentioning or referencing the derived work.
+
+   RSA Data Security, Inc. makes no representations concerning either
+   the merchantability of this software or the suitability of this
+   software for any particular purpose. It is provided "as is"
+   without express or implied warranty of any kind.
+
+   These notices must be retained in any copies of any part of this
+   documentation and/or software.
+ */
+
+For the  srclib\apr\passwd\apr_md5.c component:
+
+/*
+ * This is work is derived from material Copyright RSA Data Security, Inc.
+ *
+ * The RSA copyright statement and Licence for that original material is
+ * included below. This is followed by the Apache copyright statement and
+ * licence for the modifications made to that material.
+ */
+
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+   rights reserved.
+
+   License to copy and use this software is granted provided that it
+   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+   Algorithm" in all material mentioning or referencing this software
+   or this function.
+
+   License is also granted to make and use derivative works provided
+   that such works are identified as "derived from the RSA Data
+   Security, Inc. MD5 Message-Digest Algorithm" in all material
+   mentioning or referencing the derived work.
+
+   RSA Data Security, Inc. makes no representations concerning either
+   the merchantability of this software or the suitability of this
+   software for any particular purpose. It is provided "as is"
+   without express or implied warranty of any kind.
+
+   These notices must be retained in any copies of any part of this
+   documentation and/or software.
+ */
+/*
+ * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0
+ * MD5 crypt() function, which is licenced as follows:
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
+ * can do whatever you want with this stuff. If we meet some day, and you think
+ * this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
+ * ----------------------------------------------------------------------------
+ */
+
+For the srclib\apr-util\crypto\apr_md4.c component:
+
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD4 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+For the srclib\apr-util\include\apr_md4.h component:
+
+ *
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD4 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+
+For the srclib\apr-util\test\testdbm.c component:
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * This file came from the SDBM package (written by oz@nexus.yorku.ca).
+ * That package was under public domain. This file has been ported to
+ * APR, updated to ANSI C and other, newer idioms, and added to the Apache
+ * codebase under the above copyright and license.
+ */
+
+
+For the srclib\apr-util\test\testmd4.c component:
+
+ *
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
+ * rights reserved.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+For the srclib\apr-util\xml\expat\conftools\install-sh component:
+
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+
+For the srclib\pcre\install-sh component:
+
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+
+For the pcre component:
+
+PCRE LICENCE
+------------
+
+PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+Written by: Philip Hazel <ph10@cam.ac.uk>
+
+University of Cambridge Computing Service,
+Cambridge, England. Phone: +44 1223 334714.
+
+Copyright (c) 1997-2001 University of Cambridge
+
+Permission is granted to anyone to use this software for any purpose on any
+computer system, and to redistribute it freely, subject to the following
+restrictions:
+
+1. This software is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+2. The origin of this software must not be misrepresented, either by
+   explicit claim or by omission. In practice, this means that if you use
+   PCRE in software which you distribute to others, commercially or
+   otherwise, you must put a sentence like this
+
+     Regular expression support is provided by the PCRE library package,
+     which is open source software, written by Philip Hazel, and copyright
+     by the University of Cambridge, England.
+
+   somewhere reasonably visible in your documentation and in any relevant
+   files or online help data or similar. A reference to the ftp site for
+   the source, that is, to
+
+     ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+
+   should also be given in the documentation.
+
+3. Altered versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+4. If PCRE is embedded in any software that is released under the GNU
+   General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL),
+   then the terms of that licence shall supersede any condition above with
+   which it is incompatible.
+
+The documentation for PCRE, supplied in the "doc" directory, is distributed
+under the same terms as the software itself.
+
+End PCRE LICENCE
+
+Note: The GPL and the LGPL can be found in /usr/share/common-licenses/GPL
+and /usr/share/common-licenses/LGPL, respectively.
+
+For the test\zb.c component:
+
+/*                          ZeusBench V1.01
+			    ===============
+
+This program is Copyright (C) Zeus Technology Limited 1996.
+
+This program may be used and copied freely providing this copyright notice
+is not removed.
+
+This software is provided "as is" and any express or implied waranties, 
+including but not limited to, the implied warranties of merchantability and
+fitness for a particular purpose are disclaimed.  In no event shall 
+Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, 
+exemplary, or consequential damaged (including, but not limited to, 
+procurement of substitute good or services; loss of use, data, or profits;
+or business interruption) however caused and on theory of liability.  Whether
+in contract, strict liability or tort (including negligence or otherwise) 
+arising in any way out of the use of this software, even if advised of the
+possibility of such damage.
+
+     Written by Adam Twiss (adam@zeus.co.uk).  March 1996
+
+Thanks to the following people for their input:
+  Mike Belshe (mbelshe@netscape.com) 
+  Michael Campanella (campanella@stevms.enet.dec.com)
+
+*/
+
+For the expat xml parser component:
+
+Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+                               and Clark Cooper
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+	
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+	
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====================================================================
+
+OpenDocument icons:
+-------------------
+
+These icons are copyright of Pete Harlow and licensed under the Apache
+license. See 
+https://bugs.edge.launchpad.net/ubuntu/+source/apache2/+bug/130836 
+http://www.catnip.co.uk/opendocument/icons/#apache
--- apache2-2.2.11.orig/debian/changelog
+++ apache2-2.2.11/debian/changelog
@@ -0,0 +1,2282 @@
+apache2 (2.2.11-2ubuntu2.1) jaunty-security; urgency=low
+
+  * SECURITY UPDATE: response data disclosure in mod_proxy_ajp when a client
+    request with no request body was sent
+    - debian/patches/900_CVE-2009-1191.dpatch: adjust
+      modules/proxy/mod_proxy_ajp.c to not reuse a connection when the client
+      closes a connection without sending a body
+    - CVE-2009-1191
+  * SECURITY UPDATE: Includes option could be overridden via .htaccess file
+    when AllowOverride restrictions do not permit it
+    - debian/patches/900_CVE-2009-1195.dpatch: adjust server/config.c,
+      server/core.c, modules/filters/mod_include.c, include/http_core.h to
+      only enable .htaccess override when permitted.
+    - CVE-2009-1195
+
+ -- Jamie Strandboge <jamie@ubuntu.com>  Wed, 10 Jun 2009 17:15:00 -0500
+
+apache2 (2.2.11-2ubuntu2) jaunty; urgency=low
+
+  * debian/patches/203_fix-ssi-timeftm-ignored.dpatch: 
+    Fix timefmt is ignored when XBitHack is on. (LP: #258914) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 01 Apr 2009 11:39:17 -0400
+
+apache2 (2.2.11-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/{contro,rules}: enable PIE hardening.
+    - debian/{control, rules, apache2.2-common.ufw.profile}: add ufw profiles.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Sat, 17 Jan 2009 00:02:55 +0000
+
+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-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/{control, rules}: enable PIE hardening.
+    - debian/{control, rules, apache2.2-common.ufw.profile}: add ufw profiles.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 15 Dec 2008 00:06:50 +0000
+
+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-11ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #303375)
+    - debian/{control, rules}: enable PIE hardening.
+    - debian/{control, rules, apache2.2-common.ufw.profile}: add ufw profiles.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 29 Nov 2008 14:02:31 +0530
+
+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-10ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/{control, rules}: enable PIE hardening.
+    - debian/{control, rules, apache2.2-common.ufw.profile}: add ufw profiles.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 05 Nov 2008 02:23:18 -0400
+
+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-7ubuntu3) intrepid; urgency=low
+
+  * Revert logrotate change since it will break it for everyone. 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 19 Sep 2008 09:32:01 -0400
+
+apache2 (2.2.9-7ubuntu2) intrepid; urgency=low
+
+  * debian/logrotate: Restart rather than reload for busy websites.
+    (LP: #270899) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Thu, 18 Sep 2008 08:42:22 -0400
+
+apache2 (2.2.9-7ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/{control,rules}: enable PIE hardening.
+    - debian/{control,rules,apache2.2-common.ufw.profile}: add ufw profiles.
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 28 Aug 2008 08:10:59 -0700
+
+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-3ubuntu2) intrepid; urgency=low
+
+  * add ufw integration (see
+    https://wiki.ubuntu.com/UbuntuFirewall#Integrating%20UFW%20with%20Packages)
+    (LP: #261198)
+    - debian/control: suggest ufw for apache2.2-common
+    - add apache2.2-common.ufw.profile with 3 profiles and install it to
+      /etc/ufw/applications.d/apache2.2-common
+
+ -- Didier Roche <didrocks@ubuntu-fr.org>  Tue, 26 Aug 2008 19:03:42 +0200
+
+apache2 (2.2.9-3ubuntu1) intrepid; urgency=low
+
+  * debian/{control,rules}: enable PIE hardening
+
+ -- Kees Cook <kees@ubuntu.com>  Wed, 20 Aug 2008 15:45:00 -0700
+
+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
+
--- apache2-2.2.11.orig/debian/apache2-prefork-dev.dirs
+++ apache2-2.2.11/debian/apache2-prefork-dev.dirs
@@ -0,0 +1,4 @@
+usr/include/apache2
+usr/bin
+usr/share/apache2/build
+usr/share/man/man8
--- apache2-2.2.11.orig/debian/apache2-src.dirs
+++ apache2-2.2.11/debian/apache2-src.dirs
@@ -0,0 +1 @@
+/usr/src
\ No newline at end of file
--- apache2-2.2.11.orig/debian/apache2-doc.doc-base
+++ apache2-2.2.11/debian/apache2-doc.doc-base
@@ -0,0 +1,10 @@
+Document: apache2-manual
+Title: Apache HTTP Server Version 2.2 Documentation
+Abstract: This documentation describes the configuration of the Apache Web
+ server and the included modules.
+Section: web
+
+Format: HTML
+Index: /usr/share/doc/apache2-doc/manual/en/index.html
+Files: /usr/share/doc/apache2-doc/manual/*/*.html
+ /usr/share/doc/apache2-doc/manual/*/*/*.html
--- apache2-2.2.11.orig/debian/mpms.prerm
+++ apache2-2.2.11/debian/mpms.prerm
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+# Apache2 prerm
+# Thom May <thom@debian.org>
+
+case "$1" in
+        upgrade|remove)
+		if [ -x "/etc/init.d/apache2" ]; then
+			if [ -x /usr/sbin/invoke-rc.d ]; then
+				invoke-rc.d apache2 stop || true
+			else
+				/etc/init.d/apache2 stop || true
+			fi
+		fi
+		sleep 2
+        ;;
+        deconfigure|failed-upgrade)
+        ;;
+        *)
+                echo "prerm called with unknown argument \`$1'" >&2
+                exit 1
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- apache2-2.2.11.orig/debian/apache2-utils.install
+++ apache2-2.2.11/debian/apache2-utils.install
@@ -0,0 +1,17 @@
+usr/sbin/ab
+usr/share/man/man8/ab.8
+usr/sbin/checkgid
+usr/sbin/dbmmanage usr/bin/
+usr/share/man/man1/dbmmanage.1
+usr/sbin/htdbm usr/bin/
+usr/share/man/man1/htdbm.1
+usr/sbin/htdigest usr/bin/
+usr/share/man/man1/htdigest.1
+usr/sbin/htpasswd usr/bin/
+usr/share/man/man1/htpasswd.1
+usr/sbin/logresolve
+usr/share/man/man8/logresolve.8
+usr/sbin/rotatelogs
+usr/share/man/man8/rotatelogs.8
+usr/sbin/htcacheclean
+usr/share/man/man8/htcacheclean.8
--- apache2-2.2.11.orig/debian/apache2-utils.dirs
+++ apache2-2.2.11/debian/apache2-utils.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/sbin
+usr/share/man/man1
+usr/share/man/man8
--- apache2-2.2.11.orig/debian/apache2.2-common.apache2.default
+++ apache2-2.2.11/debian/apache2.2-common.apache2.default
@@ -0,0 +1,26 @@
+### htcacheclean settings ###
+
+## run htcacheclean: yes, no, auto
+## auto means run if /etc/apache2/mods-enabled/disk_cache.load exists
+## default: auto
+HTCACHECLEAN_RUN=auto
+
+## run mode: cron, daemon
+## run in daemon mode or as daily cron job
+## default: daemon
+HTCACHECLEAN_MODE=daemon
+
+## cache size 
+HTCACHECLEAN_SIZE=300M
+
+## interval: if in daemon mode, clean cache every x minutes
+HTCACHECLEAN_DAEMON_INTERVAL=120
+
+## path to cache
+## must be the same as in CacheRoot directive
+HTCACHECLEAN_PATH=/var/cache/apache2/mod_disk_cache
+
+## additional options:
+## -n : be nice
+## -t : remove empty directories
+HTCACHECLEAN_OPTIONS="-n"
--- apache2-2.2.11.orig/debian/apache2-suexec.lintian-overrides
+++ apache2-2.2.11/debian/apache2-suexec.lintian-overrides
@@ -0,0 +1,2 @@
+setuid-binary usr/lib/apache2/suexec 4754 root/www-data
+package-relation-with-self replaces: apache2-suexec
--- apache2-2.2.11.orig/debian/apache2-suexec.install
+++ apache2-2.2.11/debian/apache2-suexec.install
@@ -0,0 +1,2 @@
+usr/sbin/suexec usr/lib/apache2
+usr/share/man/man8/suexec.8
--- apache2-2.2.11.orig/debian/README.backtrace
+++ apache2-2.2.11/debian/README.backtrace
@@ -0,0 +1,51 @@
+If apache crashes or freezes, it is helpful if you include a backtrace in the
+bug report.
+
+
+
+In case of a crash, do the following:
+
+1) Install the packages apache2-dbg libapr1-dbg libaprutil1-dbg gdb. 
+
+2) Add "CoreDumpDirectory /var/cache/apache2" to your apache configuration.
+
+3) Execute as root:
+	/etc/init.d/apache2 stop
+	ulimit -c unlimited
+	/etc/init.d/apache2 start
+
+4) Do whatever it takes to reproduce the crash. There should now be the file
+/var/cache/apache2/core .
+
+5) If you use apache2-mpm-prefork, execute:
+	
+	gdb /usr/sbin/apache2 /var/cache/apache2/core
+	(gdb) bt full
+	...
+	(gdb) quit
+
+If you use a threaded mpm, execute:
+
+	gdb /usr/sbin/apache2 /var/cache/apache2/core
+        (gdb) thread apply all bt full
+	...
+	(gdb) quit
+
+Include the backtrace in the bug report.
+
+6) Undo the change to your configuration, uninstall the debug packages, remove
+/var/cache/apache2/core
+
+
+
+In case of a hanging process, you don't need a core dump and you can skip steps 2 and 3.
+
+4) Reproduce the problem. Get the pid of a hanging process.
+
+5) Start gdb with
+
+	gdb -p pid
+
+and continue as described above. It may also be helpful to include the output of
+
+	strace -p pid
--- apache2-2.2.11.orig/debian/watch
+++ apache2-2.2.11/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.apache.org/dist/httpd/httpd-(2\.2.*)\.tar\.gz
--- apache2-2.2.11.orig/debian/apache2.2-common.preinst
+++ apache2-2.2.11/debian/apache2.2-common.preinst
@@ -0,0 +1,40 @@
+#! /bin/sh -e
+
+# This is an evil hack around the fact that dpkg is unpacking in the
+# wrong order causing "stop" to fail.
+
+if [ -z "$2" ] && [ -e /usr/sbin/apache2 ]; then
+    if [ -x "/etc/init.d/apache2" ]; then
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+                invoke-rc.d apache2 stop || true
+        else
+                /etc/init.d/apache2 stop || true
+        fi
+    fi
+    chmod -x /usr/sbin/apache2
+fi
+
+# YAY, MORE EVILNESS
+rm -f /var/lib/dpkg/info/apache2-common.postrm
+
+mv_conffile() {
+	if [ "`md5sum $1 2>/dev/null | cut -d ' ' -f 1`" = "$2" ] ; then
+		echo Replacing $1 with new version ...
+		mv $1 $1.dpkg-apache2.2-common.old
+	fi
+}
+
+# we want to check in postinst whether /etc/apache2/ports.conf existed before
+# the install
+if [ -z "$2" ] && [ -e /etc/apache2/ports.conf ]; then
+	touch /etc/apache2/ports.conf.dpkg-apache2.2-common.existed
+fi
+
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.4-2; then
+	mv_conffile /etc/default/apache2 	9ac83f9132b78c3aa6dd4d7a583bf476
+	mv_conffile /etc/default/apache2 	801eb5156368b54d92ecb578ce710836
+	mv_conffile /etc/apache2/ports.conf	d5fcefc335117f400d451de47efeca87
+	mv_conffile /etc/apache2/conf.d/charset 641239a7d2d172856cb1413a47d2e142
+fi
+
+#DEBHELPER#
--- apache2-2.2.11.orig/debian/README.source
+++ apache2-2.2.11/debian/README.source
@@ -0,0 +1,17 @@
+Debian-apache uses dpatch to make changes to the upstream source.
+
+To apply all of the patches run:
+./debian/rules patch
+
+To unapply all of the patches run:
+./debian/rules unpatch
+
+To add (or edit) a patch run:
+dpatch-edit-patch name_of_patch_goes_here
+#make your changes
+exit
+
+dpatch will make a new patch in debian/patches/ if one with that name doesn't already exist, otherwise it will change the existing one.
+To make it get used add it to debian/patches/00list .
+
+To make a patch not get used remove it from debian/patches/00list .
--- apache2-2.2.11.orig/debian/apache2.2-common.bug.script
+++ apache2-2.2.11/debian/apache2.2-common.bug.script
@@ -0,0 +1,45 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Text::Wrap;
+$Text::Wrap::columns = 70;
+
+open (my $out, ">&=3") or die "could not open FD 3\n";
+
+my $apache = ". /etc/apache2/envvars && /usr/sbin/apache2";
+my $res = `$apache -t 2>&1`;
+my @modules;
+if ($res !~ "Syntax OK") {
+	# if we are not root, syntax check will fail because ssl private keys
+	# are not readable
+	print $out "Config file syntax check failed.\n" if $> == 0;
+	@modules = sort glob("/etc/apache2/mods-enabled/*.load");
+	map { s{^/etc/apache2/mods-enabled/(.*)\.load$}{$1} } @modules;
+	print $out "List of /etc/apache2/mods-enabled/*.load:\n";
+}
+else {
+	@modules = sort `$apache -M 2>&1`;
+	@modules = map { /^ (.*)_module \(shared\)/ ? ($1) : () } @modules;
+	print $out "List of enabled modules from 'apache2 -M':\n";
+}
+if (! scalar @modules) {
+	print $out "Could not determine module list\n";
+}
+else {
+	my $missing;
+	foreach my $m (@modules) {
+		if (-e "/etc/apache2/mods-available/$m.conf" and
+		    ! -e "/etc/apache2/mods-enabled/$m.conf") {
+			$m .= "*";
+			$missing = 1;
+		}
+	}
+
+	print $out wrap("  ", "  ", "@modules\n");
+
+	print $out
+	    wrap("  ", "   ", 
+		"(A * means that the .conf file for that module is not " .
+		"enabled in /etc/apache2/mods-enabled/)\n") 
+	    if $missing;
+}
--- apache2-2.2.11.orig/debian/apache2.2-common.install
+++ apache2-2.2.11/debian/apache2.2-common.install
@@ -0,0 +1,7 @@
+usr/share/apache2/icons
+usr/sbin/apache2ctl
+usr/share/apache2/error
+usr/lib/apache2/modules
+usr/sbin/envvars-std usr/share/apache2/build
+usr/sbin/httxt2dbm
+etc/apache2 usr/share/doc/apache2.2-common/examples
--- apache2-2.2.11.orig/debian/apache2.2-common.postrm
+++ apache2-2.2.11/debian/apache2.2-common.postrm
@@ -0,0 +1,54 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = purge ] ; then
+	rm -f 	/etc/apache2/httpd.conf \
+		/etc/apache2/ports.conf.dpkg-apache2.2-common.existed \
+		/var/cache/apache2/reload \
+		/var/log/apache2/access.log* \
+		/var/log/apache2/error.log*
+	
+	rm -rf 	/var/cache/apache2/proxy \
+		/var/cache/apache2/mod_disk_cache \
+		/var/run/apache2 \
+		/var/lock/apache2
+
+	for f in /etc/apache2/sites-enabled/* \
+		 /etc/apache2/mods-enabled/* ; do
+		[ -L "$f" ] && rm -f "$f" 
+	done
+	
+	for d in /etc/apache2/sites-enabled/ \
+		/etc/apache2/mods-enabled/ \
+		/etc/apache2/conf.d \
+		/etc/apache2 \
+		/var/log/apache2 \
+		/var/cache/apache2 ; do
+		rmdir $d 2> /dev/null || true
+	done
+
+fi
+
+restore_conffile() {
+	if [ -e $1.dpkg-apache2.2-common.old ] ; then
+		echo Restoring previous version of $1 ...
+		mv $1.dpkg-apache2.2-common.old $1
+	fi
+}
+
+if [ "$1" = abort-upgrade ] ; then
+	restore_conffile /etc/default/apache2
+	restore_conffile /etc/apache2/ports.conf
+	restore_conffile /etc/apache2/conf.d/charset
+	rm -f /etc/apache2/ports.conf.dpkg-apache2.2-common.existed
+fi
+
+if [ "$1" = remove ] ; then
+	if [ "`md5sum /var/www/index.html 2>/dev/null | cut -d ' ' -f 1`" \
+	     = "5388f60d7695cb57b87c799ee62d20b2" ] ; then
+		rm /var/www/index.html
+	fi
+fi
+
+#DEBHELPER#
--- apache2-2.2.11.orig/debian/apache2-threaded-dev.install
+++ apache2-2.2.11/debian/apache2-threaded-dev.install
@@ -0,0 +1 @@
+usr/share/man/man8/apxs2.8
--- apache2-2.2.11.orig/debian/a2enmod.8
+++ apache2-2.2.11/debian/a2enmod.8
@@ -0,0 +1,68 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH A2ENMOD 8 "12 October 2006"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+a2enmod, a2dismod \- enable or disable an apache2 module
+.SH SYNOPSIS
+.B a2enmod
+.RI [ module ]
+.PP
+.B a2dismod
+.RI [ module ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B a2enmod
+and
+.B a2dismod
+commands.
+.PP
+.B a2enmod
+is a script that enables the specified module within the
+.B apache2
+configuration.  It does this by creating symlinks within
+.BR /etc/apache2/mods-enabled .
+Likewise,
+.B a2dismod
+disables a module by removing those symlinks.  It is not an error to
+enable a module which is already enabled, or to disable one which is
+already disabled.
+.SH EXAMPLES
+.RS
+.B "a2enmod imagemap"
+.br
+.B "a2dismod mime_magic"
+.RE
+.PP
+Enables the
+.B mod_imagemap
+module, and disables the
+.B mod_mime_magic
+module.
+.SH FILES
+.TP
+.B /etc/apache2/mods-available
+Directory with files giving information on available modules.
+.TP
+.B /etc/apache2/mods-enabled
+Directory with links to the files in
+.B mods-available
+for enabled modules.
+.SH "SEE ALSO"
+.BR apache2ctl (8).
+.SH AUTHOR
+This manual page was written by Daniel Stone <daniel@sfarc.net> for the Debian
+GNU/Linux distribution, as it is a Debian-specific script with the package.
--- apache2-2.2.11.orig/debian/apache2.2-common.ufw.profile
+++ apache2-2.2.11/debian/apache2.2-common.ufw.profile
@@ -0,0 +1,14 @@
+[Apache]
+title=Web Server
+description=Apache v2 is the next generation of the omnipresent Apache web server.
+ports=80/tcp
+
+[Apache Secure]
+title=Web Server (HTTPS)
+description=Apache v2 is the next generation of the omnipresent Apache web server.
+ports=443/tcp
+
+[Apache Full]
+title=Web Server (HTTP,HTTPS)
+description=Apache v2 is the next generation of the omnipresent Apache web server.
+ports=80,443/tcp
--- apache2-2.2.11.orig/debian/apache2.2-common.lintian-overrides
+++ apache2-2.2.11/debian/apache2.2-common.lintian-overrides
@@ -0,0 +1,3 @@
+apache2.2-common: setuid-binary usr/lib/apache2/suexec 4754 root/www-data
+apache2.2-common: non-standard-dir-perm var/log/apache2/ 0750 != 0755
+apache2.2-common: package-contains-empty-directory usr/lib/cgi-bin/
--- apache2-2.2.11.orig/debian/suexec.8
+++ apache2-2.2.11/debian/suexec.8
@@ -0,0 +1,67 @@
+.TH suexec 8 "April 2008"
+.\" Copyright 1999-2004 The Apache Software Foundation
+.\" Copyright 2008 Stefan Fritsch
+.\"
+.\" Licensed 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.
+.\"
+.SH NAME
+suexec \- Switch User For Exec
+.SH SYNOPSIS
+.B suexec -V
+.PP
+This is a customized version that can be configured with
+config files in /etc/apache2/suexec.
+.PP
+No other synopsis for usage, because this program
+is otherwise only used internally by the Apache HTTP server.
+.PP
+.SH DESCRIPTION
+.B suexec
+is the "wrapper" support program for the suexec behaviour for the
+Apache HTTP server.  It is run from within the server automatically
+to switch the user when an external program has to be run under a
+different user. For more information about suexec in general, see the online
+document `Apache suexec Support' on the HTTP server project's
+Web site at  http://httpd.apache.org/docs/suexec.html .
+.PP
+This version of suexec reads a config file on every execution. Therefore
+it is a bit slower than the standard suexec version from the apache2-suexec
+package.
+.SH CONFIGURATION
+If suexec is called by a user with name 'username', it will look into
+/etc/apache2/suexec/username for configuration. If the file does not exist,
+suexec will abort. By creating several config files, you can allow several
+different apache run users to use suexec.
+.PP
+The first line in the file is used as the document root (/var/www in the
+standard suexec) and the second line in the file is used as the suffix that is
+appended to users' home directories (public_html in standard suexec).
+.PP
+If any of the lines is commented out (with #), suexec will refuse the
+corresponding type of request. It is recommended to comment out the 
+userdir suffix if you don't need it.
+.SH SECURITY
+Do not set the document root to a path that includes users' home directories
+(like /home or /var) or directories where users can mount removable media.
+Doing so would create local security issues. Suexec does not allow to set the
+document root to the root directory / .
+.SH OPTIONS
+.IP -V
+Display the list of compile-time settings used when \fBsuexec\fP
+was built.  No other action is taken.
+.PD
+.SH FILES
+.BR /etc/apache2/suexec/www-data
+.SH SEE ALSO
+.BR apache2(8) ,
+.BR /usr/share/doc/apache2.2-common/README.Debian.gz
--- apache2-2.2.11.orig/debian/a2dismod.8
+++ apache2-2.2.11/debian/a2dismod.8
@@ -0,0 +1 @@
+.so man8/a2enmod.8
--- apache2-2.2.11.orig/debian/apache2.2-common.apache2.cron.daily
+++ apache2-2.2.11/debian/apache2.2-common.apache2.cron.daily
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# run htcacheclean
+
+set -e
+set -u
+
+[ -e /usr/sbin/htcacheclean ] || exit 0
+[ -e /etc/default/apache2 ]   || exit 0
+
+
+# edit /etc/default/apache2 to change this
+HTCACHECLEAN_MODE=daemon
+HTCACHECLEAN_RUN=auto
+HTCACHECLEAN_SIZE=300M
+HTCACHECLEAN_PATH=/var/cache/apache2/mod_disk_cache
+HTCACHECLEAN_OPTIONS=""
+
+. /etc/default/apache2
+
+[ "$HTCACHECLEAN_MODE" = "cron" ] || exit 0
+
+[ "$HTCACHECLEAN_RUN" = "yes"	] || 
+( [ "$HTCACHECLEAN_RUN" = "auto" ] && \
+  [ -e /etc/apache2/mods-enabled/disk_cache.load ] )  || exit 0
+
+/usr/sbin/htcacheclean  ${HTCACHECLEAN_OPTIONS}	\
+			-p${HTCACHECLEAN_PATH}	\
+			-l${HTCACHECLEAN_SIZE}
+
--- apache2-2.2.11.orig/debian/apache2-doc.conf
+++ apache2-2.2.11/debian/apache2-doc.conf
@@ -0,0 +1,10 @@
+Alias /manual /usr/share/doc/apache2-doc/manual/
+
+<Directory "/usr/share/doc/apache2-doc/manual/">
+    Options Indexes FollowSymlinks
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+    AddDefaultCharset off
+</Directory>
+
--- apache2-2.2.11.orig/debian/apache2-mpm-prefork.preinst
+++ apache2-2.2.11/debian/apache2-mpm-prefork.preinst
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+
+#Debian preinstall handling for apache2
+# Thom May <thom@debian.org>
+
+if [ "$2" ] && dpkg --compare-versions "$2" lt 2.2; then
+    if [ -x "/etc/init.d/apache2" ]; then
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+                invoke-rc.d apache2 stop || true
+        else
+                /etc/init.d/apache2 stop || true
+        fi
+    fi
+    chmod -x /usr/sbin/apache2
+fi
+
+case "$1" in
+	install)
+		rm -f /var/cache/apache2/reload
+		;;
+	upgrade)
+		if [ -d /var/cache/apache2 ]; then
+			touch /var/cache/apache2/reload
+		fi
+		;;
+	*)
+		;;
+esac
+
+#DEBHELPER#
--- apache2-2.2.11.orig/debian/README.Debian
+++ apache2-2.2.11/debian/README.Debian
@@ -0,0 +1,318 @@
+Contents
+========
+
+	Apache2 Configuration under Debian GNU/Linux
+		Files and Directories in /etc/apache2
+		Tools
+
+	Using mod_disk_cache
+
+	SSL
+		Enabling SSL
+		Creating self-signed certificates
+		SSL workaround for MSIE
+
+	Suexec
+	
+	Documentation
+
+	Upgrades
+
+	Common Problems
+
+
+Apache2 Configuration under Debian GNU/Linux
+============================================
+
+Debian's default Apache2 installation attempts to make adding and
+removing modules, virtual hosts, and extra configuration directives as
+flexible as possible, in order to make automating the changes and
+administering the server as easy as possible.
+
+Please be aware that this layout is quite different from the standard
+Apache configuration. Due to the use of environment variables, apache2
+needs to be started/stopped with /etc/init.d/apache2 or apache2ctl. 
+Calling /usr/bin/apache2 directly will not work with the default
+configuration. To call apache2 with specific command line arguments,
+just call apache2ctl with the same arguments.
+
+Files and Directories in /etc/apache2:
+-------------------------------------
+
+apache2.conf
+
+	This is the main configuration file.
+
+envvars
+
+	This contains environment variables that may be used in the
+	configuration. Some settings, like user and pid file, need to
+	go in here so that other scripts can use them. It can also
+	be used to change some default settings used by apache2ctl.
+
+conf.d/
+
+	Files in this directory are included by this line in
+	apache2.conf:
+
+	# Include generic snippets of statements
+	Include /etc/apache2/conf.d
+
+	This is a good place to add additional configuration
+	directives.
+
+httpd.conf
+
+	Empty file.
+
+magic
+
+	Empty file.
+
+mods-available/
+
+	This directory contains a series of .load and .conf files.
+	The .load files contain the Apache configuration directive
+	necessary to load the module in question.  The respective
+	.conf files contain configuration directives necessary to
+	utilize the module in question.
+
+mods-enabled/
+
+	To actually enable a module for Apache2, it is necessary to
+	create a symlink in this directory to the .load (and .conf, if
+	it exists) files associated with the module in
+	mods-available/.  For example:
+
+	cgi.load -> /etc/apache2/mods-available/cgi.load
+
+ports.conf
+
+	Configuration directives for which ports and IP addresses to
+	listen to.
+
+sites-available/
+
+	Like mods-available/, except it contains configuration
+	directives for different virtual hosts that might be used with
+	apache2.  Note that the hostname doesn't have to correspond
+	exactly with the filename.  'default' is the default host.
+
+sites-enabled/
+
+	Similar in functionality to mods-enabled/, sites-enabled
+	contains symlinks to sites in sites-available/ that the
+	admnistrator wishes to enable.
+
+	Apache uses the first VirtualHost that matches the IP/Port
+	as default for named virtual hosts. Therefore the 'default'
+	site is linked to '000-default' so that it will be read first.
+
+	Example:
+	dedasys -> /etc/apache2/sites-available/dedasys
+
+The Include directive ignores files with names that
+
+- do not begin with a letter or number
+- contain a character that is neither letter nor number nor _-.
+- contain .dpkg
+
+Other files
+-----------
+
+For historical reasons, the pid file is in /var/run/apache2.pid and not in
+/var/run/apache2/apache2.pid.
+
+Tools
+-----
+
+a2enmod and a2dismod are available for enabling and disabling modules utilizing
+the above configuration system.
+
+a2ensite and a2dissite do essentially the same thing as the above tools, but
+for sites rather than modules.
+
+
+Using mod_disk_cache
+====================
+
+To ensure that the disk cache does not grow indefinitely, htcacheclean is
+started when mod_disk_cache is enabled. Both daemon and cron (daily) mode
+are supported. The configuration (run mode, cache size, ...) is in
+/etc/default/apache2 .
+
+Normally, htcacheclean is automatically started and stopped by
+/etc/init.d/apache2. However, if you change the state of mod_disk_cache or the
+configuration of htcacheclean while apache2 is running, you may need to
+manually start/stop htcacheclean with "/etc/init.d/apache2 start-htcacheclean"
+or "/etc/init.d/apache2 stop-htcacheclean".
+
+
+SSL
+===
+
+Enabling SSL
+------------
+
+To enable SSL, type (as user root):
+
+	a2ensite default-ssl
+	a2enmod ssl
+
+If you want to use self-signed certificates, you should install the ssl-cert
+package (see below). Otherwise, just adjust the SSLCertificateFile and
+SSLCertificateKeyFile directives in /etc/apache2/sites-available/default-ssl to
+point to your SSL certificate. Then restart apache:
+
+	/etc/init.d/apache2 restart
+
+
+Creating self-signed certificates
+---------------------------------
+
+If you install the ssl-cert package, a self-signed certificate will be
+automatically created using the hostname currently configured on your computer.
+You can recreate that certificate (e.g. after you have changed /etc/hosts or
+DNS to give the correct hostname) as user root with:
+
+	make-ssl-cert generate-default-snakeoil --force-overwrite
+
+To create more certificates with different host names, you can use
+
+	make-ssl-cert /usr/share/ssl-cert/ssleay.cnf /path/to/cert-file.crt
+
+This will ask you for the hostname and place both SSL key and certificate in
+the file /path/to/cert-file.crt . Use this file with the SSLCertificateFile
+directive in the apache config (you don't need the SSLCertificateKeyFile in
+this case).
+
+SSL workaround for MSIE
+-----------------------
+
+The SSL workaround for MS Internet Explorer needs to be added to your SSL
+VirtualHost section (it was previously in ssl.conf but caused keepalive to be
+disabled even for non-SSL connections):
+
+SetEnvIf User-Agent ".*MSIE.*"  nokeepalive ssl-unclean-shutdown \
+                                downgrade-1.0 force-response-1.0
+
+The default SSL virtual host in /etc/apache2/sites-available/default-ssl
+already contains this workaround.
+
+
+Suexec
+======
+
+Debian ships two version of the suexec helper program required by mod_suexec.
+It is not installed by default, to avoid possible security issues. The package
+apache2-suexec contains the standard version that works only with document root
+/var/www, userdir suffix public_html, and apache run user www-data. The package
+apache2-suexec-custom contains a customizable version, that can be configured
+with a config file to use different settings (like /srv/www as document root).
+For more information see the suexec(8) man page in the apache2-suexec-custom
+package.
+
+Since apache2-suexec-custom has received less testing and might be slightly
+slower, apache2-suexec is the recommended version unless you need the features
+from apache2-suexec-custom.
+
+
+Documentation
+=============
+
+The full apache 2 documentation can be found on the web at
+
+http://httpd.apache.org/docs/2.2/
+
+or, if you have installed the apache2-doc package, in
+
+/usr/share/doc/apache2-doc/manual/
+
+or at
+
+http://localhost/manual/
+
+There is also a wiki that contains useful information:
+
+http://wiki.apache.org/httpd/
+
+
+Upgrades
+========
+
+Changes in the apache packages that require manual configuration adjustments
+are announced in NEWS.Debian. Installing the apt-listchanges package is
+recommended. It will display the relevant NEWS.Debian sections before
+upgrades.
+
+
+Common Problems
+===============
+
+1) Error message "Could not determine the server's fully qualified domain name,
+using 127.0.0.1 for ServerName" during start
+
+This can usually be ignored but it means that Apache httpd was unable to obtain
+a fully-qualified hostname by doing a reverse lookup on your server's IP
+address. You may want to add the fully-qualified hostname to /etc/hosts .
+
+
+2) Error message "mod_rewrite: could not create rewrite_log_lock"
+
+This probably means that there are some stale SYSV semaphores around. This
+usually happens after apache2 has been killed with kill -9 (SIGKILL). You can
+clean up the semaphores with:
+
+	ipcs -s | grep www-data | awk ' { print $2 } ' | xargs ipcrm sem
+
+3) Message "NameVirtualHost *:80 has no VirtualHosts" in error log
+
+Probably the VirtualHost definitions have not been adjusted after the 
+NameVirtualHost directive was changed in ports.conf. 
+See /usr/share/doc/apache2.2-common/NEWS.Debian.gz
+
+4) Message "File does not exist: /htdocs" in error log
+
+In most cases this means that no matching VirtualHost definition could be
+found for an incoming request.
+
+5) Support for Spanish and Turkish language with mod_negotiation
+
+Currently Apache will send Spanish and Turkish language files with the wrong
+mime types because the extensions .es and .tr have entries in /etc/mime.types
+for application/ecmascript and application/x-troff.
+
+In order to make Spanish and Turkish language support work, you need to either
+remove these entries from /etc/mime.types, or add something like
+
+    <Files *.html.tr.utf8>
+        ForceType text/html
+    </Files>
+
+to your Apache configuration. Of course, this has to be ajusted to the actual
+filenames you use.
+
+6) Message "Couldn't create pollset in child; check user or system limits" in
+  error log
+
+On Linux kernels since 2.6.27.8, the value in
+
+    /proc/sys/fs/epoll/max_user_instances
+
+needs to be larger than
+
+    for prefork/itk  MPM: 2 * MaxClients
+    for worker/event MPM: MaxClients + MaxClients/ThreadsPerChild
+
+It can be set on boot by adding a line like
+
+        fs.epoll.max_user_instances=1024
+
+to /etc/sysctl.conf.
+
+There are several other error messages related to creating a pollset that can
+appear for the same reason.
+
+On the other hand, errors about to adding to a pollset are related to the
+setting fs.epoll.max_user_watches. On most systems, max_user_watches should be
+high enough by default.
--- apache2-2.2.11.orig/debian/apache2.2-common.bug.control
+++ apache2-2.2.11/debian/apache2.2-common.bug.control
@@ -0,0 +1 @@
+package-status: apache2-mpm-prefork apache2-mpm-worker apache2-mpm-event apache2-mpm-itk
--- apache2-2.2.11.orig/debian/a2enmod
+++ apache2-2.2.11/debian/a2enmod
@@ -0,0 +1,340 @@
+#!/usr/bin/perl -w
+#
+# a2enmod by Stefan Fritsch <sf@debian.org>
+# Licensed under Apache License 2.0
+
+use strict;
+use Cwd 'realpath';
+use File::Spec;
+use File::Basename;
+use Getopt::Long;
+
+my $quiet;
+my $force;
+Getopt::Long::Configure('bundling');
+GetOptions(
+    'quiet|q' => \$quiet,
+    'force|f' => \$force
+) or exit 2;
+
+my $basename = basename($0);
+$basename =~ /^a2(en|dis)(mod|site)((?:-.+)?)$/
+    or die "$basename call name unknown\n";
+my $act        = $1;
+my $obj        = $2;
+my $dir_suffix = $3;
+
+my $env_file = $ENV{APACHE_ENVVARS}
+    || (
+    $ENV{APACHE_CONFDIR}
+    ? "$ENV{APACHE_CONFDIR}/envvars"
+    : "/etc/apache2$dir_suffix/envvars"
+    );
+read_env_file($env_file);
+
+$act .= 'able';
+my ( $name, $dir, $sffx, $reload );
+if ( $obj eq 'mod' ) {
+    $obj    = 'module';
+    $dir    = 'mods';
+    $sffx   = '.load';
+    $reload = 'restart';
+}
+else {
+    $dir    = 'sites';
+    $sffx   = '';
+    $reload = 'reload';
+}
+$name = ucfirst($obj);
+
+my $confdir  = $ENV{APACHE_CONFDIR}                  || "/etc/apache2$dir_suffix";
+my $availdir = $ENV{ uc("APACHE_${dir}_AVAILABLE") } || "$confdir/$dir-available";
+my $enabldir = $ENV{ uc("APACHE_${dir}_ENABLED") }   || "$confdir/$dir-enabled";
+
+my $choicedir = $act eq 'enable' ? $availdir : $enabldir;
+my $linkdir = File::Spec->abs2rel( $availdir, $enabldir );
+
+my $request_reload = 0;
+
+my $rc = 0;
+
+if ( !scalar @ARGV ) {
+    my @choices = myglob('*');
+    print "Your choices are: @choices\n";
+    print "Which ${obj}(s) do you want to $act (wildcards ok)?\n";
+    my $input = <>;
+    @ARGV = split /\s+/, $input;
+
+}
+
+my @objs;
+foreach my $arg (@ARGV) {
+    my @glob = myglob($arg);
+    if ( !@glob ) {
+        error("No $obj found matching $arg!\n");
+        $rc = 1;
+    }
+    else {
+        push @objs, @glob;
+    }
+}
+
+foreach my $acton (@objs) {
+    doit($acton) or $rc = 1;
+}
+
+info("Run '/etc/init.d/apache2 $reload' to activate new configuration!\n")
+    if $request_reload;
+
+exit($rc);
+
+##############################################################################
+
+sub myglob {
+    my $arg = shift;
+
+    my @glob = map {
+        s{^$choicedir/}{};
+        s{$sffx$}{};
+        s{^000-default$}{default};
+        $_
+    } glob("$choicedir/$arg$sffx");
+
+    # use same rules as apache's Include directive
+    @glob = grep( /^[A-Za-z0-9][-.\w]*$/, @glob );
+    @glob = grep( !/\.dpkg/, @glob );
+
+    return @glob;
+}
+
+sub doit {
+    my $acton = shift;
+
+    my $prio = "";
+    if ( $obj eq 'site' && $acton eq 'default' ) {
+        $prio = '000-';
+    }
+
+    my ( $conftgt, $conflink );
+    if ( $obj eq 'module' ) {
+        if ( $acton eq 'cgi' && threaded() ) {
+            print "Your MPM seems to be threaded. Selecting cgid instead of cgi.\n";
+            $acton = 'cgid';
+        }
+
+        $conftgt = "$availdir/$acton.conf";
+        if ( -e $conftgt ) {
+            $conflink = "$enabldir/$acton.conf";
+        }
+    }
+
+    my $tgt  = "$availdir/$acton$sffx";
+    my $link = "$enabldir/$prio$acton$sffx";
+
+    if ( !-e $tgt ) {
+        if ( -l $link && !-e $link ) {
+		if ( $act eq 'disable' ) {
+			info("removing dangling symlink $link\n");
+			unlink($link);
+			return 1;
+		}
+		else {
+			error("$link is a dangling symlink!\n");
+		}
+	}
+
+        error("$name $acton does not exist!\n");
+        return 0;
+    }
+
+    # handle module dependencies
+    if ( $obj eq 'module' ) {
+        if ( $act eq 'enable' ) {
+            my $depends = qx{grep "# Depends:" "$availdir/$acton.load"|cut -f2 -d:};
+            $depends =~ s,^[\s\n]+,,;
+            $depends =~ s,[\s\n]+$,,;
+            do_deps( $acton, split( /[\n\s]+/, $depends ) ) or return 0;
+        }
+        else {
+            my @depends = qx{egrep "# Depends:.*${acton}( |\$)" $enabldir/*.load};
+            @depends = grep {s{^.*?/([^/]*?)\.load:.*}{$1}s} @depends;
+            if ( scalar @depends ) {
+                if ($force) {
+                    do_deps( $acton, @depends ) or return 0;
+                }
+                else {
+                    error(
+                        "The following modules depend on $acton ",
+                        "and need to be disabled first: @depends\n"
+                    );
+                    return 0;
+                }
+            }
+        }
+    }
+
+    if ( $act eq 'enable' ) {
+        my $check = check_link( $tgt, $link );
+        if ( $check eq 'ok' ) {
+            if ($conflink) {
+
+                # handle .conf file
+                my $confcheck = check_link( $conftgt, $conflink );
+                if ( $confcheck eq 'ok' ) {
+                    info("$name $acton already enabled\n");
+                    return 1;
+                }
+                elsif ( $confcheck eq 'missing' ) {
+                    print "Enabling config file $acton.conf.\n";
+                    add_link( $conftgt, $conflink ) or return 0;
+                }
+                else {
+                    error("Config file $acton.conf not properly enabled: $confcheck\n");
+                    return 0;
+                }
+            }
+            else {
+                info("$name $acton already enabled\n");
+                return 1;
+            }
+        }
+        elsif ( $check eq 'missing' ) {
+            if ($conflink) {
+
+                # handle .conf file
+                my $confcheck = check_link( $conftgt, $conflink );
+                if ( $confcheck eq 'missing' ) {
+                    add_link( $conftgt, $conflink ) or return 0;
+                }
+                elsif ( $confcheck ne 'ok' ) {
+                    error("Config file $acton.conf not properly enabled: $confcheck\n");
+                    return 0;
+                }
+            }
+
+            print "Enabling $obj $acton.\n";
+            if ( $acton eq 'ssl' ) {
+                info("See /usr/share/doc/apache2.2-common/README.Debian.gz on " .
+                     "how to configure SSL and create self-signed certificates.\n");
+	    }
+            return add_link( $tgt, $link );
+        }
+        else {
+            error("$name $acton not properly enabled: $check\n");
+            return 0;
+        }
+    }
+    else {
+        if ( -e $link || -l $link ) {
+            remove_link($link);
+            if ( $conflink && -e $conflink ) {
+                remove_link($conflink);
+            }
+            print "$name $acton disabled.\n";
+        }
+        elsif ( $conflink && -e $conflink ) {
+            print "Disabling stale config file $acton.conf.\n";
+            remove_link($conflink);
+        }
+        else {
+            info("$name $acton already disabled\n");
+            return 1;
+        }
+    }
+
+    return 1;
+}
+
+sub do_deps {
+    my $acton = shift;
+    foreach my $d (@_) {
+        info("Considering dependency $d for $acton:\n");
+        if ( !doit($d) ) {
+            error("Could not $act dependency $d for $acton, aborting\n");
+            return 0;
+        }
+    }
+    return 1;
+}
+
+sub add_link {
+    my ( $tgt, $link ) = @_;
+
+    # create relative link
+    if ( !symlink( File::Spec->abs2rel( $tgt, dirname($link) ), $link ) ) {
+        die("Could not create $link: $!\n");
+    }
+    $request_reload = 1;
+    return 1;
+}
+
+sub check_link {
+    my ( $tgt, $link ) = @_;
+
+    if ( !-e $link ) {
+        if ( -l $link ) {
+
+            # points to nowhere
+            info("Removing dangling link $link");
+            unlink($link) or die "Could not remove $link\n";
+        }
+        return 'missing';
+    }
+
+    if ( -e $link && !-l $link ) {
+        return "$link is a real file, not touching it";
+    }
+    if ( realpath($link) ne realpath($tgt) ) {
+        return "$link exists but does not point to $tgt, not touching it";
+    }
+    return 'ok';
+}
+
+sub remove_link {
+    my ($link) = @_;
+
+    if ( -l $link ) {
+        unlink($link) or die "Could not remove $link: $!\n";
+    }
+    elsif ( -e $link ) {
+        error("$link is not a symbolic link, not deleting\n");
+        return 0;
+    }
+    $request_reload = 1;
+    return 1;
+}
+
+sub threaded {
+    my $result = "";
+    $result = qx{/usr/sbin/apache2 -V | grep 'threaded'} if -x '/usr/sbin/apache2';
+    if ( $result =~ / no/ ) {
+        return 0;
+    }
+    else {
+        return 1;
+    }
+}
+
+sub info {
+    print @_ if !$quiet;
+}
+
+sub error {
+    print STDERR 'ERROR: ', @_;
+}
+
+sub read_env_file {
+    my $file = shift;
+
+    -r $file or return;
+    my @lines = qx{env - sh -c '. $file && env'};
+    if ($?) {
+        die "Could not read $file\n";
+    }
+
+    foreach my $l (@lines) {
+        chomp $l;
+        $l =~ /^(.*)?=(.*)$/ or die "Could not parse $file\n";
+        $ENV{$1} = $2;
+    }
+}
--- apache2-2.2.11.orig/debian/patches/201_build_suexec-custom.dpatch
+++ apache2-2.2.11/debian/patches/201_build_suexec-custom.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 201_make_suexec-custom.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add suexec-custom to the build system
+
+@DPATCH@
+diff -urNad trunk~/Makefile.in trunk/Makefile.in
+--- trunk~/Makefile.in	2007-04-24 13:08:01.000000000 +0200
++++ trunk/Makefile.in	2008-04-02 23:03:53.928260185 +0200
+@@ -221,7 +221,7 @@
+ 	fi
+ 
+ suexec:
+-	cd support && $(MAKE) suexec
++	cd support && $(MAKE) suexec suexec-custom
+ 
+ x-local-distclean:
+ 	@rm -rf autom4te.cache
+diff -urNad trunk~/support/Makefile.in trunk/support/Makefile.in
+--- trunk~/support/Makefile.in	2008-04-02 23:03:30.000000000 +0200
++++ trunk/support/Makefile.in	2008-04-02 23:03:39.188260967 +0200
+@@ -1,7 +1,7 @@
+ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
+ 	logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
+ 
+-CLEAN_TARGETS = suexec
++CLEAN_TARGETS = suexec suexec-custom
+ 
+ PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm
+ TARGETS  = $(PROGRAMS)
+@@ -62,6 +62,10 @@
+ suexec: $(suexec_OBJECTS)
+ 	$(LINK) $(suexec_OBJECTS)
+ 
++suexec-custom_OBJECTS = suexec-custom.lo
++suexec-custom: $(suexec-custom_OBJECTS)
++	$(LINK) $(suexec-custom_OBJECTS)
++
+ htcacheclean_OBJECTS = htcacheclean.lo
+ htcacheclean: $(htcacheclean_OBJECTS)
+ 	$(LINK) $(htcacheclean_LTFLAGS) $(htcacheclean_OBJECTS) $(PROGRAM_LDADD)
--- apache2-2.2.11.orig/debian/patches/033_dbm_read_hash_or_btree
+++ apache2-2.2.11/debian/patches/033_dbm_read_hash_or_btree
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 033_dbm_read_hash_or_btree by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Be more liberal in the sorts of DBM files we accept.
+
+@DPATCH@
+--- apache2/support/dbmmanage.in	2004-09-28 00:28:58.000000000 -0600
++++ apache2/support/dbmmanage.in	2004-09-28 00:29:33.000000000 -0600
+@@ -24,7 +24,7 @@
+ BEGIN { @AnyDBM_File::ISA = qw(DB_File NDBM_File GDBM_File SDBM_File) }
+ use strict;
+ use Fcntl;
+-use AnyDBM_File ();
++use DB_File ();
+ 
+ sub usage {
+     my $cmds = join "|", sort keys %dbmc::;
+@@ -154,7 +154,9 @@
+ my($mode, $flags) = $command =~ 
+     /^(?:view|check)$/ ? (0644, O_RDONLY) : (0644, O_RDWR|O_CREAT);
+ 
+-tie (%DB, "AnyDBM_File", $file, $flags, $mode) || die "Can't tie $file: $!";
++tie (%DB, "DB_File", $file, $flags, $mode, $DB_File::DB_HASH) ||
++    tie (%DB, "DB_File", $file, $flags, $mode, $DB_File::DB_BTREE) ||
++    die "Can't tie $file: $!";
+ dbmc->$command();
+ untie %DB;
+ 
+@@ -168,7 +168,7 @@
+ 	srand (time ^ $$ or time ^ ($$ + ($$ << 15)));
+     }
+     else {
+-        for (qw(-xlwwa -le)) { 
++        for (qw(xlwwa -le)) { 
+ 	    `ps $_ 2>/dev/null`;
+             $psf = $_, last unless $?;
+         }
--- apache2-2.2.11.orig/debian/patches/047_fix_usage_message.dpatch
+++ apache2-2.2.11/debian/patches/047_fix_usage_message.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 047_fix_usage_message.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add -X to the help message
+
+@DPATCH@
+diff -urNad apache2-2.2.4~/server/main.c apache2-2.2.4/server/main.c
+--- apache2-2.2.4~/server/main.c	2006-09-15 15:19:25.000000000 +0200
++++ apache2-2.2.4/server/main.c	2007-06-25 23:19:58.000000000 +0200
+@@ -336,7 +336,7 @@
+ #endif /* AP_MPM_WANT_SET_GRACEFUL_SHUTDOWN */
+ #endif
+     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+-                 "       %s [-v] [-V] [-h] [-l] [-L] [-t] [-S]", pad);
++                 "       %s [-v] [-V] [-h] [-l] [-L] [-t] [-S] [-X]", pad);
+     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+                  "Options:");
+ 
+@@ -415,6 +415,8 @@
+                  "  -M                 : a synonym for -t -D DUMP_MODULES");
+     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+                  "  -t                 : run syntax check for config files");
++    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
++                 "  -X                 : debug mode (only one worker, do not detach)");
+ 
+     destroy_and_exit_process(process, 1);
+ }
--- apache2-2.2.11.orig/debian/patches/001_branding
+++ apache2-2.2.11/debian/patches/001_branding
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 02_branding.dpatch by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes apache's PLATFORM based on lsb_release output
+
+BUILD_DIST="($(lsb_release -i -s))"
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+case "$1" in
+  -patch)
+    if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
+      echo >&2 "`basename $0`: patch already applied"
+      exit 1
+    else
+      # This is where we get our distribution-specific server signature from:
+      sed -i -e "s/(\" PLATFORM \")/${BUILD_DIST}/" server/core.c
+    fi
+  ;;
+  -unpatch) 
+    if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
+      sed -i -e "s/${BUILD_DIST}/(\" PLATFORM \")/" server/core.c
+    else
+      echo >&2 "`basename $0`: patch not yet applied, cannot unpatch"
+      exit 1
+    fi
+  ;;
+  *)
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+  ;;
+esac
--- apache2-2.2.11.orig/debian/patches/052_logresolve_linelength.dpatch
+++ apache2-2.2.11/debian/patches/052_logresolve_linelength.dpatch
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 052_logresolve_linelength.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove limit of 1024 bytes per line #331631
+
+@DPATCH@
+diff -urNad trunk~/support/logresolve.c trunk/support/logresolve.c
+--- trunk~/support/logresolve.c	2006-07-12 05:38:44.000000000 +0200
++++ trunk/support/logresolve.c	2007-09-27 20:12:47.093217594 +0200
+@@ -82,7 +82,7 @@
+ #endif
+ 
+ static void cgethost(struct in_addr ipnum, char *string, int check);
+-static int get_line(char *s, int n);
++static int get_line();
+ static void stats(FILE *output);
+ 
+ #ifdef BEOS
+@@ -90,11 +90,6 @@
+ #endif
+ 
+ 
+-/* maximum line length */
+-#ifndef MAXLINE
+-#define MAXLINE 1024
+-#endif
+-
+ /* maximum length of a domain name */
+ #ifndef MAXDNAME
+ #define MAXDNAME 256
+@@ -141,6 +136,8 @@
+ static int resolves = 0;
+ static int withname = 0;
+ static int errors[MAX_ERR + 3];
++static size_t maxline=0;
++static char *line = NULL;
+ 
+ /*
+  * cgethost - gets hostname by IP address, caching, and adding unresolvable
+@@ -287,14 +284,15 @@
+  * gets a line from stdin
+  */
+ 
+-static int get_line (char *s, int n)
++static int get_line ()
+ {
++    ssize_t len;
+     char *cp;
+ 
+-    if (!fgets(s, n, stdin))
++    if ( (len = getline(&line, &maxline, stdin)) == -1 )
+         return (0);
+-    cp = strchr(s, '\n');
+-    if (cp)
++    cp = line + len -1;
++    if (*cp == '\n')
+         *cp = '\0';
+     return (1);
+ }
+@@ -302,7 +300,7 @@
+ int main (int argc, char *argv[])
+ {
+     struct in_addr ipnum;
+-    char *bar, hoststring[MAXDNAME + 1], line[MAXLINE], *statfile;
++    char *bar, hoststring[MAXDNAME + 1], *statfile;
+     int i, check;
+ 
+ #if defined(WIN32) || (defined(NETWARE) && defined(USE_WINSOCK))
+@@ -337,7 +335,7 @@
+     for (i = 0; i < MAX_ERR + 2; i++)
+         errors[i] = 0;
+ 
+-    while (get_line(line, MAXLINE)) {
++    while (get_line()) {
+         if (line[0] == '\0')
+             continue;
+         entries++;
--- apache2-2.2.11.orig/debian/patches/00list
+++ apache2-2.2.11/debian/patches/00list
@@ -0,0 +1,28 @@
+001_branding
+002_apachectl
+004_usr_bin_perl_0wnz_j00
+008_make_include_safe
+009_apache2_has_dso
+010_fhs_compliance
+031_apxs2_sucks_more
+032_suexec_is_shared
+033_dbm_read_hash_or_btree
+034_apxs2_libtool_fixtastic
+038_no_LD_LIBRARY_PATH
+042_htdigest_CAN-2005-1344
+045_suexec_log_cloexec.dpatch
+047_fix_usage_message.dpatch
+050_enhance_apache2ctl.dpatch
+052_logresolve_linelength.dpatch
+053_bad_file_descriptor_PR42829.dpatch
+057_disablemods.dpatch
+058_suexec-CVE-2007-1742.dpatch
+067_fix_segfault_in_ab.dpatch
+068_check_pollset_create_error.dpatch
+099_config_guess_sub_update
+200_cp_suexec.dpatch
+201_build_suexec-custom.dpatch
+202_suexec-custom.dpatch
+203_fix-ssi-timeftm-ignored.dpatch
+900_CVE-2009-1191
+901_CVE-2009-1195
--- apache2-2.2.11.orig/debian/patches/034_apxs2_libtool_fixtastic
+++ apache2-2.2.11/debian/patches/034_apxs2_libtool_fixtastic
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 034_apxs2_libtool_fixtastic by Peter Samuelson <peter@p12n.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make libtool happier
+
+--- support/apxs.in
++++ apache2/support/apxs.in
+@@ -409,7 +409,7 @@
+         $la =~ s|\.c$|.la|;
+         my $o = $s;
+         $o =~ s|\.c$|.o|;
+-        push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
++        push(@cmds, "$libtool $ltflags --mode=compile --tag=disable-static $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
+         unshift(@objs, $lo);
+     }
+ 
+@@ -446,7 +446,7 @@
+         $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
+     }
+ 
+-    push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
++    push(@cmds, "$libtool $ltflags --mode=link --tag=disable-static $CFG_CC -o $dso_file $opt $lo");
+ 
+     #   execute the commands
+     &execute_cmds(@cmds);
--- apache2-2.2.11.orig/debian/patches/202_suexec-custom.dpatch
+++ apache2-2.2.11/debian/patches/202_suexec-custom.dpatch
@@ -0,0 +1,201 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 202_suexec-custom.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: the actual patch to make suexec-custom read a config file
+
+@DPATCH@
+diff -urNad trunk~/support/suexec-custom.c trunk/support/suexec-custom.c
+--- trunk~/support/suexec-custom.c	2008-05-04 19:41:30.559379143 +0200
++++ trunk/support/suexec-custom.c	2008-05-04 19:42:30.817574842 +0200
+@@ -29,6 +29,7 @@
+  *
+  *
+  */
++#define SUEXEC_CONFIG_DIR "/etc/apache2/suexec/"
+ 
+ #include "apr.h"
+ #include "ap_config.h"
+@@ -39,6 +40,7 @@
+ #include <sys/types.h>
+ #include <string.h>
+ #include <time.h>
++#include <ctype.h>
+ #if APR_HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+@@ -203,6 +205,26 @@
+     return;
+ }
+ 
++static int read_line(char *buf, FILE *file) {
++    char *p;
++    p = fgets(buf, AP_MAXPATH+1, file);
++    if (!p) return 0;
++    if (*p == '\0') return 1;
++
++    p = buf;
++    while (*p)
++        p++;
++    p--;
++
++    /* remove trailing space and slash */
++    while ( isspace(*p) && p >= buf )
++        *p-- = '\0';
++    while ( *p == '/' && p >= buf )
++        *p-- = '\0';
++
++    return 1;
++}
++
+ static void clean_env(void)
+ {
+     char pathbuf[512];
+@@ -266,6 +288,10 @@
+     struct stat dir_info;   /* directory info holder     */
+     struct stat prg_info;   /* program info holder       */
+     int cwdh;               /* handle to cwd             */
++    char *suexec_docroot        = NULL;
++    char *suexec_userdir_suffix = NULL;
++    char *filename              = NULL;
++    FILE *configfile;
+ 
+     /*
+      * Start with a "clean" environment
+@@ -296,15 +322,10 @@
+             || (! strcmp(AP_HTTPD_USER, pw->pw_name)))
+ #endif /* _OSD_POSIX */
+         ) {
+-#ifdef AP_DOC_ROOT
+-        fprintf(stderr, " -D AP_DOC_ROOT=\"%s\"\n", AP_DOC_ROOT);
+-#endif
++	fprintf(stderr, " -D SUEXEC_CONFIG_DIR=%s\n", SUEXEC_CONFIG_DIR);
+ #ifdef AP_GID_MIN
+         fprintf(stderr, " -D AP_GID_MIN=%d\n", AP_GID_MIN);
+ #endif
+-#ifdef AP_HTTPD_USER
+-        fprintf(stderr, " -D AP_HTTPD_USER=\"%s\"\n", AP_HTTPD_USER);
+-#endif
+ #ifdef AP_LOG_EXEC
+         fprintf(stderr, " -D AP_LOG_EXEC=\"%s\"\n", AP_LOG_EXEC);
+ #endif
+@@ -317,9 +338,6 @@
+ #ifdef AP_UID_MIN
+         fprintf(stderr, " -D AP_UID_MIN=%d\n", AP_UID_MIN);
+ #endif
+-#ifdef AP_USERDIR_SUFFIX
+-        fprintf(stderr, " -D AP_USERDIR_SUFFIX=\"%s\"\n", AP_USERDIR_SUFFIX);
+-#endif
+         exit(0);
+     }
+     /*
+@@ -334,23 +352,6 @@
+     target_gname = argv[2];
+     cmd = argv[3];
+ 
+-    /*
+-     * Check to see if the user running this program
+-     * is the user allowed to do so as defined in
+-     * suexec.h.  If not the allowed user, error out.
+-     */
+-#ifdef _OSD_POSIX
+-    /* User name comparisons are case insensitive on BS2000/OSD */
+-    if (strcasecmp(AP_HTTPD_USER, pw->pw_name)) {
+-        log_err("user mismatch (%s instead of %s)\n", pw->pw_name, AP_HTTPD_USER);
+-        exit(103);
+-    }
+-#else  /*_OSD_POSIX*/
+-    if (strcmp(AP_HTTPD_USER, pw->pw_name)) {
+-        log_err("user mismatch (%s instead of %s)\n", pw->pw_name, AP_HTTPD_USER);
+-        exit(103);
+-    }
+-#endif /*_OSD_POSIX*/
+ 
+     /*
+      * Check for a leading '/' (absolute path) in the command to be executed,
+@@ -375,6 +376,63 @@
+     }
+ 
+     /*
++     * Check to see if the user running this program
++     * is the user allowed to do so as defined in
++     * SUEXEC_CONFIG_DIR/username
++     * If not, error out.
++     */
++    filename = malloc(AP_MAXPATH+1);
++    suexec_docroot = malloc(AP_MAXPATH+1);
++    suexec_userdir_suffix = malloc(AP_MAXPATH+1);
++    if (!filename || !suexec_docroot || !suexec_userdir_suffix) {
++        log_err("malloc failed\n");
++	exit(120);
++    }
++
++    strncpy(filename, SUEXEC_CONFIG_DIR, AP_MAXPATH);
++    strncat(filename, pw->pw_name, AP_MAXPATH);
++    filename[AP_MAXPATH] = '\0';
++
++    configfile = fopen(filename, "r");
++    if (!configfile) {
++    	log_err("User %s not allowed: Could not open config file %s\n", pw->pw_name, filename);
++	exit(123);
++    }
++
++    if (!read_line(suexec_docroot, configfile)) {
++    	log_err("Could not read docroot from %s\n", filename);
++	exit(124);
++    }
++
++    if (!read_line(suexec_userdir_suffix, configfile)) {
++    	log_err("Could not read userdir suffix from %s\n", filename);
++	exit(125);
++    }
++
++    fclose(configfile);
++
++    if (userdir) {
++        if ( !isalnum(*suexec_userdir_suffix) && suexec_userdir_suffix[0] != '.') {
++		log_err("userdir suffix disabled in %s\n", filename);
++		exit(126);
++	}
++    }
++    else {
++    	if (suexec_docroot[0] != '/') {
++		log_err("docroot disabled in %s\n", filename);
++		exit(127);
++    	}
++
++    	if (suexec_docroot[1] == '/' ||
++	    suexec_docroot[1] == '.' ||
++	    suexec_docroot[1] == '\0' )
++	{
++		log_err("invalid docroot %s in %s\n", suexec_docroot, filename);
++		exit(128);
++    	}
++    }
++    
++    /*
+      * Error out if the target username is invalid.
+      */
+     if (strspn(target_uname, "1234567890") != strlen(target_uname)) {
+@@ -506,7 +564,7 @@
+ 
+     if (userdir) {
+         if (((chdir(target_homedir)) != 0) ||
+-            ((chdir(AP_USERDIR_SUFFIX)) != 0) ||
++            ((chdir(suexec_userdir_suffix)) != 0) ||
+             ((getcwd(dwd, AP_MAXPATH)) == NULL) ||
+             ((fchdir(cwdh)) != 0)) {
+             log_err("cannot get docroot information (%s)\n", target_homedir);
+@@ -514,10 +572,10 @@
+         }
+     }
+     else {
+-        if (((chdir(AP_DOC_ROOT)) != 0) ||
++        if (((chdir(suexec_docroot)) != 0) ||
+             ((getcwd(dwd, AP_MAXPATH)) == NULL) ||
+             ((fchdir(cwdh)) != 0)) {
+-            log_err("cannot get docroot information (%s)\n", AP_DOC_ROOT);
++            log_err("cannot get docroot information (%s)\n", suexec_docroot);
+             exit(113);
+         }
+     }
--- apache2-2.2.11.orig/debian/patches/038_no_LD_LIBRARY_PATH
+++ apache2-2.2.11/debian/patches/038_no_LD_LIBRARY_PATH
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 038_no_LD_LIBRARY_PATH by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove LD_LIBRARY_PATH from envvars-std
+
+@DPATCH@
+--- apache2/support/envvars-std.in	2004-11-07 04:07:56.000000000 -0700
++++ apache2/support/envvars-std.in	2004-11-07 04:08:08.000000000 -0700
+@@ -17,7 +17,4 @@
+ #
+ # This file is generated from envvars-std.in
+ #
+-@SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"
+-export @SHLIBPATH_VAR@
+-#
+ @OS_SPECIFIC_VARS@
--- apache2-2.2.11.orig/debian/patches/009_apache2_has_dso
+++ apache2-2.2.11/debian/patches/009_apache2_has_dso
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 009_apache2_has_dso by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make apxs usable without having apache2 installed.
+
+@DPATCH@
+--- apache2/support/apxs.in	2003-04-05 11:07:55.000000000 +0200
++++ apache2/support/apxs.in	2003-04-05 11:25:19.000000000 +0200
+@@ -237,18 +237,19 @@
+     ($httpd = $0) =~ s:support/apxs$::;
+ }
+ 
+-unless (-x "$httpd") {
+-	error("$httpd not found or not executable");
+-	exit 1;
+-}
+-
+-unless (grep /mod_so/, `. $envvars && $httpd -l`) {
+-    error("Sorry, no shared object support for Apache");
+-    error("available under your platform. Make sure");
+-    error("the Apache module mod_so is compiled into");
+-    error("your server binary `$httpd'.");
+-    exit 1;
+-}
++#commented out for Debian GNU/Linux. We know that apache2 has dso support
++#unless (-x "$httpd") {
++#	error("$httpd not found or not executable");
++#	exit 1;
++#}
++
++#unless (grep /mod_so/, `. $envvars && $httpd -l`) {
++#    error("Sorry, no shared object support for Apache");
++#    error("available under your platform. Make sure");
++#    error("the Apache module mod_so is compiled into");
++#    error("your server binary `$httpd'.");
++#    exit 1;
++#}
+ 
+ sub get_config_vars{
+     my ($file, $rh_config) = @_;
--- apache2-2.2.11.orig/debian/patches/032_suexec_is_shared
+++ apache2-2.2.11/debian/patches/032_suexec_is_shared
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 032_suexec_is_shared by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to allow suEXEC as shared.
+
+@DPATCH@
+--- apache2/os/unix/unixd.c	2004-09-27 19:53:29.000000000 -0600
++++ apache2/os/unix/unixd.c	2004-09-27 19:56:57.000000000 -0600
+@@ -209,6 +209,10 @@
+ 
+     /* Check for suexec */
+     unixd_config.suexec_enabled = 0;
++    /* If mod_suexec isn't linked in, we shouldn't test for the binary */
++    if (ap_find_linked_module("mod_suexec.c") == NULL) {
++	return;
++    }
+     if ((apr_stat(&wrapper, SUEXEC_BIN,
+                   APR_FINFO_NORM, ptemp)) != APR_SUCCESS) {
+         return;
--- apache2-2.2.11.orig/debian/patches/042_htdigest_CAN-2005-1344
+++ apache2-2.2.11/debian/patches/042_htdigest_CAN-2005-1344
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 042_htdigest_CAN-2005-1344 by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix buffer overflow in htdigest.
+
+@DPATCH@
+--- apache2/support/htdigest.c.orig	2005-05-05 02:54:31.000000000 -0600
++++ apache2/support/htdigest.c	2005-05-05 02:59:05.000000000 -0600
+@@ -222,9 +222,11 @@
+                     apr_strerror(rv, errmsg, sizeof errmsg));
+             exit(1);
+         }
++	apr_cpystrn(user, argv[4], sizeof(user));
++	apr_cpystrn(realm, argv[3], sizeof(realm));
+         apr_file_printf(errfile, "Adding password for %s in realm %s.\n",
+-                    argv[4], argv[3]);
+-        add_password(argv[4], argv[3], f);
++                    user, realm);
++        add_password(user, realm, f);
+         apr_file_close(f);
+         exit(0);
+     }
--- apache2-2.2.11.orig/debian/patches/031_apxs2_sucks_more
+++ apache2-2.2.11/debian/patches/031_apxs2_sucks_more
@@ -0,0 +1,97 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 031_apxs2_sucks_more by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make apxs2 use httpd.conf, instead of apache2.conf, plus other random fixes.
+
+@DPATCH@
+--- apache2/support/apxs.in	2005-06-10 10:18:14.000000000 +0100
++++ apache2/support/apxs.in	2006-01-26 16:50:17.000000000 +0000
+@@ -190,7 +190,7 @@
+ my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+-my $envvars = get_vars("sbindir") . "/envvars";
++my $envvars = "$CFG_SYSCONFDIR" . "/envvars";
+ $envvars = eval qq("$envvars");
+ $envvars = eval qq("$envvars");
+ 
+@@ -331,6 +331,7 @@
+     $data =~ s|%TARGET%|$CFG_TARGET|sg;
+     $data =~ s|%PREFIX%|$prefix|sg;
+     $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
++    $data =~ s|%DATADIR%|$datadir|sg;
+ 
+     my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
+ 
+@@ -480,7 +480,7 @@
+         if ($opt_i) {
+ 	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
+                  "$libtool' $f $CFG_LIBEXECDIR");
+-	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
++	    push(@cmds, "chmod 644 $CFG_LIBEXECDIR/$t");
+         }
+ 
+         #   determine module symbolname and filename
+@@ -516,7 +516,8 @@
+             $filename = "mod_${name}.c";
+         }
+         my $dir = $CFG_LIBEXECDIR;
+-        $dir =~ s|^$CFG_PREFIX/?||;
++        # Debian doesn't have a CFG_PREFIX, so this stuffs up:
++	# $dir =~ s|^$CFG_PREFIX/?||;
+         $dir =~ s|(.)$|$1/|;
+ 	$t =~ s|\.la$|.so|;
+         push(@lmd, sprintf("LoadModule %-18s %s", "${name}_module", "$dir$t"));
+@@ -527,17 +528,17 @@
+ 
+     #   activate module via LoadModule/AddModule directive
+     if ($opt_a or $opt_A) {
+-        if (not -f "$CFG_SYSCONFDIR/$CFG_TARGET.conf") {
+-            error("Config file $CFG_SYSCONFDIR/$CFG_TARGET.conf not found");
++        if (not -f "$CFG_SYSCONFDIR/httpd.conf") {
++            error("Config file $CFG_SYSCONFDIR/httpd.conf not found");
+             exit(1);
+         }
+ 
+-        open(FP, "<$CFG_SYSCONFDIR/$CFG_TARGET.conf") || die;
++        open(FP, "<$CFG_SYSCONFDIR/httpd.conf") || die;
+         my $content = join('', <FP>);
+         close(FP);
+ 
+         if ($content !~ m|\n#?\s*LoadModule\s+|) {
+-            error("Activation failed for custom $CFG_SYSCONFDIR/$CFG_TARGET.conf file.");
++            error("Activation failed for custom $CFG_SYSCONFDIR/httpd.conf file.");
+             error("At least one `LoadModule' directive already has to exist.");
+             exit(1);
+         }
+@@ -613,15 +614,15 @@
+                 $content =~ s|^(.*\n)#?\s*$lmd[^\n]*\n|$1$c$lmd\n|s;
+             }
+             $lmd =~ m|LoadModule\s+(.+?)_module.*|;
+-            notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]");
++            notice("[$what module `$1' in $CFG_SYSCONFDIR/httpd.conf]");
+         }
+         if (@lmd) {
+-            if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
++            if (open(FP, ">$CFG_SYSCONFDIR/httpd.conf.new")) {
+                 print FP $content;
+                 close(FP);
+-                system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
+-                       "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
+-                       "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
++                system("cp $CFG_SYSCONFDIR/httpd.conf $CFG_SYSCONFDIR/httpd.conf.bak && " .
++                       "cp $CFG_SYSCONFDIR/httpd.conf.new $CFG_SYSCONFDIR/httpd.conf && " .
++                       "rm $CFG_SYSCONFDIR/httpd.conf.new");
+             } else {
+                 notice("unable to open configuration file");
+             }
+@@ -694,7 +695,7 @@
+ 
+ builddir=.
+ top_srcdir=%PREFIX%
+-top_builddir=%PREFIX%
++top_builddir=%DATADIR%
+ include %INSTALLBUILDDIR%/special.mk
+ 
+ #   the used tools
--- apache2-2.2.11.orig/debian/patches/045_suexec_log_cloexec.dpatch
+++ apache2-2.2.11/debian/patches/045_suexec_log_cloexec.dpatch
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## suexec_log_cloexec.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to allow suexec to log after a cgi error (#312385)
+## DP: http://issues.apache.org/bugzilla/show_bug.cgi?id=10744
+
+@DPATCH@
+
+diff -ru apache2-2.2.3.orig/support/suexec.c apache2-2.2.3/support/suexec.c 
+--- apache2-2.2.3.orig/support/suexec.c	2006-07-12 05:38:44.000000000 +0200
++++ apache2-2.2.3/support/suexec.c	2007-05-24 18:37:04.000000000 +0200
+@@ -46,6 +46,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
++#include <fcntl.h>
+ 
+ #ifdef HAVE_PWD_H
+ #include <pwd.h>
+@@ -596,17 +597,14 @@
+ #endif /* AP_SUEXEC_UMASK */
+ 
+     /*
+-     * Be sure to close the log file so the CGI can't
+-     * mess with it.  If the exec fails, it will be reopened
+-     * automatically when log_err is called.  Note that the log
+-     * might not actually be open if AP_LOG_EXEC isn't defined.
+-     * However, the "log" cell isn't ifdef'd so let's be defensive
+-     * and assume someone might have done something with it
+-     * outside an ifdef'd AP_LOG_EXEC block.
+-     */
+-    if (log != NULL) {
+-        fclose(log);
+-        log = NULL;
++     * ask fcntl(2) to set the FD_CLOEXEC flag on the log file,
++     * so it'll be automagically closed if the exec() call succeeds.
++     */
++    fflush(log);
++    setbuf(log,NULL);
++    if(fcntl(fileno(log),F_SETFD,FD_CLOEXEC)==-1) {
++      log_err("error: can't set close-on-exec flag");
++      exit(122);
+     }
+ 
+     /*
--- apache2-2.2.11.orig/debian/patches/004_usr_bin_perl_0wnz_j00
+++ apache2-2.2.11/debian/patches/004_usr_bin_perl_0wnz_j00
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 004_usr_bin_perl_0wnz_j00 by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Call /usr/bin/perl in printenv, not /usr/local/bin/perl
+
+@DPATCH@
+--- apache2/docs/cgi-examples/printenv.orig	Fri Sep 21 17:31:24 2001
++++ apache2/docs/cgi-examples/printenv	Fri Sep 21 17:31:29 2001
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ ##
+ ##  printenv -- demo CGI program which just prints its environment
+ ##
--- apache2-2.2.11.orig/debian/patches/068_check_pollset_create_error.dpatch
+++ apache2-2.2.11/debian/patches/068_check_pollset_create_error.dpatch
@@ -0,0 +1,178 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 068_check_pollset_create_error.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: PR 46467
+## DP: https://svn.apache.org/viewcvs.cgi?view=rev&rev=732414 plus more patches
+
+@DPATCH@
+diff -urNad lenny-apache2~/modules/generators/mod_cgi.c lenny-apache2/modules/generators/mod_cgi.c
+--- lenny-apache2~/modules/generators/mod_cgi.c	2009-01-10 16:26:58.000000000 +0100
++++ lenny-apache2/modules/generators/mod_cgi.c	2009-01-10 16:29:26.865442867 +0100
+@@ -587,7 +587,12 @@
+ 
+     /* Create the pollset */
+     rv = apr_pollset_create(&data->pollset, 2, r->pool, 0);
+-    AP_DEBUG_ASSERT(rv == APR_SUCCESS);
++    if (rv != APR_SUCCESS) {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++                     "cgi: apr_pollset_create(); check system or user limits");
++        return NULL;
++    }
++
+ 
+     fd.desc_type = APR_POLL_FILE;
+     fd.reqevents = APR_POLLIN;
+@@ -595,12 +600,20 @@
+     fd.desc.f = out; /* script's stdout */
+     fd.client_data = (void *)1;
+     rv = apr_pollset_add(data->pollset, &fd);
+-    AP_DEBUG_ASSERT(rv == APR_SUCCESS);
++    if (rv != APR_SUCCESS) {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++                     "cgi: apr_pollset_add(); check system or user limits");
++        return NULL;
++    }
+ 
+     fd.desc.f = err; /* script's stderr */
+     fd.client_data = (void *)2;
+     rv = apr_pollset_add(data->pollset, &fd);
+-    AP_DEBUG_ASSERT(rv == APR_SUCCESS);
++    if (rv != APR_SUCCESS) {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++                     "cgi: apr_pollset_add(); check system or user limits");
++        return NULL;
++    }
+ 
+     data->r = r;
+     b->data = data;
+@@ -910,6 +923,8 @@
+     apr_file_pipe_timeout_set(script_err, 0);
+ 
+     b = cgi_bucket_create(r, script_in, script_err, c->bucket_alloc);
++    if (b == NULL)
++	return HTTP_INTERNAL_SERVER_ERROR;
+ #else
+     b = apr_bucket_pipe_create(script_in, c->bucket_alloc);
+ #endif
+diff -urNad lenny-apache2~/modules/proxy/mod_proxy_connect.c lenny-apache2/modules/proxy/mod_proxy_connect.c
+--- lenny-apache2~/modules/proxy/mod_proxy_connect.c	2009-01-10 16:26:58.000000000 +0100
++++ lenny-apache2/modules/proxy/mod_proxy_connect.c	2009-01-10 16:28:28.951752743 +0100
+@@ -270,7 +270,8 @@
+     if ((rv = apr_pollset_create(&pollset, 2, r->pool, 0)) != APR_SUCCESS) {
+         apr_socket_close(sock);
+         ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+-            "proxy: CONNECT: error apr_pollset_create()");
++            "proxy: CONNECT: error apr_pollset_create();"
++            " check system or user limits");
+         return HTTP_INTERNAL_SERVER_ERROR;
+     }
+ 
+@@ -280,11 +281,25 @@
+     pollfd.reqevents = APR_POLLIN;
+     pollfd.desc.s = client_socket;
+     pollfd.client_data = NULL;
+-    apr_pollset_add(pollset, &pollfd);
++    rv = apr_pollset_add(pollset, &pollfd);
++    if (rv != APR_SUCCESS) {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++                     "proxy: CONNECT: error apr_pollset_add();"
++                     " check system or user limits");
++        return HTTP_INTERNAL_SERVER_ERROR;
++    }
++
++    
+ 
+     /* Add the server side to the poll */
+     pollfd.desc.s = sock;
+-    apr_pollset_add(pollset, &pollfd);
++    rv = apr_pollset_add(pollset, &pollfd);
++    if (rv != APR_SUCCESS) {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++                     "proxy: CONNECT: error apr_pollset_add();"
++                     " check system or user limits");
++        return HTTP_INTERNAL_SERVER_ERROR;
++    }
+ 
+     while (1) { /* Infinite loop until error (one side closes the connection) */
+         if ((rv = apr_pollset_poll(pollset, -1, &pollcnt, &signalled)) != APR_SUCCESS) {
+diff -urNad lenny-apache2~/server/mpm/experimental/event/event.c lenny-apache2/server/mpm/experimental/event/event.c
+--- lenny-apache2~/server/mpm/experimental/event/event.c	2009-01-10 16:26:58.000000000 +0100
++++ lenny-apache2/server/mpm/experimental/event/event.c	2009-01-10 16:27:03.999754667 +0100
+@@ -2171,7 +2171,8 @@
+         if (rv != APR_SUCCESS) {
+             ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL,
+                          "Couldn't create a Thread Safe Pollset. "
+-                         "Is it supported on your platform?");
++                         "Is it supported on your platform?"
++                         "Also check system or user limits!");
+             return HTTP_INTERNAL_SERVER_ERROR;
+         }
+         apr_pollset_destroy(event_pollset);
+diff -urNad lenny-apache2~/server/mpm/prefork/prefork.c lenny-apache2/server/mpm/prefork/prefork.c
+--- lenny-apache2~/server/mpm/prefork/prefork.c	2009-01-10 16:27:03.595754605 +0100
++++ lenny-apache2/server/mpm/prefork/prefork.c	2009-01-10 16:27:03.999754667 +0100
+@@ -522,8 +522,12 @@
+     (void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL);
+ 
+     /* Set up the pollfd array */
+-    /* ### check the status */
+-    (void) apr_pollset_create(&pollset, num_listensocks, pchild, 0);
++    status = apr_pollset_create(&pollset, num_listensocks, pchild, 0);
++    if (status != APR_SUCCESS) {
++        ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf,
++                     "Couldn't create pollset in child; check system or user limits");
++        clean_child_exit(APEXIT_CHILDSICK); /* assume temporary resource issue */
++    }
+ 
+     for (lr = ap_listeners, i = num_listensocks; i--; lr = lr->next) {
+         apr_pollfd_t pfd = { 0 };
+@@ -533,8 +537,12 @@
+         pfd.reqevents = APR_POLLIN;
+         pfd.client_data = lr;
+ 
+-        /* ### check the status */
+-        (void) apr_pollset_add(pollset, &pfd);
++        status = apr_pollset_add(pollset, &pfd);
++        if (status != APR_SUCCESS) {
++            ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf,
++                         "Couldn't add listener to pollset; check system or user limits");
++            clean_child_exit(APEXIT_CHILDSICK);
++        }
+     }
+ 
+     mpm_state = AP_MPMQ_RUNNING;
+diff -urNad lenny-apache2~/server/mpm/worker/worker.c lenny-apache2/server/mpm/worker/worker.c
+--- lenny-apache2~/server/mpm/worker/worker.c	2009-01-10 16:26:58.000000000 +0100
++++ lenny-apache2/server/mpm/worker/worker.c	2009-01-10 16:27:03.999754667 +0100
+@@ -605,8 +605,13 @@
+ 
+     free(ti);
+ 
+-    /* ### check the status */
+-    (void) apr_pollset_create(&pollset, num_listensocks, tpool, 0);
++    rv = apr_pollset_create(&pollset, num_listensocks, tpool, 0);
++    if (rv != APR_SUCCESS) {
++        ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,
++                     "Couldn't create pollset in thread; check system or user limits");
++        clean_child_exit(APEXIT_CHILDSICK); /* assume temporary resource issue */
++    }
++
+ 
+     for (lr = ap_listeners; lr != NULL; lr = lr->next) {
+         apr_pollfd_t pfd = { 0 };
+@@ -616,8 +621,12 @@
+         pfd.reqevents = APR_POLLIN;
+         pfd.client_data = lr;
+ 
+-        /* ### check the status */
+-        (void) apr_pollset_add(pollset, &pfd);
++        rv = apr_pollset_add(pollset, &pfd);
++        if (rv != APR_SUCCESS) {
++            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,
++                         "Couldn't create add listener to pollset; check system or user limits");
++            clean_child_exit(APEXIT_CHILDSICK);
++        }
+     }
+ 
+     /* Unblock the signal used to wake this thread up, and set a handler for
--- apache2-2.2.11.orig/debian/patches/002_apachectl
+++ apache2-2.2.11/debian/patches/002_apachectl
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 002_apachectl by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: envvars lives in /etc/apache2 in our setup.
+
+@DPATCH@
+--- apache2/support/apachectl.in	2003-05-07 13:18:19.000000000 +0100
++++ apache2/support/apachectl.in	2003-05-07 13:17:37.000000000 +0100
+@@ -31,8 +31,8 @@
+ HTTPD='@exp_sbindir@/@progname@'
+ #
+ # pick up any necessary environment variables
+-if test -f @exp_sbindir@/envvars; then
+-  . @exp_sbindir@/envvars
++if test -f @exp_sysconfdir@/envvars; then
++  . @exp_sysconfdir@/envvars
+ fi
+ #
+ # a command that outputs a formatted text version of the HTML at the
--- apache2-2.2.11.orig/debian/patches/057_disablemods.dpatch
+++ apache2-2.2.11/debian/patches/057_disablemods.dpatch
@@ -0,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Stolen from the fedora package
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support "--enable-modules=none" to build an httpd binary with 
+## DP: no optional modules enabled.
+
+@DPATCH@
+diff -urNad trunk~/acinclude.m4 trunk/acinclude.m4
+--- trunk~/acinclude.m4	2005-11-13 07:33:15.000000000 +0100
++++ trunk/acinclude.m4	2008-03-14 01:28:42.379287995 +0100
+@@ -289,14 +289,19 @@
+ 
+   AC_ARG_ENABLE(modules,
+   APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Space-separated list of modules to enable | "all" | "most"),[
+-    for i in $enableval; do
+-      if test "$i" = "all" -o "$i" = "most"; then
+-        module_selection=$i
+-      else
+-        i=`echo $i | sed 's/-/_/g'`
+-        eval "enable_$i=yes"
+-      fi
+-    done
++    if test "$enableval" = "none"; then
++       module_default=no
++       module_selection=none
++    else
++      for i in $enableval; do
++        if test "$i" = "all" -o "$i" = "most"; then
++          module_selection=$i
++        else
++          i=`echo $i | sed 's/-/_/g'`
++          eval "enable_$i=yes"
++        fi
++      done
++    fi
+   ])
+   
+   AC_ARG_ENABLE(mods-shared,
+diff -urNad trunk~/configure trunk/configure
+--- trunk~/configure	2008-01-10 17:54:40.000000000 +0100
++++ trunk/configure	2008-03-14 01:31:55.675287371 +0100
+@@ -8106,6 +8106,10 @@
+   # Check whether --enable-modules was given.
+ if test "${enable_modules+set}" = set; then
+   enableval=$enable_modules;
++  if test "$enableval" = "none"; then
++     module_default=no
++     module_selection=none
++  else
+     for i in $enableval; do
+       if test "$i" = "all" -o "$i" = "most"; then
+         module_selection=$i
+@@ -8114,7 +8118,7 @@
+         eval "enable_$i=yes"
+       fi
+     done
+-
++  fi
+ fi
+ 
+ 
--- apache2-2.2.11.orig/debian/patches/008_make_include_safe
+++ apache2-2.2.11/debian/patches/008_make_include_safe
@@ -0,0 +1,68 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 008_make_include_safe by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Avoid including dpkg droppings in globbed includes.
+
+@DPATCH@
+--- apache2-2.2.0/server/config.c	2005-11-17 13:39:15.000000000 +0000
++++ apache2-2.2.0/server/config.c	2006-01-27 17:06:19.000000000 +0000
+@@ -34,6 +34,7 @@
+ #include "apr_portable.h"
+ #include "apr_file_io.h"
+ #include "apr_fnmatch.h"
++#include "apr_lib.h"
+ 
+ #define APR_WANT_STDIO
+ #define APR_WANT_STRFUNC
+@@ -1521,6 +1522,30 @@
+     return strcmp(f1->fname,f2->fname);
+ }
+ 
++static int fname_valid(const char *fname) {
++    const unsigned char *c = fname;
++    unsigned char bad_dpkg[] = "*.dpkg*";
++
++    if (!apr_isalnum(*c)) {
++        return 0;
++    }
++    ++c;
++    
++    
++    while (*c) {
++        if (!apr_isalnum(*c) && *c!='_' && *c!='-' && *c!='.') {
++            return 0;
++        }
++        ++c;
++    }
++
++    if (!apr_fnmatch(bad_dpkg, fname, 0)) {
++        return 0;
++    }
++
++    return 1;
++}
++
+ static const char *process_resource_config_nofnmatch(server_rec *s,
+                                                      const char *fname,
+                                                      ap_directive_t **conftree,
+@@ -1564,7 +1589,8 @@
+         while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
+             /* strip out '.' and '..' */
+             if (strcmp(dirent.name, ".")
+-                && strcmp(dirent.name, "..")) {
++                && strcmp(dirent.name, "..")
++                && fname_valid(dirent.name)) {
+                 fnew = (fnames *) apr_array_push(candidates);
+                 fnew->fname = ap_make_full_path(p, path, dirent.name);
+             }
+@@ -1692,7 +1718,8 @@
+             if (strcmp(dirent.name, ".")
+                 && strcmp(dirent.name, "..")
+                 && (apr_fnmatch(pattern, dirent.name,
+-                                APR_FNM_PERIOD) == APR_SUCCESS)) {
++                                APR_FNM_PERIOD) == APR_SUCCESS)
++                && fname_valid(dirent.name)) {
+                 fnew = (fnames *) apr_array_push(candidates);
+                 fnew->fname = ap_make_full_path(p, path, dirent.name);
+             }
--- apache2-2.2.11.orig/debian/patches/203_fix-ssi-timeftm-ignored.dpatch
+++ apache2-2.2.11/debian/patches/203_fix-ssi-timeftm-ignored.dpatch
@@ -0,0 +1,76 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: the actual patch to make suexec-custom read a config file
+
+@DPATCH@
+diff -Naur httpd-2.2.11.orig/modules/filters/mod_include.c httpd-2.2.11/modules/filters/mod_include.c
+--- httpd-2.2.11.orig/modules/filters/mod_include.c	2008-03-17 10:32:47.000000000 -0400
++++ httpd-2.2.11/modules/filters/mod_include.c	2009-04-01 11:21:10.000000000 -0400
+@@ -580,7 +580,7 @@
+     *p = '\0';
+ }
+ 
+-static void add_include_vars(request_rec *r, const char *timefmt)
++static void add_include_vars(request_rec *r)
+ {
+     apr_table_t *e = r->subprocess_env;
+     char *t;
+@@ -608,26 +608,18 @@
+     }
+ }
+ 
+-static const char *add_include_vars_lazy(request_rec *r, const char *var)
++static const char *add_include_vars_lazy(request_rec *r, const char *var, const char *timefmt)
+ {
+     char *val;
+     if (!strcasecmp(var, "DATE_LOCAL")) {
+         include_dir_config *conf =
+-            (include_dir_config *)ap_get_module_config(r->per_dir_config,
+-                                                       &include_module);
+-        val = ap_ht_time(r->pool, r->request_time, conf->default_time_fmt, 0);
++        val = ap_ht_time(r->pool, r->request_time, timefmt, 0);
+     }
+     else if (!strcasecmp(var, "DATE_GMT")) {
+-        include_dir_config *conf =
+-            (include_dir_config *)ap_get_module_config(r->per_dir_config,
+-                                                       &include_module);
+-        val = ap_ht_time(r->pool, r->request_time, conf->default_time_fmt, 1);
++        val = ap_ht_time(r->pool, r->request_time, timefmt, 1);
+     }
+     else if (!strcasecmp(var, "LAST_MODIFIED")) {
+-        include_dir_config *conf =
+-            (include_dir_config *)ap_get_module_config(r->per_dir_config,
+-                                                       &include_module);
+-        val = ap_ht_time(r->pool, r->finfo.mtime, conf->default_time_fmt, 0);
++        val = ap_ht_time(r->pool, r->finfo.mtime, timefmt, 0);
+     }
+     else if (!strcasecmp(var, "USER_NAME")) {
+         if (apr_uid_name_get(&val, r->finfo.user, r->pool) != APR_SUCCESS) {
+@@ -684,7 +676,7 @@
+         val = apr_table_get(r->subprocess_env, var);
+ 
+         if (val == LAZY_VALUE) {
+-            val = add_include_vars_lazy(r, var);
++            val = add_include_vars_lazy(r, var, ctx->time_str);
+         }
+     }
+ 
+@@ -2423,7 +2415,7 @@
+         /* get value */
+         val_text = elts[i].val;
+         if (val_text == LAZY_VALUE) {
+-            val_text = add_include_vars_lazy(r, elts[i].key);
++            val_text = add_include_vars_lazy(r, elts[i].key, ctx->time_str);
+         }
+         val_text = ap_escape_html(ctx->dpool, elts[i].val);
+         v_len = strlen(val_text);
+@@ -3608,7 +3600,7 @@
+          * environment */
+         ap_add_common_vars(r);
+         ap_add_cgi_vars(r);
+-        add_include_vars(r, conf->default_time_fmt);
++        add_include_vars(r);
+     }
+     /* Always unset the content-length.  There is no way to know if
+      * the content will be modified at some point by send_parsed_content.
--- apache2-2.2.11.orig/debian/patches/901_CVE-2009-1195.dpatch
+++ apache2-2.2.11/debian/patches/901_CVE-2009-1195.dpatch
@@ -0,0 +1,155 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 900_CVE-2009-1195.dpatch by Jamie Strandboge <jamie@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch: http://svn.apache.org/viewvc?view=rev&revision=773881
+## DP:        http://svn.apache.org/viewvc?view=rev&revision=779472
+## DP:        http://people.apache.org/~trawick/mod_perl_more_compat.txt
+## DP: Description: Prevent the "Includes" Option from being enabled in an
+## DP: .htaccess file if the AllowOverride restrictions do not permit it.
+##
+
+@DPATCH@
+diff -urNad apache2-2.2.11~/include/http_core.h apache2-2.2.11/include/http_core.h
+--- apache2-2.2.11~/include/http_core.h	2008-02-26 13:47:51.000000000 -0600
++++ apache2-2.2.11/include/http_core.h	2009-06-10 17:09:58.497057596 -0500
+@@ -65,7 +65,7 @@
+ #define OPT_NONE 0
+ /** Indexes directive */
+ #define OPT_INDEXES 1
+-/**  Includes directive */
++/** SSI is enabled without exec= permission  */
+ #define OPT_INCLUDES 2
+ /**  FollowSymLinks directive */
+ #define OPT_SYM_LINKS 4
+@@ -80,9 +80,22 @@
+ /** MultiViews directive */
+ #define OPT_MULTI 128
+ /**  All directives */
+-#define OPT_ALL (OPT_INDEXES|OPT_INCLUDES|OPT_SYM_LINKS|OPT_EXECCGI)
++#define OPT_ALL (OPT_INDEXES|OPT_INCLUDES|OPT_INCNOEXEC|OPT_SYM_LINKS|OPT_EXECCGI)
+ /** @} */
+ 
++#ifdef CORE_PRIVATE
++/* For internal use only - since 2.2.12, the OPT_INCNOEXEC bit is
++ * internally replaced by OPT_INC_WITH_EXEC.  The internal semantics
++ * of the two SSI-related bits are hence:
++ *
++ *  OPT_INCLUDES => "enable SSI, without exec= permission"
++ *  OPT_INC_WITH_EXEC => "iff OPT_INCLUDES is set, also enable exec="
++ *
++ * The set of options exposed via ap_allow_options() retains the
++ * semantics of OPT_INCNOEXEC by flipping the bit. */
++#define OPT_INC_WITH_EXEC OPT_INCNOEXEC
++#endif
++
+ /**
+  * @defgroup get_remote_host Remote Host Resolution 
+  * @ingroup APACHE_CORE_HTTPD
+diff -urNad apache2-2.2.11~/server/config.c apache2-2.2.11/server/config.c
+--- apache2-2.2.11~/server/config.c	2009-06-10 17:08:12.489057418 -0500
++++ apache2-2.2.11/server/config.c	2009-06-10 17:09:51.261058120 -0500
+@@ -1511,7 +1511,7 @@
+     parms.temp_pool = ptemp;
+     parms.server = s;
+     parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
+-    parms.override_opts = OPT_ALL | OPT_INCNOEXEC | OPT_SYM_OWNER | OPT_MULTI;
++    parms.override_opts = OPT_ALL | OPT_SYM_OWNER | OPT_MULTI;
+ 
+     parms.config_file = ap_pcfg_open_custom(p, "-c/-C directives",
+                                             &arr_parms, NULL,
+@@ -1643,7 +1643,7 @@
+     parms.temp_pool = ptemp;
+     parms.server = s;
+     parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
+-    parms.override_opts = OPT_ALL | OPT_INCNOEXEC | OPT_SYM_OWNER | OPT_MULTI;
++    parms.override_opts = OPT_ALL | OPT_SYM_OWNER | OPT_MULTI;
+ 
+     rv = ap_pcfg_openfile(&cfp, p, fname);
+     if (rv != APR_SUCCESS) {
+@@ -1782,7 +1782,7 @@
+     parms.temp_pool = ptemp;
+     parms.server = s;
+     parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
+-    parms.override_opts = OPT_ALL | OPT_INCNOEXEC | OPT_SYM_OWNER | OPT_MULTI;
++    parms.override_opts = OPT_ALL | OPT_SYM_OWNER | OPT_MULTI;
+     parms.limited = -1;
+ 
+     errmsg = ap_walk_config(conftree, &parms, s->lookup_defaults);
+diff -urNad apache2-2.2.11~/server/core.c apache2-2.2.11/server/core.c
+--- apache2-2.2.11~/server/core.c	2009-06-10 17:08:12.421557076 -0500
++++ apache2-2.2.11/server/core.c	2009-06-10 17:10:03.549057527 -0500
+@@ -108,8 +108,7 @@
+     conf->opts = dir ? OPT_UNSET : OPT_UNSET|OPT_ALL;
+     conf->opts_add = conf->opts_remove = OPT_NONE;
+     conf->override = dir ? OR_UNSET : OR_UNSET|OR_ALL;
+-    conf->override_opts = OPT_UNSET | OPT_ALL | OPT_INCNOEXEC | OPT_SYM_OWNER
+-                          | OPT_MULTI;
++    conf->override_opts = OPT_UNSET | OPT_ALL | OPT_SYM_OWNER | OPT_MULTI;
+ 
+     conf->content_md5 = 2;
+     conf->accept_path_info = 3;
+@@ -242,8 +241,15 @@
+         conf->opts_remove = (conf->opts_remove & ~new->opts_add)
+                             | new->opts_remove;
+         conf->opts = (conf->opts & ~conf->opts_remove) | conf->opts_add;
+-        if ((base->opts & OPT_INCNOEXEC) && (new->opts & OPT_INCLUDES)) {
+-            conf->opts = (conf->opts & ~OPT_INCNOEXEC) | OPT_INCLUDES;
++
++        /* If Includes was enabled with exec in the base config, but
++         * was enabled without exec in the new config, then disable
++         * exec in the merged set. */
++        if (((base->opts & (OPT_INCLUDES|OPT_INC_WITH_EXEC))
++             == (OPT_INCLUDES|OPT_INC_WITH_EXEC))
++            && ((new->opts & (OPT_INCLUDES|OPT_INC_WITH_EXEC))
++                == OPT_INCLUDES)) {
++            conf->opts &= ~OPT_INC_WITH_EXEC;
+         }
+     }
+     else {
+@@ -655,7 +661,16 @@
+     core_dir_config *conf =
+       (core_dir_config *)ap_get_module_config(r->per_dir_config, &core_module);
+ 
+-    return conf->opts;
++    /* Per comment in http_core.h - the OPT_INC_WITH_EXEC bit is
++     * inverted, such that the exposed semantics match that of
++     * OPT_INCNOEXEC; i.e., the bit is only enabled if exec= is *not*
++     * permitted. */
++    if (conf->opts & OPT_INCLUDES) {
++        return conf->opts ^ OPT_INC_WITH_EXEC;
++    }
++    else {
++        return conf->opts;
++    }
+ }
+ 
+ AP_DECLARE(int) ap_allow_overrides(request_rec *r)
+@@ -1304,10 +1319,12 @@
+             opt = OPT_INDEXES;
+         }
+         else if (!strcasecmp(w, "Includes")) {
+-            opt = OPT_INCLUDES;
++            /* If Includes is permitted, both Includes and
++             * IncludesNOEXEC may be changed. */
++            opt = (OPT_INCLUDES | OPT_INC_WITH_EXEC);
+         }
+         else if (!strcasecmp(w, "IncludesNOEXEC")) {
+-            opt = (OPT_INCLUDES | OPT_INCNOEXEC);
++            opt = OPT_INCLUDES;
+         }
+         else if (!strcasecmp(w, "FollowSymLinks")) {
+             opt = OPT_SYM_LINKS;
+@@ -1428,10 +1445,10 @@
+             opt = OPT_INDEXES;
+         }
+         else if (!strcasecmp(w, "Includes")) {
+-            opt = OPT_INCLUDES;
++            opt = (OPT_INCLUDES | OPT_INC_WITH_EXEC);
+         }
+         else if (!strcasecmp(w, "IncludesNOEXEC")) {
+-            opt = (OPT_INCLUDES | OPT_INCNOEXEC);
++            opt = OPT_INCLUDES;
+         }
+         else if (!strcasecmp(w, "FollowSymLinks")) {
+             opt = OPT_SYM_LINKS;
--- apache2-2.2.11.orig/debian/patches/200_cp_suexec.dpatch
+++ apache2-2.2.11/debian/patches/200_cp_suexec.dpatch
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+## DP: copy suexec to suexec-custom
+
+WORKDIR=${2:-.}
+
+if [ "$1" = -patch ]; then
+	cp $WORKDIR/support/suexec.c $WORKDIR/support/suexec-custom.c
+elif [ "$1" = -unpatch ]; then
+	rm $WORKDIR/support/suexec-custom.c
+fi
--- apache2-2.2.11.orig/debian/patches/053_bad_file_descriptor_PR42829.dpatch
+++ apache2-2.2.11/debian/patches/053_bad_file_descriptor_PR42829.dpatch
@@ -0,0 +1,98 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 053_bad_file_descriptor_PR42829.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix "Bad file descriptor" error on graceful reload
+## DP: and processes not being killed on graceful stop
+
+@DPATCH@
+--- a/server/mpm/prefork/prefork.c-dist	2007-07-17 16:48:25.000000000 +0200
++++ b/server/mpm/prefork/prefork.c	2007-11-16 10:42:08.588895000 +0100
+@@ -137,10 +137,12 @@
+ int tpf_child = 0;
+ char tpf_server_name[INETD_SERVNAME_LENGTH+1];
+ #endif /* TPF */
+ 
+ static volatile int die_now = 0;
++static volatile int listeners_closed = 0;
++static int active_connection = 0;
+ 
+ #ifdef GPROF
+ /*
+  * change directory for gprof to plop the gmon.out file
+  * configure in httpd.conf:
+@@ -328,11 +330,14 @@
+     clean_child_exit(0);
+ }
+ 
+ static void stop_listening(int sig)
+ {
+-    ap_close_listeners();
++    if (active_connection) {
++        ap_close_listeners();
++        listeners_closed = 1;
++    }
+ 
+     /* For a graceful stop, we want the child to exit when done */
+     die_now = 1;
+ }
+ 
+@@ -568,10 +573,15 @@
+             /* multiple listening sockets - need to poll */
+             for (;;) {
+                 apr_int32_t numdesc;
+                 const apr_pollfd_t *pdesc;
+ 
++                if (die_now) {
++                    status = !APR_SUCCESS;
++                    goto unlock;
++                }
++
+                 /* timeout == -1 == wait forever */
+                 status = apr_pollset_poll(pollset, -1, &numdesc, &pdesc);
+                 if (status != APR_SUCCESS) {
+                     if (APR_STATUS_IS_EINTR(status)) {
+                         if (one_process && shutdown_pending) {
+@@ -616,12 +626,18 @@
+         }
+     got_fd:
+         /* if we accept() something we don't want to die, so we have to
+          * defer the exit
+          */
+-        status = lr->accept_func(&csd, lr, ptrans);
++        if (!die_now) {
++            status = lr->accept_func(&csd, lr, ptrans);
++        }
++        else {
++            status = !APR_SUCCESS;
++        }
+ 
++    unlock:
+         SAFE_ACCEPT(accept_mutex_off());      /* unlock after "accept" */
+ 
+         if (status == APR_EGENERAL) {
+             /* resource shortage or should-not-occur occured */
+             clean_child_exit(1);
+@@ -633,15 +649,22 @@
+         /*
+          * We now have a connection, so set it up with the appropriate
+          * socket options, file descriptors, and read/write buffers.
+          */
+ 
++        active_connection = 1;
++        if (die_now && !listeners_closed) {
++            ap_close_listeners();
++            listeners_closed = 1;
++        }
++
+         current_conn = ap_run_create_connection(ptrans, ap_server_conf, csd, my_child_num, sbh, bucket_alloc);
+         if (current_conn) {
+             ap_process_connection(current_conn, csd);
+             ap_lingering_close(current_conn);
+         }
++        active_connection = 0;
+ 
+         /* Check the pod and the generation number after processing a
+          * connection so that we'll go away if a graceful restart occurred
+          * while we were processing the connection or we are the lucky
+          * idle server process that gets to die.
--- apache2-2.2.11.orig/debian/patches/010_fhs_compliance
+++ apache2-2.2.11/debian/patches/010_fhs_compliance
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 010_more_fhs_compliance by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix up FHS file locations for apache2 droppings.
+
+@DPATCH@
+--- apache2/include/ap_config_layout.h.in.orig	2005-06-15 00:06:51.000000000 +1000
++++ apache2/include/ap_config_layout.h.in	2005-10-23 14:02:43.000000000 +1000
+@@ -55,5 +55,6 @@
+ #define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"
+ #define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"
+ #define DEFAULT_REL_PROXYCACHEDIR "@rel_proxycachedir@"
++#define DEFAULT_PIDLOG "/var/run/apache2.pid"
+ 
+ #endif /* AP_CONFIG_LAYOUT_H */
+diff -ruN -x Makefile.in -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/config.layout build-tree/apache2/config.layout
+--- apache2/config.layout	2002-07-16 19:29:59.000000000 +0100
++++ apache2/config.layout	2003-05-07 13:28:20.000000000 +0100
+@@ -314,11 +314,11 @@
+     manualdir:     ${htdocsdir}/manual
+     cgidir:        ${prefix}/usr/lib/cgi-bin
+     includedir:    ${exec_prefix}/include/apache2
+-    localstatedir: ${prefix}/var/run
+-    runtimedir:    ${prefix}/var/run
++    localstatedir: ${prefix}/var/lock/apache2
++    runtimedir:    ${prefix}/var/run/apache2
+     logfiledir:    ${prefix}/var/log/apache2
+     proxycachedir: ${prefix}/var/cache/apache2/proxy
+     infodir:       ${exec_prefix}/share/info
+-    installbuilddir: ${prefix}/etc/apache2/build
++    installbuilddir: ${prefix}/usr/share/apache2/build
+     errordir:      ${datadir}/error
+ </Layout>
--- apache2-2.2.11.orig/debian/patches/067_fix_segfault_in_ab.dpatch
+++ apache2-2.2.11/debian/patches/067_fix_segfault_in_ab.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 067_fix_segfault_in_ab.dpatch by Ryan Niebur <ryanryan52@gmail.com>
+##
+## DP: Do not free what SSL_get_peer_cert_chain returns. It returns a
+## pointer to memory that is freed later on with the
+## session. (Bug#495982)
+
+@DPATCH@
+diff -urNad apache2-2.2.9~/support/ab.c apache2-2.2.9/support/ab.c
+--- apache2-2.2.9~/support/ab.c	2008-05-28 05:58:01.000000000 -0700
++++ apache2-2.2.9/support/ab.c	2008-11-29 15:47:41.000000000 -0800
+@@ -535,7 +535,6 @@
+         for (i=1; i<count; i++) {
+             cert = (X509 *)SK_VALUE(sk, i);
+             ssl_print_cert_info(bio_out, cert);
+-            X509_free(cert);
+     }
+     }
+     cert = SSL_get_peer_certificate(c->ssl);
--- apache2-2.2.11.orig/debian/patches/050_enhance_apache2ctl.dpatch
+++ apache2-2.2.11/debian/patches/050_enhance_apache2ctl.dpatch
@@ -0,0 +1,107 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 050_enhance_apache2ctl.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: - mv creation of necessary directories to apache2ctl,
+## DP:   to make it work on new installations
+## DP: - add usage message
+
+@DPATCH@
+diff -urNad trunk~/support/apachectl.in trunk/support/apachectl.in
+--- trunk~/support/apachectl.in	2008-01-31 18:29:05.711617810 +0100
++++ trunk/support/apachectl.in	2008-01-31 18:29:32.497144231 +0100
+@@ -40,28 +40,31 @@
+ # |||||||||||||||||||| START CONFIGURATION SECTION  ||||||||||||||||||||
+ # --------------------                              --------------------
+ # 
+-# the path to your httpd binary, including options if necessary
+-HTTPD='@exp_sbindir@/@progname@'
+-#
++# the path to the environment variable file
++test -z "$APACHE_ENVVARS" && APACHE_ENVVARS='/etc/apache2/envvars'
+ # pick up any necessary environment variables
+-if test -f @exp_sysconfdir@/envvars; then
+-  . @exp_sysconfdir@/envvars
++if test -f $APACHE_ENVVARS; then
++  . $APACHE_ENVVARS
+ fi
++# the following APACHE_* variables should be set in /etc/apache2/envvars
++#
++# the path to your httpd binary, including options if necessary
++HTTPD=${APACHE_HTTPD:-/usr/sbin/apache2}
+ #
+ # 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"
++LYNX="${APACHE_LYNX:-@LYNX_PATH@ -dump}"
+ #
+ # 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"
++STATUSURL="${APACHE_STATUSURL:-http://localhost:@PORT@/server-status}"
+ #
+ # Set this variable to a command that increases the maximum
+ # number of file descriptors allowed per child process. This is
+ # critical for configurations that use many file descriptors,
+ # such as mass vhosting, or a multithreaded server.
+-ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@"
++ULIMIT_MAX_FILES="${APACHE_ULIMIT_MAX_FILES:-@APACHECTL_ULIMIT@}"
+ # --------------------                              --------------------
+ # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
+ 
+@@ -71,13 +74,32 @@
+ fi
+ 
+ ERROR=0
+-if [ "x$ARGV" = "x" ] ; then 
+-    ARGV="-h"
++if [ "x$ARGV" = "x" ] || [ "x$ARGV" = "xusage" ] || [ "x$ARGV" = "x--help" ]; then 
++    echo "Usage: $0 start|stop|restart|graceful|graceful-stop|configtest|status|fullstatus" >&2
++    echo "       $0 <apache2 args>" >&2
++    exit 1
+ fi
+ 
+ case $ARGV in
+-start|stop|restart|graceful|graceful-stop)
+-    $HTTPD -k $ARGV
++start)
++    mkdir -p ${APACHE_RUN_DIR:-/var/run/apache2}
++    install -d -o ${APACHE_RUN_USER:-www-data} ${APACHE_LOCK_DIR:-/var/lock/apache2}
++    # ssl_scache shouldn't be here if we're just starting up.
++    # (this is bad if there are several apache2 instances running)
++    rm -f ${APACHE_RUN_DIR:-/var/run/apache2}/*ssl_scache*
++    $HTTPD ${APACHE_ARGUMENTS} -k $ARGV
++    ERROR=$?
++    ;;
++stop|graceful-stop)
++    $HTTPD ${APACHE_ARGUMENTS} -k $ARGV
++    ERROR=$?
++    ;;
++restart|graceful)
++    if $HTTPD ${APACHE_ARGUMENTS} -t 2> /dev/null ; then
++        $HTTPD ${APACHE_ARGUMENTS} -k $ARGV
++    else
++        $HTTPD ${APACHE_ARGUMENTS} -t
++    fi
+     ERROR=$?
+     ;;
+ startssl|sslstart|start-SSL)
+@@ -87,7 +109,7 @@
+     ERROR=2
+     ;;
+ configtest)
+-    $HTTPD -t
++    $HTTPD ${APACHE_ARGUMENTS} -t
+     ERROR=$?
+     ;;
+ status)
+@@ -97,7 +119,7 @@
+     $LYNX $STATUSURL
+     ;;
+ *)
+-    $HTTPD $ARGV
++    $HTTPD ${APACHE_ARGUMENTS} $ARGV
+     ERROR=$?
+ esac
+ 
--- apache2-2.2.11.orig/debian/patches/058_suexec-CVE-2007-1742.dpatch
+++ apache2-2.2.11/debian/patches/058_suexec-CVE-2007-1742.dpatch
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix race condition with chdir
+## DP: Fix /var/www* being accepted as docroot instead of /var/www/*
+## DP: (the same for public_html* instead of public_html/* )
+
+@DPATCH@
+--- a/support/suexec.c	(revision 644465)
++++ b/support/suexec.c	(working copy)
+@@ -42,6 +42,7 @@
+ #if APR_HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#include <fcntl.h>
+ 
+ #include <stdio.h>
+ #include <stdarg.h>
+@@ -263,6 +264,7 @@
+     struct group *gr;       /* group entry holder        */
+     struct stat dir_info;   /* directory info holder     */
+     struct stat prg_info;   /* program info holder       */
++    int cwdh;               /* handle to cwd             */
+ 
+     /*
+      * Start with a "clean" environment
+@@ -496,11 +498,16 @@
+         exit(111);
+     }
+ 
++    if ( (cwdh = open(".", O_RDONLY)) == -1 ) {
++        log_err("cannot open current working directory\n");
++	exit(111);
++    }
++
+     if (userdir) {
+         if (((chdir(target_homedir)) != 0) ||
+             ((chdir(AP_USERDIR_SUFFIX)) != 0) ||
+             ((getcwd(dwd, AP_MAXPATH)) == NULL) ||
+-            ((chdir(cwd)) != 0)) {
++            ((fchdir(cwdh)) != 0)) {
+             log_err("cannot get docroot information (%s)\n", target_homedir);
+             exit(112);
+         }
+@@ -508,12 +515,18 @@
+     else {
+         if (((chdir(AP_DOC_ROOT)) != 0) ||
+             ((getcwd(dwd, AP_MAXPATH)) == NULL) ||
+-            ((chdir(cwd)) != 0)) {
++            ((fchdir(cwdh)) != 0)) {
+             log_err("cannot get docroot information (%s)\n", AP_DOC_ROOT);
+             exit(113);
+         }
+     }
+ 
++    close(cwdh);
++
++    if (strlen(cwd) > strlen(dwd)) {
++        strncat(dwd, "/", AP_MAXPATH);
++        dwd[AP_MAXPATH-1] = '\0';
++    }
+     if ((strncmp(cwd, dwd, strlen(dwd))) != 0) {
+         log_err("command not in docroot (%s/%s)\n", cwd, cmd);
+         exit(114);
--- apache2-2.2.11.orig/debian/patches/099_config_guess_sub_update.dpatch
+++ apache2-2.2.11/debian/patches/099_config_guess_sub_update.dpatch
@@ -0,0 +1,3123 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 099_config_guess_sub_update.dpatch by  <tfheen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad apache2-2.2.3~/config.guess apache2-2.2.3/config.guess
+--- apache2-2.2.3~/config.guess	1970-01-01 01:00:00.000000000 +0100
++++ apache2-2.2.3/config.guess	2006-09-27 21:50:35.000000000 +0200
+@@ -0,0 +1,1500 @@
++#! /bin/sh
++# Attempt to guess a canonical system name.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++#   Inc.
++
++timestamp='2006-07-02'
++
++# This file is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++
++# Originally written by Per Bothner <per@bothner.com>.
++# Please send patches to <config-patches@gnu.org>.  Submit a context
++# diff and a properly formatted ChangeLog entry.
++#
++# This script attempts to guess a canonical system name similar to
++# config.sub.  If it succeeds, it prints the system name on stdout, and
++# exits with 0.  Otherwise, it exits with 1.
++#
++# The plan is that this can be called by configure scripts if you
++# don't specify an explicit build system type.
++
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION]
++
++Output the configuration name of the system \`$me' is run on.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.guess ($timestamp)
++
++Originally written by Per Bothner.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit ;;
++    --version | -v )
++       echo "$version" ; exit ;;
++    --help | --h* | -h )
++       echo "$usage"; exit ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help" >&2
++       exit 1 ;;
++    * )
++       break ;;
++  esac
++done
++
++if test $# != 0; then
++  echo "$me: too many arguments$help" >&2
++  exit 1
++fi
++
++trap 'exit 1' 1 2 15
++
++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
++# compiler to aid in system detection is discouraged as it requires
++# temporary files to be created and, as you can see below, it is a
++# headache to deal with in a portable fashion.
++
++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
++# use `HOST_CC' if defined, but it is deprecated.
++
++# Portable tmp directory creation inspired by the Autoconf team.
++
++set_cc_for_build='
++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
++: ${TMPDIR=/tmp} ;
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
++dummy=$tmp/dummy ;
++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
++case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int x;" > $dummy.c ;
++	for c in cc gcc c89 c99 ; do
++	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++	     CC_FOR_BUILD="$c"; break ;
++	  fi ;
++	done ;
++	if test x"$CC_FOR_BUILD" = x ; then
++	  CC_FOR_BUILD=no_compiler_found ;
++	fi
++	;;
++ ,,*)   CC_FOR_BUILD=$CC ;;
++ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
++esac ; set_cc_for_build= ;'
++
++# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
++# (ghazi@noc.rutgers.edu 1994-08-24)
++if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
++	PATH=$PATH:/.attbin ; export PATH
++fi
++
++UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
++UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
++UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
++UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
++
++# Note: order is significant - the case branches are not exclusive.
++
++case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++    *:NetBSD:*:*)
++	# NetBSD (nbsd) targets should (where applicable) match one or
++	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
++	# switched to ELF, *-*-netbsd* would select the old
++	# object file format.  This provides both forward
++	# compatibility and a consistent mechanism for selecting the
++	# object file format.
++	#
++	# Note: NetBSD doesn't particularly care about the vendor
++	# portion of the name.  We always set it to "unknown".
++	sysctl="sysctl -n hw.machine_arch"
++	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
++	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
++	case "${UNAME_MACHINE_ARCH}" in
++	    armeb) machine=armeb-unknown ;;
++	    arm*) machine=arm-unknown ;;
++	    sh3el) machine=shl-unknown ;;
++	    sh3eb) machine=sh-unknown ;;
++	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++	esac
++	# The Operating System including object format, if it has switched
++	# to ELF recently, or will in the future.
++	case "${UNAME_MACHINE_ARCH}" in
++	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
++		eval $set_cc_for_build
++		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
++			| grep __ELF__ >/dev/null
++		then
++		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
++		    # Return netbsd for either.  FIX?
++		    os=netbsd
++		else
++		    os=netbsdelf
++		fi
++		;;
++	    *)
++	        os=netbsd
++		;;
++	esac
++	# The OS release
++	# Debian GNU/NetBSD machines have a different userland, and
++	# thus, need a distinct triplet. However, they do not need
++	# kernel version information, so it can be replaced with a
++	# suitable tag, in the style of linux-gnu.
++	case "${UNAME_VERSION}" in
++	    Debian*)
++		release='-gnu'
++		;;
++	    *)
++		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		;;
++	esac
++	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
++	# contains redundant information, the shorter form:
++	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
++	echo "${machine}-${os}${release}"
++	exit ;;
++    *:OpenBSD:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++	exit ;;
++    *:ekkoBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
++    macppc:MirBSD:*:*)
++	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++	exit ;;
++    *:MirBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	exit ;;
++    alpha:OSF1:*:*)
++	case $UNAME_RELEASE in
++	*4.0)
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
++		;;
++	*5.*)
++	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		;;
++	esac
++	# According to Compaq, /usr/sbin/psrinfo has been available on
++	# OSF/1 and Tru64 systems produced since 1995.  I hope that
++	# covers most systems running today.  This code pipes the CPU
++	# types through head -n 1, so we only detect the type of CPU 0.
++	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
++	case "$ALPHA_CPU_TYPE" in
++	    "EV4 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV4.5 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "LCA4 (21066/21068)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV5 (21164)")
++		UNAME_MACHINE="alphaev5" ;;
++	    "EV5.6 (21164A)")
++		UNAME_MACHINE="alphaev56" ;;
++	    "EV5.6 (21164PC)")
++		UNAME_MACHINE="alphapca56" ;;
++	    "EV5.7 (21164PC)")
++		UNAME_MACHINE="alphapca57" ;;
++	    "EV6 (21264)")
++		UNAME_MACHINE="alphaev6" ;;
++	    "EV6.7 (21264A)")
++		UNAME_MACHINE="alphaev67" ;;
++	    "EV6.8CB (21264C)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8AL (21264B)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8CX (21264D)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.9A (21264/EV69A)")
++		UNAME_MACHINE="alphaev69" ;;
++	    "EV7 (21364)")
++		UNAME_MACHINE="alphaev7" ;;
++	    "EV7.9 (21364A)")
++		UNAME_MACHINE="alphaev79" ;;
++	esac
++	# A Pn.n version is a patched version.
++	# A Vn.n version is a released version.
++	# A Tn.n version is a released field test version.
++	# A Xn.n version is an unreleased experimental baselevel.
++	# 1.2 uses "1.2" for uname -r.
++	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++	exit ;;
++    Alpha\ *:Windows_NT*:*)
++	# How do we know it's Interix rather than the generic POSIX subsystem?
++	# Should we change UNAME_MACHINE based on the output of uname instead
++	# of the specific Alpha model?
++	echo alpha-pc-interix
++	exit ;;
++    21064:Windows_NT:50:3)
++	echo alpha-dec-winnt3.5
++	exit ;;
++    Amiga*:UNIX_System_V:4.0:*)
++	echo m68k-unknown-sysv4
++	exit ;;
++    *:[Aa]miga[Oo][Ss]:*:*)
++	echo ${UNAME_MACHINE}-unknown-amigaos
++	exit ;;
++    *:[Mm]orph[Oo][Ss]:*:*)
++	echo ${UNAME_MACHINE}-unknown-morphos
++	exit ;;
++    *:OS/390:*:*)
++	echo i370-ibm-openedition
++	exit ;;
++    *:z/VM:*:*)
++	echo s390-ibm-zvmoe
++	exit ;;
++    *:OS400:*:*)
++        echo powerpc-ibm-os400
++	exit ;;
++    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
++	echo arm-acorn-riscix${UNAME_RELEASE}
++	exit ;;
++    arm:riscos:*:*|arm:RISCOS:*:*)
++	echo arm-unknown-riscos
++	exit ;;
++    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
++	echo hppa1.1-hitachi-hiuxmpp
++	exit ;;
++    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
++	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
++	if test "`(/bin/universe) 2>/dev/null`" = att ; then
++		echo pyramid-pyramid-sysv3
++	else
++		echo pyramid-pyramid-bsd
++	fi
++	exit ;;
++    NILE*:*:*:dcosx)
++	echo pyramid-pyramid-svr4
++	exit ;;
++    DRS?6000:unix:4.0:6*)
++	echo sparc-icl-nx6
++	exit ;;
++    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
++	case `/usr/bin/uname -p` in
++	    sparc) echo sparc-icl-nx7; exit ;;
++	esac ;;
++    sun4H:SunOS:5.*:*)
++	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
++    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
++	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
++    i86pc:SunOS:5.*:*)
++	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
++    sun4*:SunOS:6*:*)
++	# According to config.sub, this is the proper way to canonicalize
++	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
++	# it's likely to be more like Solaris than SunOS4.
++	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
++    sun4*:SunOS:*:*)
++	case "`/usr/bin/arch -k`" in
++	    Series*|S4*)
++		UNAME_RELEASE=`uname -v`
++		;;
++	esac
++	# Japanese Language versions have a version number like `4.1.3-JL'.
++	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
++	exit ;;
++    sun3*:SunOS:*:*)
++	echo m68k-sun-sunos${UNAME_RELEASE}
++	exit ;;
++    sun*:*:4.2BSD:*)
++	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
++	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
++	case "`/bin/arch`" in
++	    sun3)
++		echo m68k-sun-sunos${UNAME_RELEASE}
++		;;
++	    sun4)
++		echo sparc-sun-sunos${UNAME_RELEASE}
++		;;
++	esac
++	exit ;;
++    aushp:SunOS:*:*)
++	echo sparc-auspex-sunos${UNAME_RELEASE}
++	exit ;;
++    # The situation for MiNT is a little confusing.  The machine name
++    # can be virtually everything (everything which is not
++    # "atarist" or "atariste" at least should have a processor
++    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
++    # to the lowercase version "mint" (or "freemint").  Finally
++    # the system name "TOS" denotes a system which is actually not
++    # MiNT.  But MiNT is downward compatible to TOS, so this should
++    # be no problem.
++    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
++        echo m68k-atari-mint${UNAME_RELEASE}
++	exit ;;
++    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
++	echo m68k-atari-mint${UNAME_RELEASE}
++        exit ;;
++    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
++        echo m68k-atari-mint${UNAME_RELEASE}
++	exit ;;
++    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
++        echo m68k-milan-mint${UNAME_RELEASE}
++        exit ;;
++    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
++        echo m68k-hades-mint${UNAME_RELEASE}
++        exit ;;
++    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
++        echo m68k-unknown-mint${UNAME_RELEASE}
++        exit ;;
++    m68k:machten:*:*)
++	echo m68k-apple-machten${UNAME_RELEASE}
++	exit ;;
++    powerpc:machten:*:*)
++	echo powerpc-apple-machten${UNAME_RELEASE}
++	exit ;;
++    RISC*:Mach:*:*)
++	echo mips-dec-mach_bsd4.3
++	exit ;;
++    RISC*:ULTRIX:*:*)
++	echo mips-dec-ultrix${UNAME_RELEASE}
++	exit ;;
++    VAX*:ULTRIX*:*:*)
++	echo vax-dec-ultrix${UNAME_RELEASE}
++	exit ;;
++    2020:CLIX:*:* | 2430:CLIX:*:*)
++	echo clipper-intergraph-clix${UNAME_RELEASE}
++	exit ;;
++    mips:*:*:UMIPS | mips:*:*:RISCos)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++#ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
++	int main (int argc, char *argv[]) {
++#else
++	int main (argc, argv) int argc; char *argv[]; {
++#endif
++	#if defined (host_mips) && defined (MIPSEB)
++	#if defined (SYSTYPE_SYSV)
++	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
++	#endif
++	#if defined (SYSTYPE_SVR4)
++	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
++	#endif
++	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
++	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
++	#endif
++	#endif
++	  exit (-1);
++	}
++EOF
++	$CC_FOR_BUILD -o $dummy $dummy.c &&
++	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++	  SYSTEM_NAME=`$dummy $dummyarg` &&
++	    { echo "$SYSTEM_NAME"; exit; }
++	echo mips-mips-riscos${UNAME_RELEASE}
++	exit ;;
++    Motorola:PowerMAX_OS:*:*)
++	echo powerpc-motorola-powermax
++	exit ;;
++    Motorola:*:4.3:PL8-*)
++	echo powerpc-harris-powermax
++	exit ;;
++    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
++	echo powerpc-harris-powermax
++	exit ;;
++    Night_Hawk:Power_UNIX:*:*)
++	echo powerpc-harris-powerunix
++	exit ;;
++    m88k:CX/UX:7*:*)
++	echo m88k-harris-cxux7
++	exit ;;
++    m88k:*:4*:R4*)
++	echo m88k-motorola-sysv4
++	exit ;;
++    m88k:*:3*:R3*)
++	echo m88k-motorola-sysv3
++	exit ;;
++    AViiON:dgux:*:*)
++        # DG/UX returns AViiON for all architectures
++        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++	then
++	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
++	       [ ${TARGET_BINARY_INTERFACE}x = x ]
++	    then
++		echo m88k-dg-dgux${UNAME_RELEASE}
++	    else
++		echo m88k-dg-dguxbcs${UNAME_RELEASE}
++	    fi
++	else
++	    echo i586-dg-dgux${UNAME_RELEASE}
++	fi
++ 	exit ;;
++    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
++	echo m88k-dolphin-sysv3
++	exit ;;
++    M88*:*:R3*:*)
++	# Delta 88k system running SVR3
++	echo m88k-motorola-sysv3
++	exit ;;
++    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
++	echo m88k-tektronix-sysv3
++	exit ;;
++    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
++	echo m68k-tektronix-bsd
++	exit ;;
++    *:IRIX*:*:*)
++	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
++	exit ;;
++    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
++	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
++	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
++    i*86:AIX:*:*)
++	echo i386-ibm-aix
++	exit ;;
++    ia64:AIX:*:*)
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	exit ;;
++    *:AIX:2:3)
++	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
++		eval $set_cc_for_build
++		sed 's/^		//' << EOF >$dummy.c
++		#include <sys/systemcfg.h>
++
++		main()
++			{
++			if (!__power_pc())
++				exit(1);
++			puts("powerpc-ibm-aix3.2.5");
++			exit(0);
++			}
++EOF
++		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++		then
++			echo "$SYSTEM_NAME"
++		else
++			echo rs6000-ibm-aix3.2.5
++		fi
++	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
++		echo rs6000-ibm-aix3.2.4
++	else
++		echo rs6000-ibm-aix3.2
++	fi
++	exit ;;
++    *:AIX:*:[45])
++	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
++	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
++		IBM_ARCH=rs6000
++	else
++		IBM_ARCH=powerpc
++	fi
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
++	exit ;;
++    *:AIX:*:*)
++	echo rs6000-ibm-aix
++	exit ;;
++    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
++	echo romp-ibm-bsd4.4
++	exit ;;
++    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
++	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
++	exit ;;                             # report: romp-ibm BSD 4.3
++    *:BOSX:*:*)
++	echo rs6000-bull-bosx
++	exit ;;
++    DPX/2?00:B.O.S.:*:*)
++	echo m68k-bull-sysv3
++	exit ;;
++    9000/[34]??:4.3bsd:1.*:*)
++	echo m68k-hp-bsd
++	exit ;;
++    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
++	echo m68k-hp-bsd4.4
++	exit ;;
++    9000/[34678]??:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	case "${UNAME_MACHINE}" in
++	    9000/31? )            HP_ARCH=m68000 ;;
++	    9000/[34]?? )         HP_ARCH=m68k ;;
++	    9000/[678][0-9][0-9])
++		if [ -x /usr/bin/getconf ]; then
++		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++                    case "${sc_cpu_version}" in
++                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                      532)                      # CPU_PA_RISC2_0
++                        case "${sc_kernel_bits}" in
++                          32) HP_ARCH="hppa2.0n" ;;
++                          64) HP_ARCH="hppa2.0w" ;;
++			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
++                        esac ;;
++                    esac
++		fi
++		if [ "${HP_ARCH}" = "" ]; then
++		    eval $set_cc_for_build
++		    sed 's/^              //' << EOF >$dummy.c
++
++              #define _HPUX_SOURCE
++              #include <stdlib.h>
++              #include <unistd.h>
++
++              int main ()
++              {
++              #if defined(_SC_KERNEL_BITS)
++                  long bits = sysconf(_SC_KERNEL_BITS);
++              #endif
++                  long cpu  = sysconf (_SC_CPU_VERSION);
++
++                  switch (cpu)
++              	{
++              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++              	case CPU_PA_RISC2_0:
++              #if defined(_SC_KERNEL_BITS)
++              	    switch (bits)
++              		{
++              		case 64: puts ("hppa2.0w"); break;
++              		case 32: puts ("hppa2.0n"); break;
++              		default: puts ("hppa2.0"); break;
++              		} break;
++              #else  /* !defined(_SC_KERNEL_BITS) */
++              	    puts ("hppa2.0"); break;
++              #endif
++              	default: puts ("hppa1.0"); break;
++              	}
++                  exit (0);
++              }
++EOF
++		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    test -z "$HP_ARCH" && HP_ARCH=hppa
++		fi ;;
++	esac
++	if [ ${HP_ARCH} = "hppa2.0w" ]
++	then
++	    eval $set_cc_for_build
++
++	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
++	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
++	    # generating 64-bit code.  GNU and HP use different nomenclature:
++	    #
++	    # $ CC_FOR_BUILD=cc ./config.guess
++	    # => hppa2.0w-hp-hpux11.23
++	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
++	    # => hppa64-hp-hpux11.23
++
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++		grep __LP64__ >/dev/null
++	    then
++		HP_ARCH="hppa2.0w"
++	    else
++		HP_ARCH="hppa64"
++	    fi
++	fi
++	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
++	exit ;;
++    ia64:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux${HPUX_REV}
++	exit ;;
++    3050*:HI-UX:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#include <unistd.h>
++	int
++	main ()
++	{
++	  long cpu = sysconf (_SC_CPU_VERSION);
++	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
++	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
++	     results, however.  */
++	  if (CPU_IS_PA_RISC (cpu))
++	    {
++	      switch (cpu)
++		{
++		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
++		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
++		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
++		  default: puts ("hppa-hitachi-hiuxwe2"); break;
++		}
++	    }
++	  else if (CPU_IS_HP_MC68K (cpu))
++	    puts ("m68k-hitachi-hiuxwe2");
++	  else puts ("unknown-hitachi-hiuxwe2");
++	  exit (0);
++	}
++EOF
++	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++		{ echo "$SYSTEM_NAME"; exit; }
++	echo unknown-hitachi-hiuxwe2
++	exit ;;
++    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
++	echo hppa1.1-hp-bsd
++	exit ;;
++    9000/8??:4.3bsd:*:*)
++	echo hppa1.0-hp-bsd
++	exit ;;
++    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
++	echo hppa1.0-hp-mpeix
++	exit ;;
++    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
++	echo hppa1.1-hp-osf
++	exit ;;
++    hp8??:OSF1:*:*)
++	echo hppa1.0-hp-osf
++	exit ;;
++    i*86:OSF1:*:*)
++	if [ -x /usr/sbin/sysversion ] ; then
++	    echo ${UNAME_MACHINE}-unknown-osf1mk
++	else
++	    echo ${UNAME_MACHINE}-unknown-osf1
++	fi
++	exit ;;
++    parisc*:Lites*:*:*)
++	echo hppa1.1-hp-lites
++	exit ;;
++    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
++	echo c1-convex-bsd
++        exit ;;
++    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
++	if getsysinfo -f scalar_acc
++	then echo c32-convex-bsd
++	else echo c2-convex-bsd
++	fi
++        exit ;;
++    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
++	echo c34-convex-bsd
++        exit ;;
++    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
++	echo c38-convex-bsd
++        exit ;;
++    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
++	echo c4-convex-bsd
++        exit ;;
++    CRAY*Y-MP:*:*:*)
++	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
++    CRAY*[A-Z]90:*:*:*)
++	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
++	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
++	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
++	      -e 's/\.[^.]*$/.X/'
++	exit ;;
++    CRAY*TS:*:*:*)
++	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
++    CRAY*T3E:*:*:*)
++	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
++    CRAY*SV1:*:*:*)
++	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
++    *:UNICOS/mp:*:*)
++	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
++    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
++	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++        exit ;;
++    5000:UNIX_System_V:4.*:*)
++        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
++    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
++	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
++	exit ;;
++    sparc*:BSD/OS:*:*)
++	echo sparc-unknown-bsdi${UNAME_RELEASE}
++	exit ;;
++    *:BSD/OS:*:*)
++	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++	exit ;;
++    *:FreeBSD:*:*)
++	case ${UNAME_MACHINE} in
++	    pc98)
++		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
++	exit ;;
++    i*:CYGWIN*:*)
++	echo ${UNAME_MACHINE}-pc-cygwin
++	exit ;;
++    i*:MINGW*:*)
++	echo ${UNAME_MACHINE}-pc-mingw32
++	exit ;;
++    i*:windows32*:*)
++    	# uname -m includes "-pc" on this system.
++    	echo ${UNAME_MACHINE}-mingw32
++	exit ;;
++    i*:PW*:*)
++	echo ${UNAME_MACHINE}-pc-pw32
++	exit ;;
++    x86:Interix*:[3456]*)
++	echo i586-pc-interix${UNAME_RELEASE}
++	exit ;;
++    EM64T:Interix*:[3456]*)
++	echo x86_64-unknown-interix${UNAME_RELEASE}
++	exit ;;
++    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
++	echo i${UNAME_MACHINE}-pc-mks
++	exit ;;
++    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
++	# How do we know it's Interix rather than the generic POSIX subsystem?
++	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
++	# UNAME_MACHINE based on the output of uname instead of i386?
++	echo i586-pc-interix
++	exit ;;
++    i*:UWIN*:*)
++	echo ${UNAME_MACHINE}-pc-uwin
++	exit ;;
++    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
++	echo x86_64-unknown-cygwin
++	exit ;;
++    p*:CYGWIN*:*)
++	echo powerpcle-unknown-cygwin
++	exit ;;
++    prep*:SunOS:5.*:*)
++	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
++    *:GNU:*:*)
++	# the GNU system
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	exit ;;
++    *:GNU/*:*:*)
++	# other systems with GNU libc and userland
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	exit ;;
++    i*86:Minix:*:*)
++	echo ${UNAME_MACHINE}-pc-minix
++	exit ;;
++    arm*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    avr32*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    cris:Linux:*:*)
++	echo cris-axis-linux-gnu
++	exit ;;
++    crisv32:Linux:*:*)
++	echo crisv32-axis-linux-gnu
++	exit ;;
++    frv:Linux:*:*)
++    	echo frv-unknown-linux-gnu
++	exit ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    m32r*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    mips:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips
++	#undef mipsel
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mipsel
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips
++	#else
++	CPU=
++	#endif
++	#endif
++EOF
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	;;
++    mips64:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips64
++	#undef mips64el
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mips64el
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips64
++	#else
++	CPU=
++	#endif
++	#endif
++EOF
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	;;
++    or32:Linux:*:*)
++	echo or32-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
++	exit ;;
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
++    parisc:Linux:*:* | hppa:Linux:*:*)
++	# Look for CPU level
++	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
++	esac
++	exit ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit ;;
++    s390:Linux:*:* | s390x:Linux:*:*)
++	echo ${UNAME_MACHINE}-ibm-linux
++	exit ;;
++    sh64*:Linux:*:*)
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    sh*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    sparc:Linux:*:* | sparc64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    vax:Linux:*:*)
++	echo ${UNAME_MACHINE}-dec-linux-gnu
++	exit ;;
++    x86_64:Linux:*:*)
++	echo x86_64-unknown-linux-gnu
++	exit ;;
++    i*86:Linux:*:*)
++	# The BFD linker knows what the default object file format is, so
++	# first see if it will tell us. cd to the root directory to prevent
++	# problems with other programs or directories called `ld' in the path.
++	# Set LC_ALL=C to ensure ld outputs messages in English.
++	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
++			 | sed -ne '/supported targets:/!d
++				    s/[ 	][ 	]*/ /g
++				    s/.*supported targets: *//
++				    s/ .*//
++				    p'`
++        case "$ld_supported_targets" in
++	  elf32-i386)
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++		;;
++	  a.out-i386-linux)
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
++		exit ;;
++	  coff-i386)
++		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
++		exit ;;
++	  "")
++		# Either a pre-BFD a.out linker (linux-gnuoldld) or
++		# one that does not give us useful --help.
++		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
++		exit ;;
++	esac
++	# Determine whether the default compiler is a.out or elf
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#include <features.h>
++	#ifdef __ELF__
++	# ifdef __GLIBC__
++	#  if __GLIBC__ >= 2
++	LIBC=gnu
++	#  else
++	LIBC=gnulibc1
++	#  endif
++	# else
++	LIBC=gnulibc1
++	# endif
++	#else
++	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
++	LIBC=gnu
++	#else
++	LIBC=gnuaout
++	#endif
++	#endif
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^LIBC/{
++		s: ::g
++		p
++	    }'`"
++	test x"${LIBC}" != x && {
++		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++		exit
++	}
++	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
++	;;
++    i*86:DYNIX/ptx:4*:*)
++	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
++	# earlier versions are messed up and put the nodename in both
++	# sysname and nodename.
++	echo i386-sequent-sysv4
++	exit ;;
++    i*86:UNIX_SV:4.2MP:2.*)
++        # Unixware is an offshoot of SVR4, but it has its own version
++        # number series starting with 2...
++        # I am not positive that other SVR4 systems won't match this,
++	# I just have to hope.  -- rms.
++        # Use sysv4.2uw... so that sysv4* matches it.
++	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++	exit ;;
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit ;;
++    i*86:XTS-300:*:STOP)
++	echo ${UNAME_MACHINE}-unknown-stop
++	exit ;;
++    i*86:atheos:*:*)
++	echo ${UNAME_MACHINE}-unknown-atheos
++	exit ;;
++    i*86:syllable:*:*)
++	echo ${UNAME_MACHINE}-pc-syllable
++	exit ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	echo i386-unknown-lynxos${UNAME_RELEASE}
++	exit ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit ;;
++    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
++	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
++	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
++		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
++	else
++		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
++	fi
++	exit ;;
++    i*86:*:5:[678]*)
++    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++	case `/bin/uname -X | grep "^Machine"` in
++	    *486*)	     UNAME_MACHINE=i486 ;;
++	    *Pentium)	     UNAME_MACHINE=i586 ;;
++	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
++	esac
++	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++	exit ;;
++    i*86:*:3.2:*)
++	if test -f /usr/options/cb.name; then
++		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
++		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
++	elif /bin/uname -X 2>/dev/null >/dev/null ; then
++		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
++		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
++		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
++			&& UNAME_MACHINE=i586
++		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
++			&& UNAME_MACHINE=i686
++		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
++			&& UNAME_MACHINE=i686
++		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
++	else
++		echo ${UNAME_MACHINE}-pc-sysv32
++	fi
++	exit ;;
++    pc:*:*:*)
++	# Left here for compatibility:
++        # uname -m prints for DJGPP always 'pc', but it prints nothing about
++        # the processor, so we play safe by assuming i386.
++	echo i386-pc-msdosdjgpp
++        exit ;;
++    Intel:Mach:3*:*)
++	echo i386-pc-mach3
++	exit ;;
++    paragon:*:*:*)
++	echo i860-intel-osf1
++	exit ;;
++    i860:*:4.*:*) # i860-SVR4
++	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
++	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
++	else # Add other i860-SVR4 vendors below as they are discovered.
++	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
++	fi
++	exit ;;
++    mini*:CTIX:SYS*5:*)
++	# "miniframe"
++	echo m68010-convergent-sysv
++	exit ;;
++    mc68k:UNIX:SYSTEM5:3.51m)
++	echo m68k-convergent-sysv
++	exit ;;
++    M680?0:D-NIX:5.3:*)
++	echo m68k-diab-dnix
++	exit ;;
++    M68*:*:R3V[5678]*:*)
++	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
++    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
++	OS_REL=''
++	test -r /etc/.relid \
++	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
++        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++          && { echo i486-ncr-sysv4; exit; } ;;
++    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
++	echo m68k-unknown-lynxos${UNAME_RELEASE}
++	exit ;;
++    mc68030:UNIX_System_V:4.*:*)
++	echo m68k-atari-sysv4
++	exit ;;
++    TSUNAMI:LynxOS:2.*:*)
++	echo sparc-unknown-lynxos${UNAME_RELEASE}
++	exit ;;
++    rs6000:LynxOS:2.*:*)
++	echo rs6000-unknown-lynxos${UNAME_RELEASE}
++	exit ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	exit ;;
++    SM[BE]S:UNIX_SV:*:*)
++	echo mips-dde-sysv${UNAME_RELEASE}
++	exit ;;
++    RM*:ReliantUNIX-*:*:*)
++	echo mips-sni-sysv4
++	exit ;;
++    RM*:SINIX-*:*:*)
++	echo mips-sni-sysv4
++	exit ;;
++    *:SINIX-*:*:*)
++	if uname -p 2>/dev/null >/dev/null ; then
++		UNAME_MACHINE=`(uname -p) 2>/dev/null`
++		echo ${UNAME_MACHINE}-sni-sysv4
++	else
++		echo ns32k-sni-sysv
++	fi
++	exit ;;
++    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++                      # says <Richard.M.Bartel@ccMail.Census.GOV>
++        echo i586-unisys-sysv4
++        exit ;;
++    *:UNIX_System_V:4*:FTX*)
++	# From Gerald Hewes <hewes@openmarket.com>.
++	# How about differentiating between stratus architectures? -djm
++	echo hppa1.1-stratus-sysv4
++	exit ;;
++    *:*:*:FTX*)
++	# From seanf@swdc.stratus.com.
++	echo i860-stratus-sysv4
++	exit ;;
++    i*86:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo ${UNAME_MACHINE}-stratus-vos
++	exit ;;
++    *:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo hppa1.1-stratus-vos
++	exit ;;
++    mc68*:A/UX:*:*)
++	echo m68k-apple-aux${UNAME_RELEASE}
++	exit ;;
++    news*:NEWS-OS:6*:*)
++	echo mips-sony-newsos6
++	exit ;;
++    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
++	if [ -d /usr/nec ]; then
++	        echo mips-nec-sysv${UNAME_RELEASE}
++	else
++	        echo mips-unknown-sysv${UNAME_RELEASE}
++	fi
++        exit ;;
++    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
++	echo powerpc-be-beos
++	exit ;;
++    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
++	echo powerpc-apple-beos
++	exit ;;
++    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
++	echo i586-pc-beos
++	exit ;;
++    SX-4:SUPER-UX:*:*)
++	echo sx4-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-5:SUPER-UX:*:*)
++	echo sx5-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-6:SUPER-UX:*:*)
++	echo sx6-nec-superux${UNAME_RELEASE}
++	exit ;;
++    Power*:Rhapsody:*:*)
++	echo powerpc-apple-rhapsody${UNAME_RELEASE}
++	exit ;;
++    *:Rhapsody:*:*)
++	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++	exit ;;
++    *:Darwin:*:*)
++	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++	case $UNAME_PROCESSOR in
++	    unknown) UNAME_PROCESSOR=powerpc ;;
++	esac
++	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++	exit ;;
++    *:procnto*:*:* | *:QNX:[0123456789]*:*)
++	UNAME_PROCESSOR=`uname -p`
++	if test "$UNAME_PROCESSOR" = "x86"; then
++		UNAME_PROCESSOR=i386
++		UNAME_MACHINE=pc
++	fi
++	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++	exit ;;
++    *:QNX:*:4*)
++	echo i386-pc-qnx
++	exit ;;
++    NSE-?:NONSTOP_KERNEL:*:*)
++	echo nse-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    NSR-?:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    *:NonStop-UX:*:*)
++	echo mips-compaq-nonstopux
++	exit ;;
++    BS2000:POSIX*:*:*)
++	echo bs2000-siemens-sysv
++	exit ;;
++    DS/*:UNIX_System_V:*:*)
++	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	exit ;;
++    *:Plan9:*:*)
++	# "uname -m" is not consistent, so use $cputype instead. 386
++	# is converted to i386 for consistency with other x86
++	# operating systems.
++	if test "$cputype" = "386"; then
++	    UNAME_MACHINE=i386
++	else
++	    UNAME_MACHINE="$cputype"
++	fi
++	echo ${UNAME_MACHINE}-unknown-plan9
++	exit ;;
++    *:TOPS-10:*:*)
++	echo pdp10-unknown-tops10
++	exit ;;
++    *:TENEX:*:*)
++	echo pdp10-unknown-tenex
++	exit ;;
++    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
++	echo pdp10-dec-tops20
++	exit ;;
++    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
++	echo pdp10-xkl-tops20
++	exit ;;
++    *:TOPS-20:*:*)
++	echo pdp10-unknown-tops20
++	exit ;;
++    *:ITS:*:*)
++	echo pdp10-unknown-its
++	exit ;;
++    SEI:*:*:SEIUX)
++        echo mips-sei-seiux${UNAME_RELEASE}
++	exit ;;
++    *:DragonFly:*:*)
++	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	exit ;;
++    *:*VMS:*:*)
++    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	case "${UNAME_MACHINE}" in
++	    A*) echo alpha-dec-vms ; exit ;;
++	    I*) echo ia64-dec-vms ; exit ;;
++	    V*) echo vax-dec-vms ; exit ;;
++	esac ;;
++    *:XENIX:*:SysV)
++	echo i386-pc-xenix
++	exit ;;
++    i*86:skyos:*:*)
++	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++	exit ;;
++    i*86:rdos:*:*)
++	echo ${UNAME_MACHINE}-pc-rdos
++	exit ;;
++esac
++
++#echo '(No uname command or uname output not recognized.)' 1>&2
++#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
++
++eval $set_cc_for_build
++cat >$dummy.c <<EOF
++#ifdef _SEQUENT_
++# include <sys/types.h>
++# include <sys/utsname.h>
++#endif
++main ()
++{
++#if defined (sony)
++#if defined (MIPSEB)
++  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
++     I don't know....  */
++  printf ("mips-sony-bsd\n"); exit (0);
++#else
++#include <sys/param.h>
++  printf ("m68k-sony-newsos%s\n",
++#ifdef NEWSOS4
++          "4"
++#else
++	  ""
++#endif
++         ); exit (0);
++#endif
++#endif
++
++#if defined (__arm) && defined (__acorn) && defined (__unix)
++  printf ("arm-acorn-riscix\n"); exit (0);
++#endif
++
++#if defined (hp300) && !defined (hpux)
++  printf ("m68k-hp-bsd\n"); exit (0);
++#endif
++
++#if defined (NeXT)
++#if !defined (__ARCHITECTURE__)
++#define __ARCHITECTURE__ "m68k"
++#endif
++  int version;
++  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
++  if (version < 4)
++    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
++  else
++    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
++  exit (0);
++#endif
++
++#if defined (MULTIMAX) || defined (n16)
++#if defined (UMAXV)
++  printf ("ns32k-encore-sysv\n"); exit (0);
++#else
++#if defined (CMU)
++  printf ("ns32k-encore-mach\n"); exit (0);
++#else
++  printf ("ns32k-encore-bsd\n"); exit (0);
++#endif
++#endif
++#endif
++
++#if defined (__386BSD__)
++  printf ("i386-pc-bsd\n"); exit (0);
++#endif
++
++#if defined (sequent)
++#if defined (i386)
++  printf ("i386-sequent-dynix\n"); exit (0);
++#endif
++#if defined (ns32000)
++  printf ("ns32k-sequent-dynix\n"); exit (0);
++#endif
++#endif
++
++#if defined (_SEQUENT_)
++    struct utsname un;
++
++    uname(&un);
++
++    if (strncmp(un.version, "V2", 2) == 0) {
++	printf ("i386-sequent-ptx2\n"); exit (0);
++    }
++    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
++	printf ("i386-sequent-ptx1\n"); exit (0);
++    }
++    printf ("i386-sequent-ptx\n"); exit (0);
++
++#endif
++
++#if defined (vax)
++# if !defined (ultrix)
++#  include <sys/param.h>
++#  if defined (BSD)
++#   if BSD == 43
++      printf ("vax-dec-bsd4.3\n"); exit (0);
++#   else
++#    if BSD == 199006
++      printf ("vax-dec-bsd4.3reno\n"); exit (0);
++#    else
++      printf ("vax-dec-bsd\n"); exit (0);
++#    endif
++#   endif
++#  else
++    printf ("vax-dec-bsd\n"); exit (0);
++#  endif
++# else
++    printf ("vax-dec-ultrix\n"); exit (0);
++# endif
++#endif
++
++#if defined (alliant) && defined (i860)
++  printf ("i860-alliant-bsd\n"); exit (0);
++#endif
++
++  exit (1);
++}
++EOF
++
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++	{ echo "$SYSTEM_NAME"; exit; }
++
++# Apollos put the system type in the environment.
++
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
++
++# Convex versions that predate uname can use getsysinfo(1)
++
++if [ -x /usr/convex/getsysinfo ]
++then
++    case `getsysinfo -f cpu_type` in
++    c1*)
++	echo c1-convex-bsd
++	exit ;;
++    c2*)
++	if getsysinfo -f scalar_acc
++	then echo c32-convex-bsd
++	else echo c2-convex-bsd
++	fi
++	exit ;;
++    c34*)
++	echo c34-convex-bsd
++	exit ;;
++    c38*)
++	echo c38-convex-bsd
++	exit ;;
++    c4*)
++	echo c4-convex-bsd
++	exit ;;
++    esac
++fi
++
++cat >&2 <<EOF
++$0: unable to guess system type
++
++This script, last modified $timestamp, has failed to recognize
++the operating system you are using. It is advised that you
++download the most up to date version of the config scripts from
++
++  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++and
++  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++
++If the version you run ($0) is already up to date, please
++send the following data and any information you think might be
++pertinent to <config-patches@gnu.org> in order to provide the needed
++information to handle your system.
++
++config.guess timestamp = $timestamp
++
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
++
++hostinfo               = `(hostinfo) 2>/dev/null`
++/bin/universe          = `(/bin/universe) 2>/dev/null`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
++/bin/arch              = `(/bin/arch) 2>/dev/null`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
++
++UNAME_MACHINE = ${UNAME_MACHINE}
++UNAME_RELEASE = ${UNAME_RELEASE}
++UNAME_SYSTEM  = ${UNAME_SYSTEM}
++UNAME_VERSION = ${UNAME_VERSION}
++EOF
++
++exit 1
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+diff -urNad apache2-2.2.3~/config.sub apache2-2.2.3/config.sub
+--- apache2-2.2.3~/config.sub	1970-01-01 01:00:00.000000000 +0100
++++ apache2-2.2.3/config.sub	2006-09-27 21:50:35.000000000 +0200
+@@ -0,0 +1,1608 @@
++#! /bin/sh
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++#   Inc.
++
++timestamp='2006-07-02'
++
++# This file is (in principle) common to ALL GNU software.
++# The presence of a machine in this file suggests that SOME GNU software
++# can handle that machine.  It does not imply ALL GNU software can.
++#
++# This file is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++
++# Please send patches to <config-patches@gnu.org>.  Submit a context
++# diff and a properly formatted ChangeLog entry.
++#
++# Configuration subroutine to validate and canonicalize a configuration type.
++# Supply the specified configuration type as an argument.
++# If it is invalid, we print an error message on stderr and exit with code 1.
++# Otherwise, we print the canonical config type on stdout and succeed.
++
++# This file is supposed to be the same for all GNU packages
++# and recognize all the CPU types, system types and aliases
++# that are meaningful with *any* GNU software.
++# Each package is responsible for reporting which valid configurations
++# it does not support.  The user should be able to distinguish
++# a failure to support a valid configuration from a meaningless
++# configuration.
++
++# The goal of this file is to map all the various variations of a given
++# machine specification into a single specification in the form:
++#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
++# or in some cases, the newer four-part form:
++#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
++# It is wrong to echo any other type of specification.
++
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++       $0 [OPTION] ALIAS
++
++Canonicalize a configuration name.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.sub ($timestamp)
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit ;;
++    --version | -v )
++       echo "$version" ; exit ;;
++    --help | --h* | -h )
++       echo "$usage"; exit ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help"
++       exit 1 ;;
++
++    *local*)
++       # First pass through any local machine types.
++       echo $1
++       exit ;;
++
++    * )
++       break ;;
++  esac
++done
++
++case $# in
++ 0) echo "$me: missing argument$help" >&2
++    exit 1;;
++ 1) ;;
++ *) echo "$me: too many arguments$help" >&2
++    exit 1;;
++esac
++
++# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
++# Here we must recognize all the valid KERNEL-OS combinations.
++maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
++case $maybe_os in
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  storm-chaos* | os2-emx* | rtmk-nova*)
++    os=-$maybe_os
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++    ;;
++  *)
++    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
++    if [ $basic_machine != $1 ]
++    then os=`echo $1 | sed 's/.*-/-/'`
++    else os=; fi
++    ;;
++esac
++
++### Let's recognize common machines as not being operating systems so
++### that things like config.sub decstation-3100 work.  We also
++### recognize some manufacturers as not being operating systems, so we
++### can provide default operating systems below.
++case $os in
++	-sun*os*)
++		# Prevent following clause from handling this invalid input.
++		;;
++	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
++	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
++	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
++	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
++	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
++	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
++	-apple | -axis | -knuth | -cray)
++		os=
++		basic_machine=$1
++		;;
++	-sim | -cisco | -oki | -wec | -winbond)
++		os=
++		basic_machine=$1
++		;;
++	-scout)
++		;;
++	-wrs)
++		os=-vxworks
++		basic_machine=$1
++		;;
++	-chorusos*)
++		os=-chorusos
++		basic_machine=$1
++		;;
++ 	-chorusrdb)
++ 		os=-chorusrdb
++		basic_machine=$1
++ 		;;
++	-hiux*)
++		os=-hiuxwe2
++		;;
++	-sco6)
++		os=-sco5v6
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco5)
++		os=-sco3.2v5
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco4)
++		os=-sco3.2v4
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco3.2.[4-9]*)
++		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco3.2v[4-9]*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco5v6*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco*)
++		os=-sco3.2v2
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-udk*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-isc)
++		os=-isc2.2
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-clix*)
++		basic_machine=clipper-intergraph
++		;;
++	-isc*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-lynx*)
++		os=-lynxos
++		;;
++	-ptx*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
++		;;
++	-windowsnt*)
++		os=`echo $os | sed -e 's/windowsnt/winnt/'`
++		;;
++	-psos*)
++		os=-psos
++		;;
++	-mint | -mint[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
++		;;
++esac
++
++# Decode aliases for certain CPU-COMPANY combinations.
++case $basic_machine in
++	# Recognize the basic CPU types without company name.
++	# Some are omitted here because they have special meanings below.
++	1750a | 580 \
++	| a29k \
++	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
++	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
++	| am33_2.0 \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++	| bfin \
++	| c4x | clipper \
++	| d10v | d30v | dlx | dsp16xx \
++	| fr30 | frv \
++	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| i370 | i860 | i960 | ia64 \
++	| ip2k | iq2000 \
++	| m32c | m32r | m32rle | m68000 | m68k | m88k \
++	| maxq | mb | microblaze | mcore \
++	| mips | mipsbe | mipseb | mipsel | mipsle \
++	| mips16 \
++	| mips64 | mips64el \
++	| mips64vr | mips64vrel \
++	| mips64orion | mips64orionel \
++	| mips64vr4100 | mips64vr4100el \
++	| mips64vr4300 | mips64vr4300el \
++	| mips64vr5000 | mips64vr5000el \
++	| mips64vr5900 | mips64vr5900el \
++	| mipsisa32 | mipsisa32el \
++	| mipsisa32r2 | mipsisa32r2el \
++	| mipsisa64 | mipsisa64el \
++	| mipsisa64r2 | mipsisa64r2el \
++	| mipsisa64sb1 | mipsisa64sb1el \
++	| mipsisa64sr71k | mipsisa64sr71kel \
++	| mipstx39 | mipstx39el \
++	| mn10200 | mn10300 \
++	| mt \
++	| msp430 \
++	| nios | nios2 \
++	| ns16k | ns32k \
++	| or32 \
++	| pdp10 | pdp11 | pj | pjl \
++	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| pyramid \
++	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++	| sh64 | sh64le \
++	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++	| spu | strongarm \
++	| tahoe | thumb | tic4x | tic80 | tron \
++	| v850 | v850e \
++	| we32k \
++	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| z8k)
++		basic_machine=$basic_machine-unknown
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12)
++		# Motorola 68HC11/12.
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
++		;;
++	ms1)
++		basic_machine=mt-unknown
++		;;
++
++	# We use `pc' rather than `unknown'
++	# because (1) that's what they normally are, and
++	# (2) the word "unknown" tends to confuse beginning users.
++	i*86 | x86_64)
++	  basic_machine=$basic_machine-pc
++	  ;;
++	# Object if more than one company name word.
++	*-*-*)
++		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		exit 1
++		;;
++	# Recognize the basic CPU types with company name.
++	580-* \
++	| a29k-* \
++	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++	| avr-* | avr32-* \
++	| bfin-* | bs2000-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++	| clipper-* | craynv-* | cydra-* \
++	| d10v-* | d30v-* | dlx-* \
++	| elxsi-* \
++	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| h8300-* | h8500-* \
++	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| i*86-* | i860-* | i960-* | ia64-* \
++	| ip2k-* | iq2000-* \
++	| m32c-* | m32r-* | m32rle-* \
++	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* \
++	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
++	| mips16-* \
++	| mips64-* | mips64el-* \
++	| mips64vr-* | mips64vrel-* \
++	| mips64orion-* | mips64orionel-* \
++	| mips64vr4100-* | mips64vr4100el-* \
++	| mips64vr4300-* | mips64vr4300el-* \
++	| mips64vr5000-* | mips64vr5000el-* \
++	| mips64vr5900-* | mips64vr5900el-* \
++	| mipsisa32-* | mipsisa32el-* \
++	| mipsisa32r2-* | mipsisa32r2el-* \
++	| mipsisa64-* | mipsisa64el-* \
++	| mipsisa64r2-* | mipsisa64r2el-* \
++	| mipsisa64sb1-* | mipsisa64sb1el-* \
++	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipstx39-* | mipstx39el-* \
++	| mmix-* \
++	| mt-* \
++	| msp430-* \
++	| nios-* | nios2-* \
++	| none-* | np1-* | ns16k-* | ns32k-* \
++	| orion-* \
++	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| pyramid-* \
++	| romp-* | rs6000-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
++	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
++	| sparclite-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
++	| tahoe-* | thumb-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tron-* \
++	| v850-* | v850e-* | vax-* \
++	| we32k-* \
++	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| xstormy16-* | xtensa-* \
++	| ymp-* \
++	| z8k-*)
++		;;
++	# Recognize the various machine names and aliases which stand
++	# for a CPU type and a company and sometimes even an OS.
++	386bsd)
++		basic_machine=i386-unknown
++		os=-bsd
++		;;
++	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
++		basic_machine=m68000-att
++		;;
++	3b*)
++		basic_machine=we32k-att
++		;;
++	a29khif)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++    	abacus)
++		basic_machine=abacus-unknown
++		;;
++	adobe68k)
++		basic_machine=m68010-adobe
++		os=-scout
++		;;
++	alliant | fx80)
++		basic_machine=fx80-alliant
++		;;
++	altos | altos3068)
++		basic_machine=m68k-altos
++		;;
++	am29k)
++		basic_machine=a29k-none
++		os=-bsd
++		;;
++	amd64)
++		basic_machine=x86_64-pc
++		;;
++	amd64-*)
++		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	amdahl)
++		basic_machine=580-amdahl
++		os=-sysv
++		;;
++	amiga | amiga-*)
++		basic_machine=m68k-unknown
++		;;
++	amigaos | amigados)
++		basic_machine=m68k-unknown
++		os=-amigaos
++		;;
++	amigaunix | amix)
++		basic_machine=m68k-unknown
++		os=-sysv4
++		;;
++	apollo68)
++		basic_machine=m68k-apollo
++		os=-sysv
++		;;
++	apollo68bsd)
++		basic_machine=m68k-apollo
++		os=-bsd
++		;;
++	aux)
++		basic_machine=m68k-apple
++		os=-aux
++		;;
++	balance)
++		basic_machine=ns32k-sequent
++		os=-dynix
++		;;
++	c90)
++		basic_machine=c90-cray
++		os=-unicos
++		;;
++	convex-c1)
++		basic_machine=c1-convex
++		os=-bsd
++		;;
++	convex-c2)
++		basic_machine=c2-convex
++		os=-bsd
++		;;
++	convex-c32)
++		basic_machine=c32-convex
++		os=-bsd
++		;;
++	convex-c34)
++		basic_machine=c34-convex
++		os=-bsd
++		;;
++	convex-c38)
++		basic_machine=c38-convex
++		os=-bsd
++		;;
++	cray | j90)
++		basic_machine=j90-cray
++		os=-unicos
++		;;
++	craynv)
++		basic_machine=craynv-cray
++		os=-unicosmp
++		;;
++	cr16c)
++		basic_machine=cr16c-unknown
++		os=-elf
++		;;
++	crds | unos)
++		basic_machine=m68k-crds
++		;;
++	crisv32 | crisv32-* | etraxfs*)
++		basic_machine=crisv32-axis
++		;;
++	cris | cris-* | etrax*)
++		basic_machine=cris-axis
++		;;
++	crx)
++		basic_machine=crx-unknown
++		os=-elf
++		;;
++	da30 | da30-*)
++		basic_machine=m68k-da30
++		;;
++	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
++		basic_machine=mips-dec
++		;;
++	decsystem10* | dec10*)
++		basic_machine=pdp10-dec
++		os=-tops10
++		;;
++	decsystem20* | dec20*)
++		basic_machine=pdp10-dec
++		os=-tops20
++		;;
++	delta | 3300 | motorola-3300 | motorola-delta \
++	      | 3300-motorola | delta-motorola)
++		basic_machine=m68k-motorola
++		;;
++	delta88)
++		basic_machine=m88k-motorola
++		os=-sysv3
++		;;
++	djgpp)
++		basic_machine=i586-pc
++		os=-msdosdjgpp
++		;;
++	dpx20 | dpx20-*)
++		basic_machine=rs6000-bull
++		os=-bosx
++		;;
++	dpx2* | dpx2*-bull)
++		basic_machine=m68k-bull
++		os=-sysv3
++		;;
++	ebmon29k)
++		basic_machine=a29k-amd
++		os=-ebmon
++		;;
++	elxsi)
++		basic_machine=elxsi-elxsi
++		os=-bsd
++		;;
++	encore | umax | mmax)
++		basic_machine=ns32k-encore
++		;;
++	es1800 | OSE68k | ose68k | ose | OSE)
++		basic_machine=m68k-ericsson
++		os=-ose
++		;;
++	fx2800)
++		basic_machine=i860-alliant
++		;;
++	genix)
++		basic_machine=ns32k-ns
++		;;
++	gmicro)
++		basic_machine=tron-gmicro
++		os=-sysv
++		;;
++	go32)
++		basic_machine=i386-pc
++		os=-go32
++		;;
++	h3050r* | hiux*)
++		basic_machine=hppa1.1-hitachi
++		os=-hiuxwe2
++		;;
++	h8300hms)
++		basic_machine=h8300-hitachi
++		os=-hms
++		;;
++	h8300xray)
++		basic_machine=h8300-hitachi
++		os=-xray
++		;;
++	h8500hms)
++		basic_machine=h8500-hitachi
++		os=-hms
++		;;
++	harris)
++		basic_machine=m88k-harris
++		os=-sysv3
++		;;
++	hp300-*)
++		basic_machine=m68k-hp
++		;;
++	hp300bsd)
++		basic_machine=m68k-hp
++		os=-bsd
++		;;
++	hp300hpux)
++		basic_machine=m68k-hp
++		os=-hpux
++		;;
++	hp3k9[0-9][0-9] | hp9[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hp9k2[0-9][0-9] | hp9k31[0-9])
++		basic_machine=m68000-hp
++		;;
++	hp9k3[2-9][0-9])
++		basic_machine=m68k-hp
++		;;
++	hp9k6[0-9][0-9] | hp6[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hp9k7[0-79][0-9] | hp7[0-79][0-9])
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k78[0-9] | hp78[0-9])
++		# FIXME: really hppa2.0-hp
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
++		# FIXME: really hppa2.0-hp
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[0-9][13679] | hp8[0-9][13679])
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[0-9][0-9] | hp8[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hppa-next)
++		os=-nextstep3
++		;;
++	hppaosf)
++		basic_machine=hppa1.1-hp
++		os=-osf
++		;;
++	hppro)
++		basic_machine=hppa1.1-hp
++		os=-proelf
++		;;
++	i370-ibm* | ibm*)
++		basic_machine=i370-ibm
++		;;
++# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
++	i*86v32)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-sysv32
++		;;
++	i*86v4*)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-sysv4
++		;;
++	i*86v)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-sysv
++		;;
++	i*86sol2)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-solaris2
++		;;
++	i386mach)
++		basic_machine=i386-mach
++		os=-mach
++		;;
++	i386-vsta | vsta)
++		basic_machine=i386-unknown
++		os=-vsta
++		;;
++	iris | iris4d)
++		basic_machine=mips-sgi
++		case $os in
++		    -irix*)
++			;;
++		    *)
++			os=-irix4
++			;;
++		esac
++		;;
++	isi68 | isi)
++		basic_machine=m68k-isi
++		os=-sysv
++		;;
++	m88k-omron*)
++		basic_machine=m88k-omron
++		;;
++	magnum | m3230)
++		basic_machine=mips-mips
++		os=-sysv
++		;;
++	merlin)
++		basic_machine=ns32k-utek
++		os=-sysv
++		;;
++	mingw32)
++		basic_machine=i386-pc
++		os=-mingw32
++		;;
++	miniframe)
++		basic_machine=m68000-convergent
++		;;
++	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
++		;;
++	mips3*-*)
++		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
++		;;
++	mips3*)
++		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
++		;;
++	monitor)
++		basic_machine=m68k-rom68k
++		os=-coff
++		;;
++	morphos)
++		basic_machine=powerpc-unknown
++		os=-morphos
++		;;
++	msdos)
++		basic_machine=i386-pc
++		os=-msdos
++		;;
++	ms1-*)
++		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		;;
++	mvs)
++		basic_machine=i370-ibm
++		os=-mvs
++		;;
++	ncr3000)
++		basic_machine=i486-ncr
++		os=-sysv4
++		;;
++	netbsd386)
++		basic_machine=i386-unknown
++		os=-netbsd
++		;;
++	netwinder)
++		basic_machine=armv4l-rebel
++		os=-linux
++		;;
++	news | news700 | news800 | news900)
++		basic_machine=m68k-sony
++		os=-newsos
++		;;
++	news1000)
++		basic_machine=m68030-sony
++		os=-newsos
++		;;
++	news-3600 | risc-news)
++		basic_machine=mips-sony
++		os=-newsos
++		;;
++	necv70)
++		basic_machine=v70-nec
++		os=-sysv
++		;;
++	next | m*-next )
++		basic_machine=m68k-next
++		case $os in
++		    -nextstep* )
++			;;
++		    -ns2*)
++		      os=-nextstep2
++			;;
++		    *)
++		      os=-nextstep3
++			;;
++		esac
++		;;
++	nh3000)
++		basic_machine=m68k-harris
++		os=-cxux
++		;;
++	nh[45]000)
++		basic_machine=m88k-harris
++		os=-cxux
++		;;
++	nindy960)
++		basic_machine=i960-intel
++		os=-nindy
++		;;
++	mon960)
++		basic_machine=i960-intel
++		os=-mon960
++		;;
++	nonstopux)
++		basic_machine=mips-compaq
++		os=-nonstopux
++		;;
++	np1)
++		basic_machine=np1-gould
++		;;
++	nsr-tandem)
++		basic_machine=nsr-tandem
++		;;
++	op50n-* | op60c-*)
++		basic_machine=hppa1.1-oki
++		os=-proelf
++		;;
++	openrisc | openrisc-*)
++		basic_machine=or32-unknown
++		;;
++	os400)
++		basic_machine=powerpc-ibm
++		os=-os400
++		;;
++	OSE68000 | ose68000)
++		basic_machine=m68000-ericsson
++		os=-ose
++		;;
++	os68k)
++		basic_machine=m68k-none
++		os=-os68k
++		;;
++	pa-hitachi)
++		basic_machine=hppa1.1-hitachi
++		os=-hiuxwe2
++		;;
++	paragon)
++		basic_machine=i860-intel
++		os=-osf
++		;;
++	pbd)
++		basic_machine=sparc-tti
++		;;
++	pbb)
++		basic_machine=m68k-tti
++		;;
++	pc532 | pc532-*)
++		basic_machine=ns32k-pc532
++		;;
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentium | p5 | k5 | k6 | nexgen | viac3)
++		basic_machine=i586-pc
++		;;
++	pentiumpro | p6 | 6x86 | athlon | athlon_*)
++		basic_machine=i686-pc
++		;;
++	pentiumii | pentium2 | pentiumiii | pentium3)
++		basic_machine=i686-pc
++		;;
++	pentium4)
++		basic_machine=i786-pc
++		;;
++	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
++		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentiumpro-* | p6-* | 6x86-* | athlon-*)
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentium4-*)
++		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pn)
++		basic_machine=pn-gould
++		;;
++	power)	basic_machine=power-ibm
++		;;
++	ppc)	basic_machine=powerpc-unknown
++		;;
++	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppcle | powerpclittle | ppc-le | powerpc-little)
++		basic_machine=powerpcle-unknown
++		;;
++	ppcle-* | powerpclittle-*)
++		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64)	basic_machine=powerpc64-unknown
++		;;
++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++		basic_machine=powerpc64le-unknown
++		;;
++	ppc64le-* | powerpc64little-*)
++		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ps2)
++		basic_machine=i386-ibm
++		;;
++	pw32)
++		basic_machine=i586-unknown
++		os=-pw32
++		;;
++	rdos)
++		basic_machine=i386-pc
++		os=-rdos
++		;;
++	rom68k)
++		basic_machine=m68k-rom68k
++		os=-coff
++		;;
++	rm[46]00)
++		basic_machine=mips-siemens
++		;;
++	rtpc | rtpc-*)
++		basic_machine=romp-ibm
++		;;
++	s390 | s390-*)
++		basic_machine=s390-ibm
++		;;
++	s390x | s390x-*)
++		basic_machine=s390x-ibm
++		;;
++	sa29200)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++	sb1)
++		basic_machine=mipsisa64sb1-unknown
++		;;
++	sb1el)
++		basic_machine=mipsisa64sb1el-unknown
++		;;
++	sei)
++		basic_machine=mips-sei
++		os=-seiux
++		;;
++	sequent)
++		basic_machine=i386-sequent
++		;;
++	sh)
++		basic_machine=sh-hitachi
++		os=-hms
++		;;
++	sh64)
++		basic_machine=sh64-unknown
++		;;
++	sparclite-wrs | simso-wrs)
++		basic_machine=sparclite-wrs
++		os=-vxworks
++		;;
++	sps7)
++		basic_machine=m68k-bull
++		os=-sysv2
++		;;
++	spur)
++		basic_machine=spur-unknown
++		;;
++	st2000)
++		basic_machine=m68k-tandem
++		;;
++	stratus)
++		basic_machine=i860-stratus
++		os=-sysv4
++		;;
++	sun2)
++		basic_machine=m68000-sun
++		;;
++	sun2os3)
++		basic_machine=m68000-sun
++		os=-sunos3
++		;;
++	sun2os4)
++		basic_machine=m68000-sun
++		os=-sunos4
++		;;
++	sun3os3)
++		basic_machine=m68k-sun
++		os=-sunos3
++		;;
++	sun3os4)
++		basic_machine=m68k-sun
++		os=-sunos4
++		;;
++	sun4os3)
++		basic_machine=sparc-sun
++		os=-sunos3
++		;;
++	sun4os4)
++		basic_machine=sparc-sun
++		os=-sunos4
++		;;
++	sun4sol2)
++		basic_machine=sparc-sun
++		os=-solaris2
++		;;
++	sun3 | sun3-*)
++		basic_machine=m68k-sun
++		;;
++	sun4)
++		basic_machine=sparc-sun
++		;;
++	sun386 | sun386i | roadrunner)
++		basic_machine=i386-sun
++		;;
++	sv1)
++		basic_machine=sv1-cray
++		os=-unicos
++		;;
++	symmetry)
++		basic_machine=i386-sequent
++		os=-dynix
++		;;
++	t3e)
++		basic_machine=alphaev5-cray
++		os=-unicos
++		;;
++	t90)
++		basic_machine=t90-cray
++		os=-unicos
++		;;
++	tic54x | c54x*)
++		basic_machine=tic54x-unknown
++		os=-coff
++		;;
++	tic55x | c55x*)
++		basic_machine=tic55x-unknown
++		os=-coff
++		;;
++	tic6x | c6x*)
++		basic_machine=tic6x-unknown
++		os=-coff
++		;;
++	tx39)
++		basic_machine=mipstx39-unknown
++		;;
++	tx39el)
++		basic_machine=mipstx39el-unknown
++		;;
++	toad1)
++		basic_machine=pdp10-xkl
++		os=-tops20
++		;;
++	tower | tower-32)
++		basic_machine=m68k-ncr
++		;;
++	tpf)
++		basic_machine=s390x-ibm
++		os=-tpf
++		;;
++	udi29k)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++	ultra3)
++		basic_machine=a29k-nyu
++		os=-sym1
++		;;
++	v810 | necv810)
++		basic_machine=v810-nec
++		os=-none
++		;;
++	vaxv)
++		basic_machine=vax-dec
++		os=-sysv
++		;;
++	vms)
++		basic_machine=vax-dec
++		os=-vms
++		;;
++	vpp*|vx|vx-*)
++		basic_machine=f301-fujitsu
++		;;
++	vxworks960)
++		basic_machine=i960-wrs
++		os=-vxworks
++		;;
++	vxworks68)
++		basic_machine=m68k-wrs
++		os=-vxworks
++		;;
++	vxworks29k)
++		basic_machine=a29k-wrs
++		os=-vxworks
++		;;
++	w65*)
++		basic_machine=w65-wdc
++		os=-none
++		;;
++	w89k-*)
++		basic_machine=hppa1.1-winbond
++		os=-proelf
++		;;
++	xbox)
++		basic_machine=i686-pc
++		os=-mingw32
++		;;
++	xps | xps100)
++		basic_machine=xps100-honeywell
++		;;
++	ymp)
++		basic_machine=ymp-cray
++		os=-unicos
++		;;
++	z8k-*-coff)
++		basic_machine=z8k-unknown
++		os=-sim
++		;;
++	none)
++		basic_machine=none-none
++		os=-none
++		;;
++
++# Here we handle the default manufacturer of certain CPU types.  It is in
++# some cases the only manufacturer, in others, it is the most popular.
++	w89k)
++		basic_machine=hppa1.1-winbond
++		;;
++	op50n)
++		basic_machine=hppa1.1-oki
++		;;
++	op60c)
++		basic_machine=hppa1.1-oki
++		;;
++	romp)
++		basic_machine=romp-ibm
++		;;
++	mmix)
++		basic_machine=mmix-knuth
++		;;
++	rs6000)
++		basic_machine=rs6000-ibm
++		;;
++	vax)
++		basic_machine=vax-dec
++		;;
++	pdp10)
++		# there are many clones, so DEC is not a safe bet
++		basic_machine=pdp10-unknown
++		;;
++	pdp11)
++		basic_machine=pdp11-dec
++		;;
++	we32k)
++		basic_machine=we32k-att
++		;;
++	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++		basic_machine=sh-unknown
++		;;
++	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
++		basic_machine=sparc-sun
++		;;
++	cydra)
++		basic_machine=cydra-cydrome
++		;;
++	orion)
++		basic_machine=orion-highlevel
++		;;
++	orion105)
++		basic_machine=clipper-highlevel
++		;;
++	mac | mpw | mac-mpw)
++		basic_machine=m68k-apple
++		;;
++	pmac | pmac-mpw)
++		basic_machine=powerpc-apple
++		;;
++	*-unknown)
++		# Make sure to match an already-canonicalized machine name.
++		;;
++	*)
++		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		exit 1
++		;;
++esac
++
++# Here we canonicalize certain aliases for manufacturers.
++case $basic_machine in
++	*-digital*)
++		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
++		;;
++	*-commodore*)
++		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
++		;;
++	*)
++		;;
++esac
++
++# Decode manufacturer-specific aliases for certain operating systems.
++
++if [ x"$os" != x"" ]
++then
++case $os in
++        # First match some system type aliases
++        # that might get confused with valid system types.
++	# -solaris* is a basic system type, with this one exception.
++	-solaris1 | -solaris1.*)
++		os=`echo $os | sed -e 's|solaris1|sunos4|'`
++		;;
++	-solaris)
++		os=-solaris2
++		;;
++	-svr4*)
++		os=-sysv4
++		;;
++	-unixware*)
++		os=-sysv4.2uw
++		;;
++	-gnu/linux*)
++		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
++		;;
++	# First accept the basic system types.
++	# The portable systems comes first.
++	# Each alternative MUST END IN A *, to match a version number.
++	# -sysv* is not here because it comes later, after sysvr4.
++	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
++	      | -aos* \
++	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
++	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -openbsd* | -solidbsd* \
++	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
++	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
++	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
++	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -chorusos* | -chorusrdb* \
++	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
++	      | -skyos* | -haiku* | -rdos* | -toppers*)
++	# Remember, each alternative MUST END IN *, to match a version number.
++		;;
++	-qnx*)
++		case $basic_machine in
++		    x86-* | i*86-*)
++			;;
++		    *)
++			os=-nto$os
++			;;
++		esac
++		;;
++	-nto-qnx*)
++		;;
++	-nto*)
++		os=`echo $os | sed -e 's|nto|nto-qnx|'`
++		;;
++	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
++	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
++	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
++		;;
++	-mac*)
++		os=`echo $os | sed -e 's|mac|macos|'`
++		;;
++	-linux-dietlibc)
++		os=-linux-dietlibc
++		;;
++	-linux*)
++		os=`echo $os | sed -e 's|linux|linux-gnu|'`
++		;;
++	-sunos5*)
++		os=`echo $os | sed -e 's|sunos5|solaris2|'`
++		;;
++	-sunos6*)
++		os=`echo $os | sed -e 's|sunos6|solaris3|'`
++		;;
++	-opened*)
++		os=-openedition
++		;;
++        -os400*)
++		os=-os400
++		;;
++	-wince*)
++		os=-wince
++		;;
++	-osfrose*)
++		os=-osfrose
++		;;
++	-osf*)
++		os=-osf
++		;;
++	-utek*)
++		os=-bsd
++		;;
++	-dynix*)
++		os=-bsd
++		;;
++	-acis*)
++		os=-aos
++		;;
++	-atheos*)
++		os=-atheos
++		;;
++	-syllable*)
++		os=-syllable
++		;;
++	-386bsd)
++		os=-bsd
++		;;
++	-ctix* | -uts*)
++		os=-sysv
++		;;
++	-nova*)
++		os=-rtmk-nova
++		;;
++	-ns2 )
++		os=-nextstep2
++		;;
++	-nsk*)
++		os=-nsk
++		;;
++	# Preserve the version number of sinix5.
++	-sinix5.*)
++		os=`echo $os | sed -e 's|sinix|sysv|'`
++		;;
++	-sinix*)
++		os=-sysv4
++		;;
++        -tpf*)
++		os=-tpf
++		;;
++	-triton*)
++		os=-sysv3
++		;;
++	-oss*)
++		os=-sysv3
++		;;
++	-svr4)
++		os=-sysv4
++		;;
++	-svr3)
++		os=-sysv3
++		;;
++	-sysvr4)
++		os=-sysv4
++		;;
++	# This must come after -sysvr4.
++	-sysv*)
++		;;
++	-ose*)
++		os=-ose
++		;;
++	-es1800*)
++		os=-ose
++		;;
++	-xenix)
++		os=-xenix
++		;;
++	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++		os=-mint
++		;;
++	-aros*)
++		os=-aros
++		;;
++	-kaos*)
++		os=-kaos
++		;;
++	-zvmoe)
++		os=-zvmoe
++		;;
++	-none)
++		;;
++	*)
++		# Get rid of the `-' at the beginning of $os.
++		os=`echo $os | sed 's/[^-]*-//'`
++		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
++		exit 1
++		;;
++esac
++else
++
++# Here we handle the default operating systems that come with various machines.
++# The value should be what the vendor currently ships out the door with their
++# machine or put another way, the most popular os provided with the machine.
++
++# Note that if you're going to try to match "-MANUFACTURER" here (say,
++# "-sun"), then you have to tell the case statement up towards the top
++# that MANUFACTURER isn't an operating system.  Otherwise, code above
++# will signal an error saying that MANUFACTURER isn't an operating
++# system, and we'll never get to this point.
++
++case $basic_machine in
++        spu-*)
++		os=-elf
++		;;
++	*-acorn)
++		os=-riscix1.2
++		;;
++	arm*-rebel)
++		os=-linux
++		;;
++	arm*-semi)
++		os=-aout
++		;;
++        c4x-* | tic4x-*)
++        	os=-coff
++		;;
++	# This must come before the *-dec entry.
++	pdp10-*)
++		os=-tops20
++		;;
++	pdp11-*)
++		os=-none
++		;;
++	*-dec | vax-*)
++		os=-ultrix4.2
++		;;
++	m68*-apollo)
++		os=-domain
++		;;
++	i386-sun)
++		os=-sunos4.0.2
++		;;
++	m68000-sun)
++		os=-sunos3
++		# This also exists in the configure program, but was not the
++		# default.
++		# os=-sunos4
++		;;
++	m68*-cisco)
++		os=-aout
++		;;
++	mips*-cisco)
++		os=-elf
++		;;
++	mips*-*)
++		os=-elf
++		;;
++	or32-*)
++		os=-coff
++		;;
++	*-tti)	# must be before sparc entry or we get the wrong os.
++		os=-sysv3
++		;;
++	sparc-* | *-sun)
++		os=-sunos4.1.1
++		;;
++	*-be)
++		os=-beos
++		;;
++	*-haiku)
++		os=-haiku
++		;;
++	*-ibm)
++		os=-aix
++		;;
++    	*-knuth)
++		os=-mmixware
++		;;
++	*-wec)
++		os=-proelf
++		;;
++	*-winbond)
++		os=-proelf
++		;;
++	*-oki)
++		os=-proelf
++		;;
++	*-hp)
++		os=-hpux
++		;;
++	*-hitachi)
++		os=-hiux
++		;;
++	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
++		os=-sysv
++		;;
++	*-cbm)
++		os=-amigaos
++		;;
++	*-dg)
++		os=-dgux
++		;;
++	*-dolphin)
++		os=-sysv3
++		;;
++	m68k-ccur)
++		os=-rtu
++		;;
++	m88k-omron*)
++		os=-luna
++		;;
++	*-next )
++		os=-nextstep
++		;;
++	*-sequent)
++		os=-ptx
++		;;
++	*-crds)
++		os=-unos
++		;;
++	*-ns)
++		os=-genix
++		;;
++	i370-*)
++		os=-mvs
++		;;
++	*-next)
++		os=-nextstep3
++		;;
++	*-gould)
++		os=-sysv
++		;;
++	*-highlevel)
++		os=-bsd
++		;;
++	*-encore)
++		os=-bsd
++		;;
++	*-sgi)
++		os=-irix
++		;;
++	*-siemens)
++		os=-sysv4
++		;;
++	*-masscomp)
++		os=-rtu
++		;;
++	f30[01]-fujitsu | f700-fujitsu)
++		os=-uxpv
++		;;
++	*-rom68k)
++		os=-coff
++		;;
++	*-*bug)
++		os=-coff
++		;;
++	*-apple)
++		os=-macos
++		;;
++	*-atari*)
++		os=-mint
++		;;
++	*)
++		os=-none
++		;;
++esac
++fi
++
++# Here we handle the case where we know the os, and the CPU type, but not the
++# manufacturer.  We pick the logical manufacturer.
++vendor=unknown
++case $basic_machine in
++	*-unknown)
++		case $os in
++			-riscix*)
++				vendor=acorn
++				;;
++			-sunos*)
++				vendor=sun
++				;;
++			-aix*)
++				vendor=ibm
++				;;
++			-beos*)
++				vendor=be
++				;;
++			-hpux*)
++				vendor=hp
++				;;
++			-mpeix*)
++				vendor=hp
++				;;
++			-hiux*)
++				vendor=hitachi
++				;;
++			-unos*)
++				vendor=crds
++				;;
++			-dgux*)
++				vendor=dg
++				;;
++			-luna*)
++				vendor=omron
++				;;
++			-genix*)
++				vendor=ns
++				;;
++			-mvs* | -opened*)
++				vendor=ibm
++				;;
++			-os400*)
++				vendor=ibm
++				;;
++			-ptx*)
++				vendor=sequent
++				;;
++			-tpf*)
++				vendor=ibm
++				;;
++			-vxsim* | -vxworks* | -windiss*)
++				vendor=wrs
++				;;
++			-aux*)
++				vendor=apple
++				;;
++			-hms*)
++				vendor=hitachi
++				;;
++			-mpw* | -macos*)
++				vendor=apple
++				;;
++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++				vendor=atari
++				;;
++			-vos*)
++				vendor=stratus
++				;;
++		esac
++		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
++		;;
++esac
++
++echo $basic_machine$os
++exit
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
--- apache2-2.2.11.orig/debian/patches/900_CVE-2009-1191.dpatch
+++ apache2-2.2.11/debian/patches/900_CVE-2009-1191.dpatch
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 900_CVE-2009-1191.dpatch by Jamie Strandboge <jamie@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream: https://issues.apache.org/bugzilla/show_bug.cgi?id=46949
+## DP: Patch: http://www.apache.org/dist/httpd/patches/apply_to_2.2.11/PR46949.diff
+## DP: Description: mod_proxy_ajp: Avoid delivering content from a previous
+## DP:              request which failed to send a request body. PR 46949
+##
+
+@DPATCH@
+diff -urNad apache2-2.2.11~/modules/proxy/mod_proxy_ajp.c apache2-2.2.11/modules/proxy/mod_proxy_ajp.c
+--- apache2-2.2.11~/modules/proxy/mod_proxy_ajp.c	2008-11-15 08:25:54.000000000 -0600
++++ apache2-2.2.11/modules/proxy/mod_proxy_ajp.c	2009-06-10 17:01:45.821558012 -0500
+@@ -307,21 +307,17 @@
+                          "proxy: read zero bytes, expecting"
+                          " %" APR_OFF_T_FMT " bytes",
+                          content_length);
+-            status = ajp_send_data_msg(conn->sock, msg, 0);
+-            if (status != APR_SUCCESS) {
+-                /* We had a failure: Close connection to backend */
+-                conn->close++;
+-                ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
+-                            "proxy: send failed to %pI (%s)",
+-                            conn->worker->cp->addr,
+-                            conn->worker->hostname);
+-                return HTTP_INTERNAL_SERVER_ERROR;
+-            }
+-            else {
+-                /* Client send zero bytes with C-L > 0
+-                 */
+-                return HTTP_BAD_REQUEST;
+-            }
++            /*
++             * We can only get here if the client closed the connection
++             * to us without sending the body.
++             * Now the connection is in the wrong state on the backend.
++             * Sending an empty data msg doesn't help either as it does
++             * not move this connection to the correct state on the backend
++             * for later resusage by the next request again.
++             * Close it to clean things up.
++             */
++            conn->close++;
++            return HTTP_BAD_REQUEST;
+         }
+     }
+ 
--- apache2-2.2.11.orig/debian/config-dir/ports.conf
+++ apache2-2.2.11/debian/config-dir/ports.conf
@@ -0,0 +1,15 @@
+# If you just change the port or add more ports here, you will likely also
+# have to change the VirtualHost statement in
+# /etc/apache2/sites-enabled/000-default
+# This is also true if you have upgraded from before 2.2.9-3 (i.e. from
+# Debian etch). See /usr/share/doc/apache2.2-common/NEWS.Debian.gz and
+# README.Debian.gz
+
+NameVirtualHost *:80
+Listen 80
+
+<IfModule mod_ssl.c>
+    # SSL name based virtual hosts are not yet supported, therefore no
+    # NameVirtualHost statement here
+    Listen 443
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/envvars
+++ apache2-2.2.11/debian/config-dir/envvars
@@ -0,0 +1,8 @@
+# envvars - default environment variables for apache2ctl
+
+# Since there is no sane way to get the parsed apache2 config in scripts, some
+# settings are defined via environment variables and then used in apache2ctl,
+# /etc/init.d/apache2, /etc/logrotate.d/apache2, etc.
+export APACHE_RUN_USER=www-data
+export APACHE_RUN_GROUP=www-data
+export APACHE_PID_FILE=/var/run/apache2.pid
--- apache2-2.2.11.orig/debian/config-dir/apache2.conf
+++ apache2-2.2.11/debian/config-dir/apache2.conf
@@ -0,0 +1,281 @@
+#
+# Based upon the NCSA server configuration files originally by Rob McCool.
+#
+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See http://httpd.apache.org/docs/2.2/ for detailed information about
+# the directives.
+#
+# 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.  
+#
+# The configuration directives are grouped into three basic sections:
+#  1. Directives that control the operation of the Apache server process as a
+#     whole (the 'global environment').
+#  2. Directives that define the parameters of the 'main' or 'default' server,
+#     which responds to requests that aren't handled by a virtual host.
+#     These directives also provide default values for the settings
+#     of all virtual hosts.
+#  3. Settings for virtual hosts, which allow Web requests to be sent to
+#     different IP addresses or hostnames and have them handled by the
+#     same Apache server process.
+#
+# 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 "/var/log/apache2/foo.log"
+# with ServerRoot set to "" will be interpreted by the
+# server as "//var/log/apache2/foo.log".
+#
+
+### Section 1: Global Environment
+#
+# The directives in this section affect the overall operation of Apache,
+# such as the number of concurrent requests it can handle or where it
+# can find its configuration files.
+#
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the LockFile documentation (available
+# at <URL:http://httpd.apache.org/docs-2.1/mod/mpm_common.html#lockfile>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+ServerRoot "/etc/apache2"
+
+#
+# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
+#
+#<IfModule !mpm_winnt.c>
+#<IfModule !mpm_netware.c>
+LockFile /var/lock/apache2/accept.lock
+#</IfModule>
+#</IfModule>
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+# This needs to be set in /etc/apache2/envvars
+#
+PidFile ${APACHE_PID_FILE}
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 15
+
+##
+## Server-Pool Size Regulation (MPM specific)
+## 
+
+# prefork MPM
+# StartServers: number of server processes to start
+# MinSpareServers: minimum number of server processes which are kept spare
+# MaxSpareServers: maximum number of server processes which are kept spare
+# MaxClients: maximum number of server processes allowed to start
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule mpm_prefork_module>
+    StartServers          5
+    MinSpareServers       5
+    MaxSpareServers      10
+    MaxClients          150
+    MaxRequestsPerChild   0
+</IfModule>
+
+# worker MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule mpm_worker_module>
+    StartServers          2
+    MaxClients          150
+    MinSpareThreads      25
+    MaxSpareThreads      75 
+    ThreadsPerChild      25
+    MaxRequestsPerChild   0
+</IfModule>
+
+# These need to be set in /etc/apache2/envvars
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+
+#
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ~ "^\.ht">
+    Order allow,deny
+    Deny from all
+</Files>
+
+#
+# DefaultType is the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
+
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+# 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 /var/log/apache2/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
+
+# Include module configuration:
+Include /etc/apache2/mods-enabled/*.load
+Include /etc/apache2/mods-enabled/*.conf
+
+# Include all the user configurations:
+Include /etc/apache2/httpd.conf
+
+# Include ports listing
+Include /etc/apache2/ports.conf
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive (see below).
+# If you are behind a reverse proxy, you might want to change %h into %{X-Forwarded-For}i
+#
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+#
+# Define an access log for VirtualHosts that don't define their own logfile
+CustomLog /var/log/apache2/other_vhosts_access.log vhost_combined
+
+#
+# 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
+#
+
+#
+# Putting this all together, we can internationalize error responses.
+#
+# We use Alias to redirect any /error/HTTP_<error>.html.var response to
+# our collection of by-error message multi-language collections.  We use 
+# includes to substitute the appropriate text.
+#
+# You can modify the messages' appearance without changing any of the
+# default HTTP_<error>.html.var files by adding the line:
+#
+#   Alias /error/include/ "/your/include/path/"
+#
+# which allows you to create your own set of files by starting with the
+# /usr/share/apache2/error/include/ files and copying them to /your/include/path/, 
+# even on a per-VirtualHost basis.  The default include files will display
+# your Apache version number and your ServerAdmin email address regardless
+# of the setting of ServerSignature.
+#
+# The internationalized error documents require mod_alias, mod_include
+# and mod_negotiation.  To activate them, uncomment the following 30 lines.
+
+#    Alias /error/ "/usr/share/apache2/error/"
+#
+#    <Directory "/usr/share/apache2/error">
+#        AllowOverride None
+#        Options IncludesNoExec
+#        AddOutputFilter Includes html
+#        AddHandler type-map var
+#        Order allow,deny
+#        Allow from all
+#        LanguagePriority en cs de es fr it nl sv pt-br ro
+#        ForceLanguagePriority Prefer Fallback
+#    </Directory>
+#
+#    ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+#    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+#    ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+#    ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+#    ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+#    ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+#    ErrorDocument 410 /error/HTTP_GONE.html.var
+#    ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+#    ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+#    ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+#    ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+#    ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+#    ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+#    ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+#    ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+#    ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+#    ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+
+
+
+# Include of directories ignores editors' and dpkg's backup files,
+# see README.Debian for details.
+
+# Include generic snippets of statements
+Include /etc/apache2/conf.d/
+
+# Include the virtual host configurations:
+Include /etc/apache2/sites-enabled/
--- apache2-2.2.11.orig/debian/config-dir/sites-available/default
+++ apache2-2.2.11/debian/config-dir/sites-available/default
@@ -0,0 +1,41 @@
+<VirtualHost *:80>
+	ServerAdmin webmaster@localhost
+
+	DocumentRoot /var/www
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /var/www/>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+		Order allow,deny
+		allow from all
+	</Directory>
+
+	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+	<Directory "/usr/lib/cgi-bin">
+		AllowOverride None
+		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	ErrorLog /var/log/apache2/error.log
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
+
+	CustomLog /var/log/apache2/access.log combined
+
+    Alias /doc/ "/usr/share/doc/"
+    <Directory "/usr/share/doc/">
+        Options Indexes MultiViews FollowSymLinks
+        AllowOverride None
+        Order deny,allow
+        Deny from all
+        Allow from 127.0.0.0/255.0.0.0 ::1/128
+    </Directory>
+
+</VirtualHost>
--- apache2-2.2.11.orig/debian/config-dir/sites-available/default-ssl
+++ apache2-2.2.11/debian/config-dir/sites-available/default-ssl
@@ -0,0 +1,170 @@
+<IfModule mod_ssl.c>
+<VirtualHost _default_:443>
+	ServerAdmin webmaster@localhost
+
+	DocumentRoot /var/www
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /var/www/>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+		Order allow,deny
+		allow from all
+	</Directory>
+
+	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+	<Directory "/usr/lib/cgi-bin">
+		AllowOverride None
+		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	ErrorLog /var/log/apache2/error.log
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
+
+	CustomLog /var/log/apache2/ssl_access.log combined
+
+	Alias /doc/ "/usr/share/doc/"
+	<Directory "/usr/share/doc/">
+		Options Indexes MultiViews FollowSymLinks
+		AllowOverride None
+		Order deny,allow
+		Deny from all
+		Allow from 127.0.0.0/255.0.0.0 ::1/128
+	</Directory>
+
+	#   SSL Engine Switch:
+	#   Enable/Disable SSL for this virtual host.
+	SSLEngine on
+
+	#   A self-signed (snakeoil) certificate can be created by installing
+	#   the ssl-cert package. See
+	#   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
+	#   If both key and certificate are stored in the same file, only the
+	#   SSLCertificateFile directive is needed.
+	SSLCertificateFile    /etc/ssl/certs/ssl-cert-snakeoil.pem
+	SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.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/apache2/ssl.crt/server-ca.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)
+	#   Note: Inside SSLCACertificatePath you need hash symlinks
+	#         to point to the certificate files. Use the provided
+	#         Makefile to update the hash symlinks after changes.
+	#SSLCACertificatePath /etc/ssl/certs/
+	#SSLCACertificateFile /etc/apache2/ssl.crt/ca-bundle.crt
+
+	#   Certificate Revocation Lists (CRL):
+	#   Set the CA revocation path where to find CA CRLs for client
+	#   authentication or alternatively one huge file containing all
+	#   of them (file must be PEM encoded)
+	#   Note: Inside SSLCARevocationPath you need hash symlinks
+	#         to point to the certificate files. Use the provided
+	#         Makefile to update the hash symlinks after changes.
+	#SSLCARevocationPath /etc/apache2/ssl.crl/
+	#SSLCARevocationFile /etc/apache2/ssl.crl/ca-bundle.crl
+
+	#   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
+	<FilesMatch "\.(cgi|shtml|phtml|php)$">
+		SSLOptions +StdEnvVars
+	</FilesMatch>
+	<Directory /usr/lib/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.*" \
+		nokeepalive ssl-unclean-shutdown \
+		downgrade-1.0 force-response-1.0
+
+</VirtualHost>
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/dbd.load
+++ apache2-2.2.11/debian/config-dir/mods-available/dbd.load
@@ -0,0 +1 @@
+LoadModule dbd_module /usr/lib/apache2/modules/mod_dbd.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/proxy.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/proxy.conf
@@ -0,0 +1,19 @@
+<IfModule mod_proxy.c>
+        #turning ProxyRequests on and allowing proxying from all may allow
+        #spammers to use your proxy to send email.
+
+        ProxyRequests Off
+
+        <Proxy *>
+                AddDefaultCharset off
+                Order deny,allow
+                Deny from all
+                #Allow from .example.com
+        </Proxy>
+
+        # Enable/disable the handling of HTTP/1.1 "Via:" headers.
+        # ("Full" adds the server version; "Block" removes all outgoing Via: headers)
+        # Set to one of: Off | On | Full | Block
+
+        ProxyVia On
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/info.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/info.conf
@@ -0,0 +1,17 @@
+<IfModule mod_info.c>
+#
+# Allow remote server configuration reports, with the URL of
+#  http://servername/server-info (requires that mod_info.c be loaded).
+# Uncomment and change the ".example.com" to allow
+# access from other hosts.
+#
+<Location /server-info>
+    SetHandler server-info
+    Order deny,allow
+    Deny from all
+    Allow from localhost ip6-localhost
+#    Allow from .example.com
+</Location>
+
+</IfModule>
+
--- apache2-2.2.11.orig/debian/config-dir/mods-available/auth_digest.load
+++ apache2-2.2.11/debian/config-dir/mods-available/auth_digest.load
@@ -0,0 +1 @@
+LoadModule auth_digest_module /usr/lib/apache2/modules/mod_auth_digest.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/proxy.load
+++ apache2-2.2.11/debian/config-dir/mods-available/proxy.load
@@ -0,0 +1 @@
+LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/suexec.load
+++ apache2-2.2.11/debian/config-dir/mods-available/suexec.load
@@ -0,0 +1 @@
+LoadModule suexec_module /usr/lib/apache2/modules/mod_suexec.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/status.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/status.conf
@@ -0,0 +1,16 @@
+<IfModule mod_status.c>
+#
+# Allow server status reports generated by mod_status,
+# with the URL of http://servername/server-status
+# Uncomment and change the ".example.com" to allow
+# access from other hosts.
+#
+<Location /server-status>
+    SetHandler server-status
+    Order deny,allow
+    Deny from all
+    Allow from localhost ip6-localhost
+#    Allow from .example.com
+</Location>
+
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/log_forensic.load
+++ apache2-2.2.11/debian/config-dir/mods-available/log_forensic.load
@@ -0,0 +1 @@
+LoadModule log_forensic_module /usr/lib/apache2/modules/mod_log_forensic.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/setenvif.load
+++ apache2-2.2.11/debian/config-dir/mods-available/setenvif.load
@@ -0,0 +1 @@
+LoadModule setenvif_module /usr/lib/apache2/modules/mod_setenvif.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authn_dbm.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authn_dbm.load
@@ -0,0 +1 @@
+LoadModule authn_dbm_module /usr/lib/apache2/modules/mod_authn_dbm.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/alias.load
+++ apache2-2.2.11/debian/config-dir/mods-available/alias.load
@@ -0,0 +1 @@
+LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/vhost_alias.load
+++ apache2-2.2.11/debian/config-dir/mods-available/vhost_alias.load
@@ -0,0 +1 @@
+LoadModule vhost_alias_module /usr/lib/apache2/modules/mod_vhost_alias.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/deflate.load
+++ apache2-2.2.11/debian/config-dir/mods-available/deflate.load
@@ -0,0 +1 @@
+LoadModule deflate_module /usr/lib/apache2/modules/mod_deflate.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/disk_cache.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/disk_cache.conf
@@ -0,0 +1,19 @@
+<IfModule mod_disk_cache.c>
+# cache cleaning is done by htcacheclean, which can be configured in
+# /etc/default/apache2
+#
+# For further information, see the comments in that file, 
+# /usr/share/doc/apache2.2-common/README.Debian, and the htcacheclean(8)
+# man page.
+
+	# This path must be the same as the one in /etc/default/apache2
+        CacheRoot /var/cache/apache2/mod_disk_cache
+
+	# This will also cache local documents. It usually makes more sense to
+	# put this into the configuration for just one virtual host.
+
+	#CacheEnable disk /
+
+        CacheDirLevels 5
+        CacheDirLength 3
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/mime_magic.load
+++ apache2-2.2.11/debian/config-dir/mods-available/mime_magic.load
@@ -0,0 +1 @@
+LoadModule mime_magic_module /usr/lib/apache2/modules/mod_mime_magic.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/asis.load
+++ apache2-2.2.11/debian/config-dir/mods-available/asis.load
@@ -0,0 +1 @@
+LoadModule asis_module /usr/lib/apache2/modules/mod_asis.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/info.load
+++ apache2-2.2.11/debian/config-dir/mods-available/info.load
@@ -0,0 +1 @@
+LoadModule info_module /usr/lib/apache2/modules/mod_info.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authn_dbd.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authn_dbd.load
@@ -0,0 +1,2 @@
+# Depends: dbd
+LoadModule authn_dbd_module /usr/lib/apache2/modules/mod_authn_dbd.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/proxy_http.load
+++ apache2-2.2.11/debian/config-dir/mods-available/proxy_http.load
@@ -0,0 +1,2 @@
+# Depends: proxy
+LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/filter.load
+++ apache2-2.2.11/debian/config-dir/mods-available/filter.load
@@ -0,0 +1 @@
+LoadModule filter_module /usr/lib/apache2/modules/mod_filter.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/proxy_balancer.load
+++ apache2-2.2.11/debian/config-dir/mods-available/proxy_balancer.load
@@ -0,0 +1,2 @@
+# Depends: proxy
+LoadModule proxy_balancer_module /usr/lib/apache2/modules/mod_proxy_balancer.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/mem_cache.load
+++ apache2-2.2.11/debian/config-dir/mods-available/mem_cache.load
@@ -0,0 +1,2 @@
+# Depends: cache
+LoadModule mem_cache_module /usr/lib/apache2/modules/mod_mem_cache.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/substitute.load
+++ apache2-2.2.11/debian/config-dir/mods-available/substitute.load
@@ -0,0 +1 @@
+LoadModule substitute_module /usr/lib/apache2/modules/mod_substitute.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/ssl.load
+++ apache2-2.2.11/debian/config-dir/mods-available/ssl.load
@@ -0,0 +1 @@
+LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/speling.load
+++ apache2-2.2.11/debian/config-dir/mods-available/speling.load
@@ -0,0 +1 @@
+LoadModule speling_module /usr/lib/apache2/modules/mod_speling.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/unique_id.load
+++ apache2-2.2.11/debian/config-dir/mods-available/unique_id.load
@@ -0,0 +1 @@
+LoadModule unique_id_module /usr/lib/apache2/modules/mod_unique_id.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/imagemap.load
+++ apache2-2.2.11/debian/config-dir/mods-available/imagemap.load
@@ -0,0 +1 @@
+LoadModule imagemap_module /usr/lib/apache2/modules/mod_imagemap.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/mime_magic.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/mime_magic.conf
@@ -0,0 +1,3 @@
+<IfModule mod_mime_magic.c>
+        MIMEMagicFile /usr/share/file/magic.mime
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/negotiation.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/negotiation.conf
@@ -0,0 +1,18 @@
+<IfModule mod_negotiation.c>
+#
+# LanguagePriority allows you to give precedence to some languages
+# in case of a tie during content negotiation.
+#
+# Just list the languages in decreasing order of preference. We have
+# more or less alphabetized them here. You probably want to change this.
+#
+LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv tr zh-CN zh-TW
+
+#
+# ForceLanguagePriority allows you to serve a result page rather than
+# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
+# [in case no accepted languages matched the available variants]
+#
+ForceLanguagePriority Prefer Fallback
+
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authn_file.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authn_file.load
@@ -0,0 +1 @@
+LoadModule authn_file_module /usr/lib/apache2/modules/mod_authn_file.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/charset_lite.load
+++ apache2-2.2.11/debian/config-dir/mods-available/charset_lite.load
@@ -0,0 +1 @@
+LoadModule charset_lite_module /usr/lib/apache2/modules/mod_charset_lite.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/ssl.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/ssl.conf
@@ -0,0 +1,64 @@
+<IfModule mod_ssl.c>
+#
+# 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 builtin
+SSLRandomSeed startup file:/dev/urandom 512
+SSLRandomSeed connect builtin
+SSLRandomSeed connect file:/dev/urandom 512
+
+##
+##  SSL Global Context
+##
+##  All SSL configuration in this context applies both to
+##  the main server and all SSL-enabled virtual hosts.
+##
+
+#
+#   Some MIME-types for downloading Certificates and CRLs
+#
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl    .crl
+
+#   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  builtin
+
+#   Inter-Process Session Cache:
+#   Configure the SSL Session Cache: First the mechanism 
+#   to use and second the expiring timeout (in seconds).
+#SSLSessionCache         dbm:/var/run/apache2/ssl_scache
+SSLSessionCache        shmcb:/var/run/apache2/ssl_scache(512000)
+SSLSessionCacheTimeout  300
+
+#   Semaphore:
+#   Configure the path to the mutual exclusion semaphore the
+#   SSL engine uses internally for inter-process synchronization. 
+SSLMutex  file:/var/run/apache2/ssl_mutex
+
+#   SSL Cipher Suite:
+#   List the ciphers that the client is permitted to negotiate.
+#   See the mod_ssl documentation for a complete list.
+#   enable only secure ciphers:
+SSLCipherSuite HIGH:MEDIUM:!ADH
+#   Use this instead if you want to allow cipher upgrades via SGC facility.
+#   In this case you also have to use something like 
+#        SSLRequire %{SSL_CIPHER_USEKEYSIZE} >= 128
+#   see http://httpd.apache.org/docs/2.2/ssl/ssl_howto.html.en#upgradeenc
+#SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+
+# enable only secure protocols: SSLv3 and TLSv1, but not SSLv2
+SSLProtocol all -SSLv2
+
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/cgid.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/cgid.conf
@@ -0,0 +1,2 @@
+# Socket for cgid communication
+ScriptSock /var/run/apache2/cgisock
--- apache2-2.2.11.orig/debian/config-dir/mods-available/env.load
+++ apache2-2.2.11/debian/config-dir/mods-available/env.load
@@ -0,0 +1 @@
+LoadModule env_module /usr/lib/apache2/modules/mod_env.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/auth_basic.load
+++ apache2-2.2.11/debian/config-dir/mods-available/auth_basic.load
@@ -0,0 +1 @@
+LoadModule auth_basic_module /usr/lib/apache2/modules/mod_auth_basic.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/dir.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/dir.conf
@@ -0,0 +1,5 @@
+<IfModule mod_dir.c>
+
+          DirectoryIndex index.html index.cgi index.pl index.php index.xhtml index.htm
+
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/mime.load
+++ apache2-2.2.11/debian/config-dir/mods-available/mime.load
@@ -0,0 +1 @@
+LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/cgid.load
+++ apache2-2.2.11/debian/config-dir/mods-available/cgid.load
@@ -0,0 +1 @@
+LoadModule cgid_module /usr/lib/apache2/modules/mod_cgid.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/usertrack.load
+++ apache2-2.2.11/debian/config-dir/mods-available/usertrack.load
@@ -0,0 +1 @@
+LoadModule usertrack_module /usr/lib/apache2/modules/mod_usertrack.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/deflate.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/deflate.conf
@@ -0,0 +1,3 @@
+<IfModule mod_deflate.c>
+          AddOutputFilterByType DEFLATE text/html text/plain text/xml
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/autoindex.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/autoindex.conf
@@ -0,0 +1,101 @@
+<IfModule mod_autoindex.c>
+#
+# Directives controlling the display of server-generated directory listings.
+#
+
+#
+# IndexOptions: Controls the appearance of server-generated directory
+# listings.
+# Remove/replace the "Charset=UTF-8" if you don't use UTF-8 for your filenames.
+#
+IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=* Charset=UTF-8
+
+#
+# AddIcon* directives tell the server which icon to show for different
+# files or filename extensions.  These are only displayed for
+# FancyIndexed directories.
+#
+AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip x-bzip2
+
+AddIconByType (TXT,/icons/text.gif) text/*
+AddIconByType (IMG,/icons/image2.gif) image/*
+AddIconByType (SND,/icons/sound2.gif) audio/*
+AddIconByType (VID,/icons/movie.gif) video/*
+
+AddIcon /icons/binary.gif .bin .exe
+AddIcon /icons/binhex.gif .hqx
+AddIcon /icons/tar.gif .tar
+AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
+AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
+AddIcon /icons/a.gif .ps .ai .eps
+AddIcon /icons/layout.gif .html .shtml .htm .pdf
+AddIcon /icons/text.gif .txt
+AddIcon /icons/c.gif .c
+AddIcon /icons/p.gif .pl .py
+AddIcon /icons/f.gif .for
+AddIcon /icons/dvi.gif .dvi
+AddIcon /icons/uuencoded.gif .uu
+AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
+AddIcon /icons/tex.gif .tex
+# It's a suffix rule, so simply matching "core" matches "score" as well !
+AddIcon /icons/bomb.gif /core
+AddIcon (SND,/icons/sound2.gif) .ogg
+AddIcon (VID,/icons/movie.gif) .ogm
+
+AddIcon /icons/back.gif ..
+AddIcon /icons/hand.right.gif README
+AddIcon /icons/folder.gif ^^DIRECTORY^^
+AddIcon /icons/blank.gif ^^BLANKICON^^
+
+# Default icons for OpenDocument format
+AddIcon /icons/odf6odt-20x22.png .odt
+AddIcon /icons/odf6ods-20x22.png .ods
+AddIcon /icons/odf6odp-20x22.png .odp
+AddIcon /icons/odf6odg-20x22.png .odg
+AddIcon /icons/odf6odc-20x22.png .odc
+AddIcon /icons/odf6odf-20x22.png .odf
+AddIcon /icons/odf6odb-20x22.png .odb
+AddIcon /icons/odf6odi-20x22.png .odi
+AddIcon /icons/odf6odm-20x22.png .odm
+
+AddIcon /icons/odf6ott-20x22.png .ott
+AddIcon /icons/odf6ots-20x22.png .ots
+AddIcon /icons/odf6otp-20x22.png .otp
+AddIcon /icons/odf6otg-20x22.png .otg
+AddIcon /icons/odf6otc-20x22.png .otc
+AddIcon /icons/odf6otf-20x22.png .otf
+AddIcon /icons/odf6oti-20x22.png .oti
+AddIcon /icons/odf6oth-20x22.png .oth
+
+#
+# DefaultIcon is which icon to show for files which do not have an icon
+# explicitly set.
+#
+DefaultIcon /icons/unknown.gif
+
+#
+# AddDescription allows you to place a short description after a file in
+# server-generated indexes.  These are only displayed for FancyIndexed
+# directories.
+# Format: AddDescription "description" filename
+#
+#AddDescription "GZIP compressed document" .gz
+#AddDescription "tar archive" .tar
+#AddDescription "GZIP compressed tar archive" .tgz
+
+#
+# ReadmeName is the name of the README file the server will look for by
+# default, and append to directory listings.
+#
+# HeaderName is the name of a file which should be prepended to
+# directory indexes. 
+ReadmeName README.html
+HeaderName HEADER.html
+
+#
+# IndexIgnore is a set of filenames which directory indexing should ignore
+# and not include in the listing.  Shell-style wildcarding is permitted.
+#
+IndexIgnore .??* *~ *# RCS CVS *,v *,t 
+
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/cgi.load
+++ apache2-2.2.11/debian/config-dir/mods-available/cgi.load
@@ -0,0 +1 @@
+LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/file_cache.load
+++ apache2-2.2.11/debian/config-dir/mods-available/file_cache.load
@@ -0,0 +1,2 @@
+# Depends: cache
+LoadModule file_cache_module /usr/lib/apache2/modules/mod_file_cache.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/include.load
+++ apache2-2.2.11/debian/config-dir/mods-available/include.load
@@ -0,0 +1 @@
+LoadModule include_module /usr/lib/apache2/modules/mod_include.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/status.load
+++ apache2-2.2.11/debian/config-dir/mods-available/status.load
@@ -0,0 +1 @@
+LoadModule status_module /usr/lib/apache2/modules/mod_status.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authz_user.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authz_user.load
@@ -0,0 +1 @@
+LoadModule authz_user_module /usr/lib/apache2/modules/mod_authz_user.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/proxy_connect.load
+++ apache2-2.2.11/debian/config-dir/mods-available/proxy_connect.load
@@ -0,0 +1,2 @@
+# Depends: proxy
+LoadModule proxy_connect_module /usr/lib/apache2/modules/mod_proxy_connect.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/version.load
+++ apache2-2.2.11/debian/config-dir/mods-available/version.load
@@ -0,0 +1 @@
+LoadModule version_module /usr/lib/apache2/modules/mod_version.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/cern_meta.load
+++ apache2-2.2.11/debian/config-dir/mods-available/cern_meta.load
@@ -0,0 +1 @@
+LoadModule cern_meta_module /usr/lib/apache2/modules/mod_cern_meta.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/mime.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/mime.conf
@@ -0,0 +1,191 @@
+<IfModule mod_mime.c>
+
+#
+# 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 mime.types 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.
+# Despite the name similarity, the following Add* directives have
+# nothing to do with the FancyIndexing customization directives above.
+#
+#AddEncoding x-compress .Z
+#AddEncoding x-gzip .gz .tgz
+#AddEncoding x-bzip2 .bz2
+#
+# 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
+AddType application/x-bzip2 .bz2
+
+#
+# DefaultLanguage and AddLanguage allows you to specify the language of 
+# a document. You can then use content negotiation to give a browser a 
+# file in a language the user can understand.
+#
+# Specify a default language. This means that all data
+# going out without a specific language tag (see below) will 
+# be marked with this one. You probably do NOT want to set
+# this unless you are sure it is correct for all cases.
+#
+# * It is generally better to not mark a page as 
+# * being a certain language than marking it with the wrong
+# * language!
+#
+# DefaultLanguage nl
+#
+# Note 1: The suffix does not have to be the same as the language
+# keyword --- those with documents in Polish (whose net-standard
+# language code is pl) may wish to use "AddLanguage pl .po" to
+# avoid the ambiguity with the common suffix for perl scripts.
+#
+# Note 2: The example entries below illustrate that in some cases 
+# the two character 'Language' abbreviation is not identical to 
+# the two character 'Country' code for its country,
+# E.g. 'Danmark/dk' versus 'Danish/da'.
+#
+# Note 3: In the case of 'ltz' we violate the RFC by using a three char
+# specifier. There is 'work in progress' to fix this and get
+# the reference data for rfc1766 cleaned up.
+#
+# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)
+# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de)
+# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja)
+# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn)
+# Norwegian (no) - Polish (pl) - Portugese (pt)
+# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv)
+# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW)
+#
+AddLanguage ca .ca
+AddLanguage cs .cz .cs
+AddLanguage da .dk
+AddLanguage de .de
+AddLanguage el .el
+AddLanguage en .en
+AddLanguage eo .eo
+# See README.Debian for Spanish
+AddLanguage es .es
+AddLanguage et .et
+AddLanguage fr .fr
+AddLanguage he .he
+AddLanguage hr .hr
+AddLanguage it .it
+AddLanguage ja .ja
+AddLanguage ko .ko
+AddLanguage ltz .ltz
+AddLanguage nl .nl
+AddLanguage nn .nn
+AddLanguage no .no
+AddLanguage pl .po
+AddLanguage pt .pt
+AddLanguage pt-BR .pt-br
+AddLanguage ru .ru
+AddLanguage sv .sv
+# See README.Debian for Turkish
+AddLanguage tr .tr
+AddLanguage zh-CN .zh-cn
+AddLanguage zh-TW .zh-tw
+
+#
+# Commonly used filename extensions to character sets. You probably
+# want to avoid clashes with the language extensions, unless you
+# are good at carefully testing your setup after each change.
+# See http://www.iana.org/assignments/character-sets for the
+# official list of charset names and their respective RFCs.
+#
+AddCharset us-ascii    .ascii .us-ascii
+AddCharset ISO-8859-1  .iso8859-1  .latin1
+AddCharset ISO-8859-2  .iso8859-2  .latin2 .cen
+AddCharset ISO-8859-3  .iso8859-3  .latin3
+AddCharset ISO-8859-4  .iso8859-4  .latin4
+AddCharset ISO-8859-5  .iso8859-5  .cyr .iso-ru
+AddCharset ISO-8859-6  .iso8859-6  .arb .arabic
+AddCharset ISO-8859-7  .iso8859-7  .grk .greek
+AddCharset ISO-8859-8  .iso8859-8  .heb .hebrew
+AddCharset ISO-8859-9  .iso8859-9  .latin5 .trk
+AddCharset ISO-8859-10  .iso8859-10  .latin6
+AddCharset ISO-8859-13  .iso8859-13
+AddCharset ISO-8859-14  .iso8859-14  .latin8
+AddCharset ISO-8859-15  .iso8859-15  .latin9
+AddCharset ISO-8859-16  .iso8859-16  .latin10
+AddCharset ISO-2022-JP .iso2022-jp .jis
+AddCharset ISO-2022-KR .iso2022-kr .kis
+AddCharset ISO-2022-CN .iso2022-cn .cis
+AddCharset Big5        .Big5       .big5 .b5
+AddCharset cn-Big5     .cn-big5
+# For russian, more than one charset is used (depends on client, mostly):
+AddCharset WINDOWS-1251 .cp-1251   .win-1251
+AddCharset CP866       .cp866
+AddCharset KOI8      .koi8
+AddCharset KOI8-E      .koi8-e
+AddCharset KOI8-r      .koi8-r .koi8-ru
+AddCharset KOI8-U      .koi8-u
+AddCharset KOI8-ru     .koi8-uk .ua
+AddCharset ISO-10646-UCS-2 .ucs2
+AddCharset ISO-10646-UCS-4 .ucs4
+AddCharset UTF-7       .utf7
+AddCharset UTF-8       .utf8
+AddCharset UTF-16      .utf16
+AddCharset UTF-16BE    .utf16be
+AddCharset UTF-16LE    .utf16le
+AddCharset UTF-32      .utf32
+AddCharset UTF-32BE    .utf32be
+AddCharset UTF-32LE    .utf32le
+AddCharset euc-cn      .euc-cn
+AddCharset euc-gb      .euc-gb
+AddCharset euc-jp      .euc-jp
+AddCharset euc-kr      .euc-kr
+#Not sure how euc-tw got in - IANA doesn't list it???
+AddCharset EUC-TW      .euc-tw
+AddCharset gb2312      .gb2312 .gb
+AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2
+AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4
+AddCharset shift_jis   .shift_jis .sjis
+
+#
+# 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 files that include their own HTTP headers:
+#
+#AddHandler send-as-is asis
+
+#
+# For server-parsed imagemap files:
+#
+#AddHandler imap-file map
+
+#
+# For type maps (negotiated resources):
+# (This is enabled by default to allow the Apache "It Worked" page
+#  to be distributed in multiple languages.)
+#
+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>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/actions.load
+++ apache2-2.2.11/debian/config-dir/mods-available/actions.load
@@ -0,0 +1 @@
+LoadModule actions_module /usr/lib/apache2/modules/mod_actions.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/dav_lock.load
+++ apache2-2.2.11/debian/config-dir/mods-available/dav_lock.load
@@ -0,0 +1 @@
+LoadModule dav_lock_module /usr/lib/apache2/modules/mod_dav_lock.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authz_dbm.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authz_dbm.load
@@ -0,0 +1 @@
+LoadModule authz_dbm_module /usr/lib/apache2/modules/mod_authz_dbm.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authz_groupfile.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authz_groupfile.load
@@ -0,0 +1 @@
+LoadModule authz_groupfile_module /usr/lib/apache2/modules/mod_authz_groupfile.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/mem_cache.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/mem_cache.conf
@@ -0,0 +1,7 @@
+<IfModule mod_mem_cache.c>
+        CacheEnable mem /
+        MCacheSize 4096
+        MCacheMaxObjectCount 100
+        MCacheMinObjectSize 1
+        MCacheMaxObjectSize 2048
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/headers.load
+++ apache2-2.2.11/debian/config-dir/mods-available/headers.load
@@ -0,0 +1 @@
+LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/proxy_ajp.load
+++ apache2-2.2.11/debian/config-dir/mods-available/proxy_ajp.load
@@ -0,0 +1,2 @@
+# Depends: proxy
+LoadModule proxy_ajp_module /usr/lib/apache2/modules/mod_proxy_ajp.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/dump_io.load
+++ apache2-2.2.11/debian/config-dir/mods-available/dump_io.load
@@ -0,0 +1 @@
+LoadModule dumpio_module /usr/lib/apache2/modules/mod_dumpio.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/ldap.load
+++ apache2-2.2.11/debian/config-dir/mods-available/ldap.load
@@ -0,0 +1 @@
+LoadModule ldap_module /usr/lib/apache2/modules/mod_ldap.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/userdir.load
+++ apache2-2.2.11/debian/config-dir/mods-available/userdir.load
@@ -0,0 +1 @@
+LoadModule userdir_module /usr/lib/apache2/modules/mod_userdir.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authz_default.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authz_default.load
@@ -0,0 +1 @@
+LoadModule authz_default_module /usr/lib/apache2/modules/mod_authz_default.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authz_host.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authz_host.load
@@ -0,0 +1 @@
+LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/setenvif.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/setenvif.conf
@@ -0,0 +1,28 @@
+<IfModule mod_setenvif.c>
+
+#
+# The following directives modify normal HTTP response behavior to
+# handle known problems with browser implementations.
+#
+BrowserMatch "Mozilla/2" nokeepalive
+BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
+BrowserMatch "RealPlayer 4\.0" force-response-1.0
+BrowserMatch "Java/1\.0" force-response-1.0
+BrowserMatch "JDK/1\.0" force-response-1.0
+
+#
+# The following directive disables redirects on non-GET requests for
+# a directory that does not include the trailing slash.  This fixes a 
+# problem with Microsoft WebFolders which does not appropriately handle 
+# redirects for folders with DAV methods.
+# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
+#
+BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "MS FrontPage" redirect-carefully
+BrowserMatch "^WebDrive" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+BrowserMatch "^gnome-vfs/1.0" redirect-carefully
+BrowserMatch "^XML Spy" redirect-carefully
+BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/cache.load
+++ apache2-2.2.11/debian/config-dir/mods-available/cache.load
@@ -0,0 +1 @@
+LoadModule cache_module /usr/lib/apache2/modules/mod_cache.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/actions.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/actions.conf
@@ -0,0 +1,10 @@
+# a2enmod-note: needs-configuration
+
+#
+# Action lets you define media types that will execute a script whenever
+# a matching file is called. This eliminates the need for repeated URL
+# pathnames for oft-used CGI file processors.
+# Format: Action media/type /cgi-script/location
+# Format: Action handler-name /cgi-script/location
+#
+
--- apache2-2.2.11.orig/debian/config-dir/mods-available/dav_fs.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/dav_fs.conf
@@ -0,0 +1 @@
+DAVLockDB /var/lock/apache2/DAVLock
--- apache2-2.2.11.orig/debian/config-dir/mods-available/dav_fs.load
+++ apache2-2.2.11/debian/config-dir/mods-available/dav_fs.load
@@ -0,0 +1,2 @@
+# Depends: dav
+LoadModule dav_fs_module /usr/lib/apache2/modules/mod_dav_fs.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/ident.load
+++ apache2-2.2.11/debian/config-dir/mods-available/ident.load
@@ -0,0 +1 @@
+LoadModule ident_module /usr/lib/apache2/modules/mod_ident.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/expires.load
+++ apache2-2.2.11/debian/config-dir/mods-available/expires.load
@@ -0,0 +1 @@
+LoadModule expires_module /usr/lib/apache2/modules/mod_expires.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authn_alias.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authn_alias.load
@@ -0,0 +1 @@
+LoadModule authn_alias_module /usr/lib/apache2/modules/mod_authn_alias.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/negotiation.load
+++ apache2-2.2.11/debian/config-dir/mods-available/negotiation.load
@@ -0,0 +1 @@
+LoadModule negotiation_module /usr/lib/apache2/modules/mod_negotiation.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/userdir.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/userdir.conf
@@ -0,0 +1,18 @@
+<IfModule mod_userdir.c>
+        UserDir public_html
+        UserDir disabled root
+
+        <Directory /home/*/public_html>
+                AllowOverride FileInfo AuthConfig Limit Indexes
+                Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+                <Limit GET POST OPTIONS>
+                        Order allow,deny
+                        Allow from all
+                </Limit>
+                <LimitExcept GET POST OPTIONS>
+                        Order deny,allow
+                        Deny from all
+                </LimitExcept>
+        </Directory>
+</IfModule>
+
--- apache2-2.2.11.orig/debian/config-dir/mods-available/dir.load
+++ apache2-2.2.11/debian/config-dir/mods-available/dir.load
@@ -0,0 +1 @@
+LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authz_owner.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authz_owner.load
@@ -0,0 +1 @@
+LoadModule authz_owner_module /usr/lib/apache2/modules/mod_authz_owner.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authnz_ldap.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authnz_ldap.load
@@ -0,0 +1,2 @@
+# Depends: ldap
+LoadModule authnz_ldap_module /usr/lib/apache2/modules/mod_authnz_ldap.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/proxy_ftp.load
+++ apache2-2.2.11/debian/config-dir/mods-available/proxy_ftp.load
@@ -0,0 +1,2 @@
+# Depends: proxy
+LoadModule proxy_ftp_module /usr/lib/apache2/modules/mod_proxy_ftp.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/autoindex.load
+++ apache2-2.2.11/debian/config-dir/mods-available/autoindex.load
@@ -0,0 +1 @@
+LoadModule autoindex_module /usr/lib/apache2/modules/mod_autoindex.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/alias.conf
+++ apache2-2.2.11/debian/config-dir/mods-available/alias.conf
@@ -0,0 +1,24 @@
+<IfModule alias_module>
+#
+# Aliases: Add here as many aliases as you need (with no limit). The format is 
+# Alias fakename realname
+#
+# Note that if you include a trailing / on fakename then the server will
+# require it to be present in the URL.  So "/icons" isn't aliased in this
+# example, only "/icons/".  If the fakename is slash-terminated, then the 
+# realname must also be slash terminated, and if the fakename omits the 
+# trailing slash, the realname must also omit it.
+#
+# We include the /icons/ alias for FancyIndexed directory listings.  If
+# you do not use FancyIndexing, you may comment this out.
+#
+Alias /icons/ "/usr/share/apache2/icons/"
+
+<Directory "/usr/share/apache2/icons">
+    Options Indexes MultiViews
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+</IfModule>
--- apache2-2.2.11.orig/debian/config-dir/mods-available/disk_cache.load
+++ apache2-2.2.11/debian/config-dir/mods-available/disk_cache.load
@@ -0,0 +1,2 @@
+# Depends: cache
+LoadModule disk_cache_module /usr/lib/apache2/modules/mod_disk_cache.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authn_default.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authn_default.load
@@ -0,0 +1 @@
+LoadModule authn_default_module /usr/lib/apache2/modules/mod_authn_default.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/ext_filter.load
+++ apache2-2.2.11/debian/config-dir/mods-available/ext_filter.load
@@ -0,0 +1 @@
+LoadModule ext_filter_module /usr/lib/apache2/modules/mod_ext_filter.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/dav.load
+++ apache2-2.2.11/debian/config-dir/mods-available/dav.load
@@ -0,0 +1 @@
+LoadModule dav_module /usr/lib/apache2/modules/mod_dav.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/rewrite.load
+++ apache2-2.2.11/debian/config-dir/mods-available/rewrite.load
@@ -0,0 +1 @@
+LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
--- apache2-2.2.11.orig/debian/config-dir/mods-available/authn_anon.load
+++ apache2-2.2.11/debian/config-dir/mods-available/authn_anon.load
@@ -0,0 +1 @@
+LoadModule authn_anon_module /usr/lib/apache2/modules/mod_authn_anon.so
--- apache2-2.2.11.orig/debian/config-dir/conf.d/charset
+++ apache2-2.2.11/debian/config-dir/conf.d/charset
@@ -0,0 +1,6 @@
+# Read the documentation before enabling AddDefaultCharset.
+# In general, it is only a good idea if you know that all your files
+# have this encoding. It will override any encoding given in the files
+# in meta http-equiv or xml encoding tags.
+
+#AddDefaultCharset UTF-8
--- apache2-2.2.11.orig/debian/config-dir/conf.d/security
+++ apache2-2.2.11/debian/config-dir/conf.d/security
@@ -0,0 +1,50 @@
+#
+# Disable access to the entire file system except for the directories that
+# are explicitly allowed later.
+#
+# This currently breaks the configurations that come with some web application
+# Debian packages. It will be made the default for the release after lenny.
+#
+#<Directory />
+#	AllowOverride None
+#	Order Deny,Allow
+#	Deny from all
+#</Directory>
+
+
+# Changing the following options will not really affect the security of the
+# server, but might make attacks slightly more difficult in some cases.
+
+#
+# ServerTokens
+# This directive configures what you return as the Server HTTP response
+# Header. The default is 'Full' which sends information about the OS-Type
+# and compiled in modules.
+# Set to one of:  Full | OS | Minimal | Minor | Major | Prod
+# where Full conveys the most information, and Prod the least.
+#
+#ServerTokens Minimal
+ServerTokens Full
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (internal error documents, FTP directory
+# listings, mod_status and mod_info output etc., but not CGI generated
+# documents or custom error documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of:  On | Off | EMail
+#
+#ServerSignature Off
+ServerSignature On
+
+#
+# Allow TRACE method
+#
+# Set to "extended" to also reflect the request body (only for testing and
+# diagnostic purposes).
+#
+# Set to one of:  On | Off | extended
+#
+#TraceEnable Off
+TraceEnable On
+
--- apache2-2.2.11.orig/debian/icons/odf6odp-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6odp-20x22.png.uue
@@ -0,0 +1,24 @@
+begin-base64 644 odf6odp-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACLlBMVEXZ2dkz
+MzMzM5lcXKxdXK1dXa1eXq6ZmZnOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT
+1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d
+3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh
+4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk
+5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn
+5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq
+6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs
+7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw
+7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz
+8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1
+9fX19fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5
++fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+
+/f7+/v7+/v///v////9yFadVAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA
+AAAJcEhZcwAACxMAAAsTAQCanBgAAAEwSURBVBjTY2BEBgxQwLhz57bNIWtX
+Lls8n3EmTJRxxzYRNiZWwcXzZzFO6oWKMm4VZgIB/umTGbtb6yGijOvZmASX
+zOdjmdzH2FJbXQIWZfQDqZsznUmzTYgRDEGCy1mZ5s2axs3c1CgEASDBxQJM
+vJO5mDiaysvy2IEALDh/Dg8zEzNnTUVJXlYyTHD6tL5e1aaa8qK8zKTosGCI
+4JSJHW2NVSVFuSkJkaGBPhDB3rammsrivMzk+Nhgf3dHiGCLUI0QAthABJuq
+SgtzU+KjggN8nBytzCGC5UL5SCr1IYLFeWnJ8RHBPu6ONpbGBtoQwVyhZCSV
+KhDBVKAyXw8XW2tjQ101JQWIYLxQMJJKGYhgeIC3i6OFubGehoqinJQ4RJCR
+HQWAg46BQQgNMDAAAGkwUKkiN6jBAAAAAElFTkSuQmCC
+====
--- apache2-2.2.11.orig/debian/icons/odf6odg-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6odg-20x22.png.uue
@@ -0,0 +1,26 @@
+begin-base64 644 odf6odg-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACbVBMVEXZ2dkq
+KiorKiorKysrKywsLCwsLC0tLS0zMzMzM5lcXKxdXK1dXa1eXq6ZmZmam5qd
+nZ2fn6Cgn5+hoaGioqKio6Kio6Ojo6OkpKSkpaWlpaWmpqampqfOztzOz9zR
+0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb
+3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g
+4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj
+4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl
+5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp
+6Ono6enp6ejp6enp6erq6enq6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr
+6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u
+7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx
+8fHx8fLx8vHy8vHy8vLy8vPz8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP0
+9PP09PT19PT19PX09fT09fX19fX19fb29fX29fb19vb29vb29vf39vf39/f4
+9/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8
+/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v////9hYXL5AAAAAXRSTlMA
+QObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAFPSURB
+VBjTY+BABgxQwHHu3OkTmYf27d6xhWMdTJTj7GlNXk4etR1b1nMsXwQV5Til
+wQkCKmtWcCyYNQUiynGEl1Nt5xZl7hWLOWZOmtAJFuVIBqnbuIbTbrY6BxiC
+BPfwcG5ev1qBa/o0dQgACe5Q5VRaIc8pO72nu5kPCMCCWzYqcnFyyU2U6Wyu
+r4AJrlm9eJHV9InS7FJ15QXZGRDBlcvmzp7W38kuyV6al5WWCBFcNHv6xL4O
+KfYKVrGMlJgwiODMqRN7OprZJYpFWBNjwgIhgtP7u9qaJFjzM1JZBcP8fSCC
+Pd0tdRVsojkpMUIsfl4uEMGO5uoKcdYMkFZmAVcHiGBTbUU+q3BcZIi/jwCz
+rSVEsKokV5g1NjIowMPNiYnfFCJYkpvBqg4DjIYQwZzUhMgwXx8PZ1tLM2N9
+HYggBx8KAAcdA4M6GmBgAABuC2ZqLPWjjgAAAABJRU5ErkJggg==
+====
--- apache2-2.2.11.orig/debian/icons/odf6ott-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6ott-20x22.png.uue
@@ -0,0 +1,25 @@
+begin-base64 644 odf6ott-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACRlBMVEXZ2dkh
+ISEzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmlpKSlpaWmpqamp6amp6en
+p6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIA
+AADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e
+3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi
+4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk
+5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm
+5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp
+6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozs
+7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw
+8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy8/Ly8/Pz8/Lz8/Pz
+8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb29fX29fb29vb29vf3
+9vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7
++/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v/////O2tP2AAAA
+AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgA
+AAFESURBVBjTY2BCBvIgwMDAwHTw4L7diVs3rlu9fOmieTOFGMGCB/YpcrJy
+yK1evnjB7GmCzFxgwb0KrCAgs4BFZIogswBEcDsnq9ya5dLsc4RZBJn5GyCC
+0SB1Sxawmk0QZOarr4EIrudgXbZ4vgRbb087LzNPMURwtSyr1BxxVtHe5qYq
+bqY8iODyJZJsrGxiHS0NVeUFudkQwQXzp08z6u1orqsqy89IToAIzp01cUJP
+W0NdZWFuWlJcJERw2oTejtb6qrKCnKyEmBA/iGCfPDLwhAj2ogi6QASbm6rL
+CnIzU2JCArzcnGwggvVA+Rz5BJAyN3l5C4hgZWlBenJcWKCPu4u9takhRLBI
+PlU+CmyeHRDrQgRzUhMiQ4J8XRysLQz1tDUhgimxEYF+rkAxU6CYugpEkIkL
+BTCBBBkY5NEAAwMA9LlgMjOLUzMAAAAASUVORK5CYII=
+====
--- apache2-2.2.11.orig/debian/icons/odf6odm-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6odm-20x22.png.uue
@@ -0,0 +1,26 @@
+begin-base64 644 odf6odm-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACW1BMVEXZ2dkt
+LS0uLi4uLy8vLy8zMzMzM5lcXKxdXK1dXa1eXq6ZmZmdnZ2fnp6gn6CgoKCh
+oaGioqGioqOjoqOkpKSkpaWmpqbOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT
+1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d
+3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh
+4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk
+5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn
+5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq
+6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs
+7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw
+7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz
+8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1
+9fX19fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5
++fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+
+/f7+/v7+/v///v/////7IDMLAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA
+AAAJcEhZcwAACxMAAAsTAQCanBgAAAFVSURBVBjTY2BFBgxQwHrixNFDyXt2
+bN20jnUFTJT1+FFlLjZOhU3rVrIunAMVZT2ixAYCcssWsc6a0gcRZd3Hxaaw
+eZ0sx6K5rJN7uprBoqyxIHWrl7FZTFVkBUOQ4DZOtrUrl0qxT5ygCAEgwU3y
+bDKLJNnEJ7a11nIDAVhw3WppdjZ2ie725trKIpjgsqVz55hM7BZjqa1gFk5N
+ggguXjB96oROMRbR4nwhJoFoiOCcqRO7O5pYRIrycpIEmAIggpP7u9uaahWL
+ctMTosMUvSGCEztbGmqKFTOT4qMDAxTdIIJtrXUVRflMgnFhQT68jHYQwaba
+0qK8dAEm/gBvXkYeK4hgTXlRZmpCBB+jpxsjj7kxRLAkLz0pJjzYR9HJQdHU
+UB8iCBSLDgvxd1O0tVI00NWGCKbFRwUHuLs52ZobG+hqqkEEWblRADjoGBgU
+0QADAwCDDmJcDd4k9QAAAABJRU5ErkJggg==
+====
--- apache2-2.2.11.orig/debian/icons/odf6ods-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6ods-20x22.png.uue
@@ -0,0 +1,24 @@
+begin-base64 644 odf6ods-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACLlBMVEXZ2dkz
+MzMzM5lcXKxdXK1dXa1eXq6ZmZnOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT
+1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d
+3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh
+4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk
+5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn
+5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq
+6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs
+7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw
+7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz
+8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1
+9fX19fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5
++fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+
+/f7+/v7+/v///v////9yFadVAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA
+AAAJcEhZcwAACxMAAAsTAQCanBgAAAEpSURBVBjTY2BEBgxQwLhz57bNIWtX
+Lls8n3EmTJRxxzYRNiZWwcXzZzFO6oWKMm4VZgIB/umTGbtb6yGijOvZmASX
+zOdjmdzH2FJbXQIWZfQDqZsznUmzTYgRDEGCy1mZ5s2axs3c1CgEASDBxQJM
+vJO5mDiaysvy2IEALDh/Dg8zEzNnTUVJXlYyTHD6tL5e1aaa8qK8zKTosGCI
+4JSJHW2NVSVFuSkJkaGBPhDB3rammsrivMzk+Nhgf3dHiGCLEDKwgQg2CZUW
+5qbECwUH+Dg5CplDBMtRVOpDBIuF0pLjI4KF3B1tLI2FtCGCuSgqVSCCqUIR
+wb4eLkLWxoa6akIKEMF4FJUyEMHwAG8XRwtzYz0NFUU5KXGIICM7CgAHHQOD
+EBpgYAAAbP5NPEH1cBAAAAAASUVORK5CYII=
+====
--- apache2-2.2.11.orig/debian/icons/odf6odi-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6odi-20x22.png.uue
@@ -0,0 +1,26 @@
+begin-base64 644 odf6odi-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACbVBMVEXZ2dkr
+KyssLCwsLC0tLS0zMzMzM5lcXKxdXK1dXa1eXq6ZmZm4uLi5uLi7u7u7u7y8
+u7u8vLy9vb2+vb2+vb69vr6+vr6/vr6+v77AwMDAwMHBwMHAwcHOztzOz9zR
+0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb
+3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g
+4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj
+4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl
+5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp
+6Ono6enp6ejp6enp6erq6enq6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr
+6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u
+7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx
+8fHx8fLx8vHy8vHy8vLy8vPz8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP0
+9PP09PT19PT19PX09fT09fX19fX19fb29fX29fb19vb29vb29vf39vf39/f4
+9/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8
+/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v////8eeoEKAAAAAXRSTlMA
+QObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAFKSURB
+VBjTY2BFBgxQwHru3OkTmYf27d6xhXUdTJT17GlNLjZOtR1b1rMuXwQVZT2l
+wQYCKmtWsC6YNQUiynqEi01t5xZljhWLWWdOmtAJFmVNBqnbuIbNbrY6KxiC
+BPdwsm1ev1qBffo0dQgACe5QZVNaIc8mO72nu5kbCMCCWzYqsrOxy03s7Wyu
+r4AJrlm9eJHV9Ik97c115QXZGRDBlcvmzp7W39neVFmal5WWCBFcNHv6xL6O
+5rqKkqKMlJgwiODMqRN7QGLFuaJMgmGBEMHp/V1tTVJM4hkiTPxM/j4QwZ7u
+ljpJZgkmYSaBIHUvF4hgR7M0C5NYhhATX6AfI68DRLBJhkU8Oy0uMsTfx52H
+0RIiWAVUlhQbGRTg4eZkrW4KESxRRwaGEMGc1ITIMF8fD2dbSzNjfR2IICs3
+CgAHHQODOhpgYAAAhh9mExNPmYgAAAAASUVORK5CYII=
+====
--- apache2-2.2.11.orig/debian/icons/odf6otf-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6otf-20x22.png.uue
@@ -0,0 +1,27 @@
+begin-base64 644 odf6otf-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACalBMVEXZ2dkh
+ISEmJiYnJycoKCgzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmen5+goKGg
+oaChoaGioaGjoqOjo6OlpKSkpaWlpaSlpaWmpqamp6amp6enp6eoqKioqKmp
+qaqqqarOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIAAADX2OTY2OTa
+2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e3t7e397e39/f
+39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi4eHh4uLi4uHi
+4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk5eTk5eXl5eXl
+5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm5vHo5+fo5+jn
+6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp6urq6unq6urq
+6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozs7e3t7e3u7e3t
+7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw8PDx8PDw8fDw
+8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP0
+9PP09PT19PT19PX09fT09fX19fX19fb29fX29fb29vb29vf39vf39/f49/j3
++Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9
+/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v////9bQbSjAAAAAXRSTlMAQObY
+ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAFcSURBVBjT
+Y2BFBtogwMDAwHr27KnjuQf37tq+eeO6VUvlGMGCZ07p8nBwa23fvH7N8kWy
+bLxgwZM6HCCgsYZdYYEsmwxE8DAPh9aOzepcK+TZZdmkeyCC6SB1G9ZwOM2R
+ZZPq7oAI7ubm2LR+tQrnzBmTJdkk6iGC2zU51FYocyjO7O9rE2Wtgghu3qDK
+ycGpNGVCT1tzTWU5RHDN6sWL7GZO6e9qa6ouyc+BCK5cNnfOjElgv2jnZaVC
+BBfNmTllYjeLZE2FGEtGQhREcNb0Kf3dbZIs4oVZqQlRoRDBmZN6O1trK0RZ
+RFKjo4IDIIL9fe1NNZWlBSLMQmFBfh4Qwe62+pqKwhwRZsHQIB9PF4hga2NN
+cX6WMLNAcIC3u6MtRLAOqCwtkZk/xIePyd7aEiIIFEtNiIO408rcFCJYkJkS
+GxUY4APUamVubAARZOVFAawgQQYGbTTAwAAAYqJv/HjEEzcAAAAASUVORK5C
+YII=
+====
--- apache2-2.2.11.orig/debian/icons/odf6oti-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6oti-20x22.png.uue
@@ -0,0 +1,27 @@
+begin-base64 644 odf6oti-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAAChVBMVEXZ2dkh
+ISErKyssLCwsLC0tLS0zMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmlpKSl
+paWmpqamp6amp6enp6eoqKioqKmpqaqqqaq4uLi5uLi7u7u7u7y8u7u8vLy9
+vb2+vb2+vb69vr6+vr6/vr6+v77AwMDAwMHBwMHAwcHOztzOz9zR0N7R0d3R
+0d/S0eDS0uDT0+DT1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc
+3Nzc3dzd3dzd3d3d3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng
+4OHh4ODh4OHh4eDh4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk
+4+Pk4+Tj5OTk5OTk5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm
+5ufn5ufm5+bm5+fn5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp
+6ejp6enp6erq6enq6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs
+6+zr7Ovr7Ozs7Ozs7O3t7Ozs7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v
+7+7v7+/v7/Dw7/Dv8O/v8PDw8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz
+8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1
+9fX19fb29fX29fb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6
++fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+
+/v7+/v///v////9GKjb7AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJ
+cEhZcwAACxMAAAsTAQCanBgAAAFaSURBVBjTY2BDBiYgwMDAwHbt2uULZaeO
+HT6wZ9f2zevEGMGCVy+b8XLyGB/Ys2PrhtWi7HxgwUumnCBguJVDYqUouwhE
+8Awvp/HBPQbcG8U5RNmFp0IEC0Dqdm7l9F4qyi40ZSJE8AgP5+4dW3S5Fi2c
+I8gu0AERPGDEqb9Rh1Nr0Yzp/fxszRDBPTv1uDi5tOfOnNrf09rUABHcumXN
+avdFc2dM7u9uqa0ohQhuWr9s6cLZUyf3tTVVlxfnQQRXL100d9aU/u7WxvrS
+wsxkiODiBXNngMQaqpSY5ZLjIIKLZk+b1KfOrFKqyCzDHBMJEZwxfUK3Gosq
+swKzbLxJeCBEcEq/Biuzcqk8s3RcNJOUL0SwT5NVpaI4Oy0xJjJEkskNItgO
+VJaflRYfGxrs72HiBBFsNEEGdhDByqLctOSoyNAALzdnBxtLiCAbHwpgAwky
+MJigAQYGAOZzdl7FtGVFAAAAAElFTkSuQmCC
+====
--- apache2-2.2.11.orig/debian/icons/odf6otp-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6otp-20x22.png.uue
@@ -0,0 +1,25 @@
+begin-base64 644 odf6otp-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACRlBMVEXZ2dkh
+ISEzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmlpKSlpaWmpqamp6amp6en
+p6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIA
+AADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e
+3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi
+4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk
+5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm
+5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp
+6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozs
+7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw
+8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy8/Ly8/Pz8/Lz8/Pz
+8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb29fX29fb29vb29vf3
+9vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7
++/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v/////O2tP2AAAA
+AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgA
+AAE/SURBVBjTY2BCBvIgwMDAwHTw4L7diVs3rlu9fOmieTOFGMGCB/YpcrJy
+yK1evnjB7GmCzFxgwb0KrCAgs4BFZIogswBEcDsnq9ya5dLsc4RZBJn5GyCC
+0SB1Sxawmk0QZOarr4EIrudgXbZ4vgRbb087LzNPMURwtSyr1BxxVtHe5qYq
+bqY8iODyJZJsrGxiHS0NVeUFudkQwQXzp08z6u1orqsqy89IToAIzp01cUJP
+W0NdZWFuWlJcJERw2oTejtb6qrKCnKyEmBA/iGCffIc8AnhCBHvbGmsrC3PS
+E2Ij/f3cXSCCzfLVSCptIIL1VcUFOakJkSF+nm4OthYQwUr5AiSVhhDBIqCy
+qNBALw8HOytjfV2IYI58ApJKTYhgSmxEoJ+ri4O1qaGetroKRJCJCwUwgQQZ
+GOTRAAMDAEoQYSbvnJwhAAAAAElFTkSuQmCC
+====
--- apache2-2.2.11.orig/debian/icons/odf6ots-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6ots-20x22.png.uue
@@ -0,0 +1,25 @@
+begin-base64 644 odf6ots-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACRlBMVEXZ2dkh
+ISEzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmlpKSlpaWmpqamp6amp6en
+p6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIA
+AADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e
+3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi
+4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk
+5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm
+5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp
+6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozs
+7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw
+8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy8/Ly8/Pz8/Lz8/Pz
+8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb29fX29fb29vb29vf3
+9vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7
++/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v/////O2tP2AAAA
+AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgA
+AAE4SURBVBjTY2BCBvIgwMDAwHTw4L7diVs3rlu9fOmieTOFGMGCB/YpcrJy
+yK1evnjB7GmCzFxgwb0KrCAgs4BFZIogswBEcDsnq9ya5dLsc4RZBJn5GyCC
+0SB1Sxawmk0QZOarr4EIrudgXbZ4vgRbb087LzNPMURwtSyr1BxxVtHe5qYq
+bqY8iODyJZJsrGxiHS0NVeUFudkQwQXzp08z6u1orqsqy89IToAIzp01cUJP
+W0NdZWFuWlJcJERw2oTejtb6qrKCnKyEmBA/iGCfPDLwhAj2yjfWVhbmyCfE
+Rvr7ybtABJtRVNpABOvliwtyUhPkQ/w83RzkLSCClSgqDSGCRfKpCVGhgfIe
+DnZWxvK6EMEcFJWaEMGU2IhAP1cXB2tTQz1tdRWIIBMXCmACCTIwyKMBBgYA
+UJpdvW69xycAAAAASUVORK5CYII=
+====
--- apache2-2.2.11.orig/debian/icons/odf6otc-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6otc-20x22.png.uue
@@ -0,0 +1,26 @@
+begin-base64 644 odf6otc-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACRlBMVEXZ2dkh
+ISEzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmlpKSlpaWmpqamp6amp6en
+p6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIA
+AADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e
+3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi
+4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk
+5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm
+5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp
+6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozs
+7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw
+8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy8/Ly8/Pz8/Lz8/Pz
+8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb29fX29fb29vb29vf3
+9vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7
++/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v/////O2tP2AAAA
+AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgA
+AAFWSURBVBjTY2BCBvIgwMDAwHTw4L7diVs3rlu9fOmieTOFGMGCB/YpcrJy
+yK1evnjB7GmCzFxgwb0KrCAgs4BFZIogswBEcDsnq9ya5dLsc4RZBJn5GyCC
+0SB1Sxawmk0QZOarr4EIrudgXbZ4vgRbb087LzNPMURwtSyr1BxxVtHe5qYq
+bqY8iODyJZJsrGxiHS0NVeUFudkQwQXzp08z6u1orqsqy89IToAIzp01cUJP
+W0NdZWFuWlJcJERwmnxvR2t9VVmBfFZCTIgfRLBPvqMZJJYtHxcZIu8JEeyV
+b6ytLMxJT5CP9PeTd4EINstXlxXkZsrHyAfIu8nbQATr5YsLcuQT5IFa5R3k
+LSCClfIF8snyYfI+8i7y1vKGEMEi+dSEqNBALw8HOytjfV2IYI48MtCECKbE
+RgT6ubo4WJsa6mmrq0AEmbhQABNIkIFBHg0wMAAA4ypjPVdnlsEAAAAASUVO
+RK5CYII=
+====
--- apache2-2.2.11.orig/debian/icons/odf6oth-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6oth-20x22.png.uue
@@ -0,0 +1,26 @@
+begin-base64 644 odf6oth-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACWFBMVEXZ2dkh
+ISEzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq53d7V4eLZ5eLd5ebd6erh7e7mZ
+mZmlpKSlpaWmpqamp6amp6enp6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R
+0d/S0eDS0uDT0+DT1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc
+3Nzc3dzd3dzd3d3d3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng
+4OHh4ODh4OHh4eDh4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk
+4+Pk4+Tj5OTk5OTk5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm
+5ufn5ufm5+bm5+fn5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp
+6ejp6enp6erq6enq6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs
+6+zr7Ovr7Ozs7Ozs7O3t7Ozs7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v
+7+7v7+/v7/Dw7/Dv8O/v8PDw8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz
+8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1
+9fX19fb29fX29fb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6
++fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+
+/v7+/v///v////9sLkI5AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJ
+cEhZcwAACxMAAAsTAQCanBgAAAFaSURBVBjTY2BCBqogwMDAwHT8+JGD6bu3
+b9m4dvWKJfMlGMGCx46oc7JyqGxcu3LZwjnizAJgwcNqrCCgtIxFapY4sxhE
+cC8nq8qmtYrsiyRZxJlF2yCCiSB1q5ax2kwTZxZpbYIIbuVgXbNyqRzb5Em9
+wsxClRDBjcqsCotkWaUnd3Y0CDKVQATXrpJnY2WT6etqa6gtKy6ECC5bOneO
+xeS+zpaGmtK8zDSI4OIF06dN6mlrqS8vzslIiYcIzpk2ua+7taGGn48vLSkq
+BCI4ZWJfJ0gM6DDeqBB/iODknvbm+nI+VtbkeFZuXy+IYGdHY01ZMVAwKoyV
+28MJItjaUFlWlM3LGgXUz+VsBxGsry7LzUyJ4QH51tHaHCJYUZSdlhAdHsDN
+xeVgaWoMEQSKxUdFBHu5OdqZmxjqQwSzkuPCQ7yBYtZAMV0tiCCTAApgAgky
+MKiiAQYGAFMTaQfquhWYAAAAAElFTkSuQmCC
+====
--- apache2-2.2.11.orig/debian/icons/odf6odb-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6odb-20x22.png.uue
@@ -0,0 +1,26 @@
+begin-base64 644 odf6odb-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACVVBMVEXZ2dkm
+JiYnJycoJycnKCgoKCgpKSkzMzMzM5lcXKxdXK1dXa1eXq6ZmZmampqcm5uf
+n5+ioaKhoqKmpqWnp6fOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIA
+AADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e
+3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi
+4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk
+5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm
+5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp
+6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozt
+7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v
+8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz8vLz8vPy
+8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb2
+9fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6
++fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+
+/v///v/////2MLzaAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ
+cwAACxMAAAsTAQCanBgAAAFOSURBVBjTY2BHBgxQwH7s2OEDibu2bd6whn0Z
+TJT96GFFHg5uuQ1rlrPPnwUVZT+kwAECMksWsM+Y1AMRZd/DwyG3cY0014LZ
+7BO7OhrBouzRIHUrl3CYTZZnB0OQ4BZujtXLF0tw9vfJQwBIcIMsh9QCcQ7R
+/pbmal4gAAuuWSnJycEp1tnaWF1eABNcsnj2LKN+ETaQTlahBIjgwnlTJ/e1
+swlXFeamCbJEQgRnTe7vbGuQZwWpZJb3gwhO7O1saaiWL8hOjYsMkfeECPa3
+N9VVFcqnJ8RG+vvJu0AEW5prygpy5VNiQgK83ORtIIIN1cUFOanykSF+nm4O
+8hYQwarSgvTkOPlAH3cXe2t5Q4hgUU5qQlQok4CHg50VP6MuRBAoFhkSJMAE
+chIjnyZEMCU2ItDP1cXB2tRQT1tdBSLIzosCwEHHwCCPBhgYAAu7YJl7iNbr
+AAAAAElFTkSuQmCC
+====
--- apache2-2.2.11.orig/debian/icons/odf6odc-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6odc-20x22.png.uue
@@ -0,0 +1,25 @@
+begin-base64 644 odf6odc-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACLlBMVEXZ2dkz
+MzMzM5lcXKxdXK1dXa1eXq6ZmZnOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT
+1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d
+3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh
+4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk
+5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn
+5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq
+6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs
+7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw
+7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz
+8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1
+9fX19fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5
++fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+
+/f7+/v7+/v///v////9yFadVAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA
+AAAJcEhZcwAACxMAAAsTAQCanBgAAAFGSURBVBjTY2BEBgxQwLhz57bNIWtX
+Lls8n3EmTJRxxzYRNiZWwcXzZzFO6oWKMm4VZgIB/umTGbtb6yGijOvZmASX
+zOdjmdzH2FJbXQIWZfQDqZsznUmzTYgRDEGCy1mZ5s2axs3c1CgEASDBxQJM
+vJO5mDiaysvy2IEALDh/Dg8zEzNnTUVJXlYyTHD6tL5e1aaa8qK8zKTosGCI
+4JSJHW2NVSVFuSkJkaGBPhDBXqGmmsrivMxkodhgf3dHiGCLUE05SCxOKNDH
+XcgGItgkVFqYmxIfFSzk4+QoZA4RLBfKz0xOiBHyF3IWshTShwgWC6UlxwsF
+CwG1ChkLaUMEc4WShcKEPIXshcyF9IRUIIKpQhHBvh4uttbGhrpqSgoQwXgh
+ZCADEQwP8HZxtDA31tNQUZSTEocIMrKjAHDQMTAIoQEGBgAAx1K+64izZQAA
+AABJRU5ErkJggg==
+====
--- apache2-2.2.11.orig/debian/icons/odf6odf-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6odf-20x22.png.uue
@@ -0,0 +1,26 @@
+begin-base64 644 odf6odf-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACWFBMVEXZ2dkm
+JiYnJycoKCgzMzMzM5lcXKxdXK1dXa1eXq6ZmZmen5+goKGgoaChoaGioaGj
+oqOjo6OlpKSkpaWlpaSmpqbOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV
+1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e
+3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh
+4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl
+5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn
+5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp
+6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t
+7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv
+8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz8vLz
+8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX1
+9fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6
++fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+
+/v7+/v///v/////zGJjLAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJ
+cEhZcwAACxMAAAsTAQCanBgAAAFLSURBVBjTY2BBBgxQwHL8+JGDSbu3b9m4
+lmU5TJTl2BElTlYO+Y1rV7AsmA0VZTmsyAoCsksXssyc3AsRZdnLySq/aa0M
++8I5LJO6O5vAoiwxIHWrlrKaT1FgAUOQ4FYO1jUrlkiyTehXgACQ4EY5VumF
+EqxiE1pbariAACy4dpUUGyubeFdbU01FIUxw6ZI5s40ndLU21JQXZKYkQgQX
+zZ82pb8DYlxyfBREcPaUCV3tjcyihbnCzLGh/hDBSX1drY01oswiafFRof5e
+EMEJHc311UW5QsyCUQH+Hq4QwdaW2vLCvKxUQSZ+b3dnW4hgY01JYW5aoiAT
+n5e7o50lRLC6rDAjJV6AidfD1cHGzAgiWAxUFh3GxOPpyM1oYqAHEQSKRYUG
+Q9ypr6MFEUyNiwzyd3N1BGrV19FQhQiycKEAcNAxMCigAQYGAJCUYbIIDCae
+AAAAAElFTkSuQmCC
+====
--- apache2-2.2.11.orig/debian/icons/odf6odt-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6odt-20x22.png.uue
@@ -0,0 +1,24 @@
+begin-base64 644 odf6odt-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACLlBMVEXZ2dkz
+MzMzM5lcXKxdXK1dXa1eXq6ZmZnOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT
+1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d
+3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh
+4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk
+5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn
+5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq
+6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs
+7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw
+7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz
+8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1
+9fX19fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5
++fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+
+/f7+/v7+/v///v////9yFadVAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA
+AAAJcEhZcwAACxMAAAsTAQCanBgAAAE1SURBVBjTY2BEBgxQwLhz57bNIWtX
+Lls8n3EmTJRxxzYRNiZWwcXzZzFO6oWKMm4VZgIB/umTGbtb6yGijOvZmASX
+zOdjmdzH2FJbXQIWZfQDqZsznUmzTYgRDEGCy1mZ5s2axs3c1CgEASDBxQJM
+vJO5mDiaysvy2IEALDh/Dg8zEzNnTUVJXlYyTHD6tL5e1aaa8qK8zKTosGCI
+4JSJHW2NVSVFuSkJkaGBPhDB3rammsrivMzk+Nhgf3dHiGCLEDKwgQg2oQia
+QwTLy/IzkxNiwv3dnW0tTfUhgsVA+XihYJAySyEhbYhgbkZyVFigp4u9lbmR
+noYKRDBVKELIF2yeIRArQATjI4J93F0dzI31tFUU5WQgguEB3i6OFkAxDaCY
+lDhEkJEdBYCDjoFBCA0wMAAAEE1PsJ/Jn2YAAAAASUVORK5CYII=
+====
--- apache2-2.2.11.orig/debian/icons/odf6otg-20x22.png.uue
+++ apache2-2.2.11/debian/icons/odf6otg-20x22.png.uue
@@ -0,0 +1,27 @@
+begin-base64 644 odf6otg-20x22.png.uue
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACf1BMVEXZ2dkh
+ISEqKiorKiorKysrKywsLCwsLC0tLS0zMzM0NDQ1NTUzM5lcXKxdXK1dXa1e
+Xq6ZmZmam5qdnZ2fn6Cgn5+hoaGioqKio6Kio6Ojo6OkpKSlpKSkpaWlpaWm
+pqampqemp6amp6enp6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R0d/S0eDS
+0uDT0+DT1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd
+3dzd3d3d3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh
+4OHh4eDh4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj
+5OTk5OTk5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm
+5+bm5+fn5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp
+6erq6enq6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr
+7Ozs7Ozs7O3t7Ozs7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v
+7/Dw7/Dv8O/v8PDw8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy
+8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb2
+9fX29fb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6
++vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v//
+/v/////QWXrUAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAA
+CxMAAAsTAQCanBgAAAFfSURBVBjTY+BEBkYgwMDAwHnlysVzJSeOHNy3a8fW
+jWtUGcGCly+aCPDwG+7btW3zupUqXIJgwQvGPCCgv5lbfbkKlzJE8JQAj+H+
+XXp869W4VbiUJkME80Dqtm/m8VyswqU4qR8ieIifZ+e2Tdq8C+bPkueSa4MI
+7jPg0V2vxaOxYNrUXhnORojgru06vDy8mrMVJvd2NTfUQQQ3b1q10nXBbHkO
+uc6m6rJiiOCGtUsWz585mUOWo6GytDAHIrhy8YLZMybJcTSzSRbnpydCBBfO
+mz1tUi+HdJ04W056YgxEcMHMKRN6pNmqigvYRBKjwiGC06b2dTazS5Tnp4uy
+Rob6QwQn9bY1S7EVg7SyCAd4QwR7Opqr2MQyU+KjwoVZPFwggq31FWJsGSmx
+0cGBvsxCDhDB+opiNiMYYLKBCJYXZKckRoQH+3m4ONpZmUMEOQVRACdIkIHB
+CA0wMAAAjGF0n7ZMFJ4AAAAASUVORK5CYII=
+====
