diff --git a/lang/php/7.2/Makefile b/lang/php/7.2/Makefile index 034ed42d947..1c0187c23ac 100644 --- a/lang/php/7.2/Makefile +++ b/lang/php/7.2/Makefile @@ -1,13 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 2018/11/04 18:17:29 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2018/11/07 22:27:54 sthen Exp $ PV= 7.2 -V= ${PV}.11 -REVISION= 4 -REVISION-main= 5 +V= ${PV}.12 -BUILD_DEPENDS+= devel/bison - -CONFIGURE_ENV+= YACC="${LOCALBASE}/bin/bison -y" CONFIGURE_ARGS+= --with-pcre-jit=no .include diff --git a/lang/php/7.2/distinfo b/lang/php/7.2/distinfo index 6936e91fe32..099d361752c 100644 --- a/lang/php/7.2/distinfo +++ b/lang/php/7.2/distinfo @@ -1,2 +1,2 @@ -SHA256 (php-7.2.11.tar.bz2) = Sg1/QC0Hlms3pgB5YoP0ykB52VXZbVvsAk3QIAnYtMU= -SIZE (php-7.2.11.tar.bz2) = 15067642 +SHA256 (php-7.2.12.tar.bz2) = tyTEwgNHthBb4QnZjMOVphAXToqttQbILoy2RbZe9rY= +SIZE (php-7.2.12.tar.bz2) = 15029274 diff --git a/lang/php/7.2/patches/patch-ext_odbc_config_m4 b/lang/php/7.2/patches/patch-ext_odbc_config_m4 index b960a9f5804..0786732673b 100644 --- a/lang/php/7.2/patches/patch-ext_odbc_config_m4 +++ b/lang/php/7.2/patches/patch-ext_odbc_config_m4 @@ -1,12 +1,13 @@ -$OpenBSD: patch-ext_odbc_config_m4,v 1.1 2018/09/28 22:22:03 sthen Exp $ +$OpenBSD: patch-ext_odbc_config_m4,v 1.2 2018/11/07 22:27:54 sthen Exp $ don't link php binary with iodbc ---- ext/odbc/config.m4.orig.port Wed Apr 15 20:05:57 2015 -+++ ext/odbc/config.m4 Sat Apr 25 18:10:11 2015 +Index: ext/odbc/config.m4 +--- ext/odbc/config.m4.orig ++++ ext/odbc/config.m4 @@ -396,7 +396,6 @@ PHP_ARG_WITH(iodbc,, AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi + fi if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) ODBC_TYPE=iodbc diff --git a/lang/php/7.2/patches/patch-sapi_cgi_cgi_main_c b/lang/php/7.2/patches/patch-sapi_cgi_cgi_main_c index 49f0424cfaf..c03d3e65821 100644 --- a/lang/php/7.2/patches/patch-sapi_cgi_cgi_main_c +++ b/lang/php/7.2/patches/patch-sapi_cgi_cgi_main_c @@ -1,8 +1,8 @@ -$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.1 2018/09/28 22:22:03 sthen Exp $ +$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.2 2018/11/07 22:27:54 sthen Exp $ Index: sapi/cgi/cgi_main.c --- sapi/cgi/cgi_main.c.orig +++ sapi/cgi/cgi_main.c -@@ -1805,6 +1805,7 @@ int main(int argc, char *argv[]) +@@ -1810,6 +1810,7 @@ int main(int argc, char *argv[]) char *orig_optarg = php_optarg; char *script_file = NULL; size_t ini_entries_len = 0; @@ -10,7 +10,7 @@ Index: sapi/cgi/cgi_main.c /* end of temporary locals */ int max_requests = 500; -@@ -1855,7 +1856,12 @@ int main(int argc, char *argv[]) +@@ -1860,7 +1861,12 @@ int main(int argc, char *argv[]) sapi_startup(&cgi_sapi_module); fastcgi = fcgi_is_fastcgi(); diff --git a/lang/php/7.2/patches/patch-sapi_fpm_fpm_fpm_atomic_h b/lang/php/7.2/patches/patch-sapi_fpm_fpm_fpm_atomic_h index 519637b77af..63e649c593e 100644 --- a/lang/php/7.2/patches/patch-sapi_fpm_fpm_fpm_atomic_h +++ b/lang/php/7.2/patches/patch-sapi_fpm_fpm_fpm_atomic_h @@ -1,11 +1,12 @@ -$OpenBSD: patch-sapi_fpm_fpm_fpm_atomic_h,v 1.1 2018/09/28 22:22:03 sthen Exp $ +$OpenBSD: patch-sapi_fpm_fpm_fpm_atomic_h,v 1.2 2018/11/07 22:27:54 sthen Exp $ Add support for mips Fix types for sparc64 ---- sapi/fpm/fpm/fpm_atomic.h.orig.port Wed Nov 21 20:07:23 2012 -+++ sapi/fpm/fpm/fpm_atomic.h Fri Nov 23 15:40:43 2012 -@@ -77,10 +77,10 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l +Index: sapi/fpm/fpm/fpm_atomic.h +--- sapi/fpm/fpm/fpm_atomic.h.orig ++++ sapi/fpm/fpm/fpm_atomic.h +@@ -76,10 +76,10 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l } /* }}} */ @@ -18,7 +19,7 @@ Fix types for sparc64 #if (__arch64__ || __arch64) typedef int64_t atomic_int_t; typedef uint64_t atomic_uint_t; -@@ -101,7 +101,7 @@ typedef uint32_t atomic_uint_t; +@@ -100,7 +100,7 @@ typedef uint32_t atomic_uint_t; typedef uint64_t atomic_uint_t; typedef volatile atomic_uint_t atomic_t; @@ -27,7 +28,7 @@ Fix types for sparc64 { __asm__ __volatile__("casx [%2], %3, %0 " : "=&r"(new) : "0"(new), "r"(lock), "r"(old): "memory"); -@@ -118,7 +118,7 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l +@@ -117,7 +117,7 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l typedef uint32_t atomic_uint_t; typedef volatile atomic_uint_t atomic_t; @@ -36,7 +37,7 @@ Fix types for sparc64 { __asm__ __volatile__("cas [%2], %3, %0 " : "=&r"(new) : "0"(new), "r"(lock), "r"(old): "memory"); -@@ -136,6 +136,64 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l +@@ -135,6 +135,64 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l #else /* #if (__sparcv9 || __sparcv9__) */ #error Sparc v8 and predecessors are not and will not be supported (see bug report 53310) #endif /* #if (__sparcv9 || __sparcv9__) */ diff --git a/lang/php/7.2/patches/patch-sapi_fpm_fpm_fpm_children_c b/lang/php/7.2/patches/patch-sapi_fpm_fpm_fpm_children_c index 2e14539d8bf..02e6c1b1557 100644 --- a/lang/php/7.2/patches/patch-sapi_fpm_fpm_fpm_children_c +++ b/lang/php/7.2/patches/patch-sapi_fpm_fpm_fpm_children_c @@ -1,9 +1,9 @@ -$OpenBSD: patch-sapi_fpm_fpm_fpm_children_c,v 1.1 2018/11/04 18:17:29 sthen Exp $ +$OpenBSD: patch-sapi_fpm_fpm_fpm_children_c,v 1.2 2018/11/07 22:27:54 sthen Exp $ Index: sapi/fpm/fpm/fpm_children.c --- sapi/fpm/fpm/fpm_children.c.orig +++ sapi/fpm/fpm/fpm_children.c -@@ -250,9 +250,9 @@ void fpm_children_bury() /* {{{ */ +@@ -249,9 +249,9 @@ void fpm_children_bury() /* {{{ */ if (!fpm_pctl_can_spawn_children()) { severity = ZLOG_DEBUG; } diff --git a/lang/php/7.2/patches/patch-scripts_Makefile_frag b/lang/php/7.2/patches/patch-scripts_Makefile_frag index c8858880620..b2f153b9c60 100644 --- a/lang/php/7.2/patches/patch-scripts_Makefile_frag +++ b/lang/php/7.2/patches/patch-scripts_Makefile_frag @@ -1,7 +1,8 @@ -$OpenBSD: patch-scripts_Makefile_frag,v 1.1 2018/09/28 22:22:03 sthen Exp $ ---- scripts/Makefile.frag.orig.port Tue Jul 13 18:24:13 2010 -+++ scripts/Makefile.frag Sat Jun 18 12:14:54 2011 -@@ -3,8 +3,8 @@ +$OpenBSD: patch-scripts_Makefile_frag,v 1.2 2018/11/07 22:27:54 sthen Exp $ +Index: scripts/Makefile.frag +--- scripts/Makefile.frag.orig ++++ scripts/Makefile.frag +@@ -2,8 +2,8 @@ # Build environment install #