From ebf50792dfd1cc2d37009510041bf2bd9a0312e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Aug 2023 11:06:56 -0400
Subject: [PATCH] New package: mkinitcpio-utils-0.0.4

---
 srcpkgs/mkinitcpio-encryptssh          |  1 +
 srcpkgs/mkinitcpio-encryptssh/template | 24 -----------------------
 srcpkgs/mkinitcpio-encryptssh/update   |  1 -
 srcpkgs/mkinitcpio-utils/INSTALL.msg   |  6 ++++++
 srcpkgs/mkinitcpio-utils/template      | 27 ++++++++++++++++++++++++++
 5 files changed, 34 insertions(+), 25 deletions(-)
 create mode 120000 srcpkgs/mkinitcpio-encryptssh
 delete mode 100644 srcpkgs/mkinitcpio-encryptssh/template
 delete mode 100644 srcpkgs/mkinitcpio-encryptssh/update
 create mode 100644 srcpkgs/mkinitcpio-utils/INSTALL.msg
 create mode 100644 srcpkgs/mkinitcpio-utils/template

diff --git a/srcpkgs/mkinitcpio-encryptssh b/srcpkgs/mkinitcpio-encryptssh
new file mode 120000
index 00000000000..32adecbc034
--- /dev/null
+++ b/srcpkgs/mkinitcpio-encryptssh
@@ -0,0 +1 @@
+mkinitcpio-utils
\ No newline at end of file
diff --git a/srcpkgs/mkinitcpio-encryptssh/template b/srcpkgs/mkinitcpio-encryptssh/template
deleted file mode 100644
index 67b7c2392af..00000000000
--- a/srcpkgs/mkinitcpio-encryptssh/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'mkinitcpio-encryptssh'
-pkgname=mkinitcpio-encryptssh
-version=0.16
-revision=3
-_version_suffix=1
-depends="mkinitcpio cryptsetup dropbear mkinitcpio-nfs-utils psmisc iproute2"
-short_desc="Allows for an encrypted root device to be unlocked remotely over SSH"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="BSD-3-Clause"
-homepage="https://github.com/grazzolini/dropbear_initrd_encrypt"
-# This package is splited into 3 repositories upstream.
-distfiles="https://github.com/grazzolini/dropbear_initrd_encrypt/archive/v${version}-${_version_suffix}.tar.gz
- https://raw.githubusercontent.com/grazzolini/mkinitcpio-dropbear/d944b72807725ac219877359de17097ef38b70ef/LICENSE"
-checksum="6b24ea3d6e1ee55d304ca31707fe17c545f7ea843a13b764e22475f838c41eae
- f07bbe0b6023321d75fde5ac5a3107a62f1f96f9384afaf28112dbf7a86975a8"
-skip_extraction="LICENSE"
-
-do_install() {
-	vinstall dropbear_hook 644 usr/lib/initcpio/hooks dropbear
-	vinstall dropbear_install 644 usr/lib/initcpio/install dropbear
-	vinstall encryptssh_hook 644 usr/lib/initcpio/hooks encryptssh
-	vinstall encryptssh_install 644 usr/lib/initcpio/install encryptssh
-	vlicense $XBPS_SRCDISTDIR/$pkgname-$version/LICENSE
-}
diff --git a/srcpkgs/mkinitcpio-encryptssh/update b/srcpkgs/mkinitcpio-encryptssh/update
deleted file mode 100644
index 443fa499fc7..00000000000
--- a/srcpkgs/mkinitcpio-encryptssh/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\-1.tar\.gz")'
diff --git a/srcpkgs/mkinitcpio-utils/INSTALL.msg b/srcpkgs/mkinitcpio-utils/INSTALL.msg
new file mode 100644
index 00000000000..5347c08e6f9
--- /dev/null
+++ b/srcpkgs/mkinitcpio-utils/INSTALL.msg
@@ -0,0 +1,6 @@
+The upstream mkinitcpio-encryptssh package has been ABANDONED in favor of the
+combination of mkinitcpio-netconf, mkinitcpio-dropbear and mkinitcpio-utils
+(which now provides the `encryptssh` hook). The `dropbear` hook now provided by
+mkinitcpio-dropbear will not configure networking. Users of the older
+`encryptssh` hook should add the `netconf` hook to the HOOKS array in
+mkinitcpio.conf, BEFORE the `dropbear` hook, to preserve existing behavior.
diff --git a/srcpkgs/mkinitcpio-utils/template b/srcpkgs/mkinitcpio-utils/template
new file mode 100644
index 00000000000..168420ce7bb
--- /dev/null
+++ b/srcpkgs/mkinitcpio-utils/template
@@ -0,0 +1,27 @@
+# Template file for 'mkinitcpio-utils'
+pkgname=mkinitcpio-utils
+version=0.0.4
+revision=1
+depends="cryptsetup device-mapper mkinitcpio"
+short_desc="Collection of mkinitcpio utilities to perform various tasks"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/grazzolini/mkinitcpio-utils"
+distfiles="https://github.com/grazzolini/mkinitcpio-utils/archive/v${version}.tar.gz"
+checksum=e42149b66f961d19e524b603fcb6f0d1e33ede18734b44f23c8b3e1cc353f977
+replaces="mkinitcpio-encryptssh>=0"
+
+do_install() {
+	vinstall utils/shells/cryptsetup_shell 0755 \
+		usr/share/mkinitcpio-utils/utils/shells
+	vinstall initcpio/hooks/encryptssh 0644 usr/lib/initcpio/hooks
+	vinstall initcpio/install/encryptssh 0644 usr/lib/initcpio/install
+	vlicense LICENSE
+}
+
+mkinitcpio-encryptssh_package() {
+	build_style=meta
+	reverts="0.16_1 0.16_2 0.16_3"
+	short_desc="Remote unlocking of encrypted roots (transitional dummy package)"
+	depends="${sourcepkg} mkinitcpio-netconf mkinitcpio-dropbear"
+}