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

Import of pkgsrc-2015Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lang/php56/Makefile
View File

@@ -1,9 +1,10 @@
# $NetBSD: Makefile,v 1.5 2015/03/16 00:26:31 taca Exp $
# $NetBSD: Makefile,v 1.6 2015/06/28 15:35:33 taca Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_VERSION}
PKGREVISION= 1
CATEGORIES= lang
HOMEPAGE= http://www.php.net/

11
lang/php56/distinfo
View File

@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.8 2015/03/20 16:31:47 taca Exp $
$NetBSD: distinfo,v 1.12 2015/06/28 15:35:33 taca Exp $
SHA1 (php-5.6.7.tar.bz2) = 36a51c7ad98a6ed210673c2e655ba501f0a2f7ed
RMD160 (php-5.6.7.tar.bz2) = 485cef74042e79591b41715e15c9373482c036e7
Size (php-5.6.7.tar.bz2) = 13697400 bytes
SHA1 (php-5.6.10.tar.bz2) = 309255ff5ac3d789f0277354f0686404af646e09
RMD160 (php-5.6.10.tar.bz2) = c5cad85f011889997b0ba9dd5e5b6f013be0fd65
Size (php-5.6.10.tar.bz2) = 14080915 bytes
SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
SHA1 (patch-aclocal.m4) = 49117c42e03bd3ed57d967d33ba543f936013b4f
SHA1 (patch-build_libtool.m4) = f459cda09cbdad9780568d271091fb17bbc5d965
@@ -13,8 +13,9 @@ SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
SHA1 (patch-ext_opcache_config.m4) = 031db201f68a120615561a5abd3e84aff58b523d
SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
SHA1 (patch-ext_phar_Makefile.frag) = 3dc3627a908d129b54cfb745d60e352e0372b271
SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
SHA1 (patch-ext_spl_spl__heap.c) = 0380d44f56efc2992eb64bd9446a75ec46a61a42
SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419

13
lang/php56/patches/patch-ext_phar_Makefile.frag
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2014/12/19 16:12:48 taca Exp $
$NetBSD: patch-ext_phar_Makefile.frag,v 1.3 2015/06/12 00:47:03 taca Exp $
--- ext/phar/Makefile.frag.orig 2014-12-17 01:25:00.000000000 +0000
--- ext/phar/Makefile.frag.orig 2015-06-10 07:42:27.000000000 +0000
+++ ext/phar/Makefile.frag
@@ -18,7 +18,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
else \
@@ -11,12 +11,3 @@ $NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2014/12/19 16:12:48 taca Exp $
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
@@ -39,7 +39,7 @@ install-pharcmd: pharcmd
-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
-@rm -f $(INSTALL_ROOT)$(bindir)/phar
- $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
+ $(LN_S) -f phar.phar $(INSTALL_ROOT)$(bindir)/phar
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
@$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1
@$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1

18
lang/php56/patches/patch-ext_spl_spl__heap.c Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-ext_spl_spl__heap.c,v 1.1 2015/06/28 15:35:33 taca Exp $
Fix Bug #69737 Segfault when SplMinHeap::compare produces fatal error.
--- ext/spl/spl_heap.c.orig 2015-06-10 07:42:27.000000000 +0000
+++ ext/spl/spl_heap.c
@@ -249,9 +249,10 @@ static void spl_ptr_heap_insert(spl_ptr_
heap->ctor(elem TSRMLS_CC);
/* sifting up */
- for(i = heap->count++; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) {
+ for(i = heap->count; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) {
heap->elements[i] = heap->elements[(i-1)/2];
}
+ heap->count++;
if (EG(exception)) {
/* exception thrown during comparison */