[arch-commits] Commit in open-iscsi/trunk (2 files)

[Christian Hesse]

    Date: Thursday, July 7, 2022 @ 08:38:29
  Author: eworm
Revision: 1247647

upgpkg: open-iscsi 2.1.7-2: fix permissions for systemd unit files

Added:
  open-iscsi/trunk/0001-etc-install-system-unit-with-without-executable-bit.patch
Modified:
  open-iscsi/trunk/PKGBUILD

----------------------------------------------------------------+
 0001-etc-install-system-unit-with-without-executable-bit.patch |   31 ++++++++++
 PKGBUILD                                                       |   14 +++-
 2 files changed, 42 insertions(+), 3 deletions(-)

Added: 0001-etc-install-system-unit-with-without-executable-bit.patch
===================================================================
--- 0001-etc-install-system-unit-with-without-executable-bit.patch	                        (rev 0)
+++ 0001-etc-install-system-unit-with-without-executable-bit.patch	2022-07-07 08:38:29 UTC (rev 1247647)
@@ -0,0 +1,31 @@
+From dda3eeb61ab5134da02ea916d7be10434dc18b94 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Thu, 7 Jul 2022 10:32:07 +0200
+Subject: [PATCH 1/1] etc: install system unit with without executable bit
+
+All systemd unit files are expected to be not executable, so install
+with correct permissions.
+---
+ etc/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/etc/Makefile b/etc/Makefile
+index 6a03c32..c47c180 100644
+--- a/etc/Makefile
++++ b/etc/Makefile
+@@ -81,10 +81,10 @@ install_systemd_service_files: $(DESTDIR)$(systemddir)/system $(SYSTEMD_DEST_SVC
+ install_systemd_generator_files: $(DESTDIR)$(systemddir)/system-generators $(SYSTEMD_DEST_GEN_FILES)
+ 
+ $(SYSTEMD_DEST_SVC_FILES): $(DESTDIR)$(systemddir)/system/%: systemd/%
+-	$(INSTALL) $? $@
++	$(INSTALL) -m 644 $? $@
+ 
+ $(SYSTEMD_DEST_GEN_FILES): $(DESTDIR)$(systemddir)/system-generators/%: systemd/%
+-	$(INSTALL) $? $@
++	$(INSTALL) -m 755 $? $@
+ 
+ install_iname: $(DESTDIR)$(HOMEDIR) $(ISCSI_INAME)
+ 	if [ ! -f $(INAME_DEST_FILE) ]; then \
+-- 
+2.37.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-07 08:17:57 UTC (rev 1247646)
+++ PKGBUILD	2022-07-07 08:38:29 UTC (rev 1247647)
@@ -3,7 +3,7 @@
 
 pkgname=open-iscsi
 pkgver=2.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc='iSCSI userland tools'
 arch=('x86_64')
 url='https://www.open-iscsi.com/'
@@ -14,9 +14,17 @@
 backup=('etc/iscsi/iscsid.conf'
 	'etc/iscsi/initiatorname.iscsi')
 options=('docs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-iscsi/archive/$pkgver.tar.gz")
-sha256sums=('d96761e47a69f8214c5fbd251d844f37961b14c3e437b63a15cc64f5b8cba2f0')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-iscsi/archive/$pkgver.tar.gz"
+        '0001-etc-install-system-unit-with-without-executable-bit.patch')
+sha256sums=('d96761e47a69f8214c5fbd251d844f37961b14c3e437b63a15cc64f5b8cba2f0'
+            '4958b838c548f6797ee25aea47b018a03be2ee11299ff41e9b56ad74f1121ead')
 
+prepare() {
+  cd "$srcdir"/${pkgname}-${pkgver}
+
+  patch -Np1 < ../0001-etc-install-system-unit-with-without-executable-bit.patch
+}
+
 build() {
   cd "$srcdir"/${pkgname}-${pkgver}