cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- apply BACKPORTS patch unconditionally and remove BACKPORTS option

Browse Source 
- update backports patch to latest version (20120504)
- align pathnames in slave ports
- bump PORTREVISION

The only drawback of this change is that now for building of every slave
port (php extension) we extracting full php52 source tree.

Apologies that it took that long.

PR:		164849
Submitted by:	Svyatoslav Lempert <svyatoslav.lempert at gmail dot com>
Approved by:	Alex Keda <admin at lissyara dot su>
Security:	60de13d5-95f0-11e1-806a-001143cd36d8
This commit is contained in:
Ruslan Makhmatkhanov 2012-05-05 15:18:09 +00:00
parent d2c2c21c94
commit 76ea697dac
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=296046
25 changed files with 63 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
converters/php52-mbstring/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig Fri Sep 8 07:42:50 2006
+++ config.m4 Fri Sep 8 07:43:00 2006
--- ext/mbstring/config.m4.orig Fri Sep 8 07:42:50 2006
+++ ext/mbstring/config.m4 Fri Sep 8 07:43:00 2006
@@ -66,7 +66,6 @@
int foo(int x, ...) {
va_list va;

4
converters/php52-mbstring/files/patch-oniguruma_regerror.c
View File

@ -1,5 +1,5 @@
--- oniguruma/regerror.c.orig Sat Jan 28 09:53:54 2006
+++ oniguruma/regerror.c Sat Jan 28 09:56:58 2006
--- ext/mbstring/oniguruma/regerror.c.orig Sat Jan 28 09:53:54 2006
+++ ext/mbstring/oniguruma/regerror.c Sat Jan 28 09:56:58 2006
@@ -27,6 +27,7 @@
* SUCH DAMAGE.
*/

4
databases/php52-dba/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig 2010-07-26 00:28:32.111202104 +0200
+++ config.m4 2010-07-26 00:28:35.656577336 +0200
--- ext/dba/config.m4.orig 2010-07-26 00:28:32.111202104 +0200
+++ ext/dba/config.m4 2010-07-26 00:28:35.656577336 +0200
@@ -280,6 +280,38 @@
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h

4
databases/php52-oci8/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig Wed Apr 5 11:06:00 2006
+++ config.m4 Tue Jul 11 08:20:27 2006
--- ext/oci8/config.m4.orig Wed Apr 5 11:06:00 2006
+++ ext/oci8/config.m4 Tue Jul 11 08:20:27 2006
@@ -177,8 +177,7 @@
;;

4
databases/php52-odbc/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig 2007-09-14 08:03:08.000000000 +0200
+++ config.m4 2007-09-14 08:14:21.000000000 +0200
--- ext/odbc/config.m4.orig 2007-09-14 08:03:08.000000000 +0200
+++ ext/odbc/config.m4 2007-09-14 08:14:21.000000000 +0200
@@ -101,7 +101,7 @@
dnl
if test -z "$ODBC_TYPE"; then

4
databases/php52-pdo_oci/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig Thu Feb 16 03:03:13 2006
+++ config.m4 Wed Feb 7 15:00:58 2007
--- ext/pdo_oci/config.m4.orig Thu Feb 16 03:03:13 2006
+++ ext/pdo_oci/config.m4 Wed Feb 7 15:00:58 2007
@@ -145,7 +145,6 @@
;;

4
databases/php52-pdo_sqlite/files/patch-sqlite_statement.c
View File

@ -1,5 +1,5 @@
--- sqlite_statement.c.orig 2007-12-31 08:20:10.000000000 +0100
+++ sqlite_statement.c 2008-12-07 11:50:35.000000000 +0100
--- ext/pdo_sqlite/sqlite_statement.c.orig 2007-12-31 08:20:10.000000000 +0100
+++ ext/pdo_sqlite/sqlite_statement.c 2008-12-07 11:50:35.000000000 +0100
@@ -104,6 +104,21 @@
pdo_sqlite_error_stmt(stmt);
return 0;

4
databases/php52-pgsql/files/patch-pgsql.c
View File

@ -1,5 +1,5 @@
--- pgsql.c.orig 2007-10-04 01:31:58.000000000 +0200
+++ pgsql.c 2008-01-29 11:10:15.000000000 +0100
--- ext/pgsql/pgsql.c.orig 2007-10-04 01:31:58.000000000 +0200
+++ ext/pgsql/pgsql.c 2008-01-29 11:10:15.000000000 +0100
@@ -62,6 +62,7 @@
#define PGSQL_MAX_LENGTH_OF_LONG 30
#define PGSQL_MAX_LENGTH_OF_DOUBLE 60

4
databases/php52-sqlite/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig Wed Nov 30 05:50:03 2005
+++ config.m4 Tue Jan 17 12:51:21 2006
--- ext/sqlite/config.m4.orig Wed Nov 30 05:50:03 2005
+++ ext/sqlite/config.m4 Tue Jan 17 12:51:21 2006
@@ -48,14 +48,6 @@

4
devel/php52-gettext/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig Tue Jul 27 23:58:02 2004
+++ config.m4 Tue Jul 27 23:59:44 2004
--- ext/gettext/config.m4.orig Tue Jul 27 23:58:02 2004
+++ ext/gettext/config.m4 Tue Jul 27 23:59:44 2004
@@ -30,7 +30,6 @@
AC_MSG_ERROR(Unable to find required gettext library)
])

4
devel/php52-pcre/files/patch-php_pcre.c
View File

@ -1,5 +1,5 @@
--- php_pcre.c.orig 2009-03-06 10:58:43.000000000 +0100
+++ php_pcre.c 2009-03-06 10:58:56.000000000 +0100
--- ext/pcre/php_pcre.c.orig 2009-03-06 10:58:43.000000000 +0100
+++ ext/pcre/php_pcre.c 2009-03-06 10:58:56.000000000 +0100
@@ -18,6 +18,10 @@
/* $Id: php_pcre.c,v 1.168.2.9.2.30 2009/01/13 19:23:31 andrei Exp $ */

4
devel/php52-readline/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig 2009-08-04 13:20:49.000000000 +0200
+++ config.m4 2009-09-22 11:13:12.000000000 +0200
--- ext/readline/config.m4.orig 2009-08-04 13:20:49.000000000 +0200
+++ ext/readline/config.m4 2009-09-22 11:13:12.000000000 +0200
@@ -5,13 +5,8 @@
PHP_ARG_WITH(libedit,for libedit readline replacement,
[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)])

4
devel/php52-spl/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig Mon Dec 4 19:01:53 2006
+++ config.m4 Wed Feb 7 12:21:20 2007
--- ext/spl/config.m4.orig Mon Dec 4 19:01:53 2006
+++ ext/spl/config.m4 Wed Feb 7 12:21:20 2007
@@ -4,6 +4,11 @@
PHP_ARG_ENABLE(spl, enable SPL suppport,
[ --disable-spl Disable Standard PHP Library], yes)

4
graphics/php52-gd/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig Mon May 30 01:16:41 2005
+++ config.m4 Wed Dec 7 11:01:13 2005
--- ext/gd/config.m4.orig Mon May 30 01:16:41 2005
+++ ext/gd/config.m4 Wed Dec 7 11:01:13 2005
@@ -220,7 +220,7 @@
],[
AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])

4
graphics/php52-gd/files/patch-libgd_gd_png.c
View File

@ -1,5 +1,5 @@
--- libgd/gd_png.c.orig 2009-03-14 18:48:42.000000000 +0100
+++ libgd/gd_png.c 2010-04-05 19:54:05.000000000 +0200
--- ext/gd/libgd/gd_png.c.orig 2009-03-14 18:48:42.000000000 +0100
+++ ext/gd/libgd/gd_png.c 2010-04-05 19:54:05.000000000 +0200
@@ -139,7 +139,11 @@
return NULL;
}

17
lang/php52/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= php52
PORTVERSION= 5.2.17
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions
@ -24,6 +24,11 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
USE_BZIP2= yes
MAKE_JOBS_SAFE= yes
# BACKPORTS patch for lang/php52 and all php52-extensions
PATCHFILES= php52-backports-security-20120504.patch
PATCH_SITES= http://php52-backports.googlecode.com/files/
.if !defined(PKGNAMESUFFIX)
USE_AUTOTOOLS= autoconf
AUTOTOOLSFILES= scripts/phpize.in
@ -52,8 +57,7 @@ OPTIONS= CLI "Build CLI version" on \
FASTCGI "Enable fastcgi support (CGI only)" on \
FPM "Enable fastcgi process manager (CGI only)" off \
PATHINFO "Enable path-info-check support (CGI only)" on \
LINKTHR "Link thread lib (for threaded extensions)" off \
BACKPORTS "Enable backported security and bugfix patches" on
LINKTHR "Link thread lib (for threaded extensions)" off
CONFLICTS= php4-4* php5-5.3*
@ -187,13 +191,6 @@ CONFIGURE_ARGS+=--enable-zend-multibyte
CONFIGURE_ARGS+=--disable-ipv6
.endif
.if defined(WITH_BACKPORTS)
PATCHFILES+= php52-backports-security-20120117.patch
PATCH_SITES+= http://php52-backports.googlecode.com/files/
.else
FORBIDDEN= Vulnerable since 2011-01-13, http://portaudit.freebsd.org/3761df02-0f9c-11e0-becc-0022156e8794.html
.endif
post-patch:
@${TOUCH} ${WRKSRC}/ext/php_config.h
@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*

18
lang/php52/Makefile.ext
View File

@ -11,7 +11,9 @@ WRKSRC= ${WRKDIR}/${EXTSUBDIR}
PATCHDIR= ${.CURDIR}/files
PLIST= ${NONEXISTENT}
EXTRACT_AFTER_ARGS?= | ${TAR} -xf - ${EXTSUBDIR}
#EXTRACT_AFTER_ARGS?= | ${TAR} -xf - ${EXTSUBDIR}
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
PATCH_DIST_STRIP+= -p1
.if ${PHP_MODNAME} == "bcmath"
CONFIGURE_ARGS+=--enable-bcmath
@ -248,7 +250,7 @@ USE_OPENSSL= yes
CONFIGURE_ARGS+=--enable-pcntl
.endif
.if ${PHP_MODNAME} == "pcre"
.if ${PHP_MODNAME} == "pcre"
OPTIONS= BUNDLED_PCRE "Select if you use apache 2.0.x" off
.endif
@ -315,7 +317,7 @@ USE_PHP_BUILD= yes
.if ${PHP_MODNAME} == "pdo_sqlite"
. if defined(WITH_SQLITE_PORT)
USE_SQLITE= yes
USE_SQLITE= yes
CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}
. else
CONFIGURE_ARGS+=--with-pdo-sqlite
@ -377,7 +379,7 @@ CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
--with-openssl-dir=${OPENSSLBASE} \
--enable-ucd-snmp-hack
LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
USE_OPENSSL= yes
.endif
@ -490,9 +492,9 @@ USE_PHP_BUILD= yes
.if ${PHP_MODNAME} == "xmlwriter"
CONFIGURE_ARGS+=--enable-xmlwriter \
--with-libxml-dir=${LOCALBASE}
--with-libxml-dir=${LOCALBASE}
USE_GNOME= libxml2
USE_GNOME= libxml2
.endif
.if ${PHP_MODNAME} == "xsl"
@ -576,7 +578,7 @@ pre-configure:
/usr/bin/ar rcs liboci8.a *.o
.endif
.if ${PHP_MODNAME} == "pcre"
.if ${PHP_MODNAME} == "pcre"
. if defined(WITH_BUNDLED_PCRE)
CONFIGURE_ARGS+=--with-pcre-regex=yes
@ -587,7 +589,7 @@ LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre
CONFIGURE_ARGS+=--with-pcre-regex=${LOCALBASE}
. endif
post-extract:
post-extract:
@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
.endif

4
math/php52-gmp/files/patch-gmp.c
View File

@ -1,5 +1,5 @@
--- gmp.c.orig 2010-04-21 22:00:31.841602968 +0000
+++ gmp.c 2010-04-21 22:00:46.412804473 +0000
--- ext/gmp/gmp.c.orig 2010-04-21 22:00:31.841602968 +0000
+++ ext/gmp/gmp.c 2010-04-21 22:00:46.412804473 +0000
@@ -1396,7 +1396,7 @@
GMPG(rand_initialized) = 1;

4
net/php52-soap/files/patch-soap.c
View File

@ -1,5 +1,5 @@
--- soap.c.orig Tue Oct 3 21:51:01 2006
+++ soap.c Sat Nov 4 11:38:29 2006
--- ext/soap/soap.c.orig Tue Oct 3 21:51:01 2006
+++ ext/soap/soap.c Sat Nov 4 11:38:29 2006
@@ -23,7 +23,7 @@
#include "config.h"
#endif

4
security/php52-filter/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig 2009-03-06 08:25:45.000000000 +0100
+++ config.m4 2009-03-06 08:28:10.000000000 +0100
--- ext/filter/config.m4.orig 2009-03-06 08:25:45.000000000 +0100
+++ ext/filter/config.m4 2009-03-06 08:28:10.000000000 +0100
@@ -19,7 +19,7 @@
CPPFLAGS=$INCLUDES
AC_EGREP_CPP(yes,[

4
sysutils/php52-posix/files/patch-posix.c
View File

@ -1,5 +1,5 @@
--- posix.c.orig Fri Feb 23 00:40:39 2007
+++ posix.c Sun May 13 17:52:27 2007
--- ext/posix/posix.c.orig Fri Feb 23 00:40:39 2007
+++ ext/posix/posix.c Sun May 13 17:52:27 2007
@@ -838,7 +838,7 @@
#if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
buflen = sysconf(_SC_GETGR_R_SIZE_MAX);

4
textproc/php52-wddx/files/patch-config.m4
View File

@ -1,5 +1,5 @@
--- config.m4.orig Mon Jul 26 09:05:10 2004
+++ config.m4 Mon Jul 26 09:07:46 2004
--- ext/wddx/config.m4.orig Mon Jul 26 09:05:10 2004
+++ ext/wddx/config.m4 Mon Jul 26 09:07:46 2004
@@ -5,6 +5,9 @@
PHP_ARG_ENABLE(wddx,whether to enable WDDX support,
[ --enable-wddx Enable WDDX support.])

4
textproc/php52-wddx/files/patch-wddx.c
View File

@ -1,5 +1,5 @@
--- wddx.c.orig Sun Jan 1 13:50:16 2006
+++ wddx.c Mon Jan 16 12:56:21 2006
--- ext/wddx/wddx.c.orig Sun Jan 1 13:50:16 2006
+++ ext/wddx/wddx.c Mon Jan 16 12:56:21 2006
@@ -18,6 +18,10 @@
/* $Id: wddx.c,v 1.119.2.8 2006/01/01 12:50:16 sniper Exp $ */

4
textproc/php52-xml/files/patch-compat.c
View File

@ -1,5 +1,5 @@
--- compat.c.orig Tue Jul 20 10:55:02 2004
+++ compat.c Tue Jul 20 10:55:55 2004
--- ext/xml/compat.c.orig Tue Jul 20 10:55:02 2004
+++ ext/xml/compat.c Tue Jul 20 10:55:55 2004
@@ -16,6 +16,10 @@
+----------------------------------------------------------------------+
*/

4
textproc/php52-xsl/files/patch-php_xsl.h
View File

@ -1,5 +1,5 @@
--- php_xsl.h.orig Sun Jan 1 13:50:17 2006
+++ php_xsl.h Tue Jan 17 16:23:10 2006
--- ext/xsl/php_xsl.h.orig Sun Jan 1 13:50:17 2006
+++ ext/xsl/php_xsl.h Tue Jan 17 16:23:10 2006
@@ -43,7 +43,7 @@
#include <libexslt/exsltconfig.h>
#endif