commit 3bd98eb510a1e9fb40ae5953eb0655b83ee081eb
Author: Adam Gołębiowski <ad...@pld-linux.org>
Date: Sat Jul 3 14:50:33 2021 +0000
- remove obsolete patches
bug-52448.patch | 8 -----
mysqlnd-shared.patch | 23 --------------
php-curl-limit-speed.patch | 30 ------------------
php-krb5-ac.patch | 11 -------
php-m4-divert.patch | 79 ----------------------------------------------
php-m4.patch | 11 -------
php-zlib.patch | 15 ---------
php.spec | 7 ----
8 files changed, 184 deletions(-)
---
diff --git a/php.spec b/php.spec
index eb5b318..8720986 100644
--- a/php.spec
+++ b/php.spec
@@ -184,7 +184,6 @@ Patch11: embed.patch
Patch12: http://ilia.ws/patch/type_hint_53_v2.txt
%endif
Patch14: %{orgname}-no_pear_install.patch
-#Patch15: %{orgname}-zlib.patch # no longer needed?
Patch17: %{orgname}-readline.patch
Patch18: %{orgname}-nohttpd.patch
Patch19: %{orgname}-gd_imagerotate_enable.patch
@@ -198,7 +197,6 @@ Patch26: %{orgname}-pear.patch
Patch27: %{orgname}-config-dir.patch
Patch29: %{orgname}-fcgi-graceful.patch
Patch31: %{orgname}-fcgi-error_log-no-newlines.patch
-#Patch32: %{orgname}-curl-limit-speed.patch # applied upstream
Patch34: %{orgname}-libtool.patch
Patch35: %{orgname}-tds.patch
Patch36: %{orgname}-mysql-charsetphpini.patch
@@ -212,20 +210,15 @@ Patch44: %{orgname}-include_path.patch
Patch45: %{orgname}-imap-annotations.patch
Patch46: %{orgname}-imap-myrights.patch
Patch47: suhosin.patch
-#Patch49: %{orgname}-m4-divert.patch # no longer needed, upstream
supports new ac
Patch50: extension-shared-optional-dep.patch
Patch51: spl-shared.patch
Patch52: pcre-shared.patch
Patch53: fix-test-run.patch
-#Patch54: mysqlnd-shared.patch # shared build supported upstream
Patch55: bug-52078-fileinode.patch
-#Patch57: bug-52448.patch # outdated
Patch59: %{orgname}-systzdata.patch
Patch60: %{orgname}-oracle-instantclient.patch
-#Patch61: %{orgname}-krb5-ac.patch # not needed on 5.4 anymore
Patch62: mcrypt-libs.patch
Patch63: %{orgname}-mysql-nowarning.patch
-#Patch64: %{orgname}-m4.patch # not needed on 5.4 branch
Patch65: system-libzip.patch
Patch66: php-db.patch
Patch67: mysql-lib-ver-mismatch.patch
diff --git a/bug-52448.patch b/bug-52448.patch
deleted file mode 100644
index b15ea82..0000000
--- a/bug-52448.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- php-5.3.3/ext/curl/tests/curl_error_basic.phpt~ 2009-07-03
03:09:08.000000000 +0300
-+++ php-5.3.3/ext/curl/tests/curl_error_basic.phpt 2010-07-26
21:02:34.822382923 +0300
-@@ -30,4 +30,4 @@
- ?>
- --EXPECT--
- == Testing curl_error with a fake URL ==
--Error: Couldn't resolve host 'fakeURL'
-+Error: Could not resolve host: fakeURL (Domain name not found)
diff --git a/mysqlnd-shared.patch b/mysqlnd-shared.patch
deleted file mode 100644
index 43eceb6..0000000
--- a/mysqlnd-shared.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- php-5.4.0alpha2/ext/mysqlnd/config9.m4~ 2011-03-23 19:14:28.000000000
+0200
-+++ php-5.4.0alpha2/ext/mysqlnd/config9.m4 2011-08-07 12:45:42.205921715
+0300
-@@ -28,7 +28,7 @@
- AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
-
- mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
-- PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
-+ PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, yes)
- PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
- PHP_INSTALL_HEADERS([ext/mysqlnd/])
- fi
---- php-5.3.2/ext/mysqlnd/php_mysqlnd.c~ 2010-01-20 19:09:28.000000000
+0200
-+++ php-5.3.2/ext/mysqlnd/php_mysqlnd.c 2010-04-14 09:18:30.725599897
+0300
-@@ -273,6 +273,9 @@
- };
- /* }}} */
-
-+#ifdef COMPILE_DL_MYSQLND
-+ZEND_GET_MODULE(mysqlnd)
-+#endif
-
- /*
- * Local variables:
diff --git a/php-curl-limit-speed.patch b/php-curl-limit-speed.patch
deleted file mode 100644
index 8348dd4..0000000
--- a/php-curl-limit-speed.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- php-5.2.5.orig/ext/curl/interface.c 2008-03-26 17:05:19.000000000
+0100
-+++ php-5.2.5/ext/curl/interface.c 2008-03-26 17:09:05.000000000 +0100
-@@ -462,6 +462,14 @@
- REGISTER_CURL_CONSTANT(CURLOPT_TCP_NODELAY);
- #endif
- REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
-+
-+/* Added constants to support limiting the transfer speed in PHP */
-+/* Fixed by Tijnema (ad...@tijnema.info) */
-+#if LIBCURL_VERSION_NUM > 0x070fff /* CURLOPT_MAX_SEND_SPEED_LARGE and
CURLOPT_MAX_SEND_SPEED_LARGE are available since curl 7.16.0 */
-+ REGISTER_CURL_CONSTANT(CURLOPT_MAX_SEND_SPEED_LARGE);
-+ REGISTER_CURL_CONSTANT(CURLOPT_MAX_RECV_SPEED_LARGE);
-+#endif
-+
- REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
- REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
- REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
-@@ -1288,6 +1296,12 @@
- #if LIBCURL_VERSION_NUM > 0x070b01 /* CURLOPT_TCP_NODELAY is available since
curl 7.11.2 */
- case CURLOPT_TCP_NODELAY:
- #endif
-+/* Added case options to support limiting the transfer speed in PHP */
-+/* Fixed by Tijnema (ad...@tijnema.info) */
-+#if LIBCURL_VERSION_NUM > 0x070fff /* CURLOPT_MAX_SEND_SPEED_LARGE and
CURLOPT_MAX_SEND_SPEED_LARGE are available since curl 7.16.0 */
-+ case CURLOPT_MAX_SEND_SPEED_LARGE:
-+ case CURLOPT_MAX_RECV_SPEED_LARGE:
-+#endif
- convert_to_long_ex(zvalue);
- error = curl_easy_setopt(ch->cp, option,
Z_LVAL_PP(zvalue));
- break;
diff --git a/php-krb5-ac.patch b/php-krb5-ac.patch
deleted file mode 100644
index c7bddd1..0000000
--- a/php-krb5-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- php-5.3.3/acinclude.m4.orig 2010-10-19 21:38:42.000000000 +0200
-+++ php-5.3.3/acinclude.m4 2010-10-19 22:53:11.792893220 +0200
-@@ -2252,7 +2252,7 @@
- KERBEROS_LIBS=`$KRB5_CONFIG --libs gssapi`
- KERBEROS_CFLAGS=`$KRB5_CONFIG --cflags gssapi`
-
-- if test -n "$KERBEROS_LIBS" && test -n "$KERBEROS_CFLAGS"; then
-+ if test -n "$KERBEROS_LIBS" || test -n "$KERBEROS_CFLAGS"; then
- found_kerberos=yes
- PHP_EVAL_LIBLINE($KERBEROS_LIBS, $1)
- PHP_EVAL_INCLINE($KERBEROS_CFLAGS)
diff --git a/php-m4-divert.patch b/php-m4-divert.patch
deleted file mode 100644
index f4e5bb5..0000000
--- a/php-m4-divert.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -ur php-5.3.0.org/configure.in php-5.3.0/configure.in
---- php-5.3.0.org/configure.in 2009-06-26 17:44:18.000000000 +0200
-+++ php-5.3.0/configure.in 2009-08-18 12:45:19.126841759 +0200
-@@ -1,7 +1,7 @@
- ## $Id$ -*- autoconf -*-
- dnl ## Process this file with autoconf to produce a configure script.
-
--divert(1)
-+divert(1001)
-
- dnl ## Diversion 1 is the autoconf + automake setup phase. We also
- dnl ## set the PHP version, deal with platform-specific compile
-@@ -308,7 +308,7 @@
- sinclude(TSRM/tsrm.m4)
-
-
--divert(2)
-+divert(1002)
-
- dnl ## Diversion 2 is where we set PHP-specific options and come up
- dnl ## with reasonable default values for them. We check for pthreads here
-@@ -347,7 +347,7 @@
- PTHREADS_FLAGS
- fi
-
--divert(3)
-+divert(1003)
-
- dnl ## In diversion 3 we check for compile-time options to the PHP
- dnl ## core and how to deal with different system dependencies.
-@@ -702,7 +702,7 @@
- PHP_CRYPT_R_STYLE
- fi
-
--divert(4)
-+divert(1004)
-
- dnl ## In diversion 4 we check user-configurable general settings.
-
-@@ -943,7 +943,7 @@
- AC_MSG_RESULT([using system default])
- fi
-
--divert(5)
-+divert(1005)
-
- dnl ## In diversion 5 we check which extensions should be compiled.
- dnl ## All of these are normally in the extension directories.
-diff -ur php-5.3.0.org/ext/standard/config.m4 php-5.3.0/ext/standard/config.m4
---- php-5.3.0.org/ext/standard/config.m4 2009-01-12 00:37:16.000000000
+0100
-+++ php-5.3.0/ext/standard/config.m4 2009-08-18 12:45:19.130174674 +0200
-@@ -1,6 +1,6 @@
- dnl $Id$ -*- autoconf -*-
-
--divert(3)dnl
-+divert(1003)dnl
-
- dnl
- dnl Check if flush should be called explicitly after buffered io
-@@ -220,7 +220,7 @@
- AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice
fpclass isinf isnan)
- AC_FUNC_FNMATCH
-
--divert(5)dnl
-+divert(1005)dnl
-
- dnl
- dnl Check if there is a support means of creating a new process
-diff -ur php-5.3.0.org/scripts/phpize.m4 php-5.3.0/scripts/phpize.m4
---- php-5.3.0.org/scripts/phpize.m4 2009-06-02 21:54:03.000000000 +0200
-+++ php-5.3.0/scripts/phpize.m4 2009-08-18 12:45:19.126841759 +0200
-@@ -1,6 +1,6 @@
- dnl This file becomes configure.in for self-contained extensions.
-
--divert(1)
-+divert(1001)
-
- AC_PREREQ(2.13)
- AC_INIT(config.m4)
diff --git a/php-m4.patch b/php-m4.patch
deleted file mode 100644
index e7981a4..0000000
--- a/php-m4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- php-5.3.7/build/buildcheck.sh~ 2011-05-18 21:55:34.000000000 +0200
-+++ php-5.3.7/build/buildcheck.sh 2011-08-20 18:28:38.223862911 +0200
-@@ -51,7 +51,7 @@
- echo " On Debian/Ubuntu both autoconf2.13 and autoconf2.59
packages exist."
- echo " Install autoconf2.13 and set the PHP_AUTOCONF env var to "
- echo " autoconf2.13 and try again."
-- exit 1
-+ echo " CONTINUING ANYWAY."
- else
- echo "buildconf: autoconf version $ac_version (ok)"
- fi
diff --git a/php-zlib.patch b/php-zlib.patch
deleted file mode 100644
index 1ee4b30..0000000
--- a/php-zlib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -burN php-5.0.0b3/ext/zlib/zlib.c php-5.0.0b3-zlib/ext/zlib/zlib.c
---- php-5.0.0b3/ext/zlib/zlib.c 2003-09-26 10:09:53.000000000 +0200
-+++ php-5.0.0b3-zlib/ext/zlib/zlib.c 2003-12-27 00:40:53.000000000 +0100
-@@ -979,6 +979,11 @@
-
- if (ZLIBG(output_handler) && strlen(ZLIBG(output_handler))) {
- php_start_ob_buffer_named(ZLIBG(output_handler), 0, 1
TSRMLS_CC);
-+ if (sapi_add_header("Content-Encoding: gzip",
sizeof("Content-Encoding: gzip") - 1 , 1)!=FAILURE) {
-+ if (sapi_add_header("Vary: Accept-Encoding",
sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
-+ SG(sapi_headers).send_default_content_type = 0;
-+ }
-+ }
- }
- return SUCCESS;
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/0a5f472302becd4cf989d3d04304626329245baf
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
