Attachment 192345 Details for Bug 227378 – add flavor support, fix portlint warnings etc.

[patch] add flavor support, fix portlint warnings etc.

20180408-suphp.diff (text/plain), 4.61 KB, created by Daniel Austin on 2018-04-08 17:37:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2018-04-08 17:37:00 UTC

Size: 4.61 KB

patch

obsolete

>diff -ruN www/suphp.orig/Makefile www/suphp/Makefile
>--- www/suphp.orig/Makefile	2018-03-11 17:38:45.000000000 +0000
>+++ www/suphp/Makefile	2018-04-08 18:02:25.950132000 +0100
>@@ -8,12 +8,15 @@
> MASTER_SITES=	http://www.suphp.org/download/ \
> 		LOCAL/bdrewery/${PORTNAME}/ \
> 		http://mirror.shatow.net/freebsd/${PORTNAME}/
>+PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
> 
> MAINTAINER=	bdrewery@FreeBSD.org
> COMMENT=	Securely execute PHP scripts under Apache
> 
>+LICENSE=	GPLv2
>+
> GNU_CONFIGURE=	yes
>-USES=		apache:2.2+ autoreconf libtool php:cgi
>+USES=		apache:2.2+ autoreconf libtool php:cgi,flavors
> SUB_FILES=	pkg-message
> 
> CFLAGS+=	-I${LOCALBASE}/include
>@@ -45,6 +48,7 @@
> post-install:
> .if !defined(WITH_DEBUG)
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/suphp
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_suphp.so
> .endif
> 	${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example \
> 	    ${STAGEDIR}${PREFIX}/etc/suphp.conf-example
>diff -ruN www/suphp.orig/files/patch-configure.ac www/suphp/files/patch-configure.ac
>--- www/suphp.orig/files/patch-configure.ac	2015-07-29 00:43:01.000000000 +0100
>+++ www/suphp/files/patch-configure.ac	2018-04-08 17:56:53.756002000 +0100
>@@ -1,6 +1,6 @@
>---- configure.ac.orig	2014-08-31 10:39:02.982846403 +0100
>-+++ configure.ac	2014-08-31 10:39:31.763844267 +0100
>-@@ -15343,7 +15343,7 @@
>+--- configure.ac.orig	2013-05-20 16:26:56 UTC
>++++ configure.ac
>+@@ -66,7 +66,7 @@ if test -n "$APXS"; then
>                      | cut -f2 -d"/" \
>                      | cut -f1 -d" "`
>      major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
>diff -ruN www/suphp.orig/files/patch-doc__suphp.conf-example www/suphp/files/patch-doc__suphp.conf-example
>--- www/suphp.orig/files/patch-doc__suphp.conf-example	2014-07-29 18:12:47.000000000 +0100
>+++ www/suphp/files/patch-doc__suphp.conf-example	1970-01-01 01:00:00.000000000 +0100
>@@ -1,34 +0,0 @@
>---- 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"
>diff -ruN www/suphp.orig/files/patch-doc_suphp.conf-example www/suphp/files/patch-doc_suphp.conf-example
>--- www/suphp.orig/files/patch-doc_suphp.conf-example	1970-01-01 01:00:00.000000000 +0100
>+++ www/suphp/files/patch-doc_suphp.conf-example	2018-04-08 17:56:53.759226000 +0100
>@@ -0,0 +1,34 @@
>+--- 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"
>diff -ruN www/suphp.orig/files/patch-src_SmartPtr.hpp www/suphp/files/patch-src_SmartPtr.hpp
>--- www/suphp.orig/files/patch-src_SmartPtr.hpp	2012-07-14 15:29:18.000000000 +0100
>+++ www/suphp/files/patch-src_SmartPtr.hpp	2018-04-08 17:56:53.762377000 +0100
>@@ -1,8 +1,4 @@
>-$NetBSD: patch-src_SmartPtr.hpp,v 1.1 2011/09/21 12:54:16 adam Exp $
>-
>-Fix C++ syntax
>-
>---- src/SmartPtr.hpp.orig	2011-09-21 12:48:02.000000000 +0000
>+--- src/SmartPtr.hpp.orig	2007-03-13 14:17:02 UTC
> +++ src/SmartPtr.hpp
> @@ -150,7 +150,7 @@ namespace suPHP {
>      template<class T>
>diff -ruN www/suphp.orig/pkg-plist www/suphp/pkg-plist
>--- www/suphp.orig/pkg-plist	2015-09-22 20:55:06.000000000 +0100
>+++ www/suphp/pkg-plist	2018-04-08 17:54:23.170248000 +0100
>@@ -1,8 +1,8 @@
> sbin/suphp
> etc/suphp.conf-example
> %%APACHEMODDIR%%/mod_suphp.so
>-@exec %D/sbin/apxs -e -a -n suphp %D/%f
>-@unexec %D/sbin/apxs -e -A -n suphp %D/%f
>+@postexec %D/sbin/apxs -e -a -n suphp %D/%f
>+@preunexec %D/sbin/apxs -e -A -n suphp %D/%f
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%%%DOCSDIR%%/README

Flags:

freebsd-ports: maintainer-approval? (bdrewery)

Actions: View | Diff

Attachments on bug 227378: 192345