commit faf7d617881620d4458eebcfd48dfc020b2d87d7
Author: Jan Palus <[email protected]>
Date: Thu Nov 21 11:27:55 2024 +0100
drop patches commented out for 4, 2 and 9 years
openssl.patch | 26 ----------------
php-mail.patch | 75 ---------------------------------------------
php-mysql-ssl-context.patch | 36 ----------------------
php.spec | 8 -----
4 files changed, 145 deletions(-)
---
diff --git a/php.spec b/php.spec
index e2ac295..b4dbc9d 100644
--- a/php.spec
+++ b/php.spec
@@ -174,11 +174,8 @@ Source13: dep-tests.sh
Source14: skip-tests.sh
Patch0: %{orgname}-shared.patch
Patch1: %{orgname}-pldlogo.patch
-Patch2: %{orgname}-mail.patch
Patch3: %{orgname}-link-libs.patch
Patch4: intl-stdc++.patch
-# https://bugs.php.net/bug.php?id=79589
-Patch5: openssl.patch
# https://github.com/php/php-src/issues/9910
Patch6: opcache-nokill-perm.patch
Patch7: %{orgname}-sapi-ini-file.patch
@@ -205,8 +202,6 @@ Patch59: %{orgname}-systzdata.patch
Patch60: %{orgname}-oracle-instantclient.patch
Patch66: php-db.patch
Patch67: mysql-lib-ver-mismatch.patch
-# https://bugs.php.net/bug.php?id=68344
-Patch68: php-mysql-ssl-context.patch
Patch71: libdb-info.patch
URL: https://www.php.net/
%{?with_pdo_firebird:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
@@ -1875,10 +1870,8 @@ Moduł PHP umożliwiający używanie kompresji zlib.
cp -p php.ini-production php.ini
%patch0 -p1
%patch1 -p1
-#%patch2 -p1 -b .mail
%patch3 -p1
%patch4 -p1
-#%patch5 -p1 resolved upstream?
%patch6 -p1
%patch7 -p1 -b .sapi-ini-file
@@ -1905,7 +1898,6 @@ cp -p php.ini-production php.ini
%endif
%patch66 -p1
%patch67 -p1 -b .mysql-lib-ver-mismatch
-#%patch68 -p1 DROP or update to 7.0 APIs
%patch71 -p1 -b .libdb-info
%{__sed} -i -e '1s,/usr/bin/env php,%{_bindir}/php,' \
diff --git a/openssl.patch b/openssl.patch
deleted file mode 100644
index 1256370..0000000
--- a/openssl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
-index 5564bf6f08..423f696c76 100644
---- a/ext/openssl/xp_ssl.c
-+++ b/ext/openssl/xp_ssl.c
-@@ -1286,6 +1286,10 @@ static int
php_openssl_set_server_specific_opts(php_stream *stream, SSL_CTX *ctx
- zval *zv;
- long ssl_ctx_options = SSL_CTX_get_options(ctx);
-
-+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
-+ ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
-+#endif
-+
- #if defined(HAVE_ECDH) && PHP_OPENSSL_API_VERSION < 0x10100
- if (php_openssl_set_server_ecdh_curve(stream, ctx) == FAILURE) {
- return FAILURE;
-@@ -1628,6 +1632,10 @@ int php_openssl_setup_crypto(php_stream *stream,
- ssl_ctx_options = SSL_OP_ALL;
- #endif
-
-+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
-+ ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
-+#endif
-+
- if (sslsock->ctx == NULL) {
- php_error_docref(NULL, E_WARNING, "SSL context creation
failure");
- return FAILURE;
diff --git a/php-mail.patch b/php-mail.patch
deleted file mode 100644
index 5b2adf0..0000000
--- a/php-mail.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- php-7.1.22.org/ext/standard/mail.c 2018-09-11 16:08:35.000000000 +0200
-+++ php-7.1.22/ext/standard/mail.c 2018-09-14 11:40:47.086119608 +0200
-@@ -46,6 +46,8 @@
- #include "php_ini.h"
- #include "php_string.h"
- #include "exec.h"
-+#include "zend_operators.h"
-+#include "zend_globals.h"
-
- #ifdef PHP_WIN32
- #include "win32/sendmail.h"
-@@ -125,6 +127,18 @@ PHP_FUNCTION(mail)
- MAIL_ASCIIZ_CHECK(ZSTR_VAL(extra_cmd), ZSTR_LEN(extra_cmd));
- }
-
-+ /* search for To: and Subject: headers which should be specified in
proper mail() parameters, not in additional headers */
-+ if (headers != NULL) {
-+ if (strncasecmp(headers, "to:", sizeof("to:") - 1) == 0 ||
strcasestr(headers, "\nto:")) {
-+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "To: headers aren't
allowed in the additional_headers parameter. Use $to parameter for that. Mail
not sent.");
-+ RETURN_FALSE;
-+ }
-+ if (strncasecmp(headers, "subject:", sizeof("subject:") - 1) == 0 ||
strcasestr(headers, "\nsubject:")) {
-+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Subject: headers
aren't allowed in the additional_headers parameter. Use $subject parameter for
that. Mail not sent.");
-+ RETURN_FALSE;
-+ }
-+ }
-+
- if (to_len > 0) {
- to_r = estrndup(to, to_len);
- for (; to_len; to_len--) {
-@@ -397,8 +411,42 @@ PHPAPI int php_mail(char *to, char *subj
- MAIL_RET(0);
- }
- #endif
-- fprintf(sendmail, "To: %s\n", to);
-- fprintf(sendmail, "Subject: %s\n", subject);
-+ TSRMLS_FETCH();
-+
-+ if ((to != NULL) && (strlen(to)!=0)) {
-+ fprintf(sendmail, "To: %s\n", to);
-+ }
-+ if ((subject != NULL) && (strlen(subject)!=0)) {
-+ fprintf(sendmail, "Subject: %s\n", subject);
-+ }
-+ if (Z_TYPE(PG(http_globals)[TRACK_VARS_SERVER]) == IS_ARRAY
-+ ||
zend_is_auto_global_str(ZEND_STRL("_SERVER"))) {
-+ zval *remote_addr, *server_name,
*server_port, *script_name, *http_user_agent;
-+ remote_addr =
zend_hash_str_find(Z_ARRVAL_P(&PG(http_globals)[TRACK_VARS_SERVER]),
-+ "REMOTE_ADDR",
sizeof("REMOTE_ADDR")-1);
-+ server_name =
zend_hash_str_find(Z_ARRVAL_P(&PG(http_globals)[TRACK_VARS_SERVER]),
-+ "SERVER_NAME",
sizeof("SERVER_NAME")-1);
-+ server_port =
zend_hash_str_find(Z_ARRVAL_P(&PG(http_globals)[TRACK_VARS_SERVER]),
-+ "SERVER_PORT",
sizeof("SERVER_PORT")-1);
-+ script_name =
zend_hash_str_find(Z_ARRVAL_P(&PG(http_globals)[TRACK_VARS_SERVER]),
-+ "SCRIPT_NAME",
sizeof("SCRIPT_NAME")-1);
-+ http_user_agent =
zend_hash_str_find(Z_ARRVAL_P(&PG(http_globals)[TRACK_VARS_SERVER]),
-+ "HTTP_USER_AGENT",
sizeof("HTTP_USER_AGENT")-1);
-+
-+ if (remote_addr &&
Z_TYPE_P(remote_addr) == IS_STRING)
-+ fprintf(sendmail,
"HTTP-Posting-Client: %s\n", Z_STRVAL_P(remote_addr));
-+ if (server_name &&
Z_TYPE_P(server_name) == IS_STRING) {
-+ fprintf(sendmail,
"HTTP-Posting-URI: %s", Z_STRVAL_P(server_name));
-+ if (server_port &&
Z_TYPE_P(server_port) == IS_STRING)
-+ fprintf(sendmail,
":%s", Z_STRVAL_P(server_port));
-+ if (script_name &&
Z_TYPE_P(script_name) == IS_STRING)
-+ fprintf(sendmail, "%s",
Z_STRVAL_P(script_name));
-+ fprintf(sendmail, "\n");
-+ }
-+ if (http_user_agent &&
Z_TYPE_P(http_user_agent) == IS_STRING)
-+ fprintf(sendmail,
"HTTP-Posting-User-Agent: %s\n", Z_STRVAL_P(http_user_agent));
-+ }
-+
- if (hdr != NULL) {
- fprintf(sendmail, "%s\n", hdr);
- }
diff --git a/php-mysql-ssl-context.patch b/php-mysql-ssl-context.patch
deleted file mode 100644
index c8ff48d..0000000
--- a/php-mysql-ssl-context.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-; obey default context options
-; https://bugs.php.net/bug.php?id=68344
-diff -urbB php-5.6.12/ext/mysqlnd/mysqlnd_net.c
php-5.6.12/ext/mysqlnd/mysqlnd_net.c
---- php-5.6.12/ext/mysqlnd/mysqlnd_net.c 2015-08-06 09:55:57.000000000
+0200
-+++ php-5.6.12/ext/mysqlnd/mysqlnd_net.c 2015-08-10 13:25:30.187912101
+0200
-@@ -29,6 +29,7 @@
- #include "mysqlnd_ext_plugin.h"
- #include "php_network.h"
- #include "zend_ini.h"
-+#include "ext/standard/file.h"
- #ifdef MYSQLND_COMPRESSION_ENABLED
- #include <zlib.h>
- #endif
-@@ -868,6 +868,21 @@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)(
- DBG_RETURN(FAIL);
- }
-
-+ if (FG(default_context)) {
-+ zval **tmpzval = NULL;
-+ int i = 0;
-+ /* copy values from default stream settings */
-+ char *opts[] = { "allow_self_signed", "cafile", "capath",
"ciphers", "CN_match",
-+ "disable_compression", "local_cert", "local_pk",
"no_ticket", "passphrase",
-+ "peer_fingerprint", "peer_name", "SNI_enabled",
"SNI_server_certs", "SNI_server_name",
-+ "verify_depth", "verify_peer", "verify_peer_name", NULL
};
-+ while (opts[i]) {
-+ if (php_stream_context_get_option(FG(default_context),
"ssl", opts[i], &tmpzval) == SUCCESS)
-+ php_stream_context_set_option(context, "ssl",
opts[i], *tmpzval);
-+ i++;
-+ }
-+ }
-+
- if (net->data->options.ssl_key) {
- zval key_zval;
- ZVAL_STRING(&key_zval, net->data->options.ssl_key, 0);
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/faf7d617881620d4458eebcfd48dfc020b2d87d7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
