File rpmlint-build-error.patch of Package drbd-utils

Overview Repositories Revisions Requests Users Attributes Meta

File rpmlint-build-error.patch of Package drbd-utils (Revision 76ef10cac2e74ddd77cfc36722b04756)

Currently displaying revision 76ef10cac2e74ddd77cfc36722b04756 , Show latest

Fix rpmlint Errors:
  1. non-executable-script /usr/lib/ocf/resource.d/linbit/drbd.shellfuncs.sh 644 /bin/bash
  2. filelist-forbidden-bashcomp-userdirs /etc/bash_completion.d/drbdadm.sh
  3. dir-or-file-in-run /run/drbd

diff -Naur drbd-utils-9.19.0.orig/scripts/drbdadm.bash_completion drbd-utils-9.19.0/scripts/drbdadm.bash_completion
--- drbd-utils-9.19.0.orig/scripts/drbdadm.bash_completion	2021-10-11 18:44:02.906467704 +0800
+++ drbd-utils-9.19.0/scripts/drbdadm.bash_completion	2021-10-11 18:48:24.653422443 +0800
@@ -1,5 +1,5 @@
 #
-# /etc/bash_completion.d/drbdadm
+# /usr/share/bash-completion/completions/drbdadm
 #
 # Bash completion for the DRBD top-level management application, drbdadm.
 #
diff -Naur drbd-utils-9.19.0.orig/scripts/Makefile.in drbd-utils-9.19.0/scripts/Makefile.in
--- drbd-utils-9.19.0.orig/scripts/Makefile.in	2021-10-11 18:44:02.906467704 +0800
+++ drbd-utils-9.19.0/scripts/Makefile.in	2021-10-11 18:51:21.716712860 +0800
@@ -147,7 +147,7 @@
 	mkdir -p $(DESTDIR)/usr/lib/ocf/resource.d/linbit
 	install -m 755 drbd.ocf $(DESTDIR)/usr/lib/ocf/resource.d/linbit/drbd
 	install -m 755 drbd-attr $(DESTDIR)/usr/lib/ocf/resource.d/linbit/drbd-attr
-	install -m 644 drbd.shellfuncs.sh $(DESTDIR)/usr/lib/ocf/resource.d/linbit/
+	install -m 755 drbd.shellfuncs.sh $(DESTDIR)/usr/lib/ocf/resource.d/linbit/
 endif
 
 install-rgmanager:
@@ -173,8 +173,8 @@
 
 install-bashcompletion:
 ifeq ($(WITH_BASHCOMPLETION),yes)
-	mkdir -p $(DESTDIR)$(sysconfdir)/bash_completion.d
-	install -m 644 drbdadm.bash_completion $(DESTDIR)$(sysconfdir)/bash_completion.d/drbdadm$(BASH_COMPLETION_SUFFIX)
+	mkdir -p $(DESTDIR)$(datadir)/bash-completion/completions
+	install -m 644 drbdadm.bash_completion $(DESTDIR)$(datadir)/bash-completion/completions/drbdadm
 endif
 
 clean:
@@ -195,7 +195,7 @@
 	rm -f $(DESTDIR)$(sysconfdir)/ha.d/resource.d/drbddisk
 	rm -f $(DESTDIR)$(sysconfdir)/ha.d/resource.d/drbdupper
 	rm -f $(DESTDIR)$(sysconfdir)/xen/scripts/block-drbd
-	rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/drbdadm$(BASH_COMPLETION_SUFFIX)
+	rm -f $(DESTDIR)$(datadir)/bash-completion/completions/drbdadm
 	! test -L $(DESTDIR)/sbin/rcdrbd || rm $(DESTDIR)/sbin/rcdrbd
 
 .PHONY: install uninstall clean distclean
diff -Naur drbd-utils-9.19.0.orig/user/v84/Makefile.in drbd-utils-9.19.0/user/v84/Makefile.in
--- drbd-utils-9.19.0.orig/user/v84/Makefile.in	2021-10-11 18:44:02.918467657 +0800
+++ drbd-utils-9.19.0/user/v84/Makefile.in	2021-10-13 11:39:05.662316197 +0800
@@ -108,7 +108,6 @@
 install:
 ifeq ($(WITH_84_SUPPORT),yes)
 	install -d $(DESTDIR)$(localstatedir)/lib/drbd
-	install -d $(DESTDIR)$(localstatedir)/run/drbd
 	install -d $(DESTDIR)$(localstatedir)/lock
 	install -d $(DESTDIR)/lib/drbd/
 	if getent group haclient > /dev/null 2> /dev/null ; then	\
diff -Naur drbd-utils-9.19.0.orig/user/v9/Makefile.in drbd-utils-9.19.0/user/v9/Makefile.in
--- drbd-utils-9.19.0.orig/user/v9/Makefile.in	2021-10-11 18:44:02.918467657 +0800
+++ drbd-utils-9.19.0/user/v9/Makefile.in	2021-10-13 11:38:48.462390954 +0800
@@ -143,7 +143,6 @@
 install:
 	install -d $(DESTDIR)$(sbindir)
 	install -d $(DESTDIR)$(localstatedir)/lib/drbd
-	install -d $(DESTDIR)$(localstatedir)/run/drbd
 	install -d $(DESTDIR)$(localstatedir)/lock
 	if getent group haclient > /dev/null 2> /dev/null ; then	\
 		install -g haclient -m 4750 drbdsetup $(DESTDIR)$(sbindir) ;	\

Places

File rpmlint-build-error.patch of Package drbd-utils (Revision 76ef10cac2e74ddd77cfc36722b04756)

Places