diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-kernel/dracut-crypt-ssh | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'sys-kernel/dracut-crypt-ssh')
3 files changed, 39 insertions, 3 deletions
diff --git a/sys-kernel/dracut-crypt-ssh/Manifest b/sys-kernel/dracut-crypt-ssh/Manifest index 2e5dd82a39fb..9e56b7ab2bb4 100644 --- a/sys-kernel/dracut-crypt-ssh/Manifest +++ b/sys-kernel/dracut-crypt-ssh/Manifest @@ -1,3 +1,4 @@ +AUX dracut-crypt-ssh-1.0.7-makefile.patch 693 BLAKE2B 538e8917b662824badaa08cf3a65ff5865011a2496caae87a61d4fc03ab4b76da0de8a4558d098683ba5f01de98e86493515e0aa1fda465dbdb601fbeb00e3ad SHA512 304ca0b2c4a3fc26db5070d323350a635cc4ed3d500ba30f5aeaea8fa8bbd71528578c322a90d001a4d1b0bf2f16bdb9acd33bcf75fcc914e47f1a640eb469ad DIST dracut-crypt-ssh-1.0.7.tar.gz 19561 BLAKE2B b778d03d792c5ebe0466de7474a6cc821445fe0cd3b216f395d3ea28a17cb4ed3aa6da4b7d6dee86e4481e2ac98d677e3410cd6581c4d8c01ab0ec9564504bf3 SHA512 2958a59c3ff615e89b7631224e248e7e931dd91c566e792b10dffe09b8bd2dfcf2c55eef4e974988f19320e0d732d3dfb14b61713445e1ff3a4a9868dfc4e966 -EBUILD dracut-crypt-ssh-1.0.7.ebuild 609 BLAKE2B 75e87317ff358fb7f69bb32bab96008e528388c3635a00fa4af401cb595fd0973d671ca59714fa0c24773c926e23b83f57835fb5b3f10d71f4a45b0f352e07f0 SHA512 94a3163e6b42b23045cdac2c131774dc2a0a1c670305add57a5f968a183e66fb623c39054155ebc2b9faadcdd17cc711ececa0c8594fa96cc5921c6383cca49b +EBUILD dracut-crypt-ssh-1.0.7.ebuild 860 BLAKE2B ebd2864603adc187950c05b4b04822ffcf8e932117d133e944b9955bde0543d4aa0d04fdc8e8803c84a1cad7d9e19c558e79b0ac9cc19816cc5ea703c8bda39c SHA512 14435d01fcab87872160a6c00151b03c069223da1b888718d7ca0de12165e08918af5b2cf627791502d2c59d9a7fa3af8b8d3841477f8bb98eb0c924d502d139 MISC metadata.xml 591 BLAKE2B 0692ea96c881cef32452bd06d736c2579e2d1fec131a2b1a6a5981c6d52ca170b7146d1ac4fd947bb3bc425559724fd53f6039d177594e3c3b931355dd3cf661 SHA512 53f13afc2475a2ea9eff68b4c749bb4b15b88f2c97edda41ec2d12aeb720099171fa080ed4b4d20cc058d9ff8b1a9c034e771b9c6d623c46c8a5c5414cb54743 diff --git a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild index e244bc9a18bc..88badd7c96af 100644 --- a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild +++ b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit toolchain-funcs + DESCRIPTION="Early unlocking of encrypted systems via ssh for dracut" HOMEPAGE="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh" SRC_URI="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -23,4 +25,18 @@ RDEPEND="${DEPEND} ) net-misc/dropbear" -DOCS=("README.md") +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) + +src_prepare() { + default + + # Fix libdir (hard-coded to "lib64") + sed "s@/lib64/@/$(get_libdir)/@" \ + -i modules/60crypt-ssh/module-setup.sh \ + || die +} + +src_configure() { + tc-export CC + default +} diff --git a/sys-kernel/dracut-crypt-ssh/files/dracut-crypt-ssh-1.0.7-makefile.patch b/sys-kernel/dracut-crypt-ssh/files/dracut-crypt-ssh-1.0.7-makefile.patch new file mode 100644 index 000000000000..d45bc41ed60a --- /dev/null +++ b/sys-kernel/dracut-crypt-ssh/files/dracut-crypt-ssh-1.0.7-makefile.patch @@ -0,0 +1,19 @@ +# https://bugs.gentoo.org/726014 +# https://bugs.gentoo.org/781125 +--- a/modules/60crypt-ssh/helper/Makefile ++++ b/modules/60crypt-ssh/helper/Makefile +@@ -17,11 +17,11 @@ clean: + rm -f *.o console_auth unlock crypttab-test + + console_auth: auth.c +- $(CC) $(CFLAGS) $^ -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ + + unlock: crypttab.o unlock.o +- $(CC) $(CFLAGS) -lblkid $^ -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -lblkid -o $@ + + crypttab-test: crypttab-test.c crypttab.o crypttab-test-data +- $(CC) crypttab-test.c $(CFLAGS) crypttab.o -lblkid -o crypttab-test ++ $(CC) crypttab-test.c $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) crypttab.o -lblkid -o crypttab-test + ./crypttab-test |