From nobody@FreeBSD.org  Mon Oct  8 13:49:23 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E272D16A419
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  8 Oct 2007 13:49:22 +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 CB60613C480
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  8 Oct 2007 13:49:22 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l98DnMm7045665
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 8 Oct 2007 13:49:22 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id l98DnMTd045664;
	Mon, 8 Oct 2007 13:49:22 GMT
	(envelope-from nobody)
Message-Id: <200710081349.l98DnMTd045664@www.freebsd.org>
Date: Mon, 8 Oct 2007 13:49:22 GMT
From: Sergey Prikhodko <sergey@network-asp.biz>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [update]: www/mod_fcgid 2.1 -> 2.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: hemi@puresimplicity.net

>Number:         117014
>Category:       ports
>Synopsis:       [update]: www/mod_fcgid 2.1 -> 2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    araujo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 08 13:50:00 GMT 2007
>Closed-Date:    Sun Dec 16 13:30:52 UTC 2007
>Last-Modified:  Sun Dec 16 13:30:52 UTC 2007
>Originator:     Sergey Prikhodko
>Release:        7.0-CURRENT
>Organization:
Network-ASP Ltd.
>Environment:
FreeBSD DTG425 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Thu Oct  4 20:55:44 EEST 2007     toor@DTG425:/usr/obj/usr/src/sys/FABRICA  i386
>Description:
Update to latest version.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN mod_fcgid.orig/Makefile mod_fcgid/Makefile
--- mod_fcgid.orig/Makefile	2007-09-30 06:25:51.000000000 -0500
+++ mod_fcgid/Makefile	2007-10-08 08:10:50.000000000 -0500
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mod_fcgid
-PORTVERSION=	2.1
-PORTREVISION=	2
+PORTVERSION=	2.2
+PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/_/-/}
diff -ruN mod_fcgid.orig/distinfo mod_fcgid/distinfo
--- mod_fcgid.orig/distinfo	2007-10-08 08:16:50.000000000 -0500
+++ mod_fcgid/distinfo	2007-10-08 08:11:12.000000000 -0500
@@ -1,3 +1,3 @@
-MD5 (mod_fcgid.2.1.tar.gz) = 0bc036276e378463c80617ff57e853dc
-SHA256 (mod_fcgid.2.1.tar.gz) = 9d847f66f8067c5b8de06088a04356d22cee9ced2db7d04be6d6a7613c6b83df
-SIZE (mod_fcgid.2.1.tar.gz) = 54359
+MD5 (mod_fcgid.2.2.tar.gz) = ce7d7b16e69643dbd549d43d85025983
+SHA256 (mod_fcgid.2.2.tar.gz) = 7a0985a120dceb4c6974e8bf216752b0b763ae949f5dfbbf93cc350510e4c80e
+SIZE (mod_fcgid.2.2.tar.gz) = 56954
diff -ruN mod_fcgid.orig/files/patch-arch-unix-fcgid_proctbl_unix.c mod_fcgid/files/patch-arch-unix-fcgid_proctbl_unix.c
--- mod_fcgid.orig/files/patch-arch-unix-fcgid_proctbl_unix.c	2007-06-28 13:47:54.000000000 -0500
+++ mod_fcgid/files/patch-arch-unix-fcgid_proctbl_unix.c	1969-12-31 18:00:00.000000000 -0600
@@ -1,98 +0,0 @@
---- arch/unix/fcgid_proctbl_unix.c.orig	Fri Feb 16 04:34:41 2007
-+++ arch/unix/fcgid_proctbl_unix.c	Tue Feb 27 18:33:28 2007
-@@ -1,4 +1,5 @@
- #include "fcgid_proctbl.h"
-+#include "apr_version.h"
- #include "apr_shm.h"
- #include "apr_global_mutex.h"
- #include "fcgid_global.h"
-@@ -17,6 +18,89 @@
- static fcgid_share *_global_memory = NULL;
- static fcgid_global_share *g_global_share = NULL;	/* global information */
- static size_t g_table_size = FCGID_PROC_TABLE_SIZE;
-+
-+/* apr version 0.x not support apr_shm_remove, I have to copy it from apr version 1.x */
-+#if (APR_MAJOR_VERSION < 1)
-+#ifdef HAVE_SYS_MMAN_H
-+#include <sys/mman.h>
-+#endif
-+#ifdef HAVE_SYS_IPC_H
-+#include <sys/ipc.h>
-+#endif
-+#ifdef HAVE_SYS_MUTEX_H
-+#include <sys/mutex.h>
-+#endif
-+#ifdef HAVE_SYS_SHM_H
-+#include <sys/shm.h>
-+#endif
-+#if !defined(SHM_R)
-+#define SHM_R 0400
-+#endif
-+#if !defined(SHM_W)
-+#define SHM_W 0200
-+#endif
-+#ifdef HAVE_SYS_FILE_H
-+#include <sys/file.h>
-+#endif
-+
-+static apr_status_t apr_shm_remove(const char *filename, apr_pool_t * pool)
-+{
-+#if APR_USE_SHMEM_SHMGET
-+	apr_status_t status;
-+	apr_file_t *file;
-+	key_t shmkey;
-+	int shmid;
-+#endif
-+
-+#if APR_USE_SHMEM_MMAP_TMP
-+	return apr_file_remove(filename, pool);
-+#endif
-+#if APR_USE_SHMEM_MMAP_SHM
-+	if (shm_unlink(filename) == -1) {
-+		return errno;
-+	}
-+	return APR_SUCCESS;
-+#endif
-+#if APR_USE_SHMEM_SHMGET
-+	/* Presume that the file already exists; just open for writing */
-+	status = apr_file_open(&file, filename, APR_WRITE,
-+						   APR_OS_DEFAULT, pool);
-+	if (status) {
-+		return status;
-+	}
-+
-+	/* ftok() (on solaris at least) requires that the file actually
-+	 * exist before calling ftok(). */
-+	shmkey = ftok(filename, 1);
-+	if (shmkey == (key_t) - 1) {
-+		goto shm_remove_failed;
-+	}
-+
-+	apr_file_close(file);
-+
-+	if ((shmid = shmget(shmkey, 0, SHM_R | SHM_W)) < 0) {
-+		goto shm_remove_failed;
-+	}
-+
-+	/* Indicate that the segment is to be destroyed as soon
-+	 * as all processes have detached. This also disallows any
-+	 * new attachments to the segment. */
-+	if (shmctl(shmid, IPC_RMID, NULL) == -1) {
-+		goto shm_remove_failed;
-+	}
-+	return apr_file_remove(filename, pool);
-+
-+  shm_remove_failed:
-+	status = errno;
-+	/* ensure the file has been removed anyway. */
-+	apr_file_remove(filename, pool);
-+	return status;
-+#endif
-+
-+	/* No support for anonymous shm */
-+	return APR_ENOTIMPL;
-+}
-+#endif							/* APR_MAJOR_VERSION<1 */
- 
- apr_status_t
- proctable_post_config(server_rec * main_server, apr_pool_t * configpool)
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-06-11 07:07:54.000000000 -0500
+++ mod_fcgid/files/patch-fcgid_conf.c	2007-10-08 08:17:41.000000000 -0500
@@ -1,6 +1,6 @@
---- fcgid_conf.c.orig	Mon Jul 26 07:08:03 2004
-+++ fcgid_conf.c	Fri Aug 13 05:04:44 2004
-@@ -15,7 +15,7 @@
+--- 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)


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Oct 8 13:50:11 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117014 
Responsible-Changed-From-To: freebsd-ports-bugs->araujo 
Responsible-Changed-By: araujo 
Responsible-Changed-When: Wed Oct 10 11:47:35 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117014 

From: Josh Tolbert <hemi@puresimplicity.net>
To: bug-followup@FreeBSD.org, sergey@network-asp.biz
Cc:  
Subject: Re: ports/117014: [update]: www/mod_fcgid 2.1 -> 2.2
Date: Wed, 10 Oct 2007 12:34:29 -0500

 Patch looks good to me. Sorry for not responding earlier.
 
 Thanks,
 
 Josh
 -- 
 Josh Tolbert
 hemi@puresimplicity.net  ||  http://www.puresimplicity.net/~hemi/
 
 Security is mostly a superstition. It does not exist in nature, nor
 do the children of men as a whole experience it. Avoiding danger
 is no safer in the long run than outright exposure. Life is either
 a daring adventure, or nothing.
     -- Helen Keller

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117014: commit references a PR
Date: Sun, 16 Dec 2007 13:20:13 +0000 (UTC)

 araujo      2007-12-16 13:20:08 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/mod_fcgid        Makefile distinfo 
     www/mod_fcgid/files  patch-fcgid_conf.c 
   Removed files:
     www/mod_fcgid/files  patch-arch-unix-fcgid_proctbl_unix.c 
   Log:
   - Update to 2.2.
   
   PR:             ports/117014
   Submitted by:   Sergey Prikhodko <sergey@network-asp.biz>
   Approved by:    Josh Tolbert <hemi@puresimplicity.net> (maintainer),
                   stas (mentor, implicit)
   
   Revision  Changes    Path
   1.13      +1 -2      ports/www/mod_fcgid/Makefile
   1.8       +3 -3      ports/www/mod_fcgid/distinfo
   1.2       +0 -98     ports/www/mod_fcgid/files/patch-arch-unix-fcgid_proctbl_unix.c (dead)
   1.3       +3 -3      ports/www/mod_fcgid/files/patch-fcgid_conf.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: araujo 
State-Changed-When: Sun Dec 16 13:30:50 UTC 2007 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117014 
>Unformatted:
