[Debian-ha-maintainers] Bug#1060545: drbd-utils: Please switch Build-Depends to systemd-dev
Michael Biebl
biebl at debian.org
Thu Jul 18 14:50:38 BST 2024
Control: tags -1 + patch pending
I've uploaded an updated package to DELAYED/14.
Please find a debdiff attached.
Regards,
Michael
-------------- next part --------------
diff -Nru drbd-utils-9.22.0/debian/changelog drbd-utils-9.22.0/debian/changelog
--- drbd-utils-9.22.0/debian/changelog 2023-01-09 15:51:18.000000000 +0100
+++ drbd-utils-9.22.0/debian/changelog 2024-07-17 19:22:06.000000000 +0200
@@ -1,3 +1,27 @@
+drbd-utils (9.22.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add Build-Depends on pkgconf and systemd-dev to get the proper paths for
+ udev rules and systemd service files. (Closes: #1060545, #921153)
+ * Rely on systemd.pc and udev.pc to get the correct paths and do not
+ override it in debian/rules.
+ * Do not set sbindir in debian/rules and use the default instead, which is
+ /usr/sbin.
+ * Install drdb.conf modules-load config into /usr/lib/modules-load.d/ which
+ is the canonical location.
+ * Drop debian/patches/0005-initscript-remove-path.patch which is no longer
+ applicable.
+ * Drop debian/drbd-utils.dirs, it is not actually needed and creates
+ unneeded directories like lib/udev/rules.d.
+ * Add debian/patches/0009-no-hard-coded-paths.patch which ensures that all
+ scripts and binaries are installed into /usr.
+ * The changes above ensure that all files are installed into non-aliased
+ locations. (Closes: #1073716)
+ * Drop debian/drbd-utils.postinst which is no longer needed.
+ * Drop dependency on obsolete package lsb-base.
+
+ -- Michael Biebl <biebl at debian.org> Wed, 17 Jul 2024 19:22:06 +0200
+
drbd-utils (9.22.0-1) unstable; urgency=medium
* New upstream version 9.22.0
diff -Nru drbd-utils-9.22.0/debian/control drbd-utils-9.22.0/debian/control
--- drbd-utils-9.22.0/debian/control 2023-01-09 15:50:35.000000000 +0100
+++ drbd-utils-9.22.0/debian/control 2024-07-17 19:22:06.000000000 +0200
@@ -9,7 +9,9 @@
docbook-xsl,
docbook-xml,
asciidoctor,
+ pkgconf,
udev,
+ systemd-dev,
bash-completion,
po4a
Standards-Version: 4.6.1
@@ -19,8 +21,7 @@
Package: drbd-utils
Architecture: linux-any
-Depends: lsb-base (>= 3.0-6),
- ${shlibs:Depends},
+Depends: ${shlibs:Depends},
${misc:Depends}
Breaks: drbd8-utils (<< 2:8.9.0)
Replaces: drbd8-utils (<< 2:8.9.0)
diff -Nru drbd-utils-9.22.0/debian/drbd-utils.dirs drbd-utils-9.22.0/debian/drbd-utils.dirs
--- drbd-utils-9.22.0/debian/drbd-utils.dirs 2020-08-24 15:35:36.000000000 +0200
+++ drbd-utils-9.22.0/debian/drbd-utils.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-etc
-etc/init.d
-etc/ha.d/resource.d
-lib/udev/rules.d
diff -Nru drbd-utils-9.22.0/debian/drbd-utils.postinst drbd-utils-9.22.0/debian/drbd-utils.postinst
--- drbd-utils-9.22.0/debian/drbd-utils.postinst 2020-08-24 15:35:36.000000000 +0200
+++ drbd-utils-9.22.0/debian/drbd-utils.postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Cleanup the old systemd unit state, if applicable
-if dpkg --compare-versions "$2" lt-nl "8.9.5-1~"; then
- if deb-systemd-helper debian-installed drbd.service; then
- deb-systemd-helper purge drbd.service >/dev/null
- deb-systemd-helper unmask drbd.service >/dev/null
- fi
-fi
-
-#DEBHELPER#
diff -Nru drbd-utils-9.22.0/debian/patches/0005-initscript-remove-path.patch drbd-utils-9.22.0/debian/patches/0005-initscript-remove-path.patch
--- drbd-utils-9.22.0/debian/patches/0005-initscript-remove-path.patch 2022-07-19 12:24:50.000000000 +0200
+++ drbd-utils-9.22.0/debian/patches/0005-initscript-remove-path.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-From: Apollon Oikonomopoulos <apoikos at debian.org>
-Date: Mon, 18 Nov 2019 22:27:25 +0200
-Subject: Remove /usr from the initscript's PATH
-
-All utilities reside on /sbin. Furthermore, the declaration of
-/usr/sbin makes lintian complain about a missing dependency on $remote_fs,
-which is strictly not necessary.
-Last-Update: 2014-06-13
-Forwarded: no
----
- scripts/drbd | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/drbd b/scripts/drbd
-index fbed28f..333eedb 100755
---- a/scripts/drbd
-+++ b/scripts/drbd
-@@ -41,7 +41,7 @@ RMMOD="/sbin/rmmod"
- UDEV_TIMEOUT=10
- ADD_MOD_PARAM=""
-
--PATH=/usr/sbin:/sbin:$PATH
-+PATH=/sbin:/bin
-
- if [ -f $DEFAULTFILE ]; then
- . $DEFAULTFILE
diff -Nru drbd-utils-9.22.0/debian/patches/0009-no-hard-coded-paths.patch drbd-utils-9.22.0/debian/patches/0009-no-hard-coded-paths.patch
--- drbd-utils-9.22.0/debian/patches/0009-no-hard-coded-paths.patch 1970-01-01 01:00:00.000000000 +0100
+++ drbd-utils-9.22.0/debian/patches/0009-no-hard-coded-paths.patch 2024-07-17 19:22:06.000000000 +0200
@@ -0,0 +1,91 @@
+Description: Do not hard-code paths to install scripts and helper binaries
+ Instead use $LIBDIR everywhere consistently.
+Author: Michael Biebl <biebl at debian.org>
+
+---
+Bug-Debian: https://bugs.debian.org/1073716
+Forwarded: https://github.com/LINBIT/drbd-utils/pull/46
+
+Index: drbd-utils-9.22.0/scripts/Makefile.in
+===================================================================
+--- drbd-utils-9.22.0.orig/scripts/Makefile.in 2024-07-18 11:45:47.161526487 +0200
++++ drbd-utils-9.22.0/scripts/Makefile.in 2024-07-18 11:45:47.161526487 +0200
+@@ -88,11 +88,11 @@
+ install -d $(DESTDIR)$(systemdunitdir)
+ install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/
+ install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/
+- install -d $(DESTDIR)/lib/drbd/scripts
+- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts
+- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts
+- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts
+- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts
++ install -d $(DESTDIR)$(LIBDIR)/scripts
++ install -m 755 drbd $(DESTDIR)$(LIBDIR)/scripts
++ install -m 755 drbd-service-shim.sh $(DESTDIR)$(LIBDIR)/scripts
++ install -m 755 drbd-wait-promotable.sh $(DESTDIR)$(LIBDIR)/scripts
++ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)$(LIBDIR)/scripts
+ install -d $(DESTDIR)$(tmpfilesdir)/
+ install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf
+ endif
+Index: drbd-utils-9.22.0/user/v83/Makefile.in
+===================================================================
+--- drbd-utils-9.22.0.orig/user/v83/Makefile.in 2022-01-13 09:54:45.000000000 +0100
++++ drbd-utils-9.22.0/user/v83/Makefile.in 2024-07-18 11:48:08.135369707 +0200
+@@ -96,19 +96,19 @@
+ ifeq ($(WITH_83_SUPPORT),yes)
+ install -d $(DESTDIR)$(localstatedir)/lib/drbd
+ install -d $(DESTDIR)$(localstatedir)/lock
+- install -d $(DESTDIR)/lib/drbd/
++ install -d $(DESTDIR)$(LIBDIR)/
+ if getent group haclient > /dev/null 2> /dev/null ; then \
+- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \
+- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \
++ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)$(LIBDIR)/ ; \
++ install -m 755 drbdadm-83 $(DESTDIR)$(LIBDIR)/ ; \
+ else \
+- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \
+- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \
++ install -m 755 drbdsetup-83 $(DESTDIR)$(LIBDIR)/ ; \
++ install -m 755 drbdadm-83 $(DESTDIR)$(LIBDIR)/ ; \
+ fi
+ endif
+
+ uninstall:
+- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83
+- rm -f $(DESTDIR)/lib/drbd/drbdadm-83
++ rm -f $(DESTDIR)$(LIBDIR)/drbdsetup-83
++ rm -f $(DESTDIR)$(LIBDIR)/drbdadm-83
+
+ .PHONY: install uninstall clean distclean
+ ../../configure:
+Index: drbd-utils-9.22.0/user/v84/Makefile.in
+===================================================================
+--- drbd-utils-9.22.0.orig/user/v84/Makefile.in 2022-01-13 09:54:45.000000000 +0100
++++ drbd-utils-9.22.0/user/v84/Makefile.in 2024-07-18 11:49:41.816554493 +0200
+@@ -110,19 +110,19 @@
+ install -d $(DESTDIR)$(localstatedir)/lib/drbd
+ install -d $(DESTDIR)$(localstatedir)/run/drbd
+ install -d $(DESTDIR)$(localstatedir)/lock
+- install -d $(DESTDIR)/lib/drbd/
++ install -d $(DESTDIR)$(LIBDIR)/
+ if getent group haclient > /dev/null 2> /dev/null ; then \
+- install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
+- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \
++ install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)$(LIBDIR)/ ; \
++ install -m 755 drbdadm-84 $(DESTDIR)$(LIBDIR)/ ; \
+ else \
+- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
+- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \
++ install -m 755 drbdsetup-84 $(DESTDIR)$(LIBDIR)/ ; \
++ install -m 755 drbdadm-84 $(DESTDIR)$(LIBDIR)/ ; \
+ fi
+ endif
+
+ uninstall:
+- rm -f $(DESTDIR)/lib/drbd/drbdsetup-84
+- rm -f $(DESTDIR)/lib/drbd/drbdadm-84
++ rm -f $(DESTDIR)$(LIBDIR)/drbdsetup-84
++ rm -f $(DESTDIR)$(LIBDIR)/drbdadm-84
+
+ spell:
+ for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \
diff -Nru drbd-utils-9.22.0/debian/patches/series drbd-utils-9.22.0/debian/patches/series
--- drbd-utils-9.22.0/debian/patches/series 2022-07-19 12:24:50.000000000 +0200
+++ drbd-utils-9.22.0/debian/patches/series 2024-07-17 19:22:06.000000000 +0200
@@ -2,7 +2,7 @@
0002-udev-rules-name
0003-disable-version-warning
0004-disable-automatic-user-survey.patch
-0005-initscript-remove-path.patch
0006-initscript-add-start-runlevels.patch
0007-drbdmon-buildflags.patch
0008-drbdmon-pass-LDFLAGS-to-g.patch
+0009-no-hard-coded-paths.patch
diff -Nru drbd-utils-9.22.0/debian/rules drbd-utils-9.22.0/debian/rules
--- drbd-utils-9.22.0/debian/rules 2022-07-19 12:23:51.000000000 +0200
+++ drbd-utils-9.22.0/debian/rules 2024-07-17 19:22:06.000000000 +0200
@@ -15,14 +15,12 @@
override_dh_auto_configure:
dh_auto_configure -- \
- --sbindir=/sbin \
--with-udev \
--with-xen \
--with-pacemaker \
--with-rgmanager \
--with-bashcompletion \
--with-initscripttype=both \
- --with-systemdunitdir=/lib/systemd/system \
--with-bashcompletion=no
override_dh_auto_install:
@@ -39,7 +37,7 @@
rmdir $(CURDIR)/debian/drbd-utils/var/run
# systemd/kmod integration
- install -D -m0644 $(CURDIR)/debian/drbd.modules-load.d $(CURDIR)/debian/drbd-utils/lib/modules-load.d/drbd.conf
+ install -D -m0644 $(CURDIR)/debian/drbd.modules-load.d $(CURDIR)/debian/drbd-utils/usr/lib/modules-load.d/drbd.conf
override_dh_installinit:
dh_installinit --name=drbd --no-enable --no-start --no-stop-on-upgrade
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/debian-ha-maintainers/attachments/20240718/c105c110/attachment.sig>
More information about the Debian-ha-maintainers
mailing list