Module Name:	pkgsrc
Committed By:	salo
Date:		Wed Apr 19 00:12:27 UTC 2006

Modified Files:
	pkgsrc/lang/php5 [pkgsrc-2006Q1]: Makefile Makefile.php distinfo
	pkgsrc/www/ap-php [pkgsrc-2006Q1]: Makefile
	pkgsrc/www/php4 [pkgsrc-2006Q1]: Makefile distinfo
Added Files:
	pkgsrc/lang/php5/patches [pkgsrc-2006Q1]: patch-ap patch-aq patch-ar
	pkgsrc/www/php4/patches [pkgsrc-2006Q1]: patch-aq patch-ar patch-as

Log Message:
Pullup ticket 1406 - requested by cube
security fixes for php

Revisions pulled up:
- pkgsrc/lang/php5/Makefile			1.29
- pkgsrc/lang/php5/Makefile.php			1.18
- pkgsrc/lang/php5/distinfo			1.15
- pkgsrc/lang/php5/patches/patch-ap		1.1
- pkgsrc/lang/php5/patches/patch-aq		1.1
- pkgsrc/lang/php5/patches/patch-ar		1.1
- pkgsrc/www/php4/Makefile			1.63
- pkgsrc/www/php4/distinfo			1.52
- pkgsrc/www/php4/patches/patch-aq		1.1
- pkgsrc/www/php4/patches/patch-ar		1.1
- pkgsrc/www/php4/patches/patch-as		1.1
- pkgsrc/www/ap-php/Makefile			1.9

   Module Name:		pkgsrc
   Committed By:	cube
   Date:		Fri Apr 14 13:47:30 UTC 2006

   Modified Files:
   	pkgsrc/lang/php5: Makefile Makefile.php distinfo
   	pkgsrc/www/ap-php: Makefile
   	pkgsrc/www/php4: Makefile distinfo

   Log Message:
   PHP4/5 security changes...  They're not critical issues;  secunia classes
   them between "not critical" and "less critical".

   Fix CVE-2006-0996, CVE-2006-1494, CVE-2006-1608, CVE-2006-1490.

   See:
       http://secunia.com/advisories/19383/
       http://secunia.com/advisories/19599/

   Patches were extracted from CVS.  I had to translate the one for
   CVE-2006-1608 on php4 because it has not made its way to the php4.4 branch
   (I don't know why;  I can confirm it fixes the issue).

   While here, add PATCHDIR to the list of variables php5's Makefile.php
   defines.  That way, ap-php gets patched too...
---
   Module Name:		pkgsrc
   Committed By:	cube
   Date:		Fri Apr 14 13:48:33 UTC 2006

   Added Files:
   	pkgsrc/lang/php5/patches: patch-ap patch-aq patch-ar
   	pkgsrc/www/php4/patches: patch-aq patch-ar patch-as

   Log Message:
   The actual patches for PHP4/5.


To generate a diff of this commit:
cvs rdiff -r1.28 -r1.28.2.1 pkgsrc/lang/php5/Makefile
cvs rdiff -r1.17 -r1.17.4.1 pkgsrc/lang/php5/Makefile.php
cvs rdiff -r1.14 -r1.14.2.1 pkgsrc/lang/php5/distinfo
cvs rdiff -r0 -r1.1.2.1 pkgsrc/lang/php5/patches/patch-ap \
    pkgsrc/lang/php5/patches/patch-aq pkgsrc/lang/php5/patches/patch-ar
cvs rdiff -r1.8 -r1.8.2.1 pkgsrc/www/ap-php/Makefile
cvs rdiff -r1.62 -r1.62.2.1 pkgsrc/www/php4/Makefile
cvs rdiff -r1.51 -r1.51.2.1 pkgsrc/www/php4/distinfo
cvs rdiff -r0 -r1.1.2.1 pkgsrc/www/php4/patches/patch-aq \
    pkgsrc/www/php4/patches/patch-ar pkgsrc/www/php4/patches/patch-as

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.