[packages/php] Drop unused patches

glen glen at pld-linux.org
Thu Nov 19 15:50:20 CET 2020


commit 4978982cda96223541647926f3981b6df6fe7c7b
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Thu Nov 19 16:18:17 2020 +0200

    Drop unused patches
    
    refs: 005c7c91717ea27fc9d4f23f9413dd9d52287d9e

 bug-test-pcntl-55479.patch | 35 -----------------------------------
 php-buff_ovf.patch         | 16 ----------------
 php-threads-acfix.patch    | 38 --------------------------------------
 php-uint32_t.patch         | 11 -----------
 4 files changed, 100 deletions(-)
---
diff --git a/bug-test-pcntl-55479.patch b/bug-test-pcntl-55479.patch
deleted file mode 100644
index 8f20b23..0000000
--- a/bug-test-pcntl-55479.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-need to setup extension dir to current build instead of defaulting to system
-defaults (which may be different php version)
-also use preprocessed PHP.INI from test framework
-
---- php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec.phpt	2011-06-24 22:18:06.000000000 +0300
-+++ php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec.phpt	2011-08-22 09:36:01.105334996 +0300
-@@ -8,7 +8,10 @@
- --FILE--
- <?php
- echo "ok\n";
--pcntl_exec(getenv("TEST_PHP_EXECUTABLE"));
-+$php = getenv("TEST_PHP_EXECUTABLE");
-+$extension_dir = ini_get("extension_dir");
-+$inipath = php_ini_loaded_file();
-+pcntl_exec($php, array("-n", "-d$extension_dir", "-c$inipath"));
- echo "nok\n";
- ?>
- --EXPECT--
---- php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec_2.phpt~	2011-06-24 22:18:06.000000000 +0300
-+++ php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec_2.phpt	2011-08-22 19:57:12.780576314 +0300
-@@ -14,7 +14,13 @@
- 	exit;
- }
- echo "ok\n";
--pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array(__FILE__), array(
-+
-+$php = getenv("TEST_PHP_EXECUTABLE");
-+$extension_dir = ini_get("extension_dir");
-+$inipath = php_ini_loaded_file();
-+$args = array("-n", "-d$extension_dir", "-c$inipath", __FILE__);
-+
-+pcntl_exec($php, $args, array(
- 	b"PCNTL_EXEC_TEST_IS_CHILD" => b"1", 
- 	b"FOO" => b"BAR",
- 	1 => b"long")
diff --git a/php-buff_ovf.patch b/php-buff_ovf.patch
deleted file mode 100644
index 0b9c006..0000000
--- a/php-buff_ovf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur php-5.3.6-orig//ext/sockets/sockets.c php-5.3.6//ext/sockets/sockets.c
---- php-5.3.6-orig//ext/sockets/sockets.c	2011-01-01 03:19:59.000000000 +0100
-+++ php-5.3.6//ext/sockets/sockets.c	2011-05-24 07:09:54.592779164 +0200
-@@ -1333,6 +1333,11 @@
- 			break;
- 
- 		case AF_UNIX:
-+			if (addr_len >= sizeof(s_un.sun_path)) {
-+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Path too long", php_sock->type);
-+					RETURN_FALSE;
-+				}
-+
- 			memset(&s_un, 0, sizeof(struct sockaddr_un));
- 
- 			s_un.sun_family = AF_UNIX;
-Tylko w php-5.3.6//ext/sockets: sockets.c~
diff --git a/php-threads-acfix.patch b/php-threads-acfix.patch
deleted file mode 100644
index 2245eac..0000000
--- a/php-threads-acfix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -burN php-5.0.4RC1.orig/TSRM/threads.m4 php-5.0.4RC1/TSRM/threads.m4
---- php-5.0.4RC1.orig/TSRM/threads.m4	2005-03-15 18:02:27.630294512 +0100
-+++ php-5.0.4RC1/TSRM/threads.m4	2005-03-15 18:07:05.301082136 +0100
-@@ -116,7 +116,6 @@
- else
-   save_CFLAGS=$CFLAGS
-   save_LIBS=$LIBS
--  PTHREADS_ASSIGN_VARS
-   PTHREADS_CHECK_COMPILE
-   LIBS=$save_LIBS
-   CFLAGS=$save_CFLAGS
-@@ -134,9 +133,10 @@
-         break
-       fi
-     done
-+    pthreads_working=
-   fi
--fi
- ])
-+fi
- 
- AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
- ac_cv_pthreads_lib=
-@@ -163,6 +163,7 @@
- dnl
- dnl
- AC_DEFUN([PTHREADS_ASSIGN_VARS],[
-+if test "$pthreads_assign_done" != "yes" ; then
- if test -n "$ac_cv_pthreads_lib"; then
-   LIBS="$LIBS -l$ac_cv_pthreads_lib"
- fi
-@@ -170,4 +171,6 @@
- if test -n "$ac_cv_pthreads_cflags"; then
-   CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
- fi
-+pthreads_assign_done="yes"
-+fi
- ])dnl
diff --git a/php-uint32_t.patch b/php-uint32_t.patch
deleted file mode 100644
index 5e9ba01..0000000
--- a/php-uint32_t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur php5.3-200903291030/Zend/zend_strtod.c mod/Zend/zend_strtod.c
---- php5.3-200903291030/Zend/zend_strtod.c	2009-03-18 12:36:20.000000000 +0100
-+++ mod/Zend/zend_strtod.c	2009-03-29 18:34:10.000000000 +0200
-@@ -93,6 +93,7 @@
- 
- #include <zend_operators.h>
- #include <zend_strtod.h>
-+#include <stdint.h>
- 
- #ifdef ZTS
- #include <TSRM.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/4978982cda96223541647926f3981b6df6fe7c7b



More information about the pld-cvs-commit mailing list