From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 12 00:00:15 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8D3C1065692 for ; Sat, 12 Dec 2009 00:00:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6BBA18FC08 for ; Sat, 12 Dec 2009 00:00:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nBC00FwA061555 for ; Sat, 12 Dec 2009 00:00:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nBC00FIO061554; Sat, 12 Dec 2009 00:00:15 GMT (envelope-from gnats) Resent-Date: Sat, 12 Dec 2009 00:00:15 GMT Resent-Message-Id: <200912120000.nBC00FIO061554@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Carsten Wiedmann Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E66F1065702 for ; Fri, 11 Dec 2009 23:53:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 2D1588FC12 for ; Fri, 11 Dec 2009 23:53:19 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nBBNrInX028382 for ; Fri, 11 Dec 2009 23:53:18 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id nBBNrIJf028380; Fri, 11 Dec 2009 23:53:18 GMT (envelope-from nobody) Message-Id: <200912112353.nBBNrIJf028380@www.freebsd.org> Date: Fri, 11 Dec 2009 23:53:18 GMT From: Carsten Wiedmann To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/141389: update mod_fcgid to 2.3.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Dec 2009 00:00:15 -0000 >Number: 141389 >Category: ports >Synopsis: update mod_fcgid to 2.3.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 12 00:00:15 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Carsten Wiedmann >Release: FreeBSD 8.0-RELEASE >Organization: >Environment: >Description: Hello, since 8 months mod_fcgid is a Apache HTTP Server subproject and now maintained and developed by ASF. The first mod_fcgid release (2.3.1) from ASF was in September, and the latest (2.3.4) in October. But the FreeBSD ports still having the old 2.2. I've made a patch to update the port to 2.3.4. file removed: files/patch-fcgid_conf.c file added: files/patch-modules-fcgid-fcgid_conf.c Regards, Carsten >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN mod_fcgid.orig/Makefile mod_fcgid/Makefile --- mod_fcgid.orig/Makefile 2009-09-02 17:01:54.000000000 +0200 +++ mod_fcgid/Makefile 2009-12-12 00:02:33.000000000 +0100 @@ -6,19 +6,27 @@ # PORTNAME= mod_fcgid -PORTVERSION= 2.2 +PORTVERSION= 2.3.4 CATEGORIES= www -MASTER_SITES= SF/mod-fcgid/OldFiles -DISTNAME= ${PORTNAME}.${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} +MASTER_SITE_SUBDIR= ${PORTNAME} +DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= hemi@puresimplicity.net COMMENT= An alternative FastCGI module for Apache2 -MAKE_JOBS_SAFE= yes +MAKE_JOBS_SAFE= yes USE_APACHE= 2.0+ +HAS_CONFIGURE= yes +CONFIGURE_SCRIPT= configure.apxs + +INSTALL_WRKSRC= ${WRKSRC}/modules/fcgid + SUB_FILES= pkg-message +SUB_LIST+= APACHEMODDIR=${APACHEMODDIR} +PLIST_SUB+= APACHEMODDIR=${APACHEMODDIR} .include @@ -26,17 +34,20 @@ MAKE_ARGS+= top_dir="${LOCALBASE}/share/apache${APACHE_VERSION}" MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/apache${APACHE_VERSION} -I${LOCALBASE}/include/apr-1" INSTALL_TARGET= install-modules-yes -PLIST_SUB+= APACHE_VERSION=${APACHE_VERSION} -SUB_LIST+= APACHE_VERSION=${APACHE_VERSION} +DOCSDIR= ${PREFIX}/share/doc/apache22/mod .else MAKE_ARGS+= top_dir="${LOCALBASE}/share/apache${APACHE_VERSION:S/20/2/}" MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/apache${APACHE_VERSION:S/20/2/}" INSTALL_TARGET= install-modules -PLIST_SUB+= APACHE_VERSION=${APACHE_VERSION:S/20/2/} -SUB_LIST+= APACHE_VERSION=${APACHE_VERSION:S/20/2/} +DOCSDIR= ${PREFIX}/share/doc/apache2/mod .endif post-install: +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/docs/manual/mod/mod_fcgid.html ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/docs/manual/mod/mod_fcgid.html.en ${DOCSDIR} +.endif ${MKDIR} -m 700 /var/run/fcgidsock ${CHOWN} www:www /var/run/fcgidsock @${CAT} ${PKGMESSAGE} diff -ruN mod_fcgid.orig/distinfo mod_fcgid/distinfo --- mod_fcgid.orig/distinfo 2007-12-16 14:20:08.000000000 +0100 +++ mod_fcgid/distinfo 2009-12-11 15:44:48.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (mod_fcgid.2.2.tar.gz) = ce7d7b16e69643dbd549d43d85025983 -SHA256 (mod_fcgid.2.2.tar.gz) = 7a0985a120dceb4c6974e8bf216752b0b763ae949f5dfbbf93cc350510e4c80e -SIZE (mod_fcgid.2.2.tar.gz) = 56954 +MD5 (mod_fcgid-2.3.4.tar.gz) = 3778c0710ae4d750d87dddee70990681 +SHA256 (mod_fcgid-2.3.4.tar.gz) = 139cb06f766fac2bb2ad583272b5e786316f4b935e072256b6f45cecd8b6df1b +SIZE (mod_fcgid-2.3.4.tar.gz) = 94417 diff -ruN mod_fcgid.orig/files/patch-fcgid_conf.c mod_fcgid/files/patch-fcgid_conf.c --- mod_fcgid.orig/files/patch-fcgid_conf.c 2007-12-16 14:20:08.000000000 +0100 +++ mod_fcgid/files/patch-fcgid_conf.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- fcgid_conf.c.orig 2007-07-31 04:09:20.000000000 -0500 -+++ fcgid_conf.c 2007-10-08 08:17:12.000000000 -0500 -@@ -17,8 +17,8 @@ - #define DEFAULT_ERROR_SCAN_INTERVAL 3 - #define DEFAULT_ZOMBIE_SCAN_INTERVAL 3 - #define DEFAULT_PROC_LIFETIME (60*60) --#define DEFAULT_SOCKET_PREFIX "logs/fcgidsock" --#define DEFAULT_SHM_PATH "logs/fcgid_shm" -+#define DEFAULT_SOCKET_PREFIX "/var/run/fcgidsock" -+#define DEFAULT_SHM_PATH "/var/run/fcgid_shm" - #define DEFAULT_SPAWNSOCRE_UPLIMIT 10 - #define DEFAULT_SPAWN_SCORE 1 - #define DEFAULT_TERMINATION_SCORE 2 diff -ruN mod_fcgid.orig/files/patch-modules-fcgid-fcgid_conf.c mod_fcgid/files/patch-modules-fcgid-fcgid_conf.c --- mod_fcgid.orig/files/patch-modules-fcgid-fcgid_conf.c 1970-01-01 01:00:00.000000000 +0100 +++ mod_fcgid/files/patch-modules-fcgid-fcgid_conf.c 2009-12-11 16:20:06.000000000 +0100 @@ -0,0 +1,13 @@ +--- modules/fcgid/fcgid_conf.c.orig 2009-10-07 05:16:08.000000000 +0200 ++++ modules/fcgid/fcgid_conf.c 2009-12-11 16:18:09.000000000 +0100 +@@ -35,8 +35,8 @@ + #define DEFAULT_ERROR_SCAN_INTERVAL 3 + #define DEFAULT_ZOMBIE_SCAN_INTERVAL 3 + #define DEFAULT_PROC_LIFETIME (60*60) +-#define DEFAULT_SOCKET_PREFIX "logs/fcgidsock" +-#define DEFAULT_SHM_PATH "logs/fcgid_shm" ++#define DEFAULT_SOCKET_PREFIX "/var/run/fcgidsock" ++#define DEFAULT_SHM_PATH "/var/run/fcgid_shm" + #define DEFAULT_SPAWNSOCRE_UPLIMIT 10 + #define DEFAULT_SPAWN_SCORE 1 + #define DEFAULT_TERMINATION_SCORE 2 diff -ruN mod_fcgid.orig/files/pkg-message.in mod_fcgid/files/pkg-message.in --- mod_fcgid.orig/files/pkg-message.in 2009-04-22 02:19:42.000000000 +0200 +++ mod_fcgid/files/pkg-message.in 2009-12-11 19:19:11.000000000 +0100 @@ -7,4 +7,8 @@ AddHandler fcgid-script .fcgi + +If you are upgrading from mod_fcgid 2.2, you have to rename +the directives you have used in the config files: +http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html#upgrade ************************************************************ diff -ruN mod_fcgid.orig/pkg-descr mod_fcgid/pkg-descr --- mod_fcgid.orig/pkg-descr 2006-05-01 18:54:32.000000000 +0200 +++ mod_fcgid/pkg-descr 2009-12-11 17:44:33.000000000 +0100 @@ -1,11 +1,9 @@ -mod_fcgid -- an alternative FastCGI module for Apache2 +mod_fcgid is a high performance alternative to mod_cgi or mod_cgid, +which starts a sufficient number instances of the CGI program to +handle concurrent requests, and these programs remain running to +handle further incoming requests. It is favored by the PHP developers, +for example, as a preferred alternative to running mod_php in-process, +delivering very similar performance. -mod_fcgid has a new process management strategy, which concentrates on -reducing the number of fastcgi server, and kick out the corrupt -fastcgi server as soon as possible. - -mod_fcgid is binary-compatible with mod_fastcgi so your existing fastcgi -programs do not need to be recompiled. mod_fcgid supports suEXEC. - -License: GPL -WWW: http://fastcgi.coremail.cn/ +License: Apache License +WWW: http://httpd.apache.org/mod_fcgid/ diff -ruN mod_fcgid.orig/pkg-plist mod_fcgid/pkg-plist --- mod_fcgid.orig/pkg-plist 2009-04-22 02:19:42.000000000 +0200 +++ mod_fcgid/pkg-plist 2009-12-12 00:11:55.000000000 +0100 @@ -1,4 +1,7 @@ %%APACHEMODDIR%%/mod_fcgid.so +%%PORTDOCS%%%%DOCSDIR%%/mod_fcgid.html +%%PORTDOCS%%%%DOCSDIR%%/mod_fcgid.html.en +%%PORTDOCS%%@unexec /bin/rmdir %D/%%DOCSDIR%% 2>/dev/null || true @exec /bin/mkdir -p -m 700 /var/run/fcgidsock @exec /usr/sbin/chown www:www /var/run/fcgidsock @unexec /bin/rmdir /var/run/fcgidsock 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: