Accepting request 1303524 from network:utilities

OBS-URL: https://build.opensuse.org/request/show/1303524
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nbd?expand=0&rev=61

0001_fix_setgroup.patch

@@ -1,30 +0,0 @@
-From 0cd9e3ba2a0f54d930d813bfde9ff9d57a12d9ed Mon Sep 17 00:00:00 2001
-From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
-Date: Tue, 24 Jul 2018 15:59:39 -0300
-Subject: [PATCH] server: clean supplementary groups when setuid
-Upstream: merged
-References: https://github.com/NetworkBlockDevice/nbd/commit/0cd9e3ba2a0f54d930d813bfde9ff9d57a12d9ed
-References: gh#NetworkBlockDevice/nbd#79
-References: https://github.com/NetworkBlockDevice/nbd/pull/79 
-
-When nbd-server drops privileges, it was leaving supplementary
-groups untouched. As nbd-server was normally dropping from root,
-nbd-server kept membership to root supplementary groups.
-
-Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
----
- nbd-server.c | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: nbd-3.19/nbd-server.c
-===================================================================
---- nbd-3.19.orig/nbd-server.c
-+++ nbd-3.19/nbd-server.c
-@@ -3476,6 +3476,7 @@ void dousers(const gchar *const username
- 			err(str);
- 		}
- 		setgroups(0, NULL);
-+		setgroups(0, NULL);
- 		if(setuid(pw->pw_uid)<0) {
- 			err("Could not set UID: %m");
- 		}

nbd-3.26.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0cf509fa5b20b1a07f7904eb637e9b47d3e30b6ed6f00075af5d8b701c78fef
+size 570628

nbd-forgotten-sh.tmpl.patch

@@ -0,0 +1,13 @@
+Index: nbd-3.26.1/man/sh.tmpl
+===================================================================
+--- /dev/null
++++ nbd-3.26.1/man/sh.tmpl
+@@ -0,0 +1,8 @@
++#!/bin/sh
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++sysconfdir=@sysconfdir@
++
++cat <<EOF
++

nbd.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Sep  3 12:35:50 UTC 2025 - pgajdos@suse.com
+
+- version update to 3.26.1
+  * fix missing -F short-option for certfile by @panarom in #151
+  * add option for gnutls priority string by @panarom in #152
+  * fix port setting from nbdtab by @felixonmars in #154
+  * Fix for a synchronization bug in the handling of errors in NBD_OPT_GO by @ebblake
+  * Various fixes for issues found by a number of static analyzers, by Łukasz Stelmach and the Tizen team
+  * fix the building of man pages
+- deleted patches
+  - 0001_fix_setgroup.patch (upstreamed)
+- added patches
+  https://github.com/NetworkBlockDevice/nbd/commit/f8d7d3dbf1ef2ef84c92fe375ebc8674a79e25c2
+  + nbd-forgotten-sh.tmpl.patch
+
 -------------------------------------------------------------------
 Tue Jun 20 08:27:42 UTC 2023 - Martin Pluskal <mpluskal@suse.com>
 

nbd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package nbd
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           nbd
-Version:        3.25
+Version:        3.26.1
 Release:        0
 Summary:        Network Block Device Server and Client Utilities
 License:        GPL-2.0-or-later
@@ -27,8 +27,10 @@ Source1:        %{name}-server.service
 Source3:        config.example
 Source4:        nbd-server.sysconfig
 Source5:        nbd-client.service
-Patch1:         0001_fix_setgroup.patch
+# https://github.com/NetworkBlockDevice/nbd/commit/f8d7d3dbf1ef2ef84c92fe375ebc8674a79e25c2
+Patch0:         nbd-forgotten-sh.tmpl.patch
 BuildRequires:  bison
+BuildRequires:  docbook-utils-minimal
 BuildRequires:  pkgconfig
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(glib-2.0) >= 2.26.0