Re: pkg/34768: lang/php5 suhosin patch

[Christian Gall <cg%cgall.de@localhost>]

The following reply was made to PR pkg/34768; it has been noted by GNATS.

From: Christian Gall <cg%cgall.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: jdolecek%NetBSD.org@localhost
Subject: Re: pkg/34768: lang/php5 suhosin patch
Date: Mon, 5 Mar 2007 03:03:02 +0100

 --vtzGhvizbBRQ85DL
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Index: Makefile.php
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /cvs/cvsroot/pkgsrc/lang/php5/Makefile.php,v
 retrieving revision 1.21.2.2
 diff -u -r1.21.2.2 Makefile.php
 --- Makefile.php       2 Mar 2007 13:02:26 -0000       1.21.2.2
 +++ Makefile.php       5 Mar 2007 01:19:27 -0000
 @@ -39,7 +39,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=3D    PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 -PKG_SUPPORTED_OPTIONS+=3D     inet6 ssl
 +PKG_SUPPORTED_OPTIONS+=3D     inet6 ssl suhosin
  PKG_SUGGESTED_OPTIONS+=3D     ssl
 =20
  .include "../../mk/bsd.options.mk"
 @@ -56,3 +56,12 @@
  .else
  CONFIGURE_ARGS+=3D    --without-openssl
  .endif
 +
 +.if !empty(PKG_OPTIONS:Msuhosin)
 +PATCH_SITES+=3D       http://www.hardened-php.net/suhosin/_media/
 +PATCHFILES+=3D        suhosin-patch-${PHP_BASE_VERS}-0.9.6.2.patch.gz
 +PATCH_DIST_STRIP=3D   -p1
 +PLIST_SUBST+=3D               SUHOSIN=3D
 +.else
 +PLIST_SUBST+=3D               SUHOSIN=3D"@comment: "
 +.endif
 Index: PLIST
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /cvs/cvsroot/pkgsrc/lang/php5/PLIST,v
 retrieving revision 1.13.4.1
 diff -u -r1.13.4.1 PLIST
 --- PLIST      23 Feb 2007 11:56:25 -0000      1.13.4.1
 +++ PLIST      5 Mar 2007 01:19:28 -0000
 @@ -208,6 +208,9 @@
  include/php/main/streams/php_stream_userspace.h
  include/php/main/streams/php_streams_int.h
  include/php/main/win95nt.h
 +${SUHOSIN}include/php/main/suhosin_globals.h
 +${SUHOSIN}include/php/main/suhosin_logo.h
 +${SUHOSIN}include/php/main/suhosin_patch.h
  include/php/regex/cclass.h
  include/php/regex/cname.h
  include/php/regex/regex.h
 Index: distinfo
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /cvs/cvsroot/pkgsrc/lang/php5/distinfo,v
 retrieving revision 1.35.2.1
 diff -u -r1.35.2.1 distinfo
 --- distinfo   23 Feb 2007 11:56:25 -0000      1.35.2.1
 +++ distinfo   5 Mar 2007 01:19:28 -0000
 @@ -3,6 +3,9 @@
  SHA1 (php-5.2.1/php-5.2.1.tar.bz2) =3D 978ce7cde3d988d9aa672e32e46f815a8b2=
 5baa0
  RMD160 (php-5.2.1/php-5.2.1.tar.bz2) =3D f75078e0e43cb9c64e6d0a8d51a2ebd23=
 cc9131d
  Size (php-5.2.1/php-5.2.1.tar.bz2) =3D 7163383 bytes
 +SHA1 (php-5.2.1/suhosin-patch-5.2.1-0.9.6.2.patch.gz) =3D dbb007554f2cc454=
 4d60bd80a23a6af305744fbd
 +RMD160 (php-5.2.1/suhosin-patch-5.2.1-0.9.6.2.patch.gz) =3D 6bab11d9622472=
 5b6c45f2de1bfdc69b992302eb
 +Size (php-5.2.1/suhosin-patch-5.2.1-0.9.6.2.patch.gz) =3D 22679 bytes
  SHA1 (patch-aa) =3D 20bc3831e435182d014b11ae9f1f6c537a21af20
  SHA1 (patch-ag) =3D 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e
  SHA1 (patch-ah) =3D c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587
 
 --vtzGhvizbBRQ85DL
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (NetBSD)
 
 iQIVAwUBRet6VTvEVoyxqYCCAQrMyw//RNGpaecjQzOBru8B1xdhzi4MmB1W+rPM
 n/Bl3fReepu27HkvYoURSF4zZNtpAvqJTbJ8tEObm02AhQlnPKanuy6mUyqlz4LI
 hZr8svU/bMVnH4DTC7VsVR4aRlbYEOktqbNO70jBOmaVt8Yw9n9odz4Xj88BZMRx
 UZd01zI7sGdpU6bMfy/t0RabRMUX+XLg5URVZmMFrKdcUIIdOumZH1lJ4otsUf4y
 m0aGK4sZRBFjfMjA7zn1X3R8LdGa4X49r6QncvfELnAIh4fprkkgibyvyUY6M69J
 YRlugwPMtVDSnkbTh/veUj9oLblDo8wcLNA7BifTw3NADz7pteozVSXJCSzy7AJM
 yXeKe/xfiC0oO2e/jtd6Qm+b66gekugnC6PZbuePdKZjGDHzys2BWy5nbFzi6IqG
 xDl4f6rLgwOO3wuNE+2mOVYSf/pMuoWZx/t53Yt7UCaRHLy2c3bITt0oj2BATQVV
 kCbVe5rKT3AHA3Ax+gdpjqeW+i48qo0iGN3VwU0GcgDKOtQwFZgow2E390Q3g7do
 aj50ja2rgipTTFz03tVCd1zqz9DE0hok8B457OgoZft3YYk/NSo8amYwe1gcHP7+
 lme2C6/amdoOexu/xSiP7MKEfprc31lYK1rvS6p+gyxR4x/HHgCQ0lbBhBtvm8r4
 C/MrOZFoMtc=
 =tC5y
 -----END PGP SIGNATURE-----
 
 --vtzGhvizbBRQ85DL--