Control: tags 1114525 + pending

Dear maintainer,

I've prepared an NMU for zabbix (versioned as 1:7.0.22+dfsg-1.1) and 
uploaded it to DELAYED/2. Please feel free to tell me if I should
cancel it.

cu
Adrian
diffstat for zabbix-7.0.22+dfsg zabbix-7.0.22+dfsg

 changelog                        |    8 ++++++++
 patches/fix-go-ldap-import.patch |   11 +++++++++++
 patches/series                   |    1 +
 3 files changed, 20 insertions(+)

diff -Nru zabbix-7.0.22+dfsg/debian/changelog zabbix-7.0.22+dfsg/debian/changelog
--- zabbix-7.0.22+dfsg/debian/changelog	2026-01-23 09:15:57.000000000 +0200
+++ zabbix-7.0.22+dfsg/debian/changelog	2026-04-21 13:58:26.000000000 +0300
@@ -1,3 +1,11 @@
+zabbix (1:7.0.22+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch from Mathias Gibbens for newer golang-github-go-ldap-ldap.
+    (Closes: #1114525)
+
+ -- Adrian Bunk <[email protected]>  Tue, 21 Apr 2026 13:58:26 +0300
+
 zabbix (1:7.0.22+dfsg-1) unstable; urgency=high
 
   * New upstream release. (Closes: #1117448)
diff -Nru zabbix-7.0.22+dfsg/debian/patches/fix-go-ldap-import.patch zabbix-7.0.22+dfsg/debian/patches/fix-go-ldap-import.patch
--- zabbix-7.0.22+dfsg/debian/patches/fix-go-ldap-import.patch	1970-01-01 02:00:00.000000000 +0200
+++ zabbix-7.0.22+dfsg/debian/patches/fix-go-ldap-import.patch	2026-04-21 13:55:53.000000000 +0300
@@ -0,0 +1,11 @@
+--- ./src/go/plugins/net/tcp/tcp.go.orig	2026-04-06 19:45:37.134549804 +0000
++++ ./src/go/plugins/net/tcp/tcp.go	2026-04-06 19:45:47.238644158 +0000
+@@ -26,7 +26,7 @@
+ 	"strings"
+ 	"time"
+ 
+-	"github.com/go-ldap/ldap"
++	"github.com/go-ldap/ldap/v3"
+ 	"golang.zabbix.com/agent2/pkg/web"
+ 	"golang.zabbix.com/sdk/log"
+ 	"golang.zabbix.com/sdk/plugin"
diff -Nru zabbix-7.0.22+dfsg/debian/patches/series zabbix-7.0.22+dfsg/debian/patches/series
--- zabbix-7.0.22+dfsg/debian/patches/series	2025-03-12 07:12:07.000000000 +0200
+++ zabbix-7.0.22+dfsg/debian/patches/series	2026-04-21 13:56:04.000000000 +0300
@@ -11,3 +11,4 @@
 java-gateway.patch
 manpages-path.patch
 fping3-sourceip-option.patch
+fix-go-ldap-import.patch

Reply via email to