[PR PATCH] dracut-crypt-ssh: update to 1.0.8

[PR PATCH] dracut-crypt-ssh: update to 1.0.8

[ftpd]

[-- Attachment #1: Type: text/plain, Size: 703 bytes --]

There is a new pull request by ftpd against master on the void-packages repository

https://github.com/ftpd/void-packages dracut-crypt-ssh-1.0.8
https://github.com/void-linux/void-packages/pull/45583

dracut-crypt-ssh: update to 1.0.8
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture: x86_64, glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l

Note: all patches from `patches/` and `pre_configure` are already in the upstream, we don't need them anymore.

A patch file from https://github.com/void-linux/void-packages/pull/45583.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-crypt-ssh-1.0.8-45583.patch --]
[-- Type: text/x-diff, Size: 2610 bytes --]

From f08c9225646b027d8aebaccda1740edfee1adff6 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Sun, 13 Aug 2023 17:20:29 +0200
Subject: [PATCH] dracut-crypt-ssh: update to 1.0.8

---
 .../patches/fix_ssh-keygen.patch                 | 13 -------------
 srcpkgs/dracut-crypt-ssh/template                | 16 +++-------------
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/dracut-crypt-ssh/patches/fix_ssh-keygen.patch

diff --git a/srcpkgs/dracut-crypt-ssh/patches/fix_ssh-keygen.patch b/srcpkgs/dracut-crypt-ssh/patches/fix_ssh-keygen.patch
deleted file mode 100644
index 4a0fe8d337929..0000000000000
--- a/srcpkgs/dracut-crypt-ssh/patches/fix_ssh-keygen.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git modules/60crypt-ssh/module-setup.sh modules/60crypt-ssh/module-setup.sh
-index c3b6584..80e7dbe 100644
---- a/modules/60crypt-ssh/module-setup.sh
-+++ b/modules/60crypt-ssh/module-setup.sh
-@@ -40,7 +40,7 @@ install() {
-     
-     case ${state} in
-       GENERATE )
--        ssh-keygen -t $keyType -f $osshKey -q -N "" || {
-+        ssh-keygen -t $keyType -f $osshKey -q -N "" -m PEM || {
-           derror "SSH ${msgKeyType} key creation failed"
-           rm -rf "$tmpDir"
-           return 1
diff --git a/srcpkgs/dracut-crypt-ssh/template b/srcpkgs/dracut-crypt-ssh/template
index 1425d223052df..0de4997baf579 100644
--- a/srcpkgs/dracut-crypt-ssh/template
+++ b/srcpkgs/dracut-crypt-ssh/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut-crypt-ssh'
 pkgname=dracut-crypt-ssh
-version=1.0.7
-revision=3
+version=1.0.8
+revision=1
 build_style=gnu-configure
 hostmakedepends="dracut which"
 makedepends="libblkid-devel"
@@ -11,17 +11,7 @@ maintainer="tastytea <tastytea@tastytea.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c50b57b16d4aea3707e1f3e86777fafdb1b3551f2f4b6c4de5576eeb3b2f6bbc
-
-pre_configure() {
-	sed -i '111s/^/#/' configure
-	sed -i 's/gcc -lblkid/gcc -lblkid $(CFLAGS)/' modules/60crypt-ssh/helper/Makefile
-	sed -i 's/gcc/$(CC)/' modules/60crypt-ssh/helper/Makefile
-	sed -i "s|CFLAGS=|CFLAGS=${CFLAGS} ${LDFLAGS} |" modules/60crypt-ssh/helper/Makefile
-	sed -i 's|/lib64/libnss_files.so.2||' modules/60crypt-ssh/module-setup.sh
-	sed -i '107s|$|\n  [ -f /lib/libnss_files.so.2 ] \&\& dracut_install /lib/libnss_files.so.2|' \
-		modules/60crypt-ssh/module-setup.sh
-}
+checksum=98423671efc20ba04c0b3c39968e3970a451acba84e7cc0b29c8699f8eb5585e
 
 post_install() {
 	vmkdir usr/lib/dracut/dracut.conf.d

Re: dracut-crypt-ssh: update to 1.0.8

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45583#issuecomment-1676437353

Comment:
I can't believe all those seds made it past review...

Re: [PR PATCH] [Merged]: dracut-crypt-ssh: update to 1.0.8

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 543 bytes --]

There's a merged pull request on the void-packages repository

dracut-crypt-ssh: update to 1.0.8
https://github.com/void-linux/void-packages/pull/45583

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture: x86_64, glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l

Note: all patches from `patches/` and `pre_configure` are already in the upstream, we don't need them anymore.