mandos: fix bin dir

2 files changed, 76 insertions, 4 deletions

diff --git a/mandos/Makefile.patch b/mandos/Makefile.patch
new file mode 100644
index 000000000..0933bf670
--- /dev/null
+++ b/mandos/Makefile.patch
@@ -0,0 +1,69 @@
+--- a/Makefile	2024-09-12 19:13:49.019811600 +0200
++++ b/Makefile	2024-10-12 15:30:35.826411432 +0200
+@@ -69,6 +69,7 @@
+ 
+ ## These settings are for a package-type install
+ PREFIX:=$(DESTDIR)/usr
++BINDIR:=$(PREFIX)/sbin
+ CONFDIR:=$(DESTDIR)/etc/mandos
+ KEYDIR:=$(DESTDIR)/etc/keys/mandos
+ MANDIR:=$(PREFIX)/share/man
+@@ -417,12 +418,12 @@
+ 		install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
+ 			$(SYSUSERS)/mandos.conf; \
+ 	fi
+-	install --directory $(PREFIX)/sbin
+-	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
++	install --directory $(BINDIR)
++	install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
+ 		mandos
+-	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
++	install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
+ 		mandos-ctl
+-	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
++	install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
+ 		mandos-monitor
+ 	install --directory $(CONFDIR)
+ 	install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
+@@ -477,8 +478,8 @@
+ 	install --mode=u=rwx,go=rx \
+ 		--target-directory=$(LIBDIR)/mandos \
+ 		mandos-to-cryptroot-unlock
+-	install --directory $(PREFIX)/sbin
+-	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
++	install --directory $(BINDIR)
++	install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
+ 		mandos-keygen
+ 	install --mode=u=rwx,go=rx \
+ 		--target-directory=$(LIBDIR)/mandos/plugins.d \
+@@ -544,7 +545,7 @@
+ .PHONY: install-client
+ install-client: install-client-nokey
+ # Post-installation stuff
+-	-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
++	-$(BINDIR)/mandos-keygen --dir "$(KEYDIR)"
+ 	if command -v update-initramfs >/dev/null; then \
+ 	    update-initramfs -k all -u; \
+ 	elif command -v dracut >/dev/null; then \
+@@ -562,9 +563,9 @@
+ 
+ .PHONY: uninstall-server
+ uninstall-server:
+-	-rm --force $(PREFIX)/sbin/mandos \
+-		$(PREFIX)/sbin/mandos-ctl \
+-		$(PREFIX)/sbin/mandos-monitor \
++	-rm --force $(BINDIR)/mandos \
++		$(BINDIR)/mandos-ctl \
++		$(BINDIR)/mandos-monitor \
+ 		$(MANDIR)/man8/mandos.8.gz \
+ 		$(MANDIR)/man8/mandos-monitor.8.gz \
+ 		$(MANDIR)/man8/mandos-ctl.8.gz \
+@@ -579,7 +580,7 @@
+ # to use it.
+ 	! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
+ 		$(DESTDIR)/etc/crypttab
+-	-rm --force $(PREFIX)/sbin/mandos-keygen \
++	-rm --force $(BINDIR)/mandos-keygen \
+ 		$(LIBDIR)/mandos/plugin-runner \
+ 		$(LIBDIR)/mandos/plugins.d/password-prompt \
+ 		$(LIBDIR)/mandos/plugins.d/mandos-client \
diff --git a/mandos/PKGBUILD b/mandos/PKGBUILD
index ae555553f..927c770b2 100644
--- a/mandos/PKGBUILD
+++ b/mandos/PKGBUILD
@@ -4,15 +4,17 @@ pkgbase='mandos'
 pkgname=('mandos-server' 'mandos-client-nokey')
 pkgdesc='system for allowing servers with encrypted root file systems to reboot unattended and/or remotely'
 pkgver='1.8.17'
-pkgrel=1
+pkgrel=2
 url='https://www.recompile.se/mandos'
 license=('GPL')
 
 source=("https://ftp.recompile.se/pub/${pkgbase}/${pkgbase}_${pkgver}.orig.tar.gz"
-        "https://ftp.recompile.se/pub/${pkgbase}/${pkgbase}_${pkgver}.orig.tar.gz.asc")
+        "https://ftp.recompile.se/pub/${pkgbase}/${pkgbase}_${pkgver}.orig.tar.gz.asc"
+        Makefile.patch)
 
 sha512sums=('0059593ab6b92b5178bbbf0be5d6852ec93393ed39032b05bc54c20c698a9e000c1db6c5069fad40f4d173f5b9d397503ca0077446ef460571138fac0f33f5ea'
-            'SKIP')
+            'SKIP'
+            '6561dfcd1c7ecc593b5d387796b01507fea7c1eb737196b880ac90c3ee561d4c7a803e2b21dc16d4c617ae116a7817465d99fa466398f53e4d7508ef8354110f')
 
 validpgpkeys=('153A37F10BBA0435987F2C4A72232973CA34C2C4')
 
@@ -21,6 +23,7 @@ makedepends=(docbook-xsl libnl man-db)
 
 prepare() {
   cd "$srcdir/$pkgbase-$pkgver"
+  patch -p1 -i "$srcdir/Makefile.patch"
   sed -i '
     /docbook\.xsl/ s@/stylesheet/nwalsh/@/'"$(
       ls /usr/share/xml/docbook/ \
@@ -40,7 +43,7 @@ build() {
 
 _package() {
   cd "$srcdir/$pkgbase-$pkgver"
-  make install-$1 DESTDIR="$pkgdir"
+  make install-$1 DESTDIR="$pkgdir" BINDIR="$pkgdir/usr/bin"
 }
 
 package_mandos-server() {