[packages/drbd-utils] - updated to 9.27.0; patch not to buildrequire udev-core

Fri Dec 29 09:42:19 CET 2023

commit 304844c4f45a57e7b7832f00eb14b6dc5811dba0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Dec 29 09:43:00 2023 +0100

    - updated to 9.27.0; patch not to buildrequire udev-core

 drbd-utils-udev.patch |  21 ++++++++
 drbd-utils.spec       | 147 +++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 142 insertions(+), 26 deletions(-)
---

diff --git a/drbd-utils.spec b/drbd-utils.spec
index 2572df5..7a9ea1e 100644
--- a/drbd-utils.spec
+++ b/drbd-utils.spec
@@ -2,25 +2,35 @@ Summary:	Setup tools and scripts for DRBD
 Summary(pl.UTF-8):	Narzędzie konfiguracyjne i skrypty dla DRBD
 Summary(pt_BR.UTF-8):	Utilitários para gerenciar dispositivos DRBD
 Name:		drbd-utils
-Version:	9.1.0
+Version:	9.27.0
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
-Source0:	http://www.drbd.org/download/drbd/utils/%{name}-%{version}.tar.gz
-# Source0-md5:	6d37a45b0c5af451b6bceb10a91187ec
+#Source0Download: https://linbit.com/linbit-software-download-page-for-linstor-and-drbd-linux-driver/
+Source0:	https://pkg.linbit.com/downloads/drbd/utils/%{name}-%{version}.tar.gz
+# Source0-md5:	d440bd8b9639b0e27f592ab598206273
+Patch0:		%{name}-udev.patch
 URL:		http://www.drbd.org/
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
+BuildRequires:	gettext-tools
+BuildRequires:	keyutils-devel
+BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	libxslt-progs
+BuildRequires:	pkgconfig
+BuildRequires:	po4a
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.671
-BuildRequires:	udev-core
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(postun):	/usr/sbin/groupdel
-Requires:	udev-core
+Requires:	udev-core >= 85
 Provides:	group(haclient)
-Obsoletes:	drbd-udev
-Obsoletes:	drbdsetup
-Obsoletes:	drbdsetup8
+Obsoletes:	drbd-udev < 8.4.3
+Obsoletes:	drbdsetup < 9
+Obsoletes:	drbdsetup8 < 9
 Conflicts:	drbdsetup
 Conflicts:	drbdsetup24
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,6 +43,7 @@ Narzędzie konfiguracyjne i skrypty startowe dla DRBD.
 
 %package -n resource-agents-drbd
 Summary:	DRBD resource agents for a cluster setup
+Summary(pl.UTF-8):	Agenci zasobów DRBD do instalacji klastrowych
 Group:		Daemons
 Requires:	drbd-utils = %{version}-%{release}
 Requires:	resource-agents
@@ -40,6 +51,9 @@ Requires:	resource-agents
 %description -n resource-agents-drbd
 DRBD resource agents for a cluster setup.
 
+%description -n resource-agents-drbd -l pl.UTF-8
+Agenci zasobów DRBD do instalacji klastrowych.
+
 %package -n bash-completion-drbd
 Summary:	bash-completion for drbd
 Summary(pl.UTF-8):	Bashowe uzupełnianie poleceń dla drbd
@@ -55,6 +69,7 @@ Ten pakiet dostarcza bashowe uzupełnianie poleceń dla drbd.
 
 %package -n drbd-xen
 Summary:	Xen block device management script for DRBD
+Summary(pl.UTF-8):	Skrypt zarządzający urządzeniem blokowym Xen dla DRBD
 Group:		Applications/System
 Requires:	drbd-utils = %{version}-%{release}
 Requires:	xen
@@ -63,16 +78,27 @@ Requires:	xen
 This package contains a Xen block device helper script for DRBD,
 capable of promoting and demoting DRBD resources as necessary.
 
+%description -n drbd-xen -l pl.UTF-8
+Ten pakiet zawiera pomocniczy skrypt urządzenia blokowego Xen dla
+DRBD, potrafiący w razie potrzeby promować i degradować zasoby DRBD.
+
 %prep
 %setup -q
+%patch0 -p1
+
+# make constistent with configure settings (DRBD_RUN_DIR)
+%{__sed} -i -e 's, /run/, /var/run/,' scripts/drbd.tmpfiles.conf
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
 %configure \
+	--with-bashcompletion \
 	--with-initscripttype=systemd \
-	--with-udev \
-	--with-xen \
 	--with-pacemaker \
-	--with-bashcompletion
+	--with-udev \
+	--with-xen
 
 %{__make} tools \
 	KVER=dummy \
@@ -90,10 +116,6 @@ $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d \
 	DRBD_ENABLE_UDEV=1 \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# Hack for borked make install
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/drbd-overview.8
-ln -s drbd-overview-9.0.8 $RPM_BUILD_ROOT%{_mandir}/man8/drbd-overview.8
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -115,32 +137,102 @@ fi
 
 %files
 %defattr(644,root,root,755)
-/sbin/*
+# symlinks
+/sbin/drbdadm
+/sbin/drbdmeta
+/sbin/drbdsetup
 %attr(755,root,root) %{_sbindir}/drbdadm
-%attr(4754,root,haclient) %{_sbindir}/drbdsetup
+%attr(755,root,root) %{_sbindir}/drbdmon
 %attr(4754,root,haclient) %{_sbindir}/drbdmeta
-%dir %{_sysconfdir}/drbd.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.d/global_common.conf
-%{systemdunitdir}/drbd.service
-%{_mandir}/man[58]/*
-/lib/udev/rules.d/65-drbd.rules
+%attr(4754,root,haclient) %{_sbindir}/drbdsetup
 %dir /lib/drbd
-%attr(755,root,root) /lib/drbd/drbd
 %attr(4754,root,haclient) /lib/drbd/drbdadm-*
 %attr(4754,root,haclient) /lib/drbd/drbdsetup-*
-%{systemdtmpfilesdir}/drbd.conf
+%dir /lib/drbd/scripts
+%attr(755,root,root) /lib/drbd/scripts/drbd
+%attr(755,root,root) /lib/drbd/scripts/drbd-service-shim.sh
+%attr(755,root,root) /lib/drbd/scripts/drbd-wait-promotable.sh
+/lib/udev/rules.d/65-drbd.rules
 %dir %{_prefix}/lib/drbd
 %attr(755,root,root) %{_prefix}/lib/drbd/*
-%attr(755,root,root) %{_sbindir}/drbd-overview
+%dir %{_sysconfdir}/drbd.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.d/global_common.conf
+%{systemdunitdir}/drbd.service
+%{systemdunitdir}/drbd-demote-or-escalate at .service
+%{systemdunitdir}/drbd-graceful-shutdown.service
+%{systemdunitdir}/drbd-lvchange at .service
+%{systemdunitdir}/drbd-promote at .service
+%{systemdunitdir}/drbd-reconfigure-suspend-or-error at .service
+%{systemdunitdir}/drbd-services at .target
+%{systemdunitdir}/drbd-wait-promotable at .service
+%{systemdunitdir}/drbd at .service
+%{systemdunitdir}/drbd at .target
+%{systemdtmpfilesdir}/drbd.conf
 %attr(750,root,root) %dir /var/lib/drbd
+%attr(700,root,root) %dir /var/run/drbd
+%{_mandir}/man5/drbd.conf.5*
+%{_mandir}/man5/drbd.conf-8.3.5*
+%{_mandir}/man5/drbd.conf-8.4.5*
+%{_mandir}/man5/drbd.conf-9.0.5*
+%{_mandir}/man7/drbd.service.7*
+%{_mandir}/man7/drbd-lvchange at .service.7*
+%{_mandir}/man7/drbd-promote at .service.7*
+%{_mandir}/man7/drbd-reconfigure-suspend-or-error at .service.7*
+%{_mandir}/man7/drbd-services at .target.7*
+%{_mandir}/man7/drbd-wait-promotable at .service.7*
+%{_mandir}/man7/drbd at .service.7*
+%{_mandir}/man7/drbd at .target.7*
+%{_mandir}/man8/drbd.8*
+%{_mandir}/man8/drbd-8.3.8*
+%{_mandir}/man8/drbd-8.4.8*
+%{_mandir}/man8/drbd-9.0.8*
+%{_mandir}/man8/drbdadm.8*
+%{_mandir}/man8/drbdadm-8.3.8*
+%{_mandir}/man8/drbdadm-8.4.8*
+%{_mandir}/man8/drbdadm-9.0.8*
+%{_mandir}/man8/drbddisk-8.3.8*
+%{_mandir}/man8/drbddisk-8.4.8*
+%{_mandir}/man8/drbdmeta.8*
+%{_mandir}/man8/drbdmeta-8.3.8*
+%{_mandir}/man8/drbdmeta-8.4.8*
+%{_mandir}/man8/drbdmeta-9.0.8*
+%{_mandir}/man8/drbdmon.8*
+%{_mandir}/man8/drbdmon-9.0.8*
+%{_mandir}/man8/drbdsetup.8*
+%{_mandir}/man8/drbdsetup-8.3.8*
+%{_mandir}/man8/drbdsetup-8.4.8*
+%{_mandir}/man8/drbdsetup-9.0.8*
+%lang(ja) %{_mandir}/ja/man5/drbd.conf.5*
+%lang(ja) %{_mandir}/ja/man5/drbd.conf-8.4.5*
+%lang(ja) %{_mandir}/ja/man5/drbd.conf-9.0.5*
+%lang(ja) %{_mandir}/ja/man8/drbd.8*
+%lang(ja) %{_mandir}/ja/man8/drbd-8.4.8*
+%lang(ja) %{_mandir}/ja/man8/drbd-9.0.8*
+%lang(ja) %{_mandir}/ja/man8/drbdadm.8*
+%lang(ja) %{_mandir}/ja/man8/drbdadm-8.4.8*
+%lang(ja) %{_mandir}/ja/man8/drbdadm-9.0.8*
+%lang(ja) %{_mandir}/ja/man8/drbddisk-8.4.8*
+%lang(ja) %{_mandir}/ja/man8/drbdmeta.8*
+%lang(ja) %{_mandir}/ja/man8/drbdmeta-8.4.8*
+%lang(ja) %{_mandir}/ja/man8/drbdmeta-9.0.8*
+%lang(ja) %{_mandir}/ja/man8/drbdmon.8*
+%lang(ja) %{_mandir}/ja/man8/drbdmon-9.0.8*
+%lang(ja) %{_mandir}/ja/man8/drbdsetup.8*
+%lang(ja) %{_mandir}/ja/man8/drbdsetup-8.4.8*
+%lang(ja) %{_mandir}/ja/man8/drbdsetup-9.0.8*
 
 %files -n resource-agents-drbd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/drbddisk
 %attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/drbdupper
+%attr(755,root,root) /lib/drbd/scripts/ocf.ra.wrapper.sh
 %dir %{_prefix}/lib/ocf/resource.d/linbit
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/linbit/*
+%{systemdunitdir}/ocf.ra at .service
+%{_mandir}/man7/ocf.ra at .service.7*
+%{_mandir}/man7/ocf_linbit_drbd.7*
+%{_mandir}/man7/ocf_linbit_drbd-attr.7*
 
 %files -n bash-completion-drbd
 %defattr(644,root,root,755)
@@ -149,3 +241,6 @@ fi
 %files -n drbd-xen
 %defattr(644,root,root,755)
 %{_sysconfdir}/xen/scripts/block-drbd
+
+# TODO: multipath subpackage? (R: multipath-tools)
+#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/multipath/conf.d/drbd.conf
diff --git a/drbd-utils-udev.patch b/drbd-utils-udev.patch
new file mode 100644
index 0000000..f9489f7
--- /dev/null
+++ b/drbd-utils-udev.patch
@@ -0,0 +1,21 @@
+--- drbd-utils-9.27.0/configure.ac.orig	2023-12-22 10:42:40.000000000 +0100
++++ drbd-utils-9.27.0/configure.ac	2023-12-28 22:28:00.048511920 +0100
+@@ -422,18 +422,6 @@ else
+     dnl default.
+     test -z $INITDIR && INITDIR="$sysconfdir/init.d"
+ 
+-    dnl Our udev rules file is known to work only with udev >= 85
+-    if test "$WITH_UDEV" = "yes"; then
+-       udev_version=$( set -- $($UDEVADM version); echo $1 )
+-       if test -z "$udev_version"; then
+-	    udev_version=$( set -- $($UDEVINFO -V); echo $3 )
+-       fi
+-       if test -z "$udev_version" || test "$udev_version" -lt 85; then
+-          UDEV_RULE_SUFFIX=".disabled"
+-          AC_MSG_WARN([Obsolete or unknown udev version. Installing disabled udev rules.])
+-       fi
+-    fi
+-
+     dnl Our sub-packages can be built for noarch, but RPM only supports
+     dnl this from version 4.6.0 forward
+     if test "$WITH_NOARCH_SUBPACKAGES" = "yes"; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/drbd-utils.git/commitdiff/304844c4f45a57e7b7832f00eb14b6dc5811dba0

