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/php55/Makefile
View File

@@ -1,9 +1,10 @@
# $NetBSD: Makefile,v 1.20 2015/03/16 00:26:31 taca Exp $
# $NetBSD: Makefile,v 1.21 2015/06/28 15:34:50 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/php55/distinfo
View File

@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.38 2015/03/20 16:30:38 taca Exp $
$NetBSD: distinfo,v 1.42 2015/06/28 15:34:50 taca Exp $
SHA1 (php-5.5.23.tar.bz2) = a206cc931bd3aec946a7e5f82b28552d4a93c3cb
RMD160 (php-5.5.23.tar.bz2) = 936892bf22a39920920e85d2b69bcdac9c4fffc9
Size (php-5.5.23.tar.bz2) = 13308115 bytes
SHA1 (php-5.5.26.tar.bz2) = f2f80ef51d38b39c4ef060942e2ddcfffec9927a
RMD160 (php-5.5.26.tar.bz2) = abfc8d5fa0615e22d4510bd025195cb9e88c2e77
Size (php-5.5.26.tar.bz2) = 13671379 bytes
SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2
SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2
@@ -13,8 +13,9 @@ SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f
SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
SHA1 (patch-ext_phar_Makefile.frag) = f8e3f7b7c3e93765d019e5614a884df6185d0436
SHA1 (patch-ext_phar_Makefile.frag) = f465bb5acd4bb87bb403baa98b61ac707800fd30
SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
SHA1 (patch-ext_spl_spl__heap.c) = cc30baddf4c935b9d9bdfe304409690a24169db0
SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937

13
lang/php55/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:10:38 taca Exp $
$NetBSD: patch-ext_phar_Makefile.frag,v 1.3 2015/06/12 00:44:32 taca Exp $
--- ext/phar/Makefile.frag.orig 2014-12-17 09:39:40.000000000 +0000
--- ext/phar/Makefile.frag.orig 2015-06-10 12:26:49.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:10:38 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/php55/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:34:50 taca Exp $
Fix Bug #69737 Segfault when SplMinHeap::compare produces fatal error.
--- ext/spl/spl_heap.c.orig 2015-06-10 12:26:49.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 */