From b9df55a911cadaf40cad781aa283588ce5a7731d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Nov 2025 12:03:57 +0100 Subject: [PATCH] package/nbd: bump version to 3.26.1 Added two upstream patches to fix build errors, autoreconf is required. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- ...he-check-no-cases-of-enable_manpages.patch | 56 +++++++++++++++++++ ...03-fix-generation-of-systemd-service.patch | 56 +++++++++++++++++++ package/nbd/nbd.hash | 2 +- package/nbd/nbd.mk | 10 +++- 4 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 package/nbd/0002-Fix-the-check-no-cases-of-enable_manpages.patch create mode 100644 package/nbd/0003-fix-generation-of-systemd-service.patch diff --git a/package/nbd/0002-Fix-the-check-no-cases-of-enable_manpages.patch b/package/nbd/0002-Fix-the-check-no-cases-of-enable_manpages.patch new file mode 100644 index 0000000000..e27f8c188d --- /dev/null +++ b/package/nbd/0002-Fix-the-check-no-cases-of-enable_manpages.patch @@ -0,0 +1,56 @@ +From f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c Mon Sep 17 00:00:00 2001 +From: Dave Jones +Date: Thu, 14 Mar 2024 11:13:05 +0000 +Subject: [PATCH] Fix the check & no cases of enable_manpages + +Currently, running "configure --disable-manpages" while docbook2man *is* +installed results in the error "don't know what to do here" when it +should disable manpages. + +There also appears to be a missing conditional at the start of the line; +there's closing un-matched ]) at the end of the line. Still, at this +point the check can be done in pure shell; no need for AC macros. I've +also removed the confusing m4_divert_text call on the check case. Not +sure why that was there, but it appears unnecessary. + +Upstream: https://github.com/NetworkBlockDevice/nbd/commit/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5e1b53c..0dccafd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -328,7 +328,7 @@ AC_MSG_CHECKING([whether man pages are requested]) + AC_ARG_ENABLE([manpages], + AS_HELP_STRING([--disable-manpages], [Do not install man pages]), + [], +- [: m4_divert_text([DEFAULTS], [enable_manpages=check])] ++ [enable_manpages=check] + ) + AC_MSG_RESULT([$enable_manpages]) + +@@ -337,9 +337,14 @@ AS_IF([test "x$enable_manpages" != "xno"], [ + ]) + AS_IF([test "x$enable_manpages" = "xyes" -a "x$DB2M" = "x"], [ + AC_MSG_ERROR([docbook2man not found, but is required to build manpages]) +- ], +- [test "x$DB2M" != "x"], [enable_manpages=yes], +- [AC_MSG_ERROR([don't know what to do here])]) ++ ]) ++if test "x$enable_manpages" = "xcheck"; then ++ if test "x$DB2M" = "x"; then ++ enable_manpages=no ++ else ++ enable_manpages=yes ++ fi ++fi + AC_MSG_CHECKING([whether to build manpages]) + AC_MSG_RESULT([$enable_manpages]) + +-- +2.47.3 + diff --git a/package/nbd/0003-fix-generation-of-systemd-service.patch b/package/nbd/0003-fix-generation-of-systemd-service.patch new file mode 100644 index 0000000000..d001d1e36d --- /dev/null +++ b/package/nbd/0003-fix-generation-of-systemd-service.patch @@ -0,0 +1,56 @@ +From f8d7d3dbf1ef2ef84c92fe375ebc8674a79e25c2 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Mon, 4 Mar 2024 11:24:57 +0100 +Subject: [PATCH] fix generation of systemd service + +The shell template is no longer required to generate man pages, so more +it to systemd/ and ship it in tarball. + +Signed-off-by: Wouter Verhelst + +Upstream: https://github.com/NetworkBlockDevice/nbd/commit/f8d7d3dbf1ef2ef84c92fe375ebc8674a79e25c2 + +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 3.26.1 tarball which does not contain man/sh.tmpl] +--- + systemd/Makefile.am | 6 +++--- + systemd/sh.tmpl | 7 +++++++ + 3 files changed, 10 insertions(+), 10 deletions(-) + delete mode 100644 man/sh.tmpl + create mode 100644 systemd/sh.tmpl + +diff --git a/systemd/Makefile.am b/systemd/Makefile.am +index f771dce..204f06f 100644 +--- a/systemd/Makefile.am ++++ b/systemd/Makefile.am +@@ -5,11 +5,11 @@ + + noinst_DATA = nbd@.service + DISTCLEANFILES = nbd@.service +-EXTRA_DIST=nbd@.service.tmpl ++EXTRA_DIST=nbd@.service.tmpl sh.tmpl + + nbd@.service: nbd@.service.sh + sh nbd@.service.sh > nbd@.service + +-nbd@.service.sh.in: nbd@.service.tmpl ../man/sh.tmpl +- cat ../man/sh.tmpl nbd@.service.tmpl > nbd@.service.sh.in ++nbd@.service.sh.in: nbd@.service.tmpl sh.tmpl ++ cat sh.tmpl nbd@.service.tmpl > nbd@.service.sh.in + echo EOF >> nbd@.service.sh.in +diff --git a/systemd/sh.tmpl b/systemd/sh.tmpl +new file mode 100644 +index 0000000..d97aa3f +--- /dev/null ++++ b/systemd/sh.tmpl +@@ -0,0 +1,7 @@ ++#!/bin/sh ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++sysconfdir=@sysconfdir@ ++ ++cat <