Attachment #192345 for bug #227378

View | Details | Raw Unified | Return to bug 227378
Collapse All | Expand All

Lines 8-19 Link Here

(-)www/suphp/Makefile (-1 / +5 lines)
8	MASTER_SITES= http://www.suphp.org/download/ \	8	MASTER_SITES= http://www.suphp.org/download/ \
9	LOCAL/bdrewery/${PORTNAME}/ \	9	LOCAL/bdrewery/${PORTNAME}/ \
10	http://mirror.shatow.net/freebsd/${PORTNAME}/	10	http://mirror.shatow.net/freebsd/${PORTNAME}/
		11	PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
11		12
12	MAINTAINER= bdrewery@FreeBSD.org	13	MAINTAINER= bdrewery@FreeBSD.org
13	COMMENT= Securely execute PHP scripts under Apache	14	COMMENT= Securely execute PHP scripts under Apache
14		15
		16	LICENSE= GPLv2
		17
15	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
16	USES= apache:2.2+ autoreconf libtool php:cgi	19	USES= apache:2.2+ autoreconf libtool php:cgi,flavors
17	SUB_FILES= pkg-message	20	SUB_FILES= pkg-message
18		21
19	CFLAGS+= -I${LOCALBASE}/include	22	CFLAGS+= -I${LOCALBASE}/include
Lines 45-50 Link Here
45	post-install:	48	post-install:
46	.if !defined(WITH_DEBUG)	49	.if !defined(WITH_DEBUG)
47	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/suphp	50	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/suphp
		51	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_suphp.so
48	.endif	52	.endif
49	${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example \	53	${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example \
50	${STAGEDIR}${PREFIX}/etc/suphp.conf-example	54	${STAGEDIR}${PREFIX}/etc/suphp.conf-example

Lines 1-6 Link Here

(-)www/suphp/files/patch-configure.ac (-3 / +3 lines)
1	--- configure.ac.orig 2014-08-31 10:39:02.982846403 +0100	1	--- configure.ac.orig 2013-05-20 16:26:56 UTC
2	+++ configure.ac 2014-08-31 10:39:31.763844267 +0100	2	+++ configure.ac
3	@@ -15343,7 +15343,7 @@	3	@@ -66,7 +66,7 @@ if test -n "$APXS"; then
4	\| cut -f2 -d"/" \	4	\| cut -f2 -d"/" \
5	\| cut -f1 -d" "`	5	\| cut -f1 -d" "`
6	major_version=`echo $APACHE_VERSION\|cut -f1,2 -d.`	6	major_version=`echo $APACHE_VERSION\|cut -f1,2 -d.`




--- doc/suphp.conf-example.orig
+++ doc/suphp.conf-example
@@ -6,10 +6,10 @@
 loglevel=info
 
 ;User Apache is running as
-webserver_user=wwwrun
+webserver_user=www
 
 ;Path all scripts have to be in
-docroot=/var/www:${HOME}/public_html
+docroot=/usr/local/www/*:${HOME}/public_html
 
 ;Path to chroot() to before executing script
 ;chroot=/mychroot
@@ -33,15 +33,15 @@
 umask=0077
 
 ; Minimum UID
-min_uid=100
+min_uid=80
 
 ; Minimum GID
-min_gid=100
+min_gid=80
 
 
 [handlers]
 ;Handler for php-scripts
-x-httpd-php="php:/usr/bin/php"
+application/x-httpd-php="php:/usr/local/bin/php-cgi"
 
 ;Handler for CGI-scripts
 x-suphp-cgi="execute:!self"




--- doc/suphp.conf-example.orig	2011-03-13 17:52:24 UTC
+++ doc/suphp.conf-example
@@ -6,10 +6,10 @@ logfile=/var/log/suphp.log
 loglevel=info
 
 ;User Apache is running as
-webserver_user=wwwrun
+webserver_user=www
 
 ;Path all scripts have to be in
-docroot=/var/www:${HOME}/public_html
+docroot=/usr/local/www/*:${HOME}/public_html
 
 ;Path to chroot() to before executing script
 ;chroot=/mychroot
@@ -33,15 +33,15 @@ env_path="/bin:/usr/bin"
 umask=0077
 
 ; Minimum UID
-min_uid=100
+min_uid=80
 
 ; Minimum GID
-min_gid=100
+min_gid=80
 
 
 [handlers]
 ;Handler for php-scripts
-x-httpd-php="php:/usr/bin/php"
+application/x-httpd-php="php:/usr/local/bin/php-cgi"
 
 ;Handler for CGI-scripts
 x-suphp-cgi="execute:!self"

Lines 1-8 Link Here

(-)www/suphp/files/patch-src_SmartPtr.hpp (-5 / +1 lines)
1	$NetBSD: patch-src_SmartPtr.hpp,v 1.1 2011/09/21 12:54:16 adam Exp $	1	--- src/SmartPtr.hpp.orig 2007-03-13 14:17:02 UTC
2
3	Fix C++ syntax
4
5	--- src/SmartPtr.hpp.orig 2011-09-21 12:48:02.000000000 +0000
6	+++ src/SmartPtr.hpp	2	+++ src/SmartPtr.hpp
7	@@ -150,7 +150,7 @@ namespace suPHP {	3	@@ -150,7 +150,7 @@ namespace suPHP {
8	template<class T>	4	template<class T>

Lines 1-8 Link Here

(-)www/suphp/pkg-plist (-2 / +2 lines)
1	sbin/suphp	1	sbin/suphp
2	etc/suphp.conf-example	2	etc/suphp.conf-example
3	%%APACHEMODDIR%%/mod_suphp.so	3	%%APACHEMODDIR%%/mod_suphp.so
4	@exec %D/sbin/apxs -e -a -n suphp %D/%f	4	@postexec %D/sbin/apxs -e -a -n suphp %D/%f
5	@unexec %D/sbin/apxs -e -A -n suphp %D/%f	5	@preunexec %D/sbin/apxs -e -A -n suphp %D/%f
6	%%PORTDOCS%%%%DOCSDIR%%/INSTALL	6	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
7	%%PORTDOCS%%%%DOCSDIR%%/LICENSE	7	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
8	%%PORTDOCS%%%%DOCSDIR%%/README	8	%%PORTDOCS%%%%DOCSDIR%%/README

Return to bug 227378

Lines 1-34 Link Here

(-)www/suphp/files/patch-doc__suphp.conf-example (-34 lines)
1	--- doc/suphp.conf-example.orig
2	+++ doc/suphp.conf-example
3	@@ -6,10 +6,10 @@
4	loglevel=info
5
6	;User Apache is running as
7	-webserver_user=wwwrun
8	+webserver_user=www
9
10	;Path all scripts have to be in
11	-docroot=/var/www:${HOME}/public_html
12	+docroot=/usr/local/www/*:${HOME}/public_html
13
14	;Path to chroot() to before executing script
15	;chroot=/mychroot
16	@@ -33,15 +33,15 @@
17	umask=0077
18
19	; Minimum UID
20	-min_uid=100
21	+min_uid=80
22
23	; Minimum GID
24	-min_gid=100
25	+min_gid=80
26
27
28	[handlers]
29	;Handler for php-scripts
30	-x-httpd-php="php:/usr/bin/php"
31	+application/x-httpd-php="php:/usr/local/bin/php-cgi"
32
33	;Handler for CGI-scripts
34	x-suphp-cgi="execute:!self"

Line 0 Link Here

(-)www/suphp/files/patch-doc_suphp.conf-example (+34 lines)
	1	--- doc/suphp.conf-example.orig 2011-03-13 17:52:24 UTC
	2	+++ doc/suphp.conf-example
	3	@@ -6,10 +6,10 @@ logfile=/var/log/suphp.log
	4	loglevel=info
	5
	6	;User Apache is running as
	7	-webserver_user=wwwrun
	8	+webserver_user=www
	9
	10	;Path all scripts have to be in
	11	-docroot=/var/www:${HOME}/public_html
	12	+docroot=/usr/local/www/*:${HOME}/public_html
	13
	14	;Path to chroot() to before executing script
	15	;chroot=/mychroot
	16	@@ -33,15 +33,15 @@ env_path="/bin:/usr/bin"
	17	umask=0077
	18
	19	; Minimum UID
	20	-min_uid=100
	21	+min_uid=80
	22
	23	; Minimum GID
	24	-min_gid=100
	25	+min_gid=80
	26
	27
	28	[handlers]
	29	;Handler for php-scripts
	30	-x-httpd-php="php:/usr/bin/php"
	31	+application/x-httpd-php="php:/usr/local/bin/php-cgi"
	32
	33	;Handler for CGI-scripts
	34	x-suphp-cgi="execute:!self"