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

Import of pkgsrc-2015Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lang/php55/Makefile
View File

@@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.21 2015/06/28 15:34:50 taca Exp $
# $NetBSD: Makefile,v 1.23 2015/09/07 12:02:05 jperkin Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_VERSION}
PKGREVISION= 1
CATEGORIES= lang
HOMEPAGE= http://www.php.net/
@@ -34,7 +33,6 @@ MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
.endif
CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
@@ -49,11 +47,6 @@ SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
# Make sure modules can link correctly
.if ${OPSYS} == "Darwin"
INSTALL_UNSTRIPPED= yes
.endif
post-extract:
cd ${WRKSRC} && \
${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \;

9
lang/php55/distinfo
View File

@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.42 2015/06/28 15:34:50 taca Exp $
$NetBSD: distinfo,v 1.45 2015/09/06 12:26:37 taca Exp $
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 (php-5.5.29.tar.bz2) = 4f6ef228e515f67232c1ab982d7b013dbb1a9008
RMD160 (php-5.5.29.tar.bz2) = 75f386974c61acdd345814b959223204bab9377e
Size (php-5.5.29.tar.bz2) = 13698565 bytes
SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2
SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2
@@ -15,7 +15,6 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
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

18
lang/php55/patches/patch-ext_spl_spl__heap.c
View File

@@ -1,18 +0,0 @@
$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 */