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: 
Subject: Re: pkg/34768: lang/php5 suhosin patch
Date: Wed, 22 Nov 2006 13:44:15 +0100

 --47eKBCiAZYFK5l32
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 
 update to -current:
 
 /pkgsrc/lang/php5$ cvs diff Makefile.php PLIST distinfo                    =
                                                                            =
                                                                            =
              =20
 
 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
 diff -u -r1.21 Makefile.php
 --- Makefile.php        6 Nov 2006 22:17:50 -0000       1.21
 +++ Makefile.php        22 Nov 2006 12:34:58 -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.1.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
 diff -u -r1.13 PLIST
 --- PLIST       19 Aug 2006 14:47:44 -0000      1.13
 +++ PLIST       22 Nov 2006 12:34:59 -0000
 @@ -200,6 +200,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
 diff -u -r1.35 distinfo
 --- distinfo    7 Nov 2006 17:24:39 -0000       1.35
 +++ distinfo    22 Nov 2006 12:34:59 -0000
 @@ -3,6 +3,9 @@
  SHA1 (php-5.2.0/php-5.2.0.tar.bz2) =3D 6306829b1b252156ca3a936ec809aba89a7=
 1d9e1
  RMD160 (php-5.2.0/php-5.2.0.tar.bz2) =3D baabe854ac219935ed9f58d348ebf08fb=
 84853de
  Size (php-5.2.0/php-5.2.0.tar.bz2) =3D 6789838 bytes
 +SHA1 (php-5.2.0/suhosin-patch-5.2.0-0.9.6.1.patch.gz) =3D 4b60c2d206c10641=
 a6d38d249fcb9baec29b8699
 +RMD160 (php-5.2.0/suhosin-patch-5.2.0-0.9.6.1.patch.gz) =3D ab13ceb1b653dd=
 13c89cc53a6d37d93be90b66ab
 +Size (php-5.2.0/suhosin-patch-5.2.0-0.9.6.1.patch.gz) =3D 23082 bytes
  SHA1 (patch-aa) =3D 20bc3831e435182d014b11ae9f1f6c537a21af20
  SHA1 (patch-ac) =3D 95cf7bbbf1a9ce645195854f3b176dd56c94fe47
  SHA1 (patch-ag) =3D 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e
 
 
 
 
 --47eKBCiAZYFK5l32
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.0 (NetBSD)
 
 iQIVAwUBRWRGHjvEVoyxqYCCAQo+zA/8DD2YRDYT357Wtp0z5nCTaMOeXfjXbeVn
 5qy5EurbPFJHkdpootHSLS2NBtpVflYMiR7Gabj+1Qt733Dt+bN+nv3S4rossIPR
 xiGzIGWTk0DkxGUxxn92hT+wjUKw3+TyAAVXZqTFGbhDXy1zemhUqCNgp4j9fbFj
 lDz87n4Fq0iTV7yNouyB/FXmzyFkcx5ZPWvMwRauk/nTaJQmn+TNMVw1pQcbuGW8
 jVxfDB2iinpJb2KeuH8Owj0Fu0tTs2Eu798b43RizSOetmbf+x+/KXMGdg2JdlJ2
 KN+YQwrfNZO0+yOVkX9JXE3l9QC8+zTQM10kdwawPtpGomOu6Uc7tNRCpKs3LFLY
 JM5nMRJ8sMFiRGHQ5vlPAKliAwm7PAD7rCycOTnTvw6T7NSxRxG/dOkUbcWbSXn7
 QBSSEmEL539HGeC74GxPO4X+t3SoWU56idYydntBype4dx71hLLqf4YLnA51MOqe
 jswk77rjBZKRVdgHB6D9q4bnR1NnBEwJq+RNjrzZfsT8tvJOdb11/sR9l+hPy9x6
 Pnl5h9WpRed+uo3uGmJlEf56omnyQ2SdFg5gbj2fwPIUV5u/5Kjdg8C5H6Wzk/dz
 HdLqM5vjzgqsCijn8WMKkQT518cfLuEVJHvBYGIVAX2zlbKeWOr5ahSYpTTDJEqj
 wyKj2F+l5MA=
 =Qt2e
 -----END PGP SIGNATURE-----
 
 --47eKBCiAZYFK5l32--