Hello community,
here is the log from the commit of package spawn-fcgi for openSUSE:Factory
checked in at Wed Jun 29 14:22:57 CEST 2011.
--------
--- spawn-fcgi/spawn-fcgi.changes 2009-04-20 15:12:18.000000000 +0200
+++ spawn-fcgi/spawn-fcgi.changes 2009-10-08 15:44:55.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Oct 8 15:43:38 CEST 2009 - mrueck...@suse.de
+
+- update to version 1.6.3
+ - Fix unix socket mode change to work without specifying
+ user/group for socket
+ - Add some ./run script examples for use with daemontools or
+ runit
+ - Fix Invalid Argument in chmod if mode=-1 (fixes #2033)
+ - Add deprecated and /bin/sh info for -f option; wrap syntax
+ output (fixes #2044)
+ - Add run script examples in automake dist build
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
spawn-fcgi-1.6.2.tar.bz2
New:
----
spawn-fcgi-1.6.3.tar.bz2
spawn-fcgi_1.6.3-1.1~backport1.diff.gz
spawn-fcgi_1.6.3-1.1~backport1.dsc
spawn-fcgi_1.6.3.orig.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spawn-fcgi.spec ++++++
--- /var/tmp/diff_new_pack.YmHJ2a/_old 2011-06-29 14:22:03.000000000 +0200
+++ /var/tmp/diff_new_pack.YmHJ2a/_new 2011-06-29 14:22:03.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package spawn-fcgi (Version 1.6.2)
+# spec file for package spawn-fcgi
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
Name: spawn-fcgi
-Version: 1.6.2
+Version: 1.6.3
Release: 1
%define pkg_version %{version}
#
@@ -34,15 +34,12 @@
Summary: Spawn FastCGI applications independent of the webserver
%description
-spawn-fcgi is used to spawn FastCGI applications independent of the
-webserver.
-
-
+spawn-fcgi is used to spawn FastCGI applications independent of the webserver.
Authors:
---------
- Jan Kneschke <j...@kneschke.de>
- Stefan Buehler <stbueh...@lighttpd.net>
+---------
+ Jan Kneschke
+ Stefan Buehler
%prep
%setup
++++++ spawn-fcgi-1.6.2.tar.bz2 -> spawn-fcgi-1.6.3.tar.bz2 ++++++
++++ 9824 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/CMakeLists.txt new/spawn-fcgi-1.6.3/CMakeLists.txt
--- old/spawn-fcgi-1.6.2/CMakeLists.txt 2009-04-18 11:26:58.000000000 +0200
+++ new/spawn-fcgi-1.6.3/CMakeLists.txt 2009-04-18 14:23:25.000000000 +0200
@@ -4,7 +4,7 @@
PROJECT(spawn-fcgi)
SET(PACKAGE_NAME ${CMAKE_PROJECT_NAME})
-SET(PACKAGE_VERSION 1.6.2)
+SET(PACKAGE_VERSION 1.6.3)
SET(CMAKE_MAN_DIR "share/man" CACHE STRING
"Install location for man pages (relative to prefix).")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/Makefile.am new/spawn-fcgi-1.6.3/Makefile.am
--- old/spawn-fcgi-1.6.2/Makefile.am 2009-04-18 11:26:58.000000000 +0200
+++ new/spawn-fcgi-1.6.3/Makefile.am 2009-09-23 14:01:49.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS=src
+SUBDIRS=src doc
EXTRA_DIST=autogen.sh spawn-fcgi.1 CMakeLists.txt
man1_MANS=spawn-fcgi.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/NEWS new/spawn-fcgi-1.6.3/NEWS
--- old/spawn-fcgi-1.6.2/NEWS 2009-04-18 12:48:25.000000000 +0200
+++ new/spawn-fcgi-1.6.3/NEWS 2009-09-23 14:27:48.000000000 +0200
@@ -3,7 +3,14 @@
NEWS
====
-- 1.6.2 -
+- 1.6.3 -
+ * Fix unix socket mode change to work without specifying user/group for
socket
+ * Add some ./run script examples for use with daemontools or runit
+ * Fix Invalid Argument in chmod if mode=-1 (fixes 2033)
+ * Add deprecated and /bin/sh info for -f option; wrap syntax output (fixes
#2044)
+ * Add run script examples in automake dist build
+
+- 1.6.2 - 2009-04-18
* Add homepage to README
* Add IPv6 support
* Fix problems with usernames starting with a digit and non-existent uids;
add warning if only user privs are dropped. (fixes #1959)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/config.h.in new/spawn-fcgi-1.6.3/config.h.in
--- old/spawn-fcgi-1.6.2/config.h.in 2009-04-18 11:27:13.000000000 +0200
+++ new/spawn-fcgi-1.6.3/config.h.in 2009-09-23 14:15:18.000000000 +0200
@@ -153,6 +153,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/configure.ac new/spawn-fcgi-1.6.3/configure.ac
--- old/spawn-fcgi-1.6.2/configure.ac 2009-04-18 11:26:58.000000000 +0200
+++ new/spawn-fcgi-1.6.3/configure.ac 2009-09-23 14:14:58.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([spawn-fcgi],[1.6.2])
+AC_INIT([spawn-fcgi],[1.6.3])
AC_CONFIG_SRCDIR([src/spawn-fcgi.c])
AC_CONFIG_HEADER([config.h])
@@ -81,8 +81,8 @@
esac],[extrawarnings=false])
if test x$extrawarnings = xtrue; then
- CFLAGS="${CFLAGS} -g -O2 -g2 -Wall -Wmissing-declarations
-Wdeclaration-after-statement -Wno-pointer-sign -Wcast-align -Winline
-Wsign-compare -Wnested-externs -Wpointer-arith -Wl,--as-needed
-Wformat-security"
+ CFLAGS="${CFLAGS} -g -O2 -g2 -Wall -Wmissing-declarations
-Wdeclaration-after-statement -Wcast-align -Winline -Wsign-compare
-Wnested-externs -Wpointer-arith -Wl,--as-needed -Wformat-security"
fi
-AC_CONFIG_FILES([Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile])
AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/doc/Makefile.am new/spawn-fcgi-1.6.3/doc/Makefile.am
--- old/spawn-fcgi-1.6.2/doc/Makefile.am 1970-01-01 01:00:00.000000000
+0100
+++ new/spawn-fcgi-1.6.3/doc/Makefile.am 2009-09-23 14:01:42.000000000
+0200
@@ -0,0 +1 @@
+EXTRA_DIST=run-generic run-php run-rails
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/doc/run-generic new/spawn-fcgi-1.6.3/doc/run-generic
--- old/spawn-fcgi-1.6.2/doc/run-generic 1970-01-01 01:00:00.000000000
+0100
+++ new/spawn-fcgi-1.6.3/doc/run-generic 2009-06-05 11:06:42.000000000
+0200
@@ -0,0 +1,49 @@
+#!/bin/bash
+# Use this as a run script with daemontools or runit
+
+## ABSOLUTE path to the spawn-fcgi binary
+SPAWNFCGI="/usr/bin/spawn-fcgi"
+
+## ABSOLUTE path to the FastCGI application (php-cgi, dispatch.fcgi, ...)
+FCGIPROGRAM="/usr/bin/php5-cgi"
+
+## bind to unix socket
+FCGISOCKET="/var/run/lighttpd/your-fcgi-app.sock"
+
+# allowed environment variables separated by spaces
+ALLOWED_ENV="PATH USER"
+
+## if this script is run as root switch to the following user
+USERID=xxx
+SOCKUSERID=www-data
+#CHROOT=/home/www/
+
+#RAILS_ENV="production"
+#export RAILS_ENV
+
+
+################## no config below this line
+
+exec 2>&1
+
+if test x$PHP_FCGI_CHILDREN = x; then
+ PHP_FCGI_CHILDREN=4
+fi
+
+ALLOWED_ENV="$ALLOWED_ENV RAILS_ENV"
+
+if test x$UID = x0; then
+ EX="$SPAWNFCGI -n -s $FCGISOCKET -u $USERID -U $SOCKUSERID -C
$PHP_FCGI_CHILDREN -- $FCGIPROGRAM"
+else
+ EX="$SPAWNFCGI -n -s $FCGISOCKET -C $PHP_FCGI_CHILDREN -- $FCGIPROGRAM"
+fi
+
+# copy the allowed environment variables
+E=
+
+for i in $ALLOWED_ENV; do
+ E="$E $i=${!i}"
+done
+
+# clean environment and set up a new one
+exec env - $E $EX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/doc/run-php new/spawn-fcgi-1.6.3/doc/run-php
--- old/spawn-fcgi-1.6.2/doc/run-php 1970-01-01 01:00:00.000000000 +0100
+++ new/spawn-fcgi-1.6.3/doc/run-php 2009-06-05 10:58:44.000000000 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Use this as a ./run script with daemontools or runit
+# You should replace xxx with the user you want php to run as (and www-data
with the user lighty runs as)
+
+exec 2>&1
+PHP_FCGI_CHILDREN=2 \
+PHP_FCGI_MAX_REQUESTS=1000 \
+exec /usr/bin/spawn-fcgi -n -s /var/run/lighttpd/php-xxx.sock -n -u xxx -U
www-data -- /usr/bin/php5-cgi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/doc/run-rails new/spawn-fcgi-1.6.3/doc/run-rails
--- old/spawn-fcgi-1.6.2/doc/run-rails 1970-01-01 01:00:00.000000000 +0100
+++ new/spawn-fcgi-1.6.3/doc/run-rails 2009-06-05 10:58:32.000000000 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Use this as a ./run script with daemontools or runit
+# You should replace xxx with the user you want rails to run as (and www-data
with the user lighty runs as)
+# /path-to-rails should be replaced with the correct path too :)
+
+exec 2>&1
+RAILS_ENV="production" \
+exec /usr/bin/spawn-fcgi -n -s /var/run/lighttpd/rails-xxx.sock -u xxx -U
www-data -- /path-to-rails/public/dispatch.fcgi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/missing new/spawn-fcgi-1.6.3/missing
--- old/spawn-fcgi-1.6.2/missing 2009-04-18 11:27:14.000000000 +0200
+++ new/spawn-fcgi-1.6.3/missing 2009-09-23 14:14:11.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# 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.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to <bug-autom...@gnu.org>."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/src/CMakeLists.txt new/spawn-fcgi-1.6.3/src/CMakeLists.txt
--- old/spawn-fcgi-1.6.2/src/CMakeLists.txt 2009-04-18 11:26:58.000000000
+0200
+++ new/spawn-fcgi-1.6.3/src/CMakeLists.txt 2009-06-03 18:50:25.000000000
+0200
@@ -9,8 +9,8 @@
OPTION(BUILD_EXTRA_WARNINGS "extra warnings")
IF(BUILD_EXTRA_WARNINGS)
- SET(WARN_FLAGS "-g -O2 -g2 -Wall -Wmissing-declarations
-Wdeclaration-after-statement -Wno-pointer-sign -Wcast-align -Winline
-Wsign-compare -Wnested-externs -Wpointer-arith -Wl,--as-needed
-Wformat-security")
- # -Werror -Wbad-function-cast -Wmissing-prototypes
+ SET(WARN_FLAGS "-g -O2 -g2 -Wall -Wmissing-declarations
-Wdeclaration-after-statement -Wcast-align -Winline -Wsign-compare
-Wnested-externs -Wpointer-arith -Wl,--as-needed -Wformat-security")
+ # -Wno-pointer-sign -Werror -Wbad-function-cast
-Wmissing-prototypes
ELSE(BUILD_EXTRA_WARNINGS)
SET(WARN_FLAGS "")
ENDIF(BUILD_EXTRA_WARNINGS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/spawn-fcgi-1.6.2/src/spawn-fcgi.c new/spawn-fcgi-1.6.3/src/spawn-fcgi.c
--- old/spawn-fcgi-1.6.2/src/spawn-fcgi.c 2009-04-18 11:38:38.000000000
+0200
+++ new/spawn-fcgi-1.6.3/src/spawn-fcgi.c 2009-09-19 11:48:40.000000000
+0200
@@ -77,6 +77,7 @@
#define PACKAGE_DESC "spawn-fcgi v" PACKAGE_VERSION PACKAGE_FEATURES " -
spawns FastCGI processes\n"
+#define CONST_STR_LEN(s) s, sizeof(s) - 1
static int bind_socket(const char *addr, unsigned short port, const char
*unixsocket, uid_t uid, gid_t gid, int mode) {
int fcgi_fd, socket_type, val;
@@ -197,13 +198,13 @@
unlink(unixsocket);
return -1;
}
+ }
- if (-1 == chmod(unixsocket, mode)) {
- fprintf(stderr, "spawn-fcgi: couldn't chmod
socket: %s\n", strerror(errno));
- close(fcgi_fd);
- unlink(unixsocket);
- return -1;
- }
+ if (-1 != mode && -1 == chmod(unixsocket, mode)) {
+ fprintf(stderr, "spawn-fcgi: couldn't chmod socket:
%s\n", strerror(errno));
+ close(fcgi_fd);
+ unlink(unixsocket);
+ return -1;
}
}
@@ -271,7 +272,7 @@
execv(appArgv[0], appArgv);
} else {
- char *b = malloc(strlen("exec ") +
strlen(appPath) + 1);
+ char *b = malloc((sizeof("exec ") - 1) +
strlen(appPath) + 1);
strcpy(b, "exec ");
strcat(b, appPath);
@@ -336,7 +337,6 @@
}
}
close(pid_fd);
- pid_fd = -1;
close(fcgi_fd);
@@ -404,41 +404,43 @@
}
static void show_version () {
- const char *b = PACKAGE_DESC
-"Build-Date: " __DATE__ " " __TIME__ "\n";
-;
- write(1, b, strlen(b));
+ write(1, CONST_STR_LEN(
+ PACKAGE_DESC \
+ "Build-Date: " __DATE__ " " __TIME__ "\n"
+ ));
}
static void show_help () {
- char *b = \
-"Usage: spawn-fcgi [options] [-- <fcgiapp> [fcgi app arguments]]\n" \
-"\n" \
-PACKAGE_DESC \
-"\n" \
-"Options:\n" \
-" -f <path> filename of the fcgi-application (ignored if <fcgiapp> is
given)\n" \
-" -d <directory> chdir to directory before spawning\n" \
-" -a <address> bind to IPv4/IPv6 address (defaults to 0.0.0.0)\n" \
-" -p <port> bind to TCP-port\n" \
-" -s <path> bind to Unix domain socket\n" \
-" -M <mode> change Unix domain socket mode\n" \
-" -C <children> (PHP only) numbers of childs to spawn (default: not
setting\n" \
-" the PHP_FCGI_CHILDREN environment variable - PHP defaults to
0)\n" \
-" -F <children> number of children to fork (default 1)\n" \
-" -P <path> name of PID-file for spawned process (ignored in no-fork
mode)\n" \
-" -n no fork (for daemontools)\n" \
-" -v show version\n" \
-" -?, -h show this help\n" \
-"(root only)\n" \
-" -c <directory> chroot to directory\n" \
-" -S create socket before chroot() (default is to create the
socket in the chroot)\n" \
-" -u <user> change to user-id\n" \
-" -g <group> change to group-id (default: primary group of user if -u is
given)\n" \
-" -U <user> change Unix domain socket owner to user-id\n" \
-" -G <group> change Unix domain socket group to group-id\n" \
-;
- write(1, b, strlen(b));
+ write(1, CONST_STR_LEN(
+ "Usage: spawn-fcgi [options] [-- <fcgiapp> [fcgi app
arguments]]\n" \
+ "\n" \
+ PACKAGE_DESC \
+ "\n" \
+ "Options:\n" \
+ " -f <path> filename of the fcgi-application (deprecated;
ignored if\n" \
+ " <fcgiapp> is given; needs /bin/sh)\n" \
+ " -d <directory> chdir to directory before spawning\n" \
+ " -a <address> bind to IPv4/IPv6 address (defaults to
0.0.0.0)\n" \
+ " -p <port> bind to TCP-port\n" \
+ " -s <path> bind to Unix domain socket\n" \
+ " -M <mode> change Unix domain socket mode\n" \
+ " -C <children> (PHP only) numbers of childs to spawn
(default: not setting\n" \
+ " the PHP_FCGI_CHILDREN environment variable -
PHP defaults to 0)\n" \
+ " -F <children> number of children to fork (default 1)\n" \
+ " -P <path> name of PID-file for spawned process (ignored
in no-fork mode)\n" \
+ " -n no fork (for daemontools)\n" \
+ " -v show version\n" \
+ " -?, -h show this help\n" \
+ "(root only)\n" \
+ " -c <directory> chroot to directory\n" \
+ " -S create socket before chroot() (default is to
create the socket\n" \
+ " in the chroot)\n" \
+ " -u <user> change to user-id\n" \
+ " -g <group> change to group-id (default: primary group of
user if -u\n" \
+ " is given)\n" \
+ " -U <user> change Unix domain socket owner to user-id\n" \
+ " -G <group> change Unix domain socket group to group-id\n"
\
+ ));
}
++++++ spawn-fcgi_1.6.3-1.1~backport1.diff.gz ++++++
--- spawn-fcgi-1.6.3.orig/debian/README.Debian
+++ spawn-fcgi-1.6.3/debian/README.Debian
@@ -0,0 +1,8 @@
+spawn-fcgi for Debian
+---------------------
+
+The spawn-fcgi program in this package installs as an alternative :
+ update-alternatives --config spawn-fcgi
+and choose the standalone version.
+
+ -- Jérémy Lal <kapo...@melix.org> Mon, 20 Apr 2009 09:08:46 +0200
--- spawn-fcgi-1.6.3.orig/debian/docs
+++ spawn-fcgi-1.6.3/debian/docs
@@ -0,0 +1,2 @@
+NEWS
+doc/run-*
--- spawn-fcgi-1.6.3.orig/debian/rules
+++ spawn-fcgi-1.6.3/debian/rules
@@ -0,0 +1,109 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# 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)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+
+
+config.status: configure
+ dh_testdir
+ # Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+
+
+build: build-stamp
+
+build-stamp: config.status
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE)
+
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ [ ! -f Makefile ] || $(MAKE) distclean
+ rm -f config.sub config.guess
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/spawn-fcgi.
+ $(MAKE) DESTDIR=$(CURDIR)/debian/spawn-fcgi install
+
+ # prepare for update-alternative
+ mv debian/spawn-fcgi/usr/share/man/man1/spawn-fcgi.1 \
+ debian/spawn-fcgi/usr/share/man/man1/spawn-fcgi.standalone.1
+ mv debian/spawn-fcgi/usr/bin/spawn-fcgi \
+ debian/spawn-fcgi/usr/bin/spawn-fcgi.standalone
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+# dh_install
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_python
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- spawn-fcgi-1.6.3.orig/debian/compat
+++ spawn-fcgi-1.6.3/debian/compat
@@ -0,0 +1 @@
+5
--- spawn-fcgi-1.6.3.orig/debian/control
+++ spawn-fcgi-1.6.3/debian/control
@@ -0,0 +1,23 @@
+Source: spawn-fcgi
+Section: web
+Priority: extra
+Maintainer: Jérémy Lal <kapo...@melix.org>
+Build-Depends: debhelper (>= 5.0.0)
+Standards-Version: 3.8.3
+Homepage: http://redmine.lighttpd.net/projects/spawn-fcgi
+
+Package: spawn-fcgi
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A fastcgi process spawner
+ spawn-fcgi allows fcgi processes to be separated from web server process :
+ * Easy creation of chmoded socket.
+ * Privilege separation without needing a suid-binary,
+ or running a server as root.
+ * You can restart your web server and the FastCGI applications
+ without restarting the others.
+ * You can run them in different chroot()s.
+ * Running your FastCGI applications doesn’t depend on the web server
+ you are running, which allows for easier testing of/migration
+ to other web servers.
+
--- spawn-fcgi-1.6.3.orig/debian/spawn-fcgi.postinst
+++ spawn-fcgi-1.6.3/debian/spawn-fcgi.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+# postinst script for spawn-fcgi
+
+update-alternatives \
+ --install /usr/bin/spawn-fcgi \
+ spawn-fcgi /usr/bin/spawn-fcgi.standalone 10 \
+ --slave /usr/share/man/man1/spawn-fcgi.1.gz \
+ spawn-fcgi.1.gz /usr/share/man/man1/spawn-fcgi.standalone.1.gz
+
+#DEBHELPER#
+
+exit 0
--- spawn-fcgi-1.6.3.orig/debian/manpages
+++ spawn-fcgi-1.6.3/debian/manpages
@@ -0,0 +1 @@
+spawn-fcgi.1
--- spawn-fcgi-1.6.3.orig/debian/copyright
+++ spawn-fcgi-1.6.3/debian/copyright
@@ -0,0 +1,40 @@
+This package was debianized by Jérémy Lal <kapo...@melix.org> on
+Mon, 20 Apr 2009 09:08:46 +0200.
+
+It was downloaded from http://redmine.lighttpd.net/projects/spawn-fcgi/
+
+Upstream Authors:
+ jan kneschke <j...@kneschke.de>
+ stefan bühler <light...@stbuehler.de>
+
+Copyright:
+
+Copyright (c) 2004, Jan Kneschke, incremental
+ All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+- 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.
+
+- Neither the name of the 'incremental' nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
+
--- spawn-fcgi-1.6.3.orig/debian/spawn-fcgi.prerm
+++ spawn-fcgi-1.6.3/debian/spawn-fcgi.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if test "$1" != "upgrade"; then
+ update-alternatives --remove spawn-fcgi /usr/bin/spawn-fcgi.standalone
+fi
+
+#DEBHELPER#
+
+exit 0
--- spawn-fcgi-1.6.3.orig/debian/changelog
+++ spawn-fcgi-1.6.3/debian/changelog
@@ -0,0 +1,33 @@
+spawn-fcgi (1.6.3-1.1~backport1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debhelper backport
+
+ -- Stefan Bühler <sou...@stbuehler.de> Thu, 11 Feb 2010 17:03:13 +0000
+
+spawn-fcgi (1.6.3-1) unstable; urgency=low
+
+ * Upstream update
+ * Updates Standards-Version to 3.8.3
+ * Remove debian/spawn-fcgi.1, add debian/manpages
+
+ -- Jérémy Lal <kapo...@melix.org> Wed, 23 Sep 2009 17:13:35 +0200
+
+spawn-fcgi (1.6.2-3) unstable; urgency=low
+
+ * Drop libc6-dev build-dependency (Closes: #533880)
+ * Updates Standards-Version to 3.8.2
+
+ -- Jérémy Lal <kapo...@melix.org> Sun, 21 Jun 2009 19:43:56 +0200
+
+spawn-fcgi (1.6.2-2) unstable; urgency=low
+
+ * Show update-alternatives usage in README.Debian
+
+ -- Jérémy Lal <kapo...@melix.org> Mon, 20 Apr 2009 11:39:31 +0200
+
+spawn-fcgi (1.6.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #523707)
+
+ -- Jérémy Lal <kapo...@melix.org> Mon, 20 Apr 2009 09:08:46 +0200
--- spawn-fcgi-1.6.3.orig/debian/watch
+++ spawn-fcgi-1.6.3/debian/watch
@@ -0,0 +1,5 @@
+# Compulsory line, this is a version 3 file
+version=3
+
+http://redmine.lighttpd.net/projects/spawn-fcgi/news
http://www.lighttpd.net/download/spawn-fcgi-([\d\.]*)\.tar\.gz
+
++++++ spawn-fcgi_1.6.3-1.1~backport1.dsc ++++++
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.0
Source: spawn-fcgi
Binary: spawn-fcgi
Architecture: any
Version: 1.6.3-1.1~backport1
Maintainer: Jérémy Lal <kapo...@melix.org>
Homepage: http://redmine.lighttpd.net/projects/spawn-fcgi
Standards-Version: 3.8.3
Build-Depends: debhelper (>= 5.0.0)
Checksums-Sha1:
2b97ea57d9d79745fe8d6051d830fa507b421169 97921 spawn-fcgi_1.6.3.orig.tar.gz
e2acbb1992ec9205d41c6590e176552c37a6841b 3266
spawn-fcgi_1.6.3-1.1~backport1.diff.gz
Checksums-Sha256:
7507a822995731629149040ee5686279b7582ae46f0296efd64b542ef052a90e 97921
spawn-fcgi_1.6.3.orig.tar.gz
673aeb89983f45745a62c31bd0ffdadff97cc5a553ff56844fc89dae0d1d3437 3266
spawn-fcgi_1.6.3-1.1~backport1.diff.gz
Files:
6d75f9e9435056fa1e574d836d823cd0 97921 spawn-fcgi_1.6.3.orig.tar.gz
42714226442c9be2f1cfdcc5470aec2e 3266 spawn-fcgi_1.6.3-1.1~backport1.diff.gz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkt0OSkACgkQgBIc0keWidiGrwCfcFAwjKZlHeRFsk+W9BF+R1wn
pqMAnjuDnLmbZOkCQ5z3A0OYVYoG0oHp
=2dku
-----END PGP SIGNATURE-----
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
