Thursday, May 31, 2018

PHP force res_search even stronger

Right now if libresolv or libsocket is picked up somewhere they are
linked in.

Diff below tightens the check and forces only res_search from libc.

Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
+++ 5.6/Makefile 31 May 2018 12:48:48 -0000
@@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e

PV= 5.6
V= ${PV}.36
-REVISION= 4
+REVISION= 5

MASTER_SITES0= https://download.suhosin.org/

Index: 5.6/patches/patch-ext_standard_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_standard_config_m4,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ext_standard_config_m4
--- 5.6/patches/patch-ext_standard_config_m4 6 May 2016 19:59:32 -0000 1.2
+++ 5.6/patches/patch-ext_standard_config_m4 31 May 2018 12:48:48 -0000
@@ -1,7 +1,11 @@
$OpenBSD: patch-ext_standard_config_m4,v 1.2 2016/05/06 19:59:32 sthen Exp $
---- ext/standard/config.m4.orig.port Thu Apr 28 01:33:49 2016
-+++ ext/standard/config.m4 Fri Apr 29 14:02:27 2016
-@@ -398,16 +398,16 @@ dnl
+
+Don't pick up libbind or libsocket if we them accidentally installed.
+
+Index: ext/standard/config.m4
+--- ext/standard/config.m4.orig
++++ ext/standard/config.m4
+@@ -398,16 +398,12 @@ dnl
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS
dnl
@@ -9,17 +13,13 @@ $OpenBSD: patch-ext_standard_config_m4,v
-PHP_CHECK_FUNC(dns_search, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_nsearch, resolv, socket)
-+PHP_CHECK_FUNC(dns_search, resolv, socket)
-+PHP_CHECK_FUNC(dn_expand, resolv, socket)
-+PHP_CHECK_FUNC(dn_skipname, resolv, socket)

dnl
dnl These are old deprecated functions
dnl

-PHP_CHECK_FUNC(res_search, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_search, resolv, socket)
++PHP_CHECK_FUNC(res_search)

dnl
dnl Check if atof() accepts NAN
Index: 7.0/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- 7.0/Makefile 27 May 2018 22:05:50 -0000 1.55
+++ 7.0/Makefile 31 May 2018 12:48:48 -0000
@@ -2,7 +2,7 @@

PV= 7.0
V= ${PV}.30
-REVISION= 4
+REVISION= 5

BUILD_DEPENDS+= devel/bison

Index: 7.0/patches/patch-ext_standard_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_standard_config_m4,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ext_standard_config_m4
--- 7.0/patches/patch-ext_standard_config_m4 12 Jun 2017 11:48:34 -0000 1.4
+++ 7.0/patches/patch-ext_standard_config_m4 31 May 2018 12:48:48 -0000
@@ -1,8 +1,11 @@
$OpenBSD: patch-ext_standard_config_m4,v 1.4 2017/06/12 11:48:34 sthen Exp $
+
+Don't pick up libbind or libsocket if we them accidentally installed.
+
Index: ext/standard/config.m4
--- ext/standard/config.m4.orig
+++ ext/standard/config.m4
-@@ -401,17 +401,17 @@ dnl
+@@ -401,17 +401,12 @@ dnl
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS
dnl
@@ -11,18 +14,13 @@ Index: ext/standard/config.m4
-PHP_CHECK_FUNC(dns_search, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_nsearch, resolv, socket)
-+PHP_CHECK_FUNC(res_ndestroy, resolv, socket)
-+PHP_CHECK_FUNC(dns_search, resolv, socket)
-+PHP_CHECK_FUNC(dn_expand, resolv, socket)
-+PHP_CHECK_FUNC(dn_skipname, resolv, socket)

dnl
dnl These are old deprecated functions
dnl

-PHP_CHECK_FUNC(res_search, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_search, resolv, socket)
++PHP_CHECK_FUNC(res_search)

dnl
dnl Check if atof() accepts NAN

No comments:

Post a Comment