Date: Wed, 24 Feb 2010 11:02:34 GMT From: Peter Vereshagin <peter@vereshagin.org> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/144262: [PATCH] www/p5-FCGI-Spawn: update to 0.16.1 Message-ID: <201002241102.o1OB2YAJ037439@www.freebsd.org> Resent-Message-ID: <201002241110.o1OBA2qn085317@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144262 >Category: misc >Synopsis: [PATCH] www/p5-FCGI-Spawn: update to 0.16.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Feb 24 11:10:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Peter Vereshagin >Release: releng_7 as of year+ ago >Organization: ' >Environment: FreeBSD my.host 7.1-STABLE FreeBSD 7.1-STABLE #1: Sat Jan 10 14:27:57 SAMT 2009 user@my.host:/usr/local/src/sys/i386/compile/MYKERN i386 >Description: FCGI::Spawn-0.16.1 release brings the daemon and thus the port has the script for rc.d now and "fcgi" user addition advisory. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -uNr www/p5-FCGI-Spawn.orig/Makefile www/p5-FCGI-Spawn/Makefile --- www/p5-FCGI-Spawn.orig/Makefile 2009-12-16 23:04:11.000000000 +0400 +++ www/p5-FCGI-Spawn/Makefile 2010-02-24 14:48:51.509806422 +0400 @@ -2,22 +2,53 @@ # Date created: 2007-12-28 # Whom: Peter <peter@vereshagin.org> # -# $FreeBSD: ports/www/p5-FCGI-Spawn/Makefile,v 1.5 2009/12/16 19:04:11 pgollucci Exp $ +# $FreeBSD$ # PORTNAME= FCGI-Spawn -PORTVERSION= 0.15.1 +PORTVERSION= 0.16.1 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= peter@vereshagin.org -COMMENT= Process manager/(CGI-like)application server for FastCGI protocol +COMMENT= FastCGI server for CGI-like applications multiprocessing RUN_DEPENDS= ${SITE_PERL}/FCGI/ProcManager.pm:${PORTSDIR}/www/p5-FCGI-ProcManager PERL_CONFIGURE= yes +USE_RC_SUBR+= fcgi_spawn + MAN3= FCGI::Spawn.3 +MAN1= fcgi_spawn.1 + +OPTIONS= MYSQL "MySQL dependency to run on RC start" off \ + PGSQL "PgSQL dependency to run on RC start" off + +.include <bsd.port.pre.mk> + +.if defined(WITH_MYSQL) +# RUN_DEPENDS+= mysql-server>=0:${PORTSDIR}/databases/mysql${MYSQL_VER}-server +SUB_LIST+= MYSQL=mysql +. else +SUB_LIST+= MYSQL= +.endif + +.if defined(WITH_PGSQL) +# RUN_DEPENDS+= postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server +SUB_LIST+= PGSQL=postgresql +. else +SUB_LIST+= PGSQL= +.endif + +post-install: + ${ECHO} ${WITH_MYSQL} ${SUB_LIST} + @${MKDIR} ${PREFIX}/etc/fcgi_spawn + @${INSTALL_DATA} ${WRKSRC}/fcgi_spawn.conf.sample ${PREFIX}/etc/fcgi_spawn + @${MKDIR} ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} + @${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/Bugzilla.CGI.pm.fcgi.spawn.patch ${WRKSRC}/CGI.pm.fcgi.spawn.patch \ + ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} + @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -uNr www/p5-FCGI-Spawn.orig/distinfo www/p5-FCGI-Spawn/distinfo --- www/p5-FCGI-Spawn.orig/distinfo 2009-12-16 23:04:11.000000000 +0400 +++ www/p5-FCGI-Spawn/distinfo 2010-02-24 14:48:51.509806422 +0400 @@ -1,3 +1,3 @@ -MD5 (FCGI-Spawn-0.15.1.tar.gz) = 4fbc9d3779c4f3b4d7b95386fed2fc48 -SHA256 (FCGI-Spawn-0.15.1.tar.gz) = fcf8dbeae55b486f845330b37643619566e0f7bd9373167b8e378fba6c82c3ca -SIZE (FCGI-Spawn-0.15.1.tar.gz) = 22409 +SIZE (FCGI-Spawn-0.16.1.tar.gz) = 27199 +MD5 (FCGI-Spawn-0.16.1.tar.gz) = a6124efd9b12f56cfe7cb9d750e7db34 +SHA256 (FCGI-Spawn-0.16.1.tar.gz) = 8163dd5d78e6c29197ef6f97f6429cbf4e5a800b668b6162fa18b9da6c330d49 diff -uNr www/p5-FCGI-Spawn.orig/files/fcgi_spawn.in www/p5-FCGI-Spawn/files/fcgi_spawn.in --- www/p5-FCGI-Spawn.orig/files/fcgi_spawn.in 1970-01-01 04:00:00.000000000 +0400 +++ www/p5-FCGI-Spawn/files/fcgi_spawn.in 2010-02-24 14:48:51.500805836 +0400 @@ -0,0 +1,29 @@ +#!/bin/sh + +# PROVIDE: fcgi_spawn +# REQUIRE: LOGIN %%MYSQL%% %%PGSQL%% +# BEFORE: +# KEYWORD: shutdown + +. %%RC_SUBR%% + +name="fcgi_spawn" +rcvar=${name}_enable + +fcgi_spawn_enable=${fcgi_spawn_enable:-"NO"} +pidfile=${fcgi_spawn_pid:-"/var/run/${name}.pid"} + +load_rc_config ${name} + +fcgi_spawn_config_path=${fcgi_spawn_config_path:-"/usr/local/etc/${name}"} +fcgi_spawn_log=${fcgi_spawn_log:-"/var/log/${name}.log"} +fcgi_spawn_socket_path=${fcgi_spawn_socket_path:-"/tmp/spawner.sock"} +fcgi_spawn_redefine_exit=${fcgi_spawn_redefine_exit:-"0"} +fcgi_spawn_username=${fcgi_spawn_username:-"fcgi"} +fcgi_spawn_groupname=${fcgi_spawn_groupname:-"fcgi"} +fcgi_spawn_flags=${fcgi_spawn_flags:-""} +command="%%PREFIX%%/bin/${name}" +command_args="-l ${fcgi_spawn_log} -p ${pidfile} -c ${fcgi_spawn_config_path} -u ${fcgi_spawn_username} -g ${fcgi_spawn_groupname} -s ${fcgi_spawn_socket_path}" +required_dirs=${fcgi_spawn_config_path} + +run_rc_command "$1" diff -uNr www/p5-FCGI-Spawn.orig/pkg-deinstall www/p5-FCGI-Spawn/pkg-deinstall --- www/p5-FCGI-Spawn.orig/pkg-deinstall 1970-01-01 04:00:00.000000000 +0400 +++ www/p5-FCGI-Spawn/pkg-deinstall 2010-02-24 14:48:51.511806676 +0400 @@ -0,0 +1,16 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +if [ "$2" != "POST-DEINSTALL" ]; then + exit 0 +fi + +USER=fcgi + +if pw usershow "${USER}" 2>/dev/null 1>&2; then + echo "To delete user permanently, use 'pw userdel ${USER}'. Also, unused groups of that user should be deleted, too" +fi + +exit 0 diff -uNr www/p5-FCGI-Spawn.orig/pkg-install www/p5-FCGI-Spawn/pkg-install --- www/p5-FCGI-Spawn.orig/pkg-install 1970-01-01 04:00:00.000000000 +0400 +++ www/p5-FCGI-Spawn/pkg-install 2010-02-24 14:48:51.511806676 +0400 @@ -0,0 +1,34 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +if [ "$2" != "PRE-INSTALL" ]; then + exit 0 +fi + +USER=fcgi +GROUP=${USER} + +if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then + if pw groupadd ${GROUP} ; then + echo "Added group \"${GROUP}\"." + else + echo "Adding group \"${GROUP}\" failed..." + exit 1 + fi +fi + +if ! pw usershow "${USER}" 2>/dev/null 1>&2; then + if pw useradd ${USER} -g ${GROUP} -h - \ + -s "/sbin/nologin" -d "/nonexistent" \ + -c "FastCGI Spawner"; \ + then + echo "Added user \"${USER}\"." + else + echo "Adding user \"${USER}\" failed..." + exit 1 + fi +fi + +exit 0 diff -uNr www/p5-FCGI-Spawn.orig/pkg-message www/p5-FCGI-Spawn/pkg-message --- www/p5-FCGI-Spawn.orig/pkg-message 1970-01-01 04:00:00.000000000 +0400 +++ www/p5-FCGI-Spawn/pkg-message 2010-02-24 14:48:51.510806269 +0400 @@ -0,0 +1,12 @@ +-=*** FCGI::Spawn and fcgi_spawn are installed ***=- + +For the first time, check all the docs supplied wwith the package. + +To run the fcgi_spawn on boot time, create the system user for it, and group, +too. After that, assuming you name them "fcgi", add this to your rc.conf: + +fcgi_spawn_enable="YES" +fcgi_spawn_username="fcgi" +fcgi_spawn_groupname="fcgi" + +You may want to set fcgi_spawn_flags also according to taste. diff -uNr www/p5-FCGI-Spawn.orig/pkg-plist www/p5-FCGI-Spawn/pkg-plist --- www/p5-FCGI-Spawn.orig/pkg-plist 2008-01-12 20:11:30.000000000 +0400 +++ www/p5-FCGI-Spawn/pkg-plist 2010-02-24 14:48:51.510806269 +0400 @@ -1,5 +1,12 @@ %%SITE_PERL%%/FCGI/Spawn.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/Spawn/.packlist +bin/fcgi_spawn +etc/fcgi_spawn/fcgi_spawn.conf.sample +share/doc/p5-FCGI-Spawn/CGI.pm.fcgi.spawn.patch +share/doc/p5-FCGI-Spawn/README +share/doc/p5-FCGI-Spawn/Bugzilla.CGI.pm.fcgi.spawn.patch @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/Spawn @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI @dirrmtry %%SITE_PERL%%/FCGI +@dirrmtry share/doc/p5-FCGI-Spawn +@dirrmtry etc/fcgi_spawn >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002241102.o1OB2YAJ037439>