update www/suphp: 0.2.2 --> 0.2.3

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

PR:		53873
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>
Pointed out by:	bento via kris

3 files changed, 19 insertions, 17 deletions

diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 48a679ca0dc3..a313cf454e54 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -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 @@ MAINTAINER=	sheepkiller@cultdeadsheep.org
 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 @@ WWW_GROUP?=	www
 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 @@ do-configure:
 	@${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 @@ post-install:
 	${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 --git a/www/suphp/distinfo b/www/suphp/distinfo
index 7cb1c8848772..05ba5f52cb1a 100644
--- a/www/suphp/distinfo
+++ b/www/suphp/distinfo
@@ -1 +1 @@
-MD5 (suphp-0.2.2.tar.gz) = c035fa4ffc73b3cb037791ab85fe94fa
+MD5 (suphp-0.2.3.tar.gz) = a540fa3ac0af43a46afc33cf8401ee89
diff --git a/www/suphp/files/patch-suphp.c b/www/suphp/files/patch-suphp.c
index 832fd84d1868..5ea6bf32dcd1 100644
--- a/www/suphp/files/patch-suphp.c
+++ b/www/suphp/files/patch-suphp.c
@@ -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);