From 16c88f40aeacd61dd6d70b0c3aefc8fc48fdc092 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 05 2022 10:24:23 +0000
Subject: import php-8.0.20-2.module+el8.7.0+16187+bb5ab920


---

diff --git a/SOURCES/php-8.0.10-snmp-sha.patch b/SOURCES/php-8.0.10-snmp-sha.patch
index 3ef67ea..a48ad5f 100644
--- a/SOURCES/php-8.0.10-snmp-sha.patch
+++ b/SOURCES/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/SPECS/php.spec b/SPECS/php.spec
index 15a1e16..2fd094c 100644
--- a/SPECS/php.spec
+++ b/SPECS/php.spec
@@ -60,7 +60,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
@@ -1505,6 +1505,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Mon Aug  1 2022 Remi Collet <rcollet@redhat.com> - 8.0.20-2
+- snmp3 calls using authPriv or authNoPriv immediately return false #2104630
+
 * Wed Jul 20 2022 Remi Collet <rcollet@redhat.com> - 8.0.20-1
 - rebase to 8.0.20 #2100876
 - fix wrong mod_php configuration #2094728