From 47f9d8edadbb53052bddcb009a64987400d8ac5a Mon Sep 17 00:00:00 2001 From: "Alexander G. M. Smith" Date: Tue, 17 Aug 2021 06:42:25 -0400 Subject: [PATCH] OpenSSH: remove work-around script that creates user. (#6014) Now that the package daemon properly runs post-install actions in hrev54986, such as creating users, we can remove the work-around script files that did the same job. Make this active for R1Beta3 for compatibility reasons. --- .../fix_openssh_post_install_usergroup.sh | 14 -------------- net-misc/openssh/openssh-8.6p1.recipe | 8 +------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100755 net-misc/openssh/additional-files/fix_openssh_post_install_usergroup.sh diff --git a/net-misc/openssh/additional-files/fix_openssh_post_install_usergroup.sh b/net-misc/openssh/additional-files/fix_openssh_post_install_usergroup.sh deleted file mode 100755 index 5326911e9..000000000 --- a/net-misc/openssh/additional-files/fix_openssh_post_install_usergroup.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# Create the users and groups needed by sshd. They are part of the package -# metadata, but that currently (Beta1, Beta2) doesn't work for packages in a -# newly installed system (the installation actions aren't run since the files -# are just copied to the new system). So until running installation stuff -# on first boot is fixed (Beta3?), redundantly create the user and group in -# the post-install script, which is run on the first boot by launch_daemon. -# See https://dev.haiku-os.org/ticket/14382 - -# Remove the user created by the installer (if it did install), has the wrong group. -userdel "sshd" - -groupadd "sshd" -useradd -n "sshd user" -d "SubstUserHomeDirHere" -s "/bin/true" -g "sshd" "sshd" diff --git a/net-misc/openssh/openssh-8.6p1.recipe b/net-misc/openssh/openssh-8.6p1.recipe index 069397438..fc00d6886 100644 --- a/net-misc/openssh/openssh-8.6p1.recipe +++ b/net-misc/openssh/openssh-8.6p1.recipe @@ -16,14 +16,13 @@ ssh-keyscan, ssh-keygen and sftp-server." HOMEPAGE="http://www.openssh.com/" COPYRIGHT="2005-2020 Tatu Ylonen et al." LICENSE="OpenSSH" -REVISION="1" +REVISION="2" SOURCE_URI="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz" CHECKSUM_SHA256="c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae" PATCHES="openssh-$portVersion.patchset" ADDITIONAL_FILES=" sshd_keymaker.sh fix_openssh_config_paths.sh - fix_openssh_post_install_usergroup.sh " ARCHITECTURES="x86_gcc2 x86 x86_64 sparc m68k" @@ -41,7 +40,6 @@ USER_SETTINGS_FILES=" POST_INSTALL_SCRIPTS=" $relativePostInstallDir/sshd_keymaker.sh $relativePostInstallDir/fix_openssh_config_paths.sh - $relativePostInstallDir/fix_openssh_post_install_usergroup.sh " sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty" PACKAGE_USERS=" @@ -135,10 +133,6 @@ INSTALL() mkdir -p $postInstallDir cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir cp -f $portDir/additional-files/fix_openssh_config_paths.sh $postInstallDir - sed -e "s|SubstUserHomeDirHere|$sshdUserHomeDir|" \ - < "$portDir/additional-files/fix_openssh_post_install_usergroup.sh" \ - > "$postInstallDir/fix_openssh_post_install_usergroup.sh" - chmod a+rx "$postInstallDir/fix_openssh_post_install_usergroup.sh" install -m 755 contrib/ssh-copy-id $binDir install -m 644 contrib/ssh-copy-id.1 $manDir/man1