diff -u aolserver4-4.5.0/debian/examples/aolconf-1.01/Makefile aolserver4-4.5.0/debian/examples/aolconf-1.01/Makefile
--- aolserver4-4.5.0/debian/examples/aolconf-1.01/Makefile
+++ aolserver4-4.5.0/debian/examples/aolconf-1.01/Makefile
@@ -15,11 +15,11 @@
 CONFFILES = aolconf.conf
 
 # these go into SBINDIR
-SBINFILES = aolserver-php4-cgi-wrapper aolserver4-newdomain
+SBINFILES = aolserver-php5-cgi-wrapper aolserver4-newdomain
 
 # theses get packaged
 PACKFILES = run nsperm_init.tcl example_perms.tcl tDAV.tcl \
-	    aolserver4-init aolserver-php4-cgi-wrapper \
+	    aolserver4-init aolserver-php5-cgi-wrapper \
 	    aolserver4-newdomain \
 	    domains.cfg minimal.cfg $(TCLSCRIPTS) aolconf.conf \
 	    Makefile NEWS TODO
@@ -76,7 +76,7 @@
 	@echo You must activate the script by yourself if you want to
 	@echo use SysV style startup
 	# cgi-wrapper
-	$(INSTALL) aolserver-php4-cgi-wrapper $(SBINDIR)
+	$(INSTALL) aolserver-php5-cgi-wrapper $(SBINDIR)
 	# utilities
 	$(INSTALL) aolserver4-newdomain $(SBINDIR)
 
diff -u aolserver4-4.5.0/debian/examples/aolconf-1.01/aolserver4-init aolserver4-4.5.0/debian/examples/aolconf-1.01/aolserver4-init
--- aolserver4-4.5.0/debian/examples/aolconf-1.01/aolserver4-init
+++ aolserver4-4.5.0/debian/examples/aolconf-1.01/aolserver4-init
@@ -7,12 +7,17 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 DAEMON=/usr/lib/aolserver4/run
 AOLSERVER=/usr/sbin/aolserver4-nsd
-PIDFILE=/var/run/aolserver4/$NAME.pid
+PID_DIR=/var/run/aolserver4
+PIDFILE=$PID_DIR/$NAME.pid
 
 trap "" 1
 
 [ -f $AOLSERVER ] || exit 0
 
+if [ ! -d ${PID_DIR} ]; then
+	mkdir -p -m 0755 ${PID_DIR}
+fi
+
 start()
 {
     echo -n "Starting web server: $NAME"
diff -u aolserver4-4.5.0/debian/examples/aolconf-1.01/main.tcl aolserver4-4.5.0/debian/examples/aolconf-1.01/main.tcl
--- aolserver4-4.5.0/debian/examples/aolconf-1.01/main.tcl
+++ aolserver4-4.5.0/debian/examples/aolconf-1.01/main.tcl
@@ -33,7 +33,7 @@
 set ca_dir  certs
 
 # php wrapper hack, unset to disable
-set php_wrapper "/usr/local/sbin/aolserver-php4-cgi-wrapper"
+set php_wrapper "/usr/local/sbin/aolserver-php5-cgi-wrapper"
 
 # Utility procedures for location of configfiles, defaults and logs
 # Locate a relative filename in $confdir, else at its original place
reverted:
--- aolserver4-4.5.0/debian/examples/aolconf-1.01/aolserver-php4-cgi-wrapper
+++ aolserver4-4.5.0.orig/debian/examples/aolconf-1.01/aolserver-php4-cgi-wrapper
@@ -1,4 +0,0 @@
-#!/bin/sh
-SCRIPT_FILENAME=$1
-export SCRIPT_FILENAME
-exec php4-cgi
diff -u aolserver4-4.5.0/debian/changelog aolserver4-4.5.0/debian/changelog
--- aolserver4-4.5.0/debian/changelog
+++ aolserver4-4.5.0/debian/changelog
@@ -1,3 +1,11 @@
+aolserver4 (4.5.0-8ubuntu2) gutsy; urgency=low
+
+  * Move to aolserver-php5-cgi-wrapper
+  * Recreate /var/run/aolserver4 at startup
+  * Create /var/run/aolserver4 during configuration (LP: #109793)
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 16 Jun 2007 11:20:53 +0200
+
 aolserver4 (4.5.0-8ubuntu1) gutsy; urgency=low
 
   * Resync from debian unstable, dropped changes:
diff -u aolserver4-4.5.0/debian/aolserver4.postinst aolserver4-4.5.0/debian/aolserver4.postinst
--- aolserver4-4.5.0/debian/aolserver4.postinst
+++ aolserver4-4.5.0/debian/aolserver4.postinst
@@ -30,6 +30,10 @@
 INIT="/etc/init.d/$PACKAGE"
 INIT_NEW="$INIT.$NEW_SUFFIX"
 
+if [ ! -d ${RUNDIR} ]; then
+	mkdir -p -m 0755 ${RUNDIR}
+fi
+
 replace_file () {
     file=$1
     if [ ! -f $file ] ; then
only in patch2:
unchanged:
--- aolserver4-4.5.0.orig/debian/examples/aolconf-1.01/aolserver-php5-cgi-wrapper
+++ aolserver4-4.5.0/debian/examples/aolconf-1.01/aolserver-php5-cgi-wrapper
@@ -0,0 +1,4 @@
+#!/bin/sh
+SCRIPT_FILENAME=$1
+export SCRIPT_FILENAME
+exec php5-cgi