* Re: [PR PATCH] [Updated] New package: mkinitcpio-dropbear-0.0.4
2023-08-23 21:32 [PR PATCH] New package: mkinitcpio-dropbear-0.0.4 ahesford
@ 2023-08-25 15:16 ` ahesford
2023-08-25 15:17 ` ahesford
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2023-08-25 15:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages mkinitcpio-dropbear
https://github.com/void-linux/void-packages/pull/45734
New package: mkinitcpio-dropbear-0.0.4
I got approval from @grazzolini in #archlinux on libera to pick up the baton for this package, so let's make it available (with a few enhancments over the original) available for Void.
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/45734.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mkinitcpio-dropbear-45734.patch --]
[-- Type: text/x-diff, Size: 7247 bytes --]
From 2a527de7126345ec709ee5d6f099204136f2a7a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 23 Aug 2023 17:30:51 -0400
Subject: [PATCH 1/3] New package: mkinitcpio-dropbear-0.0.4
---
srcpkgs/mkinitcpio-dropbear/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/mkinitcpio-dropbear/template
diff --git a/srcpkgs/mkinitcpio-dropbear/template b/srcpkgs/mkinitcpio-dropbear/template
new file mode 100644
index 0000000000000..de581b49d3969
--- /dev/null
+++ b/srcpkgs/mkinitcpio-dropbear/template
@@ -0,0 +1,16 @@
+# Template file for 'mkinitcpio-dropbear'
+pkgname=mkinitcpio-dropbear
+version=0.0.4
+revision=1
+build_style=gnu-makefile
+depends="mkinitcpio dropbear"
+short_desc="Hook for mkinitcpio to enable dropbear SSH in early userspace"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/ahesford/mkinitcpio-dropbear"
+distfiles="https://github.com/ahesford/mkinitcpio-dropbear/archive/v${version}.tar.gz"
+checksum=25c9bc01ff19a3807f7a16bc2eb18fd0938e9191d88390eec74e4aa566ce3374
+
+post_install() {
+ vlicense LICENSE
+}
From 5c330730b9f27617c659ab40b513a62f7bb70f1a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Aug 2023 11:05:11 -0400
Subject: [PATCH 2/3] New package: mkinitcpio-netconf-0.0.5
---
srcpkgs/mkinitcpio-netconf/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/mkinitcpio-netconf/template
diff --git a/srcpkgs/mkinitcpio-netconf/template b/srcpkgs/mkinitcpio-netconf/template
new file mode 100644
index 0000000000000..e72854d3235a7
--- /dev/null
+++ b/srcpkgs/mkinitcpio-netconf/template
@@ -0,0 +1,17 @@
+# Template file for 'mkinitcpio-netconf'
+pkgname=mkinitcpio-netconf
+version=0.0.5
+revision=1
+depends="mkinitcpio-nfs-utils iproute2"
+short_desc="Hook to set up early userspace networking with mkinitcpio"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/grazzolini/mkinitcpio-netconf"
+distfiles="https://github.com/grazzolini/mkinitcpio-netconf/archive/v${version}.tar.gz"
+checksum=373aaf19e02ce3183bf08f6bcd08617204c81c29f3bae1cbfebfabaa94eb6d70
+
+do_install() {
+ vinstall netconf_hook 644 usr/lib/initcpio/hooks netconf
+ vinstall netconf_install 644 usr/lib/initcpio/install netconf
+ vlicense LICENSE
+}
From af09e6ed868d99c8aa32e00458c2260d891f8d2c 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 3/3] New package: mkinitcpio-utils-0.0.4
---
srcpkgs/mkinitcpio-encryptssh | 1 +
srcpkgs/mkinitcpio-encryptssh/template | 24 -----------------
srcpkgs/mkinitcpio-encryptssh/update | 1 -
.../mkinitcpio-encryptssh.INSTALL.msg | 8 ++++++
srcpkgs/mkinitcpio-utils/template | 26 +++++++++++++++++++
5 files changed, 35 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/mkinitcpio-encryptssh.INSTALL.msg
create mode 100644 srcpkgs/mkinitcpio-utils/template
diff --git a/srcpkgs/mkinitcpio-encryptssh b/srcpkgs/mkinitcpio-encryptssh
new file mode 120000
index 0000000000000..32adecbc03460
--- /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 67b7c2392afe7..0000000000000
--- 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 443fa499fc767..0000000000000
--- 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/mkinitcpio-encryptssh.INSTALL.msg b/srcpkgs/mkinitcpio-utils/mkinitcpio-encryptssh.INSTALL.msg
new file mode 100644
index 0000000000000..ec3d3e3289fab
--- /dev/null
+++ b/srcpkgs/mkinitcpio-utils/mkinitcpio-encryptssh.INSTALL.msg
@@ -0,0 +1,8 @@
+The upstream mkinitcpio-encryptssh package has been ABANDONED in favor of the
+mkinitcpio-netconf, mkinitcpio-dropbear and mkinitcpio-utils packages. In
+particular, the `dropbear` hook now provided by mkinitcpio-dropbear will not
+configure networking on its own.
+
+Users requiring network configuration for dropbear should add the `netconf`
+hook to the `netconf` hook to the HOOKS array in mkinitcpio.conf BEFORE the
+`dropbear` hook.
diff --git a/srcpkgs/mkinitcpio-utils/template b/srcpkgs/mkinitcpio-utils/template
new file mode 100644
index 0000000000000..c29f23fb905e6
--- /dev/null
+++ b/srcpkgs/mkinitcpio-utils/template
@@ -0,0 +1,26 @@
+# 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() {
+ 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"
+}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Updated] New package: mkinitcpio-dropbear-0.0.4
2023-08-23 21:32 [PR PATCH] New package: mkinitcpio-dropbear-0.0.4 ahesford
2023-08-25 15:16 ` [PR PATCH] [Updated] " ahesford
@ 2023-08-25 15:17 ` ahesford
2023-08-25 15:21 ` ahesford
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2023-08-25 15:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages mkinitcpio-dropbear
https://github.com/void-linux/void-packages/pull/45734
New package: mkinitcpio-dropbear-0.0.4
I got approval from @grazzolini in #archlinux on libera to pick up the baton for this package, so let's make it available (with a few enhancments over the original) available for Void.
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/45734.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mkinitcpio-dropbear-45734.patch --]
[-- Type: text/x-diff, Size: 7266 bytes --]
From 2a527de7126345ec709ee5d6f099204136f2a7a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 23 Aug 2023 17:30:51 -0400
Subject: [PATCH 1/3] New package: mkinitcpio-dropbear-0.0.4
---
srcpkgs/mkinitcpio-dropbear/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/mkinitcpio-dropbear/template
diff --git a/srcpkgs/mkinitcpio-dropbear/template b/srcpkgs/mkinitcpio-dropbear/template
new file mode 100644
index 0000000000000..de581b49d3969
--- /dev/null
+++ b/srcpkgs/mkinitcpio-dropbear/template
@@ -0,0 +1,16 @@
+# Template file for 'mkinitcpio-dropbear'
+pkgname=mkinitcpio-dropbear
+version=0.0.4
+revision=1
+build_style=gnu-makefile
+depends="mkinitcpio dropbear"
+short_desc="Hook for mkinitcpio to enable dropbear SSH in early userspace"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/ahesford/mkinitcpio-dropbear"
+distfiles="https://github.com/ahesford/mkinitcpio-dropbear/archive/v${version}.tar.gz"
+checksum=25c9bc01ff19a3807f7a16bc2eb18fd0938e9191d88390eec74e4aa566ce3374
+
+post_install() {
+ vlicense LICENSE
+}
From 5c330730b9f27617c659ab40b513a62f7bb70f1a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Aug 2023 11:05:11 -0400
Subject: [PATCH 2/3] New package: mkinitcpio-netconf-0.0.5
---
srcpkgs/mkinitcpio-netconf/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/mkinitcpio-netconf/template
diff --git a/srcpkgs/mkinitcpio-netconf/template b/srcpkgs/mkinitcpio-netconf/template
new file mode 100644
index 0000000000000..e72854d3235a7
--- /dev/null
+++ b/srcpkgs/mkinitcpio-netconf/template
@@ -0,0 +1,17 @@
+# Template file for 'mkinitcpio-netconf'
+pkgname=mkinitcpio-netconf
+version=0.0.5
+revision=1
+depends="mkinitcpio-nfs-utils iproute2"
+short_desc="Hook to set up early userspace networking with mkinitcpio"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/grazzolini/mkinitcpio-netconf"
+distfiles="https://github.com/grazzolini/mkinitcpio-netconf/archive/v${version}.tar.gz"
+checksum=373aaf19e02ce3183bf08f6bcd08617204c81c29f3bae1cbfebfabaa94eb6d70
+
+do_install() {
+ vinstall netconf_hook 644 usr/lib/initcpio/hooks netconf
+ vinstall netconf_install 644 usr/lib/initcpio/install netconf
+ vlicense LICENSE
+}
From 03a4e89c1ca7e52f49b21cbe276d020100466b36 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 3/3] New package: mkinitcpio-utils-0.0.4
---
srcpkgs/mkinitcpio-encryptssh | 1 +
srcpkgs/mkinitcpio-encryptssh/template | 24 -----------------
srcpkgs/mkinitcpio-encryptssh/update | 1 -
.../mkinitcpio-encryptssh.INSTALL.msg | 8 ++++++
srcpkgs/mkinitcpio-utils/template | 27 +++++++++++++++++++
5 files changed, 36 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/mkinitcpio-encryptssh.INSTALL.msg
create mode 100644 srcpkgs/mkinitcpio-utils/template
diff --git a/srcpkgs/mkinitcpio-encryptssh b/srcpkgs/mkinitcpio-encryptssh
new file mode 120000
index 0000000000000..32adecbc03460
--- /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 67b7c2392afe7..0000000000000
--- 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 443fa499fc767..0000000000000
--- 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/mkinitcpio-encryptssh.INSTALL.msg b/srcpkgs/mkinitcpio-utils/mkinitcpio-encryptssh.INSTALL.msg
new file mode 100644
index 0000000000000..ec3d3e3289fab
--- /dev/null
+++ b/srcpkgs/mkinitcpio-utils/mkinitcpio-encryptssh.INSTALL.msg
@@ -0,0 +1,8 @@
+The upstream mkinitcpio-encryptssh package has been ABANDONED in favor of the
+mkinitcpio-netconf, mkinitcpio-dropbear and mkinitcpio-utils packages. In
+particular, the `dropbear` hook now provided by mkinitcpio-dropbear will not
+configure networking on its own.
+
+Users requiring network configuration for dropbear should add the `netconf`
+hook to the `netconf` hook to the HOOKS array in mkinitcpio.conf BEFORE the
+`dropbear` hook.
diff --git a/srcpkgs/mkinitcpio-utils/template b/srcpkgs/mkinitcpio-utils/template
new file mode 100644
index 0000000000000..168420ce7bbf2
--- /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"
+}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: New package: mkinitcpio-dropbear-0.0.4
2023-08-23 21:32 [PR PATCH] New package: mkinitcpio-dropbear-0.0.4 ahesford
2023-08-25 15:16 ` [PR PATCH] [Updated] " ahesford
2023-08-25 15:17 ` ahesford
@ 2023-08-25 15:21 ` ahesford
2023-08-25 15:30 ` [PR PATCH] [Updated] " ahesford
2023-09-08 14:49 ` [PR PATCH] [Merged]: " ahesford
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2023-08-25 15:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/45734#issuecomment-1693533643
Comment:
@thypon The `mkinitcpio-encryptssh` package has [long been abandoned upstream](https://github.com/grazzolini/dropbear_initrd_encrypt) in favor of the `mkinitcpio-utils`, `mkinitcpio-netconf` and `mkinitcpio-dropbear` packages.
I propose making `mkinitcpio-encryptssh` a dummy package that will pull in these new packages in its place. Unfortunately, this will require manual intervention because the `mkinitcpio-dropbear` package no longer configures its own networking. Users will need to add `netconf` to `mkinitcpio.conf` to preserve existing behavior.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] New package: mkinitcpio-dropbear-0.0.4
2023-08-23 21:32 [PR PATCH] New package: mkinitcpio-dropbear-0.0.4 ahesford
` (2 preceding siblings ...)
2023-08-25 15:21 ` ahesford
@ 2023-08-25 15:30 ` ahesford
2023-09-08 14:49 ` [PR PATCH] [Merged]: " ahesford
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2023-08-25 15:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages mkinitcpio-dropbear
https://github.com/void-linux/void-packages/pull/45734
New package: mkinitcpio-dropbear-0.0.4
I got approval from @grazzolini in #archlinux on libera to pick up the baton for this package, so let's make it available (with a few enhancments over the original) available for Void.
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/45734.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mkinitcpio-dropbear-45734.patch --]
[-- Type: text/x-diff, Size: 7172 bytes --]
From 2a527de7126345ec709ee5d6f099204136f2a7a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 23 Aug 2023 17:30:51 -0400
Subject: [PATCH 1/3] New package: mkinitcpio-dropbear-0.0.4
---
srcpkgs/mkinitcpio-dropbear/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/mkinitcpio-dropbear/template
diff --git a/srcpkgs/mkinitcpio-dropbear/template b/srcpkgs/mkinitcpio-dropbear/template
new file mode 100644
index 0000000000000..de581b49d3969
--- /dev/null
+++ b/srcpkgs/mkinitcpio-dropbear/template
@@ -0,0 +1,16 @@
+# Template file for 'mkinitcpio-dropbear'
+pkgname=mkinitcpio-dropbear
+version=0.0.4
+revision=1
+build_style=gnu-makefile
+depends="mkinitcpio dropbear"
+short_desc="Hook for mkinitcpio to enable dropbear SSH in early userspace"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/ahesford/mkinitcpio-dropbear"
+distfiles="https://github.com/ahesford/mkinitcpio-dropbear/archive/v${version}.tar.gz"
+checksum=25c9bc01ff19a3807f7a16bc2eb18fd0938e9191d88390eec74e4aa566ce3374
+
+post_install() {
+ vlicense LICENSE
+}
From 5c330730b9f27617c659ab40b513a62f7bb70f1a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Aug 2023 11:05:11 -0400
Subject: [PATCH 2/3] New package: mkinitcpio-netconf-0.0.5
---
srcpkgs/mkinitcpio-netconf/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/mkinitcpio-netconf/template
diff --git a/srcpkgs/mkinitcpio-netconf/template b/srcpkgs/mkinitcpio-netconf/template
new file mode 100644
index 0000000000000..e72854d3235a7
--- /dev/null
+++ b/srcpkgs/mkinitcpio-netconf/template
@@ -0,0 +1,17 @@
+# Template file for 'mkinitcpio-netconf'
+pkgname=mkinitcpio-netconf
+version=0.0.5
+revision=1
+depends="mkinitcpio-nfs-utils iproute2"
+short_desc="Hook to set up early userspace networking with mkinitcpio"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/grazzolini/mkinitcpio-netconf"
+distfiles="https://github.com/grazzolini/mkinitcpio-netconf/archive/v${version}.tar.gz"
+checksum=373aaf19e02ce3183bf08f6bcd08617204c81c29f3bae1cbfebfabaa94eb6d70
+
+do_install() {
+ vinstall netconf_hook 644 usr/lib/initcpio/hooks netconf
+ vinstall netconf_install 644 usr/lib/initcpio/install netconf
+ vlicense LICENSE
+}
From be419cc02e5d74f4a83ce2e5798aa751ff76718e 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 3/3] 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 0000000000000..32adecbc03460
--- /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 67b7c2392afe7..0000000000000
--- 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 443fa499fc767..0000000000000
--- 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 0000000000000..5347c08e6f97a
--- /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 0000000000000..168420ce7bbf2
--- /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"
+}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Merged]: New package: mkinitcpio-dropbear-0.0.4
2023-08-23 21:32 [PR PATCH] New package: mkinitcpio-dropbear-0.0.4 ahesford
` (3 preceding siblings ...)
2023-08-25 15:30 ` [PR PATCH] [Updated] " ahesford
@ 2023-09-08 14:49 ` ahesford
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2023-09-08 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
There's a merged pull request on the void-packages repository
New package: mkinitcpio-dropbear-0.0.4
https://github.com/void-linux/void-packages/pull/45734
Description:
I got approval from @grazzolini in #archlinux on libera to pick up the baton for this package, so let's make it available (with a few enhancments over the original) available for Void.
#### Testing the changes
- I tested the changes in this PR: **YES**
^ permalink raw reply [flat|nested] 6+ messages in thread