head	1.8;
access;
symbols
	pkgsrc-2013Q2:1.8.0.4
	pkgsrc-2013Q2-base:1.8
	pkgsrc-2012Q4:1.8.0.2
	pkgsrc-2012Q4-base:1.8
	pkgsrc-2012Q1:1.7.0.26
	pkgsrc-2012Q1-base:1.7
	pkgsrc-2011Q4:1.7.0.24
	pkgsrc-2011Q4-base:1.7
	pkgsrc-2011Q3:1.7.0.22
	pkgsrc-2011Q3-base:1.7
	pkgsrc-2011Q2:1.7.0.20
	pkgsrc-2011Q2-base:1.7
	pkgsrc-2011Q1:1.7.0.18
	pkgsrc-2011Q1-base:1.7
	pkgsrc-2010Q4:1.7.0.16
	pkgsrc-2010Q4-base:1.7
	pkgsrc-2010Q3:1.7.0.14
	pkgsrc-2010Q3-base:1.7
	pkgsrc-2010Q2:1.7.0.12
	pkgsrc-2010Q2-base:1.7
	pkgsrc-2010Q1:1.7.0.10
	pkgsrc-2010Q1-base:1.7
	pkgsrc-2009Q4:1.7.0.8
	pkgsrc-2009Q4-base:1.7
	pkgsrc-2009Q3:1.7.0.6
	pkgsrc-2009Q3-base:1.7
	pkgsrc-2009Q2:1.7.0.4
	pkgsrc-2009Q2-base:1.7
	pkgsrc-2009Q1:1.7.0.2
	pkgsrc-2009Q1-base:1.7
	pkgsrc-2008Q4:1.6.0.2
	pkgsrc-2008Q4-base:1.6
	pkgsrc-2008Q3:1.5.0.14
	pkgsrc-2008Q3-base:1.5
	cube-native-xorg:1.5.0.12
	cube-native-xorg-base:1.5
	pkgsrc-2008Q2:1.5.0.10
	pkgsrc-2008Q2-base:1.5
	cwrapper:1.5.0.8
	pkgsrc-2008Q1:1.5.0.6
	pkgsrc-2008Q1-base:1.5
	pkgsrc-2007Q4:1.5.0.4
	pkgsrc-2007Q4-base:1.5
	pkgsrc-2007Q3:1.5.0.2
	pkgsrc-2007Q3-base:1.5
	pkgsrc-2007Q2:1.4.0.2
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.2.0.12
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.10
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.8
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.6
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.4
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.2
	pkgsrc-2005Q4-base:1.2;
locks; strict;
comment	@# @;


1.8
date	2012.06.16.15.15.06;	author taca;	state dead;
branches;
next	1.7;

1.7
date	2009.02.07.18.03.00;	author adrianp;	state Exp;
branches;
next	1.6;

1.6
date	2008.10.28.07.07.59;	author adam;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2007.09.02.21.12.42;	author jdolecek;	state Exp;
branches;
next	1.4;

1.4
date	2007.06.11.17.45.30;	author heinz;	state Exp;
branches;
next	1.3;

1.3
date	2007.06.08.12.29.53;	author adrianp;	state Exp;
branches;
next	1.2;

1.2
date	2005.12.03.18.53.57;	author jdolecek;	state dead;
branches
	1.2.12.1;
next	1.1;

1.1
date	2005.10.16.12.17.47;	author jdolecek;	state Exp;
branches;
next	;

1.6.2.1
date	2009.03.15.19.21.22;	author tron;	state Exp;
branches;
next	;

1.2.12.1
date	2007.06.14.23.34.09;	author salo;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Remove php5 (PHP 5.2.17), please migra to php53 or php54.
@
text
@$NetBSD: patch-an,v 1.7 2009/02/07 18:03:00 adrianp Exp $

--- configure.orig	2008-12-07 11:31:12.000000000 -0800
+++ configure
@@@@ -12471,7 +12471,7 @@@@ EOF
 
     echo "$ac_t""$PHP_PATH_INFO_CHECK" 1>&6
 
-        INSTALL_IT="@@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
+        INSTALL_IT="@@echo \"Installing PHP CGI binary:	\$(INSTALL_ROOT)@@CGIDIR@@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@@CGIDIR@@/php"
     
   PHP_SAPI=cgi
   
@@@@ -21467,7 +21467,7 @@@@ fi
     if test "$found_openssl" = "no"; then
   
     if test "$PHP_OPENSSL_DIR" = "yes"; then
-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
     fi
 
     for i in $PHP_OPENSSL_DIR; do
@@@@ -34588,7 +34588,7 @@@@ fi
     if test "$found_openssl" = "no"; then
   
     if test "$PHP_OPENSSL_DIR" = "yes"; then
-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
     fi
 
     for i in $PHP_OPENSSL_DIR; do
@@@@ -48878,7 +48878,7 @@@@ fi
     if test "$found_openssl" = "no"; then
   
     if test "$PHP_OPENSSL_DIR" = "yes"; then
-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
     fi
 
     for i in $PHP_OPENSSL_DIR; do
@@@@ -87996,7 +87996,7 @@@@ fi
     if test "$found_openssl" = "no"; then
   
     if test "$PHP_OPENSSL_DIR" = "yes"; then
-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
     fi
 
     for i in $PHP_OPENSSL_DIR; do
@@@@ -108297,12 +108297,7 @@@@ old_CC=$CC
 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
   CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
   INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
-  cat >meta_ccld<<EOF
-#! /bin/sh
-exec $CC $ac_cv_pthreads_cflags \$@@
-EOF
-  CC="$abs_builddir/meta_ccld"
-  chmod +x meta_ccld
+  CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
 fi
 
 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
@


1.7
log
@Get SSL support working on OpenSolaris.  Unfortunately on OpenSolairs the
OpenSSL install is split between /lib and /usr/include/openssl with plays
havoc with the php ./configure as it assumes both have the same base
directory (e.g. /usr).  This patch uses a modified inbuilt check for
OpenSSL instead of explicitly specifying a base using --with-openssl.
@
text
@d1 1
a1 1
$NetBSD$
@


1.6
log
@Fix buildling ap-php with APACHE_MPM=worker
@
text
@d3 1
a3 1
--- configure.orig	2008-04-30 20:37:32.000000000 +0200
d5 1
a5 1
@@@@ -12437,7 +12437,7 @@@@ EOF
d14 37
a50 1
@@@@ -107515,12 +107515,7 @@@@ old_CC=$CC
@


1.6.2.1
log
@Pullup ticket #2721 - requested by adrianp
php5: security update

Revisions pulled up:
- lang/php5/MESSAGE.suhosin			1.1 via patch
- lang/php5/Makefile				1.71 via patch
- lang/php5/Makefile.common			1.35
- lang/php5/Makefile.php			1.33-1.34
- lang/php5/PLIST				1.21
- lang/php5/distinfo				1.61-1.62
- lang/php5/patches/patch-an			patch
- lang/php5/patches/patch-ar			patch
- lang/php5/patches/patch-as			delete
---
Module Name:	pkgsrc
Committed By:	adrianp
Date:		Mon Mar  2 22:52:17 UTC 2009

Modified Files:
	pkgsrc/lang/php5: Makefile Makefile.common Makefile.php PLIST distinfo
Removed Files:
	pkgsrc/lang/php5/patches: patch-as

Log Message:
The PHP development team would like to announce the immediate availability of PHP 5.2.9. This release focuses on improving the stability of the PHP 5.2.x branch with over 50 bug fixes, several of which are security related. All users of PHP are encouraged to upgrade to this release.

Security Enhancements and Fixes in PHP 5.2.9:

    * Fixed security issue in imagerotate(), background colour isn't validated correctly with a non truecolour image. Reported by Hamid Ebadi, APA Laboratory (Fixes CVE-2008-5498). (Scott)
    * Fixed a crash on extract in zip when files or directories entry names contain a relative path. (Pierre)
    * Fixed explode() behavior with empty string to respect negative limit. (Shire)
    * Fixed a segfault when malformed string is passed to json_decode(). (Scott)

Key enhancements in PHP 5.2.9 include:

    * Added optional sorting type flag parameter to array_unique(). Default is SORT_REGULAR. (Andrei)
    * Fixed bug #45996 (libxml2 2.7 causes breakage with character data in xml_parse()). (Rob)
    * A number of fixes in the mbstring extension (Moriyoshi)
    * Fixed bug #44336 (Improve pcre UTF-8 string matching performance). (frode at coretrek dot com, Nuno)
    * Fixed bug #46699 (xml_parse crash when parser is namespace aware). (Rob)
    * Fixed bug #46748 (Segfault when an SSL error has more than one error). (Scott)
    * Fixed bug #46889 (Memory leak in strtotime()). (Derick)
    * Fixed bug #47049 (SoapClient::__soapCall causes a segmentation fault). (Dmitry)
    * Fixed bug #47165 (Possible memory corruption when passing return value by reference). (Dmitry)
    * Fixed bug #47282 (FILTER_VALIDATE_EMAIL is marking valid email addresses as invalid). (Ilia)
    * Fixed bug #47422 (modulus operator returns incorrect results on 64 bit linux). (Matt)
    * Over 50 bug fixes.
---
Module Name:	pkgsrc
Committed By:	adrianp
Date:		Thu Mar  5 23:22:24 UTC 2009

Modified Files:
	pkgsrc/lang/php5: Makefile.php distinfo

Log Message:
Add back suhosin patch as a new one for 5.2.9 is out
@
text
@d1 1
a1 1
$NetBSD: patch-an,v 1.7 2009/02/07 18:03:00 adrianp Exp $
d3 1
a3 1
--- configure.orig	2008-12-07 11:31:12.000000000 -0800
d5 1
a5 1
@@@@ -12471,7 +12471,7 @@@@ EOF
d14 1
a14 37
@@@@ -21467,7 +21467,7 @@@@ fi
     if test "$found_openssl" = "no"; then
   
     if test "$PHP_OPENSSL_DIR" = "yes"; then
-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
     fi
 
     for i in $PHP_OPENSSL_DIR; do
@@@@ -34588,7 +34588,7 @@@@ fi
     if test "$found_openssl" = "no"; then
   
     if test "$PHP_OPENSSL_DIR" = "yes"; then
-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
     fi
 
     for i in $PHP_OPENSSL_DIR; do
@@@@ -48878,7 +48878,7 @@@@ fi
     if test "$found_openssl" = "no"; then
   
     if test "$PHP_OPENSSL_DIR" = "yes"; then
-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
     fi
 
     for i in $PHP_OPENSSL_DIR; do
@@@@ -87996,7 +87996,7 @@@@ fi
     if test "$found_openssl" = "no"; then
   
     if test "$PHP_OPENSSL_DIR" = "yes"; then
-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
     fi
 
     for i in $PHP_OPENSSL_DIR; do
@@@@ -108297,12 +108297,7 @@@@ old_CC=$CC
@


1.5
log
@Update lang/php5 to 5.2.4 - miscellaneous security fixes and over 120 other
bug fixes
@
text
@d3 1
a3 1
--- configure.orig	2007-09-02 19:32:56.000000000 +0200
d14 14
@


1.4
log
@Added support for installation to DESTDIR. patch-an had removed correct
support for this before, probably unintentionally.
@
text
@d1 1
a1 1
$NetBSD: patch-an,v 1.3 2007/06/08 12:29:53 adrianp Exp $
d3 1
a3 1
--- configure.orig	2007-05-30 20:50:52.000000000 +0200
d5 1
a5 1
@@@@ -11985,7 +11985,7 @@@@ EOF
d7 1
a7 1
     echo "$ac_t""$PHP_ENABLE_FASTCGI" 1>&6
d9 2
a10 2
-    INSTALL_IT="@@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
+    INSTALL_IT="@@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@@CGIDIR@@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@@CGIDIR@@/php"
@


1.3
log
@Fix the install path for the CGI binary so it ends up where we want it.
Pointed out by schmonz@@ and taca@@
Bump PKGREVISION
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- configure.orig	2007-05-30 19:50:52.000000000 +0100
d10 1
a10 1
+    INSTALL_IT="@@echo \"Installing PHP CGI binary: @@CGIDIR@@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) @@CGIDIR@@/php"
@


1.2
log
@Update PHP5 to version 5.1.1. Some of the key features include:

* A complete rewrite of date handling code, with improved timezone support.
* Significant performance improvements compared to PHP 5.0.X.
* PDO extension is now enabled by default (separate pkg for pkgsrc)
* Over 30 new functions in various extensions and built-in functionality.
* Bundled libraries, PCRE and SQLite upgraded to latest versions.
* Over 400 various bug fixes.
* PEAR upgraded to version 1.4.5

This release also fixes various security problems discovered in 5.0.X.
@
text
@d1 1
a1 1
$NetBSD: patch-an,v 1.1 2005/10/16 12:17:47 jdolecek Exp $
d3 3
a5 4
--- ext/mbstring/libmbfl/mbfl/mbfilter.c.orig	2005-10-16 14:09:17.000000000 +0200
+++ ext/mbstring/libmbfl/mbfl/mbfilter.c	2005-10-16 14:09:21.000000000 +0200
@@@@ -1990,7 +1990,7 @@@@
 		break;
d7 7
a13 6
 	default:	/* ASCII */
-		if (!qp_table[(c & 0xff)]) { /* ordinary characters */
+		if (c >= 0 && c < 0x100 && !qp_table[(c & 0xff)]) { /* ordinary characters */
 			mbfl_memory_device_output(c, &pe->tmpdev);
 			pe->status1 = 1;
 		} else if (pe->status1 == 0 && c == 0x20) {	/* repeat SPACE */
@


1.2.12.1
log
@Pullup ticket 2113 - requested by adrianp
security update for php5

Revisions pulled up:
- pkgsrc/lang/php5/Makefile			1.52, 1.53, 1.54, 1.55
- pkgsrc/lang/php5/Makefile.common		1.26
- pkgsrc/lang/php5/distinfo			1.41, 1.42, 1.43, 1.44
- pkgsrc/lang/php5/patches/patch-am		1.3
- pkgsrc/lang/php5/patches/patch-an		1.3, 1.4

   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Wed Jun  6 19:33:13 UTC 2007

   Modified Files:
   	pkgsrc/lang/php5: Makefile Makefile.common distinfo

   Log Message:
   Update to php-5.2.3

   Security Fixes
   * Fixed an integer overflow inside chunk_split() (by Gerhard Wagner,
     CVE-2007-2872)
   * Fixed possible infinite loop in imagecreatefrompng. (by Xavier Roche,
     CVE-2007-2756)
   * Fixed ext/filter Email Validation Vulnerability (MOPB-45 by Stefan
     Esser, CVE-2007-1900)
   * Fixed bug #41492 (open_basedir/safe_mode bypass inside realpath())
     (by bugs dot php dot net at chsc dot dk)
   * Improved fix for CVE-2007-1887 to work with non-bundled sqlite2 lib.
   * Added mysql_set_charset() to allow runtime altering of connection
     encoding.

   * Upgraded bundled SQLite 3 to version 3.3.17. (Ilia)
   * Fixed gd build when used with freetype 1.x (Pierre, Tony)

   And a fair few bugs fixed, see: http://www.php.net/ChangeLog-5.php#5.2.3
   for all the details.
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Thu Jun  7 10:45:18 UTC 2007

   Added Files:
   	pkgsrc/lang/php5/patches: patch-am

   Log Message:
   Add in the correct patch to fix CVE-2007-2872
   Spotted by Takahiro Kambe
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Thu Jun  7 10:45:42 UTC 2007

   Modified Files:
   	pkgsrc/lang/php5: Makefile distinfo

   Log Message:
   Add in the correct patch to fix CVE-2007-2872
   Spotted by Takahiro Kambe
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Fri Jun  8 12:29:53 UTC 2007

   Modified Files:
   	pkgsrc/lang/php5: Makefile distinfo
   Added Files:
   	pkgsrc/lang/php5/patches: patch-an

   Log Message:
   Fix the install path for the CGI binary so it ends up where we want it.
   Pointed out by schmonz@@ and taca@@
   Bump PKGREVISION
---
   Module Name:		pkgsrc
   Committed By:	heinz
   Date:		Mon Jun 11 17:45:30 UTC 2007

   Modified Files:
   	pkgsrc/lang/php5: Makefile distinfo
   	pkgsrc/lang/php5/patches: patch-an

   Log Message:
   Added support for installation to DESTDIR. patch-an had removed correct
   support for this before, probably unintentionally.
@
text
@d1 1
a1 1
$NetBSD: patch-an,v 1.4 2007/06/11 17:45:30 heinz Exp $
d3 4
a6 3
--- configure.orig	2007-05-30 20:50:52.000000000 +0200
+++ configure
@@@@ -11985,7 +11985,7 @@@@ EOF
d8 6
a13 7
     echo "$ac_t""$PHP_ENABLE_FASTCGI" 1>&6
 
-    INSTALL_IT="@@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
+    INSTALL_IT="@@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@@CGIDIR@@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@@CGIDIR@@/php"
     
   PHP_SAPI=cgi
   
@


1.1
log
@Fix bug in mbstring extension function mb_encode_mimeheader(), which
misinterpreted some Japanese characters as ASCII.

PR: 31223 by Takahiro Kambe
@
text
@d1 1
a1 1
$NetBSD$
@