upstream update, add webdav

Makefile

@@ -21,7 +21,7 @@ _SOURCES=$(_SRCBASE)/source
 
 ## ############################################################################
 
-VERSION_APACHE=2.2.11
+VERSION_APACHE=2.2.14
 PACKAGE_APACHE=httpd-$(VERSION_APACHE).tar.bz2
 DOWNLOAD_APACHE=http://apache.speedbone.de/httpd/$(PACKAGE_APACHE)
 SOURCE_APACHE=$(_SOURCES)/httpd-$(VERSION_APACHE)
@@ -31,7 +31,7 @@ PACKAGE_RPAF=mod_rpaf-$(VERSION_RPAF).tar.gz
 DOWNLOAD_RPAF=http://stderr.net/apache/rpaf/download/$(PACKAGE_RPAF)
 SOURCE_RPAF=$(_SOURCES)/mod_rpaf-$(VERSION_RPAF)
 
-VERSION_PHP=5.2.9
+VERSION_PHP=5.2.12
 PACKAGE_PHP=php-$(VERSION_PHP).tar.bz2
 DOWNLOAD_PHP=http://de3.php.net/get/$(PACKAGE_PHP)/from/this/mirror
 SOURCE_PHP=$(_SOURCES)/php-$(VERSION_PHP)
@@ -43,7 +43,7 @@ SOURCE_EACCELERATOR=$(_SOURCES)/eaccelerator-$(VERSION_EACCELERATOR)
 
 ## ############################################################################
 
-all: apache-fe apache-be
+all: apache-fe apache-dav apache-be
 
 fetch: $(_DOWNLOADS)/$(PACKAGE_APACHE) \
     $(_DOWNLOADS)/$(PACKAGE_RPAF) \
@@ -85,6 +85,37 @@ $(SOURCE_EACCELERATOR)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_EACCELERATOR)
 
 ## ############################################################################
 
+_APACHE_DAV_BUILD=$(_SOURCES)/apache22-webdav
+_APACHE_DAV_DEST=$(DESTDIR)/apache22-webdav
+_APACHE_DAV_CONF=/etc/apache22-dav
+
+apache-dav: $(_APACHE_DAV_BUILD)/.installed
+
+$(_APACHE_DAV_BUILD)/.configured: $(SOURCE_APACHE)/.unpacked
+	mkdir -p $(_APACHE_DAV_BUILD)
+	( cd $(_APACHE_DAV_BUILD); \
+		$(SOURCE_APACHE)/configure \
+		--enable-layout=Webdav \
+		--with-mpm=worker \
+		--enable-dav \
+		--enable-dav-fs \
+	);
+	touch $@
+
+$(_APACHE_DAV_BUILD)/.compiled: $(_APACHE_DAV_BUILD)/.configured
+	make $(MAKE_FLAGS) -C $(_APACHE_DAV_BUILD) all
+	touch $@
+
+$(_APACHE_DAV_BUILD)/.installed: $(_APACHE_DAV_BUILD)/.compiled
+	make -C $(_APACHE_DAV_BUILD) install
+	rm -rf $(_APACHE_DAV_CONF)/original
+	touch $@
+
+apache-dav-clean:
+	rm -rf $(_APACHE_DAV_BUILD)
+
+## ############################################################################
+
 _APACHE_FE_BUILD=$(_SOURCES)/apache22-frontend
 _APACHE_FE_DEST=$(DESTDIR)/apache22-frontend
 _APACHE_FE_CONF=/etc/apache22-fe

apache-layouts

@@ -43,3 +43,26 @@
     logfiledir:    /var/log/apache22-be
     proxycachedir: ${localstatedir}/proxy
 </Layout>
+
+<Layout Webdav>
+    prefix:        /opt/apache22-webdav
+    exec_prefix:   ${prefix}
+    bindir:        ${exec_prefix}/bin
+    sbindir:       ${exec_prefix}/bin
+    libdir:        ${exec_prefix}/lib
+    libexecdir:    ${exec_prefix}/modules
+    mandir:        ${prefix}/man
+    sysconfdir:    /etc/apache22-dav
+    datadir:       ${prefix}
+    installbuilddir: ${datadir}/build
+    errordir:      ${datadir}/error
+    iconsdir:      ${datadir}/icons
+    htdocsdir:     ${datadir}/htdocs
+    manualdir:     ${datadir}/manual
+    cgidir:        ${datadir}/cgi-bin
+    includedir:    ${prefix}/include
+    localstatedir: ${prefix}
+    runtimedir:    ${localstatedir}/run
+    logfiledir:    /var/log/apache22-dav
+    proxycachedir: ${localstatedir}/proxy
+</Layout>

init-scripts/apache22-dav

@@ -0,0 +1,55 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          apache22-dav
+# Required-Start:    $network
+# Required-Stop:     $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: apache22-dav initscript
+# Description:       none
+### END INIT INFO
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Apache22 WebDAV"
+
+APACHECTL="/opt/apache22-webdav/bin/apachectl"
+[ -x "$APACHECTL" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+case "$1" in
+start)
+	log_daemon_msg "Starting $DESC"
+	$APACHECTL -k start
+	case "$?" in
+		0) log_end_msg 0 ;;
+		*) log_end_msg 1 ;;
+	esac
+	;;
+stop)
+	log_daemon_msg "Stopping $DESC"
+	$APACHECTL -k stop
+	case "$?" in
+		0) log_end_msg 0 ;;
+		*) log_end_msg 1 ;;
+	esac
+	;;
+restart)
+	log_daemon_msg "Stopping $DESC"
+	$APACHECTL -k restart
+	case "$?" in
+		0) log_end_msg 0 ;;
+		*) log_end_msg 1 ;;
+	esac
+	;;
+
+*)
+	echo "Usage: $0 {start|stop|restart}" >&2
+	exit 3
+	;;
+esac