From 16e6c68e5d6067783fe86242ceecbfa62e3ea10d Mon Sep 17 00:00:00 2001 From: David Guglielmi Date: Sat, 16 May 2020 17:38:36 +0200 Subject: [PATCH] sys-kernel/dracut-openssh: Bump to 0.3 --- sys-kernel/dracut-openssh/Manifest | 8 +- ...h-0.2.ebuild => dracut-openssh-0.3.ebuild} | 16 +--- .../dracut-openssh/files/dracut-openssh.conf | 18 ---- .../dracut-openssh/files/module-setup.sh | 86 ------------------- sys-kernel/dracut-openssh/files/sshd-banner | 2 - sys-kernel/dracut-openssh/files/sshd.service | 19 ---- sys-kernel/dracut-openssh/files/sshd_config | 11 --- 7 files changed, 4 insertions(+), 156 deletions(-) rename sys-kernel/dracut-openssh/{dracut-openssh-0.2.ebuild => dracut-openssh-0.3.ebuild} (61%) delete mode 100644 sys-kernel/dracut-openssh/files/dracut-openssh.conf delete mode 100644 sys-kernel/dracut-openssh/files/module-setup.sh delete mode 100644 sys-kernel/dracut-openssh/files/sshd-banner delete mode 100644 sys-kernel/dracut-openssh/files/sshd.service delete mode 100644 sys-kernel/dracut-openssh/files/sshd_config diff --git a/sys-kernel/dracut-openssh/Manifest b/sys-kernel/dracut-openssh/Manifest index 71ed579..254d98f 100644 --- a/sys-kernel/dracut-openssh/Manifest +++ b/sys-kernel/dracut-openssh/Manifest @@ -1,6 +1,2 @@ -AUX dracut-openssh.conf 505 BLAKE2B 812b38131fafa3c6974866a143178a941420e1f828589342a27029e95fb1f9d7251c45684f85fe9fe140a69e16e6331ddfc6e7d5d21f5ae53c65fe9bd7ef7854 SHA512 37c9678367cc379765e3db6aaeea5a298156428a21a36d7c6225b913214bd9b766304bc7c5f533c17ba039659902529ae492c523ef8c662a3bfed1d452fabc8b -AUX module-setup.sh 2316 BLAKE2B 13d15f422adfde66eb979e23780c704e5a1e09f8e1feedee6e244b570c5d115b0828e272c1aa877ee09d59691855c8be79c672cea58abdde5c46f97b0e0b7db9 SHA512 df23c1dd830e28b39a3ec699a7edde072fd228e86f4b2aadbb792bda5bd086dc5c9194980e82693722742b9782d66629ac8900c1e524e9a291c3ca337c127f05 -AUX sshd-banner 70 BLAKE2B c3c868acc771e9a5546f624e1a05d4d64b02efecc5a018d3267bc250916c145794b3aef50eac3ece8ab0a9193d7d4282a471f1aad9ce47069b4d39df990b2ea9 SHA512 2d2bef16581d006deb2fadcdc2a3a9b4f720c3d8acac5f6624ea0fed2304fc3f84f497bde73297c687baefd0db7acdaa3c2c136ae90f798d558a8155db05245a -AUX sshd.service 312 BLAKE2B e4be767736d45d3ccbe3a6848d32ee6f9523f5e0641cf973da4501b5dcc7a41b9c127f208bb5125cef8683393d25729856652d94e7d5d8154b11a69300a4f860 SHA512 a4aaee86716a51c904ee95a08dae22c79a1153bfc8e1cb1cd15806a133200e3a7aacee9aa4abf0a749544ea898346b79454d6da30cef0ab42253bfbe9b83d866 -AUX sshd_config 476 BLAKE2B f8f9b4536fc664bb4add6dd9718c70dbf45141004ead9662802c9352a71d1b0ccca55c2a69a1ca372818ad03563166868441edcd1c25c597f8ee30bd436bd446 SHA512 9039c83d3c37635d33e45004b1c9295f2a64355322114cea2f0600dd8f29c36e9b5d1b6a002c15a46b717a9de9797fea09a49f866c4a349d2e57300ac6bfa8e1 -EBUILD dracut-openssh-0.2.ebuild 952 BLAKE2B 380e7ef3fd7f7ed3c8b62fd345bc215457baa5fbb85475b8a67e08155dce08db7372674ad44080ba3d82d1e727633934bebb716e8f824449f83fd9e8b8ac06cc SHA512 cd4bd8d41eac8bbcd5575367b974e4012568d8a934c2dbc7051920cd8ae20e2d147f74d1bdefbccecea5f485c229868c6a1b4f9ced869f38457775832723d804 +DIST dracut-openssh-0.3.tar.gz 13944 BLAKE2B 4116b892b2ed7988453d35cec2f2f3f73c56c24876d447d8f852fed1c820139a6ab9dab5a713e6e4d6664bc3f64a66422ce7ee453d5a294ba9e5ba30b20916eb SHA512 30b8dac3829574ecebc18f27ada22a5d9adbb5e61780d8aa9cd6dfbd55c06112174b482445dbe0b7c5d187a26963a6c31e4310f287d96220ff207918be3ba3c8 +EBUILD dracut-openssh-0.3.ebuild 700 BLAKE2B 590a2bdc70ea05f47d706bfd526e8bc501780c2176c390a74a80be38702ad223701ee9a9b322ced3deb3834e5a02b602528c5647b9f518cfd6a2ae98a964d473 SHA512 f9682c82ed86bfaae0c1f5cded1a8b07704d4ac6237f9f736cd6a88a17b5af2e249e2b244cc52a00adec7f94897228c64c4ff6c45b7866c50973da3fb36e138d diff --git a/sys-kernel/dracut-openssh/dracut-openssh-0.2.ebuild b/sys-kernel/dracut-openssh/dracut-openssh-0.3.ebuild similarity index 61% rename from sys-kernel/dracut-openssh/dracut-openssh-0.2.ebuild rename to sys-kernel/dracut-openssh/dracut-openssh-0.3.ebuild index 65e0964..762afd3 100644 --- a/sys-kernel/dracut-openssh/dracut-openssh-0.2.ebuild +++ b/sys-kernel/dracut-openssh/dracut-openssh-0.3.ebuild @@ -5,7 +5,7 @@ EAPI=7 DESCRIPTION="Dracut OpenSSH module" HOMEPAGE="https://github.com/dguglielmi/dracut-openssh" -SRC_URI="" +SRC_URI="https://github.com/dguglielmi/dracut-openssh/archive/0.3.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" @@ -19,21 +19,9 @@ DEPEND="!systemd-networkd? ( net-misc/dhcp ) sys-kernel/dracut" RDEPEND="${DEPEND}" -S="${WORKDIR}" - src_install() { - dodir /usr/lib/dracut/modules.d/48openssh + emake PREFIX=${D} install - insinto /usr/lib/dracut/modules.d/48openssh - doins "${FILESDIR}"/sshd_config - doins "${FILESDIR}"/sshd-banner - doins "${FILESDIR}"/sshd.service - - exeinto /usr/lib/dracut/modules.d/48openssh - doexe "${FILESDIR}/module-setup.sh" - - insinto /etc/dracut.conf.d - doins "${FILESDIR}/dracut-openssh.conf" if use systemd-networkd; then sed -i \ 's@^#network_provider=.*@network_provider="systemd-networkd"@1' \ diff --git a/sys-kernel/dracut-openssh/files/dracut-openssh.conf b/sys-kernel/dracut-openssh/files/dracut-openssh.conf deleted file mode 100644 index adb3d41..0000000 --- a/sys-kernel/dracut-openssh/files/dracut-openssh.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Dracut OpenSSH configuration -# -#sshd_opts="-e -p 22" -# -#authorized_keys="/root/.ssh/authorized_keys" -# -#dsa_host_key="/etc/ssh/ssh_host_dsa_key" -#ecdsa_host_key="/etc/ssh/ssh_host_ecdsa_key" -#ed25519_host_key="/etc/ssh/ssh_host_ed25519_key" -#rsa_host_key="/etc/ssh/ssh_host_rsa_key" -# -# select network provider -# auto: autodetect network provider -# systemd-networkd: systemd network provider -# network: dracut default provider -#network_provider="auto" -# -#systemd_networkd_files="/etc/systemd/network/*" diff --git a/sys-kernel/dracut-openssh/files/module-setup.sh b/sys-kernel/dracut-openssh/files/module-setup.sh deleted file mode 100644 index 4ebf5d7..0000000 --- a/sys-kernel/dracut-openssh/files/module-setup.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -net_provider() { - [ -z ${network_provider} ] && network_provider="auto" - - if [ "${network_provider}" = "auto" ]; then - if systemctl -q is-active systemd-networkd; then - network_provider="systemd-networkd" - else - network_provider="network" - fi - fi - - echo ${network_provider} -} - -# called by dracut -check() { - #check for sshd - require_binaries sshd || return 1 - - return 0 -} - -# called by dracut -depends() { - echo $(net_provider) - return 0 -} - -# called by dracut -install() { - [ -z ${authorized_keys} ] && authorized_keys="/root/.ssh/authorized_keys" - [ -z ${sshd_opts} ] && sshd_opts="-e -p 22" - [ -z ${dsa_host_key} ] && dsa_host_key="/etc/ssh/ssh_host_dsa_key" - [ -z ${ecdsa_host_key} ] && ecdsa_host_key="/etc/ssh/ssh_host_ecdsa_key" - [ -z ${ed25519_host_key} ] && ed25519_host_key="/etc/ssh/ssh_host_ed25519_key" - [ -z ${rsa_host_key} ] && rsa_host_key="/etc/ssh/ssh_host_rsa_key" - [ -z ${systemd_networkd_files} ] && systemd_networkd_files="/etc/systemd/network/*" - - local keytype keyfile - for keytype in dsa ecdsa ed25519 rsa; do - case ${keytype} in - dsa) keyfile=${dsa_host_key} ;; - ecdsa) keyfile=${ecdsa_host_key} ;; - ed25519) keyfile=${ed25519_host_key} ;; - rsa) keyfile=${rsa_host_key} ;; - esac - - [ -f ${keyfile} ] && inst_simple "${keyfile}" /etc/ssh/ssh_host_${keytype}_key - done - - inst_simple "${moddir}/sshd_config" /etc/ssh/sshd_config - inst_simple "${moddir}/sshd-banner" /etc/ssh/sshd-banner - inst_simple "$(which sshd)" - - inst_simple "${moddir}/sshd.service" ${systemdsystemunitdir}/sshd.service - mkdir -p "${initdir}/etc/sysconfig" - echo "SSHD_OPTS=\"${sshd_opts}\"" > "${initdir}/etc/sysconfig/sshd" - - if [ ! -r "${authorized_keys}" ]; then - dfatal "No authorized_keys found!" - return 1 - fi - - inst_simple ${authorized_keys} /root/.ssh/authorized_keys - - getent passwd sshd >> "${initdir}/etc/passwd" - getent group sshd >> "${initdir}/etc/group" - - mkdir -p -m 0755 "${initdir}$(getent passwd sshd | cut -d':' -f6)" - - systemctl -q --root "${initdir}" enable sshd - - mkdir -p -m 0755 "${initdir}/var/log" - touch "${initdir}/var/log/lastlog" - - local nf - if [ "$(net_provider)" = "systemd-networkd" ]; then - for nf in ${systemd_networkd_files}; do - inst_simple "${nf}" - done - fi - - return 0 -} diff --git a/sys-kernel/dracut-openssh/files/sshd-banner b/sys-kernel/dracut-openssh/files/sshd-banner deleted file mode 100644 index 1f6ae11..0000000 --- a/sys-kernel/dracut-openssh/files/sshd-banner +++ /dev/null @@ -1,2 +0,0 @@ -To unlock LUKS volume type "systemd-tty-ask-password-agent" command. - diff --git a/sys-kernel/dracut-openssh/files/sshd.service b/sys-kernel/dracut-openssh/files/sshd.service deleted file mode 100644 index d20a573..0000000 --- a/sys-kernel/dracut-openssh/files/sshd.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=OpenSSH server daemon -DefaultDependencies=no -Before=cryptsetup.target - -[Service] -Type=simple - -EnvironmentFile=-/etc/sysconfig/sshd - -ExecStart=/usr/sbin/sshd -D $SSHD_OPTS - -ExecReload=/bin/kill -HUP $MAINPID -KillMode=process -Restart=on-failure -RestartSec=42s - -[Install] -WantedBy=sysinit.target diff --git a/sys-kernel/dracut-openssh/files/sshd_config b/sys-kernel/dracut-openssh/files/sshd_config deleted file mode 100644 index ac55920..0000000 --- a/sys-kernel/dracut-openssh/files/sshd_config +++ /dev/null @@ -1,11 +0,0 @@ -SyslogFacility AUTHPRIV -PermitRootLogin prohibit-password -AuthorizedKeysFile .ssh/authorized_keys -AuthenticationMethods publickey -UsePAM no -X11Forwarding no -Banner /etc/ssh/sshd-banner - -AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES -AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT -AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE