FreeBSD Bugzilla – Attachment 93528 Details for
Bug 131451
[PATCH] www/suphp: update to 0.7.0, take maintainership
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
suphp-0.7.0.patch
suphp-0.7.0.patch (text/plain), 7.43 KB, created by
Yi-Jheng Lin
on 2009-02-06 17:50:01 UTC
(
hide
)
Description:
suphp-0.7.0.patch
Filename:
MIME Type:
Creator:
Yi-Jheng Lin
Created:
2009-02-06 17:50:01 UTC
Size:
7.43 KB
patch
obsolete
>Index: Makefile >=================================================================== >RCS file: /home/ncvs/ports/www/suphp/Makefile,v >retrieving revision 1.29 >diff -u -r1.29 Makefile >--- Makefile 20 Nov 2008 11:06:24 -0000 1.29 >+++ Makefile 6 Feb 2009 17:23:43 -0000 >@@ -6,12 +6,12 @@ > # > > PORTNAME= suphp >-PORTVERSION= 0.6.3 >+PORTVERSION= 0.7.0 > CATEGORIES= www > MASTER_SITES= http://www.suphp.org/download/ \ > ${MASTER_SITE_LOCAL:S|%SUBDIR%|koitsu|} > >-MAINTAINER= ports@FreeBSD.org >+MAINTAINER= yzlin@cs.nctu.edu.tw > COMMENT= Securely execute PHP scripts under Apache > > GNU_CONFIGURE= yes >@@ -26,7 +26,6 @@ > > CONFIGURE_ARGS= --with-apxs=${APXS} > >- > # WITH_SETID_MODE should be a value of "owner", "force", or "paranoid". > # It's important that you understand the differences between each mode. > # See /usr/local/share/doc/suphp/INSTALL for details. >@@ -34,7 +33,6 @@ > WITH_SETID_MODE?= owner > CONFIGURE_ARGS+= --with-setid-mode=${WITH_SETID_MODE} > >- > .include <bsd.port.pre.mk> > > # Apache 2.0 (www/apache2) has apr-config in LOCALBASE/lib/apache2, while >@@ -48,7 +46,6 @@ > > post-patch: > @${REINPLACE_CMD} -e 's|2.61|2.62|g' ${WRKSRC}/aclocal.m4 >- @${REINPLACE_CMD} -e 's|1.10|1.10.1|g' ${WRKSRC}/aclocal.m4 > @${CHMOD} 755 ${WRKSRC}/config/install-sh > > post-install: >@@ -56,13 +53,13 @@ > @${MKDIR} ${DOCSDIR} > @${MKDIR} ${DOCSDIR}/apache > .for f in ${MYPORTDOCS} >- @${CP} -Rfp ${WRKSRC}/doc/${f} ${DOCSDIR}/${f} >+ @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f} > .endfor > .endif > .if !defined(WITH_DEBUG) > @${STRIP_CMD} ${PREFIX}/sbin/suphp > .endif >- @${CP} -fp ${WRKSRC}/doc/suphp.conf-example ${PREFIX}/etc/suphp.conf-example >+ @${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example ${PREFIX}/etc/suphp.conf-example > @${CAT} ${PKGMESSAGE} > > .include <bsd.port.post.mk> >Index: distinfo >=================================================================== >RCS file: /home/ncvs/ports/www/suphp/distinfo,v >retrieving revision 1.11 >diff -u -r1.11 distinfo >--- distinfo 30 Mar 2008 22:49:06 -0000 1.11 >+++ distinfo 6 Feb 2009 17:23:43 -0000 >@@ -1,3 +1,3 @@ >-MD5 (suphp-0.6.3.tar.gz) = 756e8893857fefed087a89959a87645a >-SHA256 (suphp-0.6.3.tar.gz) = 0c2e64aa22d47c07e899d92c9997556dfbc242192d2f4e9d3cdce517c46d7ecc >-SIZE (suphp-0.6.3.tar.gz) = 377176 >+MD5 (suphp-0.7.0.tar.gz) = dac578fc8bda630cc37ed6e47d4ff213 >+SHA256 (suphp-0.7.0.tar.gz) = 0baadee9a1b6f2c2c8c84e3d11c531b89d6791f2d821a1c9c9c7dac7c5a5da8b >+SIZE (suphp-0.7.0.tar.gz) = 389689 >Index: pkg-message >=================================================================== >RCS file: /home/ncvs/ports/www/suphp/pkg-message,v >retrieving revision 1.4 >diff -u -r1.4 pkg-message >--- pkg-message 12 Dec 2007 17:27:49 -0000 1.4 >+++ pkg-message 6 Feb 2009 17:23:43 -0000 >@@ -1,7 +1,7 @@ > ---------------------------------------------------------------- > For help on using this module, please see the suPHP homepage: > >- http://www.suphp.org/ >+ http://www.suphp.org/ > > Using suPHP can break some PHP-scripts, because of Apache's CGI > interface. >@@ -9,7 +9,7 @@ > > ----------------------------------------------------------------- > For those migrating from suPHP 0.5.x, be aware there are many >-changes in 0.6.x that can cause your current Apache environment >+changes since 0.6.x that can cause your current Apache environment > to stop working or behave oddly. Here are two migration tips: > > suPHP now uses a configuration file for runtime configuration. >@@ -20,7 +20,7 @@ > ...but *has not* been created for you. A sample configuration > file has been installed here: > >- /usr/local/etc/suphp.conf-example >+ /usr/local/etc/suphp.conf-example > > This means that many of the make.conf(5) knobs for the > www/suphp port are no longer used, and are modifiable in >@@ -31,17 +31,16 @@ > for determining what content get handled by suPHP. In 0.5.x, > you used the following Apache directives: > >- suPHP_Engine on >+ suPHP_Engine on > AddType application/x-httpd-php .php > AddHandler x-httpd-php .php > >-In suPHP 0.6.x, you should use the following: >+Since suPHP 0.6.x, you should use the following: > >- suPHP_Engine on >+ suPHP_Engine on > AddType application/x-httpd-php .php > suPHP_AddHandler application/x-httpd-php > > Otherwise, Apache will begin serving PHP files as downloadable > content, rather than parse them with the PHP interpreter. > ----------------------------------------------------------------- >- >Index: files/patch-acinclude.m4 >=================================================================== >RCS file: files/patch-acinclude.m4 >diff -N files/patch-acinclude.m4 >--- files/patch-acinclude.m4 11 Dec 2007 20:38:58 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,11 +0,0 @@ >---- acinclude.m4.orig 2006-10-18 13:42:07.000000000 -0700 >-+++ acinclude.m4 2007-11-11 02:15:56.000000000 -0800 >-@@ -40,7 +40,7 @@ >- dnl value of apr_config to fetch any necessary build/link information. >- dnl >- >--AC_DEFUN(APR_FIND_APR, [ >-+AC_DEFUN([APR_FIND_APR], [ >- apr_found="no" >- >- if test "$ac_cv_emxos2" = "yes"; then >Index: files/patch-doc::suphp.conf-example >=================================================================== >RCS file: /home/ncvs/ports/www/suphp/files/patch-doc::suphp.conf-example,v >retrieving revision 1.2 >diff -u -r1.2 patch-doc::suphp.conf-example >--- files/patch-doc::suphp.conf-example 12 Dec 2007 17:27:49 -0000 1.2 >+++ files/patch-doc::suphp.conf-example 6 Feb 2009 17:23:43 -0000 >@@ -1,6 +1,6 @@ >---- doc/suphp.conf-example.orig 2005-11-26 11:29:02.000000000 -0800 >-+++ doc/suphp.conf-example 2007-12-12 09:21:02.000000000 -0800 >-@@ -6,7 +6,7 @@ >+--- doc/suphp.conf-example.orig >++++ doc/suphp.conf-example >+@@ -6,10 +6,10 @@ > loglevel=info > > ;User Apache is running as >@@ -8,7 +8,11 @@ > +webserver_user=www > > ;Path all scripts have to be in >- docroot=/ >+-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 > >@@ -23,8 +27,8 @@ > > [handlers] > ;Handler for php-scripts >--x-httpd-php=php:/usr/bin/php >-+application/x-httpd-php=php:/usr/local/bin/php-cgi >+-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 >+ x-suphp-cgi="execute:!self" >Index: files/patch-src::apache2::mod_suphp.c >=================================================================== >RCS file: files/patch-src::apache2::mod_suphp.c >diff -N files/patch-src::apache2::mod_suphp.c >--- files/patch-src::apache2::mod_suphp.c 11 Dec 2007 20:38:58 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,13 +0,0 @@ >---- src/apache2/mod_suphp.c.orig 2006-11-05 16:57:12.000000000 -0800 >-+++ src/apache2/mod_suphp.c 2007-11-11 03:15:50.000000000 -0800 >-@@ -321,8 +321,8 @@ >- AP_INIT_TAKE2("suPHP_UserGroup", suphp_handle_cmd_user_group, NULL, RSRC_CONF | ACCESS_CONF, >- "User and group scripts shall be run as"), >- #endif >-- AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"), >-- AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"), >-+ AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"), >-+ AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"), >- {NULL} >- }; >-
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 131451
: 93528