haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

openssh: Work around first boot user creation bug. (#4945)

Browse Source
This commit is contained in:
Alexander G. M. Smith
2020-05-24 16:18:34 -04:00
committed by GitHub
parent 0f6088cd48
commit ad280fa0f6
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net-misc/openssh/additional-files/fix_openssh_post_install_usergroup.sh Executable file
View File

@@ -0,0 +1,14 @@
#!/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"

10
net-misc/openssh/openssh-8.2p1.recipe
View File

@@ -16,7 +16,7 @@ ssh-keyscan, ssh-keygen and sftp-server."
HOMEPAGE="http://www.openssh.com/"
COPYRIGHT="2005-2020 Tatu Ylonen et al."
LICENSE="OpenSSH"
REVISION="3"
REVISION="4"
SOURCE_URI="https://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
CHECKSUM_SHA256="43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671"
PATCHES="sshd_config.patch
@@ -28,6 +28,7 @@ PATCHES="sshd_config.patch
ADDITIONAL_FILES="
sshd_keymaker.sh
fix_openssh_config_paths.sh
fix_openssh_post_install_usergroup.sh
"
ARCHITECTURES="x86_gcc2 x86 x86_64 sparc m68k"
@@ -45,10 +46,11 @@ 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="
sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\" groups \"sshd\"
"
PACKAGE_GROUPS="sshd"
@@ -139,6 +141,10 @@ 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