From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 14 10:10:37 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F3FE16A546 for ; Wed, 14 Jul 2004 10:10:37 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 178AA43D46 for ; Wed, 14 Jul 2004 10:10:37 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6EAAa6v052778 for ; Wed, 14 Jul 2004 10:10:36 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6EAAa7g052777; Wed, 14 Jul 2004 10:10:36 GMT (envelope-from gnats) Resent-Date: Wed, 14 Jul 2004 10:10:36 GMT Resent-Message-Id: <200407141010.i6EAAa7g052777@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, Jeremy Chadwick Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52EFB16A4CE; Wed, 14 Jul 2004 10:01:13 +0000 (GMT) Received: from mail.parodius.com (mail.parodius.com [64.62.145.229]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BEB743D1D; Wed, 14 Jul 2004 10:01:13 +0000 (GMT) (envelope-from jdc@pentarou.parodius.com) Received: from pentarou.parodius.com (jdc@localhost [127.0.0.1]) by mail.parodius.com (8.12.11/8.12.11) with ESMTP id i6EA1CiZ081301 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Jul 2004 03:01:12 -0700 (PDT) (envelope-from jdc@pentarou.parodius.com) Received: (from jdc@localhost) by pentarou.parodius.com (8.12.11/8.12.11/Submit) id i6EA1C6X081300; Wed, 14 Jul 2004 03:01:12 -0700 (PDT) (envelope-from jdc) Message-Id: <200407141001.i6EA1C6X081300@pentarou.parodius.com> Date: Wed, 14 Jul 2004 03:01:12 -0700 (PDT) From: Jeremy Chadwick To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: clement@FreeBSD.org Subject: ports/69048: suphp update (0.5.2), plus unofficial Apache 2 fix X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jeremy Chadwick List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2004 10:10:37 -0000 >Number: 69048 >Category: ports >Synopsis: suphp update (0.5.2), plus unofficial Apache 2 fix >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jul 14 10:10:36 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Jeremy Chadwick >Release: FreeBSD 4.10-PRERELEASE i386 >Organization: >Environment: System: FreeBSD pentarou.parodius.com 4.10-PRERELEASE FreeBSD 4.10-PRERELEASE #0: Wed May 5 03:33:17 PDT 2004 root@pentarou.parodius.com:/usr/obj/usr/src/sys/PENTAROU i386 >Description: Update port to use suphp 0.5.2 (official stable release). In addition, this includes a new patch for suphp, which fixes Apache 2.x support. This is presently an "unofficial" fix, but it's literally the only way to get suphp to work on Apache 2.x. I have submitted this issue for discussion on the suphp mailing list, and I have also fired off a private Email to the Apache APR developer who submitted the APR code in question. For further details, see the following URL: http://lists.marsching.biz/pipermail/suphp/2004-July/000756.html Workaround patch tested on -STABLE and -CURRENT using Apache 2.0.50. Finally, updated the port a little bit to rely on the new bsd.php.mk framework. Also, we don't require gmake to build this; BSD make works great. We DO, however, need CGI-based PHP for suphp to work (module and CLI will break). Maintainer has been CC'd in this send-pr, in hopes of his approval (hi Clement! LTNS :) ) >How-To-Repeat: Not applicable. >Fix: diff -ruN suphp.orig/Makefile suphp/Makefile --- suphp.orig/Makefile Tue Jun 29 05:21:20 2004 +++ suphp/Makefile Wed Jul 14 01:58:45 2004 @@ -6,17 +6,16 @@ # PORTNAME= suphp -PORTVERSION= 0.5.1 +PORTVERSION= 0.5.2 CATEGORIES= www MASTER_SITES= http://www.suphp.org/download/ MAINTAINER= clement@FreeBSD.org COMMENT= A combination which provides a wrapper for PHP -RUN_DEPENDS= ${LOCALBASE}/bin/php:${PORTSDIR}/www/php4-cgi - GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_PHP= yes +WANT_PHP_CGI= yes USE_APACHE= yes CONFLICTS= mod_php4-4* php-4.* @@ -56,6 +55,7 @@ ## WITH_LOGPATH (formerly known as LOG_PATH): logging directory ## (default: /var/log) ## WITH_LOGNAME: log file name (default suphp.log) + .include .if exists(${LOCALBASE}/include/apache2/apr.h) || defined(WITH_APACHE2) diff -ruN suphp.orig/distinfo suphp/distinfo --- suphp.orig/distinfo Wed Feb 25 03:47:24 2004 +++ suphp/distinfo Wed Jul 14 01:49:21 2004 @@ -1,2 +1,2 @@ -MD5 (suphp-0.5.1.tar.gz) = 6898ccd801ec93cb7c6a69a9ac8f3703 -SIZE (suphp-0.5.1.tar.gz) = 217350 +MD5 (suphp-0.5.2.tar.gz) = 337909e87027af124052baddddbd2994 +SIZE (suphp-0.5.2.tar.gz) = 104699 diff -ruN suphp.orig/files/patch-src::apache2::mod_suphp.c suphp/files/patch-src::apache2::mod_suphp.c --- suphp.orig/files/patch-src::apache2::mod_suphp.c Wed Dec 31 16:00:00 1969 +++ suphp/files/patch-src::apache2::mod_suphp.c Wed Jul 14 01:53:41 2004 @@ -0,0 +1,16 @@ +--- src/apache2/mod_suphp.c.orig Tue Jul 13 02:43:41 2004 ++++ src/apache2/mod_suphp.c Wed Jul 14 01:51:27 2004 +@@ -463,7 +463,13 @@ + + if (((rv = apr_procattr_create(&procattr, p)) != APR_SUCCESS) + || ((rv = apr_procattr_io_set(procattr, APR_CHILD_BLOCK, APR_CHILD_BLOCK, APR_CHILD_BLOCK)) != APR_SUCCESS) ++ ++/* XXX: Pending review by both the Apache APR folks, as well as the suPHP folks. See thread: ++ * http://lists.marsching.biz/pipermail/suphp/2004-July/000756.html ++ */ ++/* + || ((rv = apr_procattr_dir_set(procattr, ap_make_dirstr_parent(r->pool, r->filename))) != APR_SUCCESS) ++*/ + + /* set resource limits */ + >Release-Note: >Audit-Trail: >Unformatted: