Date: Tue, 11 Sep 2007 12:43:50 GMT From: Vladimir Korkodinov <viper@perm.raid.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/116281: [Update] www/suphp to 0.6.2 Message-ID: <200709111243.l8BChofv022139@www.freebsd.org> Resent-Message-ID: <200709111250.l8BCo1RD020047@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116281 >Category: ports >Synopsis: [Update] www/suphp to 0.6.2 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Sep 11 12:50:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Vladimir Korkodinov >Release: 6.2-STABLE >Organization: >Environment: FreeBSD xxxxx 6.2-STABLE FreeBSD 6.2-STABLE #3: Wed Aug 29 14:50:03 YEKST 2007 viper@xxxxx:/usr/obj/usr/src/sys/viper2 i386 >Description: Update www/suphp to latest release (0.6.2). >How-To-Repeat: n/a >Fix: Apply patch Patch attached with submission follows: diff -ruN suphp.orig/Makefile suphp/Makefile --- suphp.orig/Makefile 2006-05-11 04:23:14.000000000 +0600 +++ suphp/Makefile 2007-09-11 16:38:16.000000000 +0600 @@ -6,8 +6,8 @@ # PORTNAME= suphp -PORTVERSION= 0.5.2 -PORTREVISION= 2 +PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.suphp.org/download/ @@ -24,8 +24,8 @@ MIN_UID?= 80 MIN_GID?= 80 WITH_SETID_MODE?= owner -MYPORTDOCS= apache/CONFIG apache/INSTALL apache/README apache/LICENSE LICENSE INSTALL README -LANG= en de +MYPORTDOCS= apache/CONFIG apache/INSTALL apache/README CONFIG LICENSE INSTALL README + CONFIGURE_ARGS+= --with-php=${PHP_PATH} \ --with-logfile=${WITH_LOGFILE} \ @@ -42,6 +42,7 @@ # SUPHP_PATH?= /bin:/usr/bin + ## Available knobs: ## WITHOUT_CHECKPATH: disable check if script resides in DOCUMENT_ROOT .if defined(WITHOUT_CHECKPATH) @@ -60,26 +61,26 @@ .include <bsd.port.pre.mk> +.if ${APACHE_VERSION} == 20 +CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/lib/apache2 +.endif + show-options: @${SED} -ne 's/^##//p' ${.CURDIR}/Makefile pre-everything:: show-options @${DO_NADA} -post-patch: - @${REINPLACE_CMD} -e 's|%%SUPHP_PATH%%|${SUPHP_PATH}|g' \ - ${WRKSRC}/src/suphp.c post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for l in ${LANG} - @${MKDIR} ${DOCSDIR}/${l}/apache -. for f in ${MYPORTDOCS} - @${CP} -Rfp ${WRKSRC}/doc/${l}/${f} ${DOCSDIR}/${l}/${f} -. endfor + @${MKDIR} ${DOCSDIR}/apache +.for f in ${MYPORTDOCS} + @${CP} -Rfp ${WRKSRC}/doc/${f} ${DOCSDIR}/${f} .endfor .endif + @${CP} -Rfp ${WRKSRC}/doc/suphp.conf-example ${LOCALBASE}/etc/suphp.conf @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff -ruN suphp.orig/distinfo suphp/distinfo --- suphp.orig/distinfo 2006-01-24 08:14:10.000000000 +0500 +++ suphp/distinfo 2007-09-11 15:20:28.000000000 +0600 @@ -1,3 +1,3 @@ -MD5 (suphp-0.5.2.tar.gz) = 337909e87027af124052baddddbd2994 -SHA256 (suphp-0.5.2.tar.gz) = 3da1eced3bdf12caa72716f4b72f47d79eec89a1810015c5bab3705469b162c7 -SIZE (suphp-0.5.2.tar.gz) = 104699 +MD5 (suphp-0.6.2.tar.gz) = 06ca9e592a5c6dd3dcb9360c958369c1 +SHA256 (suphp-0.6.2.tar.gz) = 1bb9c6af84bb901c8a39611354e49e5bcd79185eb37b02878dc0840facf0ccfc +SIZE (suphp-0.6.2.tar.gz) = 372228 diff -ruN suphp.orig/files/patch-Makefile.in suphp/files/patch-Makefile.in --- suphp.orig/files/patch-Makefile.in 2004-10-29 00:29:16.000000000 +0600 +++ suphp/files/patch-Makefile.in 1970-01-01 05:00:00.000000000 +0500 @@ -1,9 +0,0 @@ ---- Makefile.in.orig Tue Jul 13 02:43:40 2004 -+++ Makefile.in Wed Oct 27 23:10:27 2004 -@@ -17,5 +17,5 @@ - srcdir='$(srcdir)' - - all install clean: -- @$(MAKE) $(MAKEDEFS) -C src $@ -+ cd src && $(MAKE) $(MAKEDEFS) $@ - diff -ruN suphp.orig/files/patch-configure suphp/files/patch-configure --- suphp.orig/files/patch-configure 2006-04-08 18:56:16.000000000 +0600 +++ suphp/files/patch-configure 1970-01-01 05:00:00.000000000 +0500 @@ -1,11 +0,0 @@ ---- configure.orig Thu Mar 2 13:38:36 2006 -+++ configure Thu Mar 2 13:39:23 2006 -@@ -2405,7 +2405,7 @@ - | cut -f2 -d"/" \ - | cut -f1 -d" "` - major_version=`echo $APACHE_VERSION|cut -f1,2 -d.` -- if test "$major_version" = "2.0"; then -+ if test "$major_version" = "2.0" -o "$major_version" = "2.2"; then - APACHE_VERSION_2=true - APACHE_VERSION_1_3=false - else diff -ruN suphp.orig/files/patch-src-suphp.c suphp/files/patch-src-suphp.c --- suphp.orig/files/patch-src-suphp.c 2006-05-11 04:23:14.000000000 +0600 +++ suphp/files/patch-src-suphp.c 1970-01-01 05:00:00.000000000 +0500 @@ -1,11 +0,0 @@ ---- src/suphp.c.orig Tue Jul 13 02:43:41 2004 -+++ src/suphp.c Tue May 9 08:59:46 2006 -@@ -55,7 +55,7 @@ - - // Set secure PATH - -- suphp_setenv("PATH", "/bin:/usr/bin", 1); -+ suphp_setenv("PATH", "%%SUPHP_PATH%%", 1); - - // Check for PHP_CONFIG environment variable - diff -ruN suphp.orig/files/patch-src::Makefile.in suphp/files/patch-src::Makefile.in --- suphp.orig/files/patch-src::Makefile.in 2004-08-12 15:31:51.000000000 +0600 +++ suphp/files/patch-src::Makefile.in 1970-01-01 05:00:00.000000000 +0500 @@ -1,62 +0,0 @@ ---- 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 - -+SRCS= suphp.c filesystem.c check.c error.c log.c compat.c -+OBJS= ${SRCS:.c=.o} -+ - all: suphp suphp.mod - --suphp: suphp.o filesystem.o check.o error.o log.o compat.o -- $(CC) $(LDFLAGS) $(DEFS) -o suphp \ -- suphp.o filesystem.o check.o error.o log.o compat.o -+suphp: ${OBJS} -+ $(CC) $(LDFLAGS) $(DEFS) -o suphp ${OBJS} - - suphp.mod: - @if test "$(APXS)" != "/notfound/"; then \ - 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 -- $(INSTALL_PROGRAM) -d $(DESTDIR)$(sbindir) - $(INSTALL_PROGRAM) -m 4755 suphp $(DESTDIR)$(sbindir)/suphp - @if test "$(APXS)" != "/notfound/"; then \ - if test "$(APACHE_VERSION_2)" = "true"; then \ - 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} - $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< - 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 2006-04-08 18:56:16.000000000 +0600 +++ suphp/files/patch-src::apache2::mod_suphp.c 1970-01-01 05:00:00.000000000 +0500 @@ -1,58 +0,0 @@ ---- src/apache2/mod_suphp.c.orig Tue Jul 13 04:43:41 2004 -+++ src/apache2/mod_suphp.c Thu Mar 2 20:14:04 2006 -@@ -56,7 +56,7 @@ - return -1; - - rv = apr_bucket_read(b, &bucket_data, &bucket_data_len, APR_BLOCK_READ); -- if (!APR_STATUS_IS_SUCCESS(rv) || (bucket_data_len == 0)) -+ if (!(rv == APR_SUCCESS) || (bucket_data_len == 0)) - { - return 0; - } -@@ -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 */ - -@@ -524,7 +530,9 @@ - return rv; - } - -- APR_BRIGADE_FOREACH(bucket, bb) -+ for (bucket = APR_BRIGADE_FIRST(bb); -+ bucket != APR_BRIGADE_SENTINEL(bb); -+ bucket = APR_BUCKET_NEXT(bucket)) - { - const char *data; - apr_size_t len; -@@ -595,7 +603,9 @@ - - const char *buf; - apr_size_t blen; -- APR_BRIGADE_FOREACH(b, bb) -+ for (b = APR_BRIGADE_FIRST(bb); -+ b != APR_BRIGADE_SENTINEL(bb); -+ b = APR_BUCKET_NEXT(b)) - { - if (APR_BUCKET_IS_EOS(b)) - break; -@@ -616,7 +626,9 @@ - /* empty brigade (script output) */ - const char *buf; - apr_size_t blen; -- APR_BRIGADE_FOREACH(b, bb) -+ for (b = APR_BRIGADE_FIRST(bb); -+ b != APR_BRIGADE_SENTINEL(bb); -+ b = APR_BUCKET_NEXT(b)) - { - if (APR_BUCKET_IS_EOS(b)) - break; diff -ruN suphp.orig/files/patch-src::apache::Makefile.in suphp/files/patch-src::apache::Makefile.in --- suphp.orig/files/patch-src::apache::Makefile.in 2003-08-25 18:13:36.000000000 +0600 +++ suphp/files/patch-src::apache::Makefile.in 1970-01-01 05:00:00.000000000 +0500 @@ -1,13 +0,0 @@ ---- src/apache/Makefile.in.orig Mon Aug 25 11:40:47 2003 -+++ src/apache/Makefile.in Mon Aug 25 11:41:02 2003 -@@ -29,7 +29,9 @@ - all: suphp.mod - - suphp.mod: mod_suphp.c -- $(APXS) -c $(DEFS) $(EXTRADEFS) $(INCLUDES) -Wc,"$(CFLAGS)" mod_suphp.c -+ @if [ ! -f mod_suphp.o ]; then \ -+ $(APXS) -c $(DEFS) $(EXTRADEFS) $(INCLUDES) -Wc,"$(CFLAGS)" mod_suphp.c ;\ -+ fi; - - install: suphp.mod - $(APXS) -i -a mod_suphp.so diff -ruN suphp.orig/pkg-plist suphp/pkg-plist --- suphp.orig/pkg-plist 2006-04-08 18:56:16.000000000 +0600 +++ suphp/pkg-plist 2007-09-11 16:08:17.000000000 +0600 @@ -1,23 +1,14 @@ sbin/suphp +etc/suphp.conf %%APACHEMODDIR%%/mod_suphp.so @exec %D/sbin/apxs -e -a -n suphp %D/%f @unexec %D/sbin/apxs -e -A -n suphp %D/%f -%%PORTDOCS%%%%DOCSDIR%%/en/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/en/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/en/README -%%PORTDOCS%%%%DOCSDIR%%/en/apache/CONFIG -%%PORTDOCS%%%%DOCSDIR%%/en/apache/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/en/apache/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/en/apache/README -%%PORTDOCS%%%%DOCSDIR%%/de/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/de/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/de/README -%%PORTDOCS%%%%DOCSDIR%%/de/apache/CONFIG -%%PORTDOCS%%%%DOCSDIR%%/de/apache/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/de/apache/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/de/apache/README -%%PORTDOCS%%@dirrm %%DOCSDIR%%/de/apache -%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/apache -%%PORTDOCS%%@dirrm %%DOCSDIR%%/de -%%PORTDOCS%%@dirrm %%DOCSDIR%%/en +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/CONFIG +%%PORTDOCS%%%%DOCSDIR%%/apache/CONFIG +%%PORTDOCS%%%%DOCSDIR%%/apache/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/apache/README +%%PORTDOCS%%@dirrm %%DOCSDIR%%/apache %%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709111243.l8BChofv022139>