pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/ap2-suphp Update ap2-suphp to 0.6.3.
details: https://anonhg.NetBSD.org/pkgsrc/rev/ca1b46f02d7e
branches: trunk
changeset: 542433:ca1b46f02d7e
user: obache <obache%pkgsrc.org@localhost>
date: Sat May 17 02:37:24 2008 +0000
description:
Update ap2-suphp to 0.6.3.
While here, add DESTDIR support and more adapt sample config file to default settings.
* Version 0.6.3 (30 March 2008)
- Fixed a possible race condition concerning the check for the
right symlink owner.
- Added checks for the owner of the parent directories were added.
* Version 0.6.2 (19 November 2006)
- Made mod_suphp compatible with Apache 2.2
- Modified SmartPtr implementation (hopefully) fixing
double free problem
- Fixed problem that caused the process to block
when more than 4096 were written to stderr
- Implemented userdir support
- Fixed problem with PATH_INFO and PHP scripts
* Version 0.6.1 (26 November 2005)
- Changed usage of STL to gain better compatibility with old GCC versions
(credits to Jeremy Chadwick for finding the relevant code)
- Fixed typos in mod_suphp.c (Apache 1.3)
(credits to Johan Ekenberg for finding these typos)
- Fixed potential buffer overflow in function suphp_bucket_read() in
src/apache2/mod_suphp.c
- Fix problems with scripts sending "Last-Modified" headers
- Extended autoconf script to look for an installation of APR
and to use its includedir when building mod_suphp for Apache 2
- Added support for chroot() call before execution of script
diffstat:
www/ap2-suphp/Makefile | 13 ++++++---
www/ap2-suphp/distinfo | 11 +++----
www/ap2-suphp/patches/patch-aa | 40 ++----------------------------
www/ap2-suphp/patches/patch-ab | 55 ------------------------------------------
4 files changed, 16 insertions(+), 103 deletions(-)
diffs (169 lines):
diff -r 487ff5ade750 -r ca1b46f02d7e www/ap2-suphp/Makefile
--- a/www/ap2-suphp/Makefile Sat May 17 02:28:17 2008 +0000
+++ b/www/ap2-suphp/Makefile Sat May 17 02:37:24 2008 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2008/03/04 11:02:26 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2008/05/17 02:37:24 obache Exp $
#
-DISTNAME= suphp-0.6.0
+DISTNAME= suphp-0.6.3
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME}
-PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= http://www.suphp.org/download/
@@ -11,6 +10,8 @@
HOMEPAGE= http://www.suphp.org/
COMMENT= SuEXEC-like wrapper for PHP scripts
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= lex
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -34,10 +35,12 @@
SUBST_STAGE.suphp= post-configure
SUBST_FILES.suphp= doc/suphp.conf-example
SUBST_SED.suphp= -e "s,wwwrun,${APACHE_USER},g"
+SUBST_SED.suphp+= -e "s,/var/log/suphp.log,${VARBASE}/httpd/suphp_log,g"
+SUBST_SED.suphp+= -e "s,/usr/bin/php,${PREFIX}/bin/php,g"
post-install:
- ${INSTALL_DATA_DIR} ${EGDIR:Q}
- ${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example ${EGDIR}/suphp.conf
+ ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR:Q}
+ ${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example ${DESTDIR}${EGDIR}/suphp.conf
.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 487ff5ade750 -r ca1b46f02d7e www/ap2-suphp/distinfo
--- a/www/ap2-suphp/distinfo Sat May 17 02:28:17 2008 +0000
+++ b/www/ap2-suphp/distinfo Sat May 17 02:37:24 2008 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/06/30 15:05:08 joerg Exp $
+$NetBSD: distinfo,v 1.4 2008/05/17 02:37:24 obache Exp $
-SHA1 (suphp-0.6.0.tar.gz) = 7ec81c132355e6f508e6a3017947a870072d6eb8
-RMD160 (suphp-0.6.0.tar.gz) = 953f3be08d7e33ff64e327ee34bb84639888aa5f
-Size (suphp-0.6.0.tar.gz) = 247534 bytes
-SHA1 (patch-aa) = 85fdde4e2b170a1e9cf3d2dc297903486475bd73
-SHA1 (patch-ab) = 35f054add18241ee7dedc10e780afd6b77e3463e
+SHA1 (suphp-0.6.3.tar.gz) = 53588e8631cdc708da4d3d199e1b7218b9f4c87e
+RMD160 (suphp-0.6.3.tar.gz) = 6fe03b3eb704b6feaa991bb0099288c8d4b31cb3
+Size (suphp-0.6.3.tar.gz) = 377176 bytes
+SHA1 (patch-aa) = 7cad8ced11f0c9945af85077a30e1788a624bad1
diff -r 487ff5ade750 -r ca1b46f02d7e www/ap2-suphp/patches/patch-aa
--- a/www/ap2-suphp/patches/patch-aa Sat May 17 02:28:17 2008 +0000
+++ b/www/ap2-suphp/patches/patch-aa Sat May 17 02:37:24 2008 +0000
@@ -1,11 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2007/06/30 15:05:08 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2008/05/17 02:37:24 obache Exp $
Allow the directives to be set in the global configuration file, too.
-Fix APR 1.2 build.
---- src/apache2/mod_suphp.c.orig 2005-02-27 17:56:37.000000000 +0000
+--- src/apache2/mod_suphp.c.orig 2006-11-06 00:57:12.000000000 +0000
+++ src/apache2/mod_suphp.c
-@@ -313,8 +313,8 @@ static const command_rec suphp_cmds[] =
+@@ -321,8 +321,8 @@ static const command_rec suphp_cmds[] =
AP_INIT_TAKE2("suPHP_UserGroup", suphp_handle_cmd_user_group, NULL, RSRC_CONF | ACCESS_CONF,
"User and group scripts shall be run as"),
#endif
@@ -16,36 +15,3 @@
{NULL}
};
-@@ -558,7 +558,9 @@ static int suphp_handler(request_rec *r)
- 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;
-@@ -629,7 +631,9 @@ static int suphp_handler(request_rec *r)
-
- 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;
-@@ -650,7 +654,9 @@ static int suphp_handler(request_rec *r)
- /* 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 -r 487ff5ade750 -r ca1b46f02d7e www/ap2-suphp/patches/patch-ab
--- a/www/ap2-suphp/patches/patch-ab Sat May 17 02:28:17 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/06/30 15:05:08 joerg Exp $
-
---- configure.orig 2005-06-01 21:01:19.000000000 +0000
-+++ configure
-@@ -3960,13 +3960,13 @@ darwin* | rhapsody*)
- esac
- ;;
-
--freebsd*)
-+freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
-- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
-@@ -6491,7 +6491,7 @@ else
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
-+ freebsd* | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
-@@ -6953,7 +6953,7 @@ freebsd1*)
- dynamic_linker=no
- ;;
-
--freebsd*)
-+freebsd* | dragonfly*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
-@@ -9022,12 +9022,12 @@ if test -n "$APXS"; then
- | cut -f2 -d"/" \
- | cut -f1 -d" "`
- major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
-- if test "$major_version" = "2.0"; then
-- APACHE_VERSION_2=true
-- APACHE_VERSION_1_3=false
-- else
-+ if test "$major_version" = "1.3"; then
- APACHE_VERSION_2=false
- APACHE_VERSION_1_3=true
-+ else
-+ APACHE_VERSION_2=true
-+ APACHE_VERSION_1_3=false
- fi
-
-
Home |
Main Index |
Thread Index |
Old Index