[packages/nbd] up to 3.26.1

[atler]

commit 2d3810af3dbf512ae4c3a7cb2aabb7765b4884fe
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Aug 14 13:48:50 2024 +0200

    up to 3.26.1
    
    - switch to github for releases as sourceforge does not seem to be
      updated anymore (see https://github.com/NetworkBlockDevice/nbd/issues/168)
    - upstream patch to fix systemd scripts generation
    - remove gznbd -- no longer compiles and is already dropped entirely by
      upstream

 nbd-gznbd.patch   | 12 ------------
 nbd.spec          | 19 +++++++++++++------
 systemd-gen.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 18 deletions(-)
---
diff --git a/nbd.spec b/nbd.spec
index 444cae8..7e85a86 100644
--- a/nbd.spec
+++ b/nbd.spec
@@ -1,14 +1,17 @@
 Summary:	Tools for using the Network Block Device
 Summary(pl.UTF-8):	Narzędzia do używania Network Block Device
 Name:		nbd
-Version:	3.24
+Version:	3.26.1
 Release:	1
 License:	GPL v2
 Group:		Applications/System
-Source0:	http://downloads.sourceforge.net/nbd/%{name}-%{version}.tar.xz
-# Source0-md5:	a6d9e7bbc311a2ed07ef84a58b82b5dd
-Patch0:		%{name}-gznbd.patch
+Source0:	https://github.com/NetworkBlockDevice/nbd/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	9a15e88f2b63d467ce5a6db1da8a2f0f
+Patch0:		systemd-gen.patch
 URL:		http://nbd.sourceforge.net/
+BuildRequires:	autoconf
+BuildRequires:	autoconf-archive
+BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	docbook-dtd41-sgml
 BuildRequires:	docbook-dtd45-sgml
@@ -17,6 +20,7 @@ BuildRequires:	flex
 BuildRequires:	glib2-devel >= 1:2.68.0
 BuildRequires:	gnutls-devel >= 2.12.0
 BuildRequires:	libnl-devel >= 3.1
+BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
@@ -52,9 +56,13 @@ przypadku stacji bezdyskowych.
 %patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--disable-silent-rules \
-	--enable-gznbd \
 	--enable-lfs
 
 %{__make}
@@ -72,7 +80,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.md
-%attr(755,root,root) %{_bindir}/gznbd
 %attr(755,root,root) %{_bindir}/nbd-server
 %attr(755,root,root) %{_bindir}/nbd-trdump
 %attr(755,root,root) %{_bindir}/nbd-trplay
diff --git a/nbd-gznbd.patch b/nbd-gznbd.patch
deleted file mode 100644
index 910e24c..0000000
--- a/nbd-gznbd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- nbd-2.8.2/cliserv.h.orig	2005-10-28 09:50:09.000000000 +0200
-+++ nbd-2.8.2/cliserv.h	2005-11-19 17:14:12.314759648 +0100
-@@ -14,6 +14,9 @@
- #include <netinet/tcp.h>
- #include <netinet/in.h>
- #include <stdlib.h>
-+#ifdef ISSERVER
-+#include <syslog.h>
-+#endif
- 
- #if SIZEOF_UNSIGNED_SHORT_INT==4
- typedef unsigned short u32;
diff --git a/systemd-gen.patch b/systemd-gen.patch
new file mode 100644
index 0000000..f7643f9
--- /dev/null
+++ b/systemd-gen.patch
@@ -0,0 +1,45 @@
+From f8d7d3dbf1ef2ef84c92fe375ebc8674a79e25c2 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+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 <w at uter.be>
+---
+ systemd/Makefile.am      | 6 +++---
+ {man => systemd}/sh.tmpl | 0
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+ rename {man => systemd}/sh.tmpl (100%)
+
+diff --git a/systemd/Makefile.am b/systemd/Makefile.am
+index f771dce6..204f06ff 100644
+--- a/systemd/Makefile.am
++++ b/systemd/Makefile.am
+@@ -5,11 +5,11 @@
+ 
+ noinst_DATA = nbd at .service
+ DISTCLEANFILES = nbd at .service
+-EXTRA_DIST=nbd at .service.tmpl
++EXTRA_DIST=nbd at .service.tmpl sh.tmpl
+ 
+ nbd at .service: nbd at .service.sh
+ 	sh nbd at .service.sh > nbd at .service
+ 
+-nbd at .service.sh.in: nbd at .service.tmpl ../man/sh.tmpl
+-	cat ../man/sh.tmpl nbd at .service.tmpl > nbd at .service.sh.in
++nbd at .service.sh.in: nbd at .service.tmpl sh.tmpl
++	cat sh.tmpl nbd at .service.tmpl > nbd at .service.sh.in
+ 	echo EOF >> nbd at .service.sh.in
+diff --git a/systemd/sh.tmpl b/systemd/sh.tmpl
+--- a/systemd/sh.tmpl
+--- b/systemd/sh.tmpl
+@@ -0,0 +1,7 @@
++#!/bin/sh
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++sysconfdir=@sysconfdir@
++
++cat <<EOF
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nbd.git/commitdiff/2d3810af3dbf512ae4c3a7cb2aabb7765b4884fe