ports/53873: [maintainer update/bento fix] www/suphp: update to 0.2.3 and cleanups.

[Clement Laforet]

>Number:         53873
>Category:       ports
>Synopsis:       [maintainer update/bento fix] www/suphp: update to 0.2.3 and cleanups.
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 28 05:50:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD chuck.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sun Jun 22 01:48:26 CEST 2003 root at chuck.cultdeadsheep.org:/usr/obj/usr/src/sys/DARTH-VADER i386


	
>Description:
        ChangeLog:
        * update suphp to 0.2.3
        * fix bento build (apxs related problem)
        * Separate build/install stages for mod_suphp

>How-To-Repeat:
	N/A.
>Fix:

	

--- suphp.diff begins here ---
diff -Nru suphp.orig/Makefile suphp/Makefile
--- suphp.orig/Makefile	Sat Jun 28 10:47:34 2003
+++ suphp/Makefile	Sat Jun 28 12:18:56 2003
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	suphp
-PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTVERSION=	0.2.3
 CATEGORIES=	www
 MASTER_SITES=	http://www.suphp.org/download/
 
@@ -15,10 +14,9 @@
 COMMENT=	suPHP is a combination which provides a wrapper for PHP
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${LOCALBASE}/bin/php:${PORTSDIR}/lang/php4
+RUN_DEPENDS=	${LOCALBASE}/bin/php:${PORTSDIR}/lang/php4-cli
 
 USE_REINPLACE=	yes
-HAS_CONFIGURE=	no
 
 MAKE_ARGS+=	APXS="${APXS}"
 APXS?=		${LOCALBASE}/sbin/apxs
@@ -27,11 +25,15 @@
 LOG_PATH?=	/var/log
 PHP_PATH?=	${LOCALBASE}/bin/php
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/libexec/apache/libphp4.so)
+IGNORE="suPHP conflicts with mod_php4. It works only with php4-cli"
+.endif
+
 pre-configure:
 	@${ECHO}
 	@${ECHO} "*-------------------------------------------------------------*"
-	@${ECHO} " suPHP conflicts with mod_php4. It works only with php command"
-	@${ECHO} " line binairy."
 	@${ECHO} " Options :"
 	@${ECHO} "     - WWW_USER = Apache's User (default www)"
 	@${ECHO} "     - Define CHECK_PATH, to enable suExec-like path checking"
@@ -62,10 +64,11 @@
 	@${ECHO} "Setting suphp path in mod_suphp"
 	@${REINPLACE_CMD} -e "s,/usr/sbin/suphp,${PREFIX}/sbin/suphp," ${WRKSRC}/apache/mod_suphp.c
 
-pre-install:
-	${APXS} -i -a -c -n suphp ${WRKSRC}/apache/mod_suphp.c
+post-build:
+	@(cd ${WRKSRC}/apache && ${APXS} -c mod_suphp.c) 
 
 post-install:
+	@(cd ${WRKSRC}/apache && ${APXS} -i -a -n suphp ${WRKSRC}/apache/mod_suphp.so)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/apache ${DOCSDIR}/de-doc ${DOCSDIR}/de-doc/apache
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
@@ -82,7 +85,6 @@
 	${INSTALL_DATA} ${WRKSRC}/de-doc/apache/INSTALL.de ${DOCSDIR}/de-doc/apache
 	${INSTALL_DATA} ${WRKSRC}/de-doc/apache/CONFIG.de ${DOCSDIR}/de-doc/apache
 .endif
-	@${RM} mod_suphp.o
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Nru suphp.orig/distinfo suphp/distinfo
--- suphp.orig/distinfo	Sat Jun 28 10:47:34 2003
+++ suphp/distinfo	Sat Jun 28 11:47:10 2003
@@ -1 +1 @@
-MD5 (suphp-0.2.2.tar.gz) = c035fa4ffc73b3cb037791ab85fe94fa
+MD5 (suphp-0.2.3.tar.gz) = a540fa3ac0af43a46afc33cf8401ee89
diff -Nru suphp.orig/files/patch-suphp.c suphp/files/patch-suphp.c
--- suphp.orig/files/patch-suphp.c	Sat Jun 28 10:47:34 2003
+++ suphp/files/patch-suphp.c	Sat Jun 28 12:02:21 2003
@@ -1,5 +1,5 @@
---- suphp.c.orig	Wed Oct 23 22:16:50 2002
-+++ suphp.c	Wed Nov 13 16:26:01 2002
+--- suphp.c.orig	Wed Dec 25 14:21:27 2002
++++ suphp.c	Sat Jun 28 12:02:12 2003
 @@ -68,6 +68,7 @@
  {
   // Check, if program has been started by Apache
@@ -21,14 +21,14 @@
   // Get gid and uid of the file and check it
   targetuser = getpwuid(file_get_uid(path_translated));
 - if (targetuser->pw_uid < OPT_MIN_UID)
-+ if (targetuser->pw_uid < OPT_MIN_UID && targetuser->pw_uid != apacheuser->pw_uid)
++ if (targetuser->pw_uid < OPT_MIN_UID && targetuser->pw_uid != apacheuser->pw_uid )
   {
-   log_error ("UID of %s (%d / %s) < %d", path_translated, targetuser->pw_uid, targetuser->pw_name, OPT_MIN_UID);
+   log_error ("UID of %s or its target (%d / %s) < %d", path_translated, targetuser->pw_uid, targetuser->pw_name, OPT_MIN_UID);
    error_exit(ERRCODE_LOW_UID);
   }
   targetgroup = getgrgid(file_get_gid(path_translated));
 - if (targetgroup->gr_gid < OPT_MIN_GID)
-+ if (targetgroup->gr_gid < OPT_MIN_GID && targetgroup->gr_gid != apachegroup->gr_gid)
++ if (targetgroup->gr_gid < OPT_MIN_GID && targetgroup->gr_gid != apachegroup->gr_gid )
   {
-   log_error ("GID of %s (%d / %s) < %d", path_translated, targetgroup->gr_gid, targetgroup->gr_name, OPT_MIN_GID);
+   log_error ("GID of %s or its target (%d / %s) < %d", path_translated, targetgroup->gr_gid, targetgroup->gr_name, OPT_MIN_GID);
    error_exit(ERRCODE_LOW_GID);
--- suphp.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: