Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3237bdde0e1d
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 47f9d8edadbb
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 17, 2021

  1. 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.
    @agmsmith
    agmsmith authored Aug 17, 2021
    Copy the full SHA
    47f9d8e View commit details
Showing with 1 addition and 21 deletions.
  1. +0 −14 net-misc/openssh/additional-files/fix_openssh_post_install_usergroup.sh
  2. +1 −7 net-misc/openssh/openssh-8.6p1.recipe
14 changes: 0 additions & 14 deletions net-misc/openssh/additional-files/fix_openssh_post_install_usergroup.sh
View file

This file was deleted.

8 changes: 1 addition & 7 deletions net-misc/openssh/openssh-8.6p1.recipe
View file
Original file line number Diff line number Diff line change
@@ -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