summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-07-29 10:14:50 +0200
committerRemi Collet <remi@php.net>2022-07-29 10:14:50 +0200
commitd08d4823a7f4b04834bf1d452d33cff1305f355d (patch)
tree0857b37990fdb70dc5ca1b8ced6bac9591f530d9
parent645ea53b3f2d95e517cb4525051ee74106c7ba24 (diff)
fix snmp backport
-rw-r--r--php-8.0.10-snmp-sha.patch12
-rw-r--r--php80.spec5
2 files changed, 10 insertions, 7 deletions
diff --git a/php-8.0.10-snmp-sha.patch b/php-8.0.10-snmp-sha.patch
index 3ef67ea..a48ad5f 100644
--- a/php-8.0.10-snmp-sha.patch
+++ b/php-8.0.10-snmp-sha.patch
@@ -61,12 +61,12 @@ index 69d6549405b17..f0917501751f5 100644
#include "ext/spl/spl_exceptions.h"
#include "snmp_arginfo.h"
-@@ -938,16 +939,48 @@ static int netsnmp_session_set_auth_prot
+@@ -938,16 +939,48 @@ static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot)
if (!strcasecmp(prot, "MD5")) {
s->securityAuthProto = usmHMACMD5AuthProtocol;
s->securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN;
- } else
-+ return true;
++ return 0;
+ }
#endif
+
@@ -76,7 +76,7 @@ index 69d6549405b17..f0917501751f5 100644
- } else {
- zend_value_error("Authentication protocol must be either \"MD5\" or \"SHA\"");
- return (-1);
-+ return true;
++ return 0;
}
- return (0);
+
@@ -84,7 +84,7 @@ index 69d6549405b17..f0917501751f5 100644
+ if (!strcasecmp(prot, "SHA256")) {
+ s->securityAuthProto = usmHMAC192SHA256AuthProtocol;
+ s->securityAuthProtoLen = sizeof(usmHMAC192SHA256AuthProtocol) / sizeof(oid);
-+ return true;
++ return 0;
+ }
+#endif
+
@@ -92,7 +92,7 @@ index 69d6549405b17..f0917501751f5 100644
+ if (!strcasecmp(prot, "SHA512")) {
+ s->securityAuthProto = usmHMAC384SHA512AuthProtocol;
+ s->securityAuthProtoLen = sizeof(usmHMAC384SHA512AuthProtocol) / sizeof(oid);
-+ return true;
++ return 0;
+ }
+#endif
+
@@ -111,7 +111,7 @@ index 69d6549405b17..f0917501751f5 100644
+ smart_string_0(&err);
+ zend_value_error("%s", err.c);
+ smart_string_free(&err);
-+ return false;
++ return -1;
}
/* }}} */
diff --git a/php80.spec b/php80.spec
index 1f47bf6..ffa4d7d 100644
--- a/php80.spec
+++ b/php80.spec
@@ -106,7 +106,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -2181,6 +2181,9 @@ fi
%changelog
+* Fri Jul 29 2022 Remi Collet <remi@remirepo.net> - 8.0.22~RC1-2
+- fix snmp backport
+
* Tue Jul 19 2022 Remi Collet <remi@remirepo.net> - 8.0.22~RC1-1
- update to 8.0.22RC1