[pkg-lighttpd] r328 - lighttpd/trunk/debian

[madcoder at alioth.debian.org]

Author: madcoder
Date: 2008-05-06 17:58:17 +0000 (Tue, 06 May 2008)
New Revision: 328

Added:
   lighttpd/trunk/debian/lighttpd.prerm
   lighttpd/trunk/debian/spawn-fcgi.lighttpd.1
Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/lighttpd.manpages
   lighttpd/trunk/debian/lighttpd.postinst
   lighttpd/trunk/debian/rules
Log:
(Closes: 479501)



Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2008-04-23 21:24:48 UTC (rev 327)
+++ lighttpd/trunk/debian/changelog	2008-05-06 17:58:17 UTC (rev 328)
@@ -3,6 +3,13 @@
   * Fix /var/cache/lighttpd/uploads permissions in postinst (Closes: 476870).
   * Update patches/ssl-connection-errors.patch using upstream r2144, thanks to
     upstream for noticing.
+  * cherokee and lighttpd both provide spawn-fcgi, fix that using alternatives
+    (Closes: 479501):
+    + add spawn-fcgi.lighttpd.1 shamelessly stolen from cherokee packaging
+      (thanks Gunnar).
+    + install spawn-fcgi as spawn-fcgi.lighttpd.
+    + install master alternatives on spawn-fcgi.lighttpd and
+      spawn-fcgi.lighttd.1.
 
  -- Pierre Habouzit <madcoder at debian.org>  Sun, 13 Apr 2008 13:27:55 +0200
 

Modified: lighttpd/trunk/debian/lighttpd.manpages
===================================================================
--- lighttpd/trunk/debian/lighttpd.manpages	2008-04-23 21:24:48 UTC (rev 327)
+++ lighttpd/trunk/debian/lighttpd.manpages	2008-05-06 17:58:17 UTC (rev 328)
@@ -1 +1,2 @@
 debian/lighty-enable-mod.1
+debian/spawn-fcgi.lighttpd.1

Modified: lighttpd/trunk/debian/lighttpd.postinst
===================================================================
--- lighttpd/trunk/debian/lighttpd.postinst	2008-04-23 21:24:48 UTC (rev 327)
+++ lighttpd/trunk/debian/lighttpd.postinst	2008-05-06 17:58:17 UTC (rev 328)
@@ -1,8 +1,6 @@
-#! /bin/sh
+#! /bin/sh -e
 # postinst script for lighttpd
 
-set -e
-
 if [ "$1" = "configure" ]; then
    	if [ ! -r /var/www/index.lighttpd.html ];
    	then
@@ -14,6 +12,11 @@
 	chmod 0750 /var/log/lighttpd /var/run/lighttpd
 fi
 
+update-alternatives --quiet --install \
+    /usr/bin/spawn-fcgi spawn-fcgi /usr/bin/spawn-fcgi.lighttpd 20
+update-alternatives --quiet --install \
+    /usr/share/man/man1/spawn-fcgi.1.gz spawn-fcgi.1.gz /usr/share/man/man1/spawn-fcgi.lighttpd.1.gz 20
+
 #DEBHELPER#
 
 exit 0

Added: lighttpd/trunk/debian/lighttpd.prerm
===================================================================
--- lighttpd/trunk/debian/lighttpd.prerm	                        (rev 0)
+++ lighttpd/trunk/debian/lighttpd.prerm	2008-05-06 17:58:17 UTC (rev 328)
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if test "$1" != "upgrade"; then
+    update-alternatives --quiet --remove spawn-fcgi /usr/bin/spawn-fcgi.lighttpd
+    update-alternatives --quiet --remove spawn-fcgi.1.gz /usr/share/man/man1/spawn-fcgi.lighttpd.1.gz
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: lighttpd/trunk/debian/rules
===================================================================
--- lighttpd/trunk/debian/rules	2008-04-23 21:24:48 UTC (rev 327)
+++ lighttpd/trunk/debian/rules	2008-05-06 17:58:17 UTC (rev 328)
@@ -15,3 +15,8 @@
 	chmod a+x debian/create-mime.assign.pl
 	chmod a+x debian/include-conf-enabled.pl
 	chmod a+x debian/lighty-enable-mod
+
+binary-post-install/lighttpd::
+	rm -f debian/lighttpd/usr/share/man/spawn-fcgi.1*
+	mv debian/tmp/usr/bin/spawn-fcgi \
+	    debian/tmp/usr/bin/spawn-fcgi.lighttpd

Added: lighttpd/trunk/debian/spawn-fcgi.lighttpd.1
===================================================================
--- lighttpd/trunk/debian/spawn-fcgi.lighttpd.1	                        (rev 0)
+++ lighttpd/trunk/debian/spawn-fcgi.lighttpd.1	2008-05-06 17:58:17 UTC (rev 328)
@@ -0,0 +1,57 @@
+.TH spawn-fcgi 1
+.SH NAME
+spawn-fcgi - Spawns FastCGI processes
+.SH SYNOPSIS
+.B spawn-fcgi
+\-f <fcgiapp> \-a <addr> \-p port
+.
+.B spawn-fcgi
+\-s <path>
+.SH DESCRIPTION
+\fIspawn-fcgi\fP is used to spawn remote FastCGI processes.
+.SH OPTIONS
+\fIspawn-fcgi\fP accepts the following options:
+.TP 8
+.B  \-h
+General usage instructions
+.TP 8
+.B  \-f <fcgiapp>
+Filename of the FastCGI application to spawn
+.TP 8
+.B  \-a <addr>
+IP address to bind to (for TCP/IP-based IPC)
+.TP 8
+.B  \-p <port>
+TCP port to bind to (for TCP/IP-based IPC)
+.TP 8
+.B  \-s <path>
+Path to the Unix-domain socket to bind to (for Unix sockets-based IPC)
+.TP 8
+.B  \-C <children>
+(PHP only) Number of children to spawn. Defaults to 5.
+.TP 8
+.B  \-F <children>
+Number of children to fork. Defaults to 1.
+.TP 8
+.B  \-P <path>
+Name of the PID file for spawned processes
+.TP 8
+.B  \-n
+No forking should take place (for daemontools)
+.TP 8
+.B  \-v
+Shows version information and exits
+.TP 8
+.B  \-c <dir>
+Chroot to specified directory (can only be invoked by root)
+.TP 8
+.B  \-u
+User ID to change to (can only be invoked by root)
+.TP 8
+.B  \-g
+Group ID to change to (can only be invoked by root)
+.PP
+This program is a part of the Lighttpd web server, \&\fIlighttpd\fR\|(1)
+.SH AUTHOR
+This manual page was written by Gunnar Wolf <gwolf at debian.org>, for
+the Debian GNU/linux system (but may be used by others).