[pkgsrc/trunk]: pkgsrc/lang/php5 Add Suhosin patch support via options.mk - n...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc0b4492ddc6
branches:  trunk
changeset: 554674:bc0b4492ddc6
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Tue Feb 17 23:18:55 2009 +0000

description:
Add Suhosin patch support via options.mk - no change to default package.

diffstat:

 lang/php5/MESSAGE.suhosin |   7 +++++++
 lang/php5/Makefile.php    |  14 ++++++++++++--
 lang/php5/PLIST           |   5 ++++-
 lang/php5/distinfo        |   5 ++++-
 4 files changed, 27 insertions(+), 4 deletions(-)

diffs (88 lines):

diff -r 07f1ace0eb4b -r bc0b4492ddc6 lang/php5/MESSAGE.suhosin
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php5/MESSAGE.suhosin Tue Feb 17 23:18:55 2009 +0000
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE.suhosin,v 1.1 2009/02/17 23:18:55 adrianp Exp $
+
+As you have chosen to install the Suhosin patch you may also want to
+install the Suhosin extension which can be found in security/php-suhosin.
+
+===========================================================================
diff -r 07f1ace0eb4b -r bc0b4492ddc6 lang/php5/Makefile.php
--- a/lang/php5/Makefile.php    Tue Feb 17 23:17:25 2009 +0000
+++ b/lang/php5/Makefile.php    Tue Feb 17 23:18:55 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.30 2009/02/07 18:03:00 adrianp Exp $
+# $NetBSD: Makefile.php,v 1.31 2009/02/17 23:18:55 adrianp Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -10,6 +10,7 @@
 USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         YES
 BUILD_DEFS+=           VARBASE
+PLIST_VARS+=           suhosin
 
 CONFIGURE_ENV+=                EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
@@ -41,7 +42,7 @@
 # Note: This expression is the same as ${PKGBASE}, but the latter is
 # not defined yet, so we cannot use it here.
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
-PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts
+PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts suhosin
 PKG_SUGGESTED_OPTIONS+=        ssl
 
 SUBST_CLASSES+=                ini
@@ -53,6 +54,15 @@
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Msuhosin)
+PATCH_SITES=           http://download.suhosin.org/
+PATCHFILES+=           suhosin-patch-5.2.8-0.9.6.3.patch.gz
+PATCH_DIST_STRIP=      -p1
+PLIST.suhosin=         yes
+MESSAGE_SRC=           ${PKGDIR}/MESSAGE
+MESSAGE_SRC+=          ${PKGDIR}/MESSAGE.suhosin
+.endif
+
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
 .else
diff -r 07f1ace0eb4b -r bc0b4492ddc6 lang/php5/PLIST
--- a/lang/php5/PLIST   Tue Feb 17 23:17:25 2009 +0000
+++ b/lang/php5/PLIST   Tue Feb 17 23:18:55 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2008/12/10 19:37:01 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/02/17 23:18:55 adrianp Exp $
 bin/php
 bin/php-config
 bin/phpize
@@ -201,6 +201,9 @@
 include/php/main/streams/php_stream_userspace.h
 include/php/main/streams/php_streams_int.h
 include/php/main/win95nt.h
+${PLIST.suhosin}include/php/main/suhosin_globals.h
+${PLIST.suhosin}include/php/main/suhosin_logo.h
+${PLIST.suhosin}include/php/main/suhosin_patch.h
 include/php/regex/cclass.h
 include/php/regex/cname.h
 include/php/regex/regex.h
diff -r 07f1ace0eb4b -r bc0b4492ddc6 lang/php5/distinfo
--- a/lang/php5/distinfo        Tue Feb 17 23:17:25 2009 +0000
+++ b/lang/php5/distinfo        Tue Feb 17 23:18:55 2009 +0000
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.57 2009/02/07 18:03:00 adrianp Exp $
+$NetBSD: distinfo,v 1.58 2009/02/17 23:18:55 adrianp Exp $
 
 SHA1 (php-5.2.8/php-5.2.8.tar.bz2) = d285636144e0a4aa61195793634807e763c63dc3
 RMD160 (php-5.2.8/php-5.2.8.tar.bz2) = d38fe5d918c335089a027600a93d950f417a7e98
 Size (php-5.2.8/php-5.2.8.tar.bz2) = 9827180 bytes
+SHA1 (php-5.2.8/suhosin-patch-5.2.8-0.9.6.3.patch.gz) = b1f12dd856778e734837819114d278adaa3cfe05
+RMD160 (php-5.2.8/suhosin-patch-5.2.8-0.9.6.3.patch.gz) = 9c8a0972e75e1ad887b940f57aec4d877e9364bd
+Size (php-5.2.8/suhosin-patch-5.2.8-0.9.6.3.patch.gz) = 23125 bytes
 SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20
 SHA1 (patch-ad) = b324c33b1e70adee5b89dcecdd7690dcadcc18ec
 SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e