Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lang/php53/DESCR
View File

@@ -3,3 +3,5 @@ some object-oriented features. Much of its syntax is borrowed from
C, Java and Perl with a couple of unique PHP-specific features
thrown in. The language is designed to allow web developers to
write dynamically generated pages quickly.
This package provides PHP version 5.3.x.

4
lang/php53/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.39.4.3 2013/08/31 16:51:50 tron Exp $
# $NetBSD: Makefile,v 1.47 2014/03/12 19:52:04 asau Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -8,7 +8,7 @@ PKGREVISION= 2
CATEGORIES= lang
HOMEPAGE= http://www.php.net/
COMMENT= PHP Hypertext Preprocessor version 5
COMMENT= PHP Hypertext Preprocessor version 5.3
LICENSE= php
TEST_TARGET= test

9
lang/php53/Makefile.common
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.26.2.2 2013/08/25 16:56:44 tron Exp $
# $NetBSD: Makefile.common,v 1.30 2013/10/25 21:47:51 joerg Exp $
# used by lang/php53/Makefile.php
# used by lang/php/ext.mk
# used by meta-pkgs/php53-extensions/Makefile
@@ -13,7 +13,6 @@
PHP_VERSION_REQD= 53
PHP_BASE_VERS= ${PHP53_VERSION}
PHP_CHECK_INSTALLED= No
.include "../../lang/php/common.mk"
@@ -23,4 +22,10 @@ MAINTAINER?= pkgsrc-users@NetBSD.org
# needed due to (broken?) configure checks in php-xmlrpc and php5-dom
CONFIGURE_ENV+= PHP_LIBXML_SHARED="1"
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
# configure test gets confused by wrappers dropping -R /usr/lib
CONFIGURE_ENV+= php_cv_cc_dashr=no
.endif
.include "../../mk/bsd.prefs.mk"

5
lang/php53/Makefile.php
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.php,v 1.34.2.2 2013/08/25 16:56:44 tron Exp $
# $NetBSD: Makefile.php,v 1.38 2013/12/13 15:30:35 taca Exp $
# used by lang/php53/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
@@ -53,7 +53,7 @@ PKG_SUGGESTED_OPTIONS+= inet6 ssl
.if !empty(PKG_OPTIONS:Msuhosin)
SUHOSIN_PHPVER= 5.3.25
. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != "5.3.27"
. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != "5.3.28"
PKG_FAIL_REASON+= "The suhosin patch is currently not available for"
PKG_FAIL_REASON+= "this version of PHP. You may have to wait until"
PKG_FAIL_REASON+= "an updated patch is released or temporarily"
@@ -91,7 +91,6 @@ CONFIGURE_ARGS+= --enable-maintainer-zts
.endif
.if !empty(PKG_OPTIONS:Mreadline)
USE_GNU_READLINE= yes
.include "../../devel/readline/buildlink3.mk"
CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
.else

17
lang/php53/distinfo
View File

@@ -1,14 +1,15 @@
$NetBSD: distinfo,v 1.65.2.2 2013/08/25 16:52:09 tron Exp $
$NetBSD: distinfo,v 1.72 2014/03/23 09:55:59 spz Exp $
SHA1 (php-5.3.27.tar.bz2) = 4f95682940ebe1bc1a93812d593460625a2aae64
RMD160 (php-5.3.27.tar.bz2) = c2887004859f32b25229ffe52d86270c8de194b7
Size (php-5.3.27.tar.bz2) = 11432791 bytes
SHA1 (php-5.3.28.tar.bz2) = f985ca1f6a5f49ebfb25a08f1837a44c563b31f8
RMD160 (php-5.3.28.tar.bz2) = e4910c0c365f39a5009807801bd5ee6e25be020d
Size (php-5.3.28.tar.bz2) = 11051714 bytes
SHA1 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = ce5883b05daf91e8a44fffbfa4d3989ac3311dd1
RMD160 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 6c4d0cfe070802481121be465b66d3cefe44da83
Size (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 32447 bytes
SHA1 (patch-aa) = fd930d0d9b1c60e8c7c514cfb6864b61ce4d158d
SHA1 (patch-ab) = 5e8f0b91426656cb7f9272d17586ce40ab0fb547
SHA1 (patch-ac) = e8a7218d74f2f4093acca2160693c9a245e4cfc7
SHA1 (patch-ab) = 36789fea71e316d5c4358e597df1928d94f8ea6a
SHA1 (patch-ac) = b194eaed2d81877166b13db58b37c5ddff0210a6
SHA1 (patch-aclocal.m4) = 473b76c8575331604d30e24a08c527e15b166778
SHA1 (patch-ad) = 6b42868f41335ddfa5a8c1e982819166b05e4ad2
SHA1 (patch-ae) = 3a354cb5c1253eb375041d8ee8549c2f663e6c74
SHA1 (patch-af) = 4f5aac4c52ce576f4489cb1f06fdb672745a8fdb
@@ -17,7 +18,9 @@ SHA1 (patch-ah) = 697156508da2d837a1ea1a41f036eab4fb87e94b
SHA1 (patch-ai) = 9659f73eef1b4fcca9b844bdaa785ac6d5e582a1
SHA1 (patch-aj) = 181658ae523bd60f67750566711fc078b49191b7
SHA1 (patch-al) = fe534d7d50a529e3c7d0ffed76afdb70bb55a521
SHA1 (patch-ext_openssl_openssl.c) = f45f4322ac875db7b0bb86efb7cfda1f659ac6cc
SHA1 (patch-build_libtool.m4) = 6835b90ebd34739440c8eb94ed19ebacdf2ba6a5
SHA1 (patch-ext_date_lib_parse__iso__intervals.c) = 1243e4cda1d6446ee4f8b6cab61556fa07837139
SHA1 (patch-ext_date_lib_parse__iso__intervals.re) = 75d4abd666c17d7d5f8a4ee9e489bf2565f83524
SHA1 (patch-ext_standard_basic__functions.c) = 017fd25e646af4d7eb2a0bd13b3c8da34eaee8c5
SHA1 (patch-main_streams_cast.c) = d68b69c9418a8780b1610b8755487771f7c46a5a
SHA1 (patch-php__mssql.c) = 524c4e5d7ede0e503049bf1febec58e0c4a29aa4

2
lang/php53/patches/patch-aa
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.2.20.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-aa,v 1.3 2013/07/12 00:07:04 taca Exp $
--- acinclude.m4.orig 2013-07-10 17:43:08.000000000 +0000
+++ acinclude.m4

70
lang/php53/patches/patch-ab
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.6.2.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-ab,v 1.8 2014/03/12 19:52:04 asau Exp $
--- configure.orig 2013-07-11 17:08:25.000000000 +0000
--- configure.orig 2013-12-10 20:13:12.000000000 +0000
+++ configure
@@ -14121,7 +14121,7 @@ EOF
PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6.2.1 2013/07/15 22:32:24 tron Exp $
if test "$PHP_SAPI" != "default"; then
{ echo "configure: error:
@@ -23465,7 +23465,7 @@ fi
@@ -23462,7 +23462,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.6.2.1 2013/07/15 22:32:24 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -25456,7 +25456,7 @@ echo "configure:25433: checking bundled
@@ -25453,7 +25453,7 @@ echo "configure:25433: checking bundled
PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.6.2.1 2013/07/15 22:32:24 tron Exp $
unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
@@ -36318,7 +36318,7 @@ fi
@@ -36315,7 +36315,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.6.2.1 2013/07/15 22:32:24 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -50659,7 +50659,7 @@ fi
@@ -50656,7 +50656,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -47,7 +47,7 @@ $NetBSD: patch-ab,v 1.6.2.1 2013/07/15 22:32:24 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -84777,7 +84777,7 @@ fi
@@ -84774,7 +84774,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.6.2.1 2013/07/15 22:32:24 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -107940,12 +107940,7 @@ old_CC=$CC
@@ -107937,12 +107937,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"
@@ -70,3 +70,57 @@ $NetBSD: patch-ab,v 1.6.2.1 2013/07/15 22:32:24 tron Exp $
fi
if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
@@ -110873,7 +110868,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
;;
- freebsd1*)
+ freebsd1|freebsd1.*)
ld_shlibs=no
;;
@@ -111512,7 +111507,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -111523,7 +111518,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -113653,7 +113648,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
- freebsd[12]*)
+ freebsd[12]|freebsd[12].*)
# C++ shared libraries reported to be fairly broken before switch to ELF
ld_shlibs_CXX=no
;;
@@ -115181,7 +115176,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -115192,7 +115187,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi

24
lang/php53/patches/patch-ac
View File

@@ -1,6 +1,8 @@
$NetBSD: patch-ac,v 1.5.4.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-ac,v 1.7 2014/03/23 09:55:59 spz Exp $
--- ext/gd/config.m4.orig 2013-07-10 17:43:08.000000000 +0000
Adjustments for zlib, png and freetype2
--- ext/gd/config.m4.orig 2013-12-10 19:04:57.000000000 +0000
+++ ext/gd/config.m4
@@ -45,18 +45,7 @@ dnl Checks for the configure options
dnl
@@ -47,3 +49,21 @@ $NetBSD: patch-ac,v 1.5.4.1 2013/07/15 22:32:24 tron Exp $
],[
-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
])
@@ -162,7 +150,7 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
if test "$PHP_FREETYPE_DIR" != "no"; then
for i in $PHP_FREETYPE_DIR /usr/local /usr; do
- if test -f "$i/include/freetype2/freetype/freetype.h"; then
+ if test -f "$i/include/ft2build.h" -o -f "$i/include/freetype2/ft2build.h"; then
FREETYPE2_DIR=$i
FREETYPE2_INC_DIR=$i/include/freetype2
break
@@ -170,7 +158,7 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
done
if test -z "$FREETYPE2_DIR"; then
- AC_MSG_ERROR([freetype.h not found.])
+ AC_MSG_ERROR([ft2build.h not found.])
fi
PHP_CHECK_LIBRARY(freetype, FT_New_Face,

40
lang/php53/patches/patch-aclocal.m4 Normal file
View File

@@ -0,0 +1,40 @@
$NetBSD: patch-aclocal.m4,v 1.1 2014/03/12 19:52:04 asau Exp $
--- aclocal.m4.orig 2013-12-10 20:13:10.000000000 +0000
+++ aclocal.m4
@@ -4424,7 +4424,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -4435,7 +4435,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[123]]|freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -6051,7 +6051,7 @@ case $host_os in
;;
esac
;;
- freebsd[[12]]*)
+ freebsd[[12]]|freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -8734,7 +8734,7 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
+ freebsd1|freebsd1.*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;

2
lang/php53/patches/patch-ad
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-ad,v 1.1.1.1.28.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-ad,v 1.2 2013/07/12 00:07:04 taca Exp $
--- ext/imap/config.m4.orig 2013-07-10 17:43:08.000000000 +0000
+++ ext/imap/config.m4

2
lang/php53/patches/patch-ae
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-ae,v 1.1.1.1.28.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-ae,v 1.2 2013/07/12 00:07:04 taca Exp $
--- ext/pdo/config.m4.orig 2013-07-10 17:43:08.000000000 +0000
+++ ext/pdo/config.m4

2
lang/php53/patches/patch-af
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-af,v 1.3.18.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-af,v 1.4 2013/07/12 00:07:04 taca Exp $
--- ext/phar/Makefile.frag.orig 2013-07-10 17:43:08.000000000 +0000
+++ ext/phar/Makefile.frag

2
lang/php53/patches/patch-ag
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-ag,v 1.2.8.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-ag,v 1.3 2013/07/12 00:07:04 taca Exp $
Use proper shbang line.

2
lang/php53/patches/patch-ah
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-ah,v 1.1.1.1.28.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-ah,v 1.2 2013/07/12 00:07:04 taca Exp $
--- php.ini-development.orig 2013-07-10 17:43:08.000000000 +0000
+++ php.ini-development

2
lang/php53/patches/patch-ai
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-ai,v 1.1.1.1.28.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-ai,v 1.2 2013/07/12 00:07:04 taca Exp $
--- php.ini-production.orig 2013-07-10 17:43:08.000000000 +0000
+++ php.ini-production

2
lang/php53/patches/patch-aj
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-aj,v 1.2.8.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-aj,v 1.3 2013/07/12 00:07:04 taca Exp $
Use proper shbang line.

2
lang/php53/patches/patch-al
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-al,v 1.1.26.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-al,v 1.2 2013/07/12 00:07:04 taca Exp $
--- ext/pdo_mysql/config.m4.orig 2013-07-10 17:43:08.000000000 +0000
+++ ext/pdo_mysql/config.m4

40
lang/php53/patches/patch-build_libtool.m4 Normal file
View File

@@ -0,0 +1,40 @@
$NetBSD: patch-build_libtool.m4,v 1.1 2014/03/12 19:52:04 asau Exp $
--- build/libtool.m4.orig 2013-12-10 19:04:57.000000000 +0000
+++ build/libtool.m4
@@ -1532,7 +1532,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -1543,7 +1543,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[123]]|freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -3159,7 +3159,7 @@ case $host_os in
;;
esac
;;
- freebsd[[12]]*)
+ freebsd[[12]]|freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -5842,7 +5842,7 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
+ freebsd1|freebsd1.*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;

15
lang/php53/patches/patch-ext_date_lib_parse__iso__intervals.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-ext_date_lib_parse__iso__intervals.c,v 1.1 2013/12/05 16:16:40 taca Exp $
Fix for CVE-2013-6712.
--- ext/date/lib/parse_iso_intervals.c.orig 2013-07-10 17:43:08.000000000 +0000
+++ ext/date/lib/parse_iso_intervals.c
@@ -415,7 +415,7 @@ yy6:
break;
}
ptr++;
- } while (*ptr);
+ } while (!s->errors->error_count && *ptr);
s->have_period = 1;
TIMELIB_DEINIT;
return TIMELIB_PERIOD;

15
lang/php53/patches/patch-ext_date_lib_parse__iso__intervals.re Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-ext_date_lib_parse__iso__intervals.re,v 1.1 2013/12/05 16:16:40 taca Exp $
Fix for CVE-2013-6712.
--- ext/date/lib/parse_iso_intervals.re.orig 2013-07-10 17:43:08.000000000 +0000
+++ ext/date/lib/parse_iso_intervals.re
@@ -383,7 +383,7 @@ isoweek = year4 "-"? "W" weekof
break;
}
ptr++;
- } while (*ptr);
+ } while (!s->errors->error_count && *ptr);
s->have_period = 1;
TIMELIB_DEINIT;
return TIMELIB_PERIOD;

114
lang/php53/patches/patch-ext_openssl_openssl.c
View File

@@ -1,114 +0,0 @@
$NetBSD$
Fix for CVE-2013-4248.
--- ext/openssl/openssl.c.orig 2013-07-10 17:43:08.000000000 +0000
+++ ext/openssl/openssl.c
@@ -1326,6 +1326,75 @@ PHP_FUNCTION(openssl_x509_check_private_
}
/* }}} */
+
+/* Special handling of subjectAltName, see CVE-2013-4073
+ * Christian Heimes
+ */
+
+static int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension)
+{
+ GENERAL_NAMES *names;
+ const X509V3_EXT_METHOD *method = NULL;
+ long i, length, num;
+ const unsigned char *p;
+
+ method = X509V3_EXT_get(extension);
+ if (method == NULL) {
+ return -1;
+ }
+
+ p = extension->value->data;
+ length = extension->value->length;
+ if (method->it) {
+ names = (GENERAL_NAMES*)(ASN1_item_d2i(NULL, &p, length,
+ ASN1_ITEM_ptr(method->it)));
+ } else {
+ names = (GENERAL_NAMES*)(method->d2i(NULL, &p, length));
+ }
+ if (names == NULL) {
+ return -1;
+ }
+
+ num = sk_GENERAL_NAME_num(names);
+ for (i = 0; i < num; i++) {
+ GENERAL_NAME *name;
+ ASN1_STRING *as;
+ name = sk_GENERAL_NAME_value(names, i);
+ switch (name->type) {
+ case GEN_EMAIL:
+ BIO_puts(bio, "email:");
+ as = name->d.rfc822Name;
+ BIO_write(bio, ASN1_STRING_data(as),
+ ASN1_STRING_length(as));
+ break;
+ case GEN_DNS:
+ BIO_puts(bio, "DNS:");
+ as = name->d.dNSName;
+ BIO_write(bio, ASN1_STRING_data(as),
+ ASN1_STRING_length(as));
+ break;
+ case GEN_URI:
+ BIO_puts(bio, "URI:");
+ as = name->d.uniformResourceIdentifier;
+ BIO_write(bio, ASN1_STRING_data(as),
+ ASN1_STRING_length(as));
+ break;
+ default:
+ /* use builtin print for GEN_OTHERNAME, GEN_X400,
+ * GEN_EDIPARTY, GEN_DIRNAME, GEN_IPADD and GEN_RID
+ */
+ GENERAL_NAME_print(bio, name);
+ }
+ /* trailing ', ' except for last element */
+ if (i < (num - 1)) {
+ BIO_puts(bio, ", ");
+ }
+ }
+ sk_GENERAL_NAME_pop_free(names, GENERAL_NAME_free);
+
+ return 0;
+}
+
/* {{{ proto array openssl_x509_parse(mixed x509 [, bool shortnames=true])
Returns an array of the fields/values of the CERT */
PHP_FUNCTION(openssl_x509_parse)
@@ -1422,15 +1491,29 @@ PHP_FUNCTION(openssl_x509_parse)
for (i = 0; i < X509_get_ext_count(cert); i++) {
+ int nid;
extension = X509_get_ext(cert, i);
- if (OBJ_obj2nid(X509_EXTENSION_get_object(extension)) != NID_undef) {
+ nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
+ if (nid != NID_undef) {
extname = (char *)OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(extension)));
} else {
OBJ_obj2txt(buf, sizeof(buf)-1, X509_EXTENSION_get_object(extension), 1);
extname = buf;
}
bio_out = BIO_new(BIO_s_mem());
- if (X509V3_EXT_print(bio_out, extension, 0, 0)) {
+ if (nid == NID_subject_alt_name) {
+ if (openssl_x509v3_subjectAltName(bio_out, extension) == 0) {
+ add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1);
+ } else {
+ zval_dtor(return_value);
+ if (certresource == -1 && cert) {
+ X509_free(cert);
+ }
+ BIO_free(bio_out);
+ RETURN_FALSE;
+ }
+ }
+ else if (X509V3_EXT_print(bio_out, extension, 0, 0)) {
BIO_get_mem_ptr(bio_out, &bio_buf);
add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1);
} else {

2
lang/php53/patches/patch-ext_standard_basic__functions.c
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-ext_standard_basic__functions.c,v 1.1.10.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-ext_standard_basic__functions.c,v 1.2 2013/07/12 00:07:04 taca Exp $
Work around VAX FP lack of INF

2
lang/php53/patches/patch-main_streams_cast.c
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-main_streams_cast.c,v 1.1.14.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-main_streams_cast.c,v 1.2 2013/07/12 00:07:04 taca Exp $
* For NetBSD 6.0+, __NetBSD_Version__ should includes 600000000.

2
lang/php53/patches/patch-php__mssql.c
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-php__mssql.c,v 1.1.16.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-php__mssql.c,v 1.2 2013/07/12 00:07:04 taca Exp $
Fix with newer freetds:

2
lang/php53/patches/patch-sapi_fpm_php-fpm.conf.in
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.1.4.1 2013/07/15 22:32:24 tron Exp $
$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.2 2013/07/12 00:07:04 taca Exp $
Uncomment the pid parameter so the pidfile is created and rc.d script
can really start / stop php-fpm