diff options
| -rw-r--r-- | www/suphp/Makefile | 29 | ||||
| -rw-r--r-- | www/suphp/files/patch-src::Makefile.in | 41 | ||||
| -rw-r--r-- | www/suphp/pkg-plist | 2 |
3 files changed, 45 insertions, 27 deletions
diff --git a/www/suphp/Makefile b/www/suphp/Makefile index 676b1e429c79..70ccf5f0bd72 100644 --- a/www/suphp/Makefile +++ b/www/suphp/Makefile @@ -7,22 +7,21 @@ PORTNAME= suphp PORTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.suphp.org/download/ MAINTAINER= freebsd@jdc.parodius.com -COMMENT= A combination which provides a wrapper for PHP +COMMENT= Securely execute ~user PHP scripts GNU_CONFIGURE= yes -USE_GMAKE= yes USE_PHP= yes -WANT_PHP_CGI= yes USE_APACHE= yes +WANT_PHP_CGI= yes CONFLICTS= mod_php4-4* php-4.* -LOGFILE?= /var/log/suphp.log +WITH_LOGFILE?= /var/log/suphp.log PHP_PATH?= ${LOCALBASE}/bin/php -APACHE_USER?= ${WWWOWN} MIN_UID?= 80 MIN_GID?= 80 WITH_SETID_MODE?= owner @@ -31,38 +30,30 @@ MYPORTDOCS= apache/CONFIG apache/INSTALL apache/README apache/LICENSE \ LANG= en de CONFIGURE_ARGS+= --with-php=${PHP_PATH} \ - --with-logfile=${LOGFILE} \ - --with-apache-user=${APACHE_USER} \ + --with-logfile=${WITH_LOGFILE} \ + --with-apache-user=${WWWOWN} \ --with-min-gid=${MIN_UID} \ --with-min-uid=${MIN_GID} \ --with-apxs=${APXS} ## Available knobs: -## WITHOUT_CHECKPATH: disable check if script resides in DOCUMENT_ROOT +## WITHOUT_CHECKPATH: disable check if script resides in DOCUMENT_ROOT .if defined(WITHOUT_CHECKPATH) CONFIGURE_ARGS+= --disable-checkpath .endif -## WITHOUT_CHECKUID: accept UIDs that are not listed in /etc/passwd +## WITHOUT_CHECKUID: accept UIDs that are not listed in /etc/passwd .if defined(WITHOUT_CHECKUID) CONFIGURE_ARGS+= --disable-checkuid .endif -## WITHOUT_CHECKGID: accept GIDs that are not listed in /etc/group +## WITHOUT_CHECKGID: accept GIDs that are not listed in /etc/group .if defined(WITHOUT_CHECKGID) CONFIGURE_ARGS+= --disable-checkgid .endif -## WITH_SETID_MODE: Mode to use for setting UID/GID. +## WITH_SETID_MODE: mode to use for setting UID/GID. CONFIGURE_ARGS+= --with-setid-mode=${WITH_SETID_MODE} .include <bsd.port.pre.mk> -## -## Sanity check; -C flag for make(1) was added in 4.8, but was not -## fully fixed until shortly before 4.9-RELEASE. We need -C ! -## -.if ${OSVERSION} < 490000 -BROKEN= Please upgrade to FreeBSD 4.9-RELEASE or higher \(see PR bin/50981\). -.endif - .if exists(${LOCALBASE}/include/apache2/apr.h) || defined(WITH_APACHE2) APACHE_PORT= www/apache2 PLIST_SUB+= MODULEDIR="libexec/apache2/" diff --git a/www/suphp/files/patch-src::Makefile.in b/www/suphp/files/patch-src::Makefile.in index 4035be6302d0..804eebc2e4c2 100644 --- a/www/suphp/files/patch-src::Makefile.in +++ b/www/suphp/files/patch-src::Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Mon Aug 25 11:50:48 2003 -+++ src/Makefile.in Thu Jul 15 22:52:13 2004 -@@ -28,11 +28,13 @@ +--- src/Makefile.in.orig Tue Jul 13 02:43:41 2004 ++++ src/Makefile.in Wed Aug 11 22:02:44 2004 +@@ -28,37 +28,38 @@ INCLUDES = -I$(top_srcdir)/src RM = rm -f @@ -17,7 +17,18 @@ suphp.mod: @if test "$(APXS)" != "/notfound/"; then \ -@@ -49,7 +51,6 @@ + if test "$(APACHE_VERSION_2)" = "true"; then \ + echo "*** INFO: Building mod_suphp for Apache 2.0 ***"; \ +- $(MAKE) $(MAKEDEFS) -C apache2; \ ++ cd apache2 && $(MAKE) $(MAKEDEFS); \ + fi; \ + if test "$(APACHE_VERSION_1_3)" = "true"; then \ + echo "*** INFO: Building mod_suphp for Apache 1.3 ***"; \ +- $(MAKE) $(MAKEDEFS) -C apache; \ ++ cd apache && $(MAKE) $(MAKEDEFS); \ + fi; \ + else \ + echo "*** WARNING: No 'apxs' found. Skipping mod_suphp! ***"; \ fi install: suphp suphp.mod @@ -25,9 +36,25 @@ $(INSTALL_PROGRAM) -m 4755 suphp $(DESTDIR)$(sbindir)/suphp @if test "$(APXS)" != "/notfound/"; then \ if test "$(APACHE_VERSION_2)" = "true"; then \ -@@ -69,6 +70,6 @@ - @$(MAKE) $(MAKEDEFS) -C apache clean - @$(MAKE) $(MAKEDEFS) -C apache2 clean + echo "*** INFO: Installing mod_suphp for Apache 2.0 ***"; \ +- $(MAKE) $(MAKEDEFS) -C apache2 install; \ ++ cd apache2 && $(MAKE) $(MAKEDEFS) install; \ + fi; \ + if test "$(APACHE_VERSION_1_3)" = "true"; then \ + echo "*** INFO: Installing mod_suphp for Apache 1.3 ***"; \ +- $(MAKE) $(MAKEDEFS) -C apache install; \ ++ cd apache && $(MAKE) $(MAKEDEFS) install; \ + fi; \ + else \ + echo "*** WARNING: No 'apxs' found. Skipping installation of mod_suphp! ***"; \ +@@ -66,9 +67,9 @@ + + clean: + $(RM) suphp *.o +- @$(MAKE) $(MAKEDEFS) -C apache clean +- @$(MAKE) $(MAKEDEFS) -C apache2 clean ++ cd apache && $(MAKE) $(MAKEDEFS) clean ++ cd apache2 && $(MAKE) $(MAKEDEFS) clean -%.o : %.c +${OBJS}: ${SRCS} diff --git a/www/suphp/pkg-plist b/www/suphp/pkg-plist index 7e27de7ce1dc..3cba50c1b4ec 100644 --- a/www/suphp/pkg-plist +++ b/www/suphp/pkg-plist @@ -1,7 +1,7 @@ sbin/suphp %%MODULEDIR%%/mod_suphp.so @exec %D/sbin/apxs -e -a -n suphp %D/%f -@unexec echo "===> If you do not plan on reinstalling suphp, you must manually remove"; echo "===> references to it in httpd.conf." +@unexec %D/sbin/apxs -e -A -n suphp %D/%f %%PORTDOCS%%%%DOCSDIR%%/en/INSTALL %%PORTDOCS%%%%DOCSDIR%%/en/LICENSE %%PORTDOCS%%%%DOCSDIR%%/en/README |