Skip to content

Commit

Permalink
Update openssh
Browse files Browse the repository at this point in the history
  • Loading branch information
hgreebe committed Dec 11, 2024
1 parent fe08c18 commit 22c336a
Show file tree
Hide file tree
Showing 52 changed files with 2,605 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cookbook "apt", path: "./cookbooks/third-party/apt-7.5.22"
cookbook "iptables", path: "./cookbooks/third-party/iptables-8.0.0"
cookbook "line", path: "./cookbooks/third-party/line-4.5.13"
cookbook "nfs", path: "./cookbooks/third-party/nfs-5.1.2"
cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.12"
cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.15"
cookbook "pyenv", path: "./cookbooks/third-party/pyenv-4.2.3"
cookbook "yum", path: "./cookbooks/third-party/yum-7.4.13"
cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-5.0.2"
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-awsbatch/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cookbook "apt", path: "../third-party/apt-7.5.22"
cookbook "iptables", path: "../third-party/iptables-8.0.0"
cookbook "line", path: "../third-party/line-4.5.13"
cookbook "nfs", path: "../third-party/nfs-5.1.2"
cookbook "openssh", path: "../third-party/openssh-2.11.12"
cookbook "openssh", path: "../third-party/openssh-2.11.15"
cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
cookbook "yum", path: "../third-party/yum-7.4.13"
cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-awsbatch/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
depends 'iptables', '~> 8.0.0'
depends 'nfs', '~> 5.1.2'
depends 'line', '~> 4.5.13'
depends 'openssh', '~> 2.11.12'
depends 'openssh', '~> 2.11.15'
depends 'pyenv', '~> 4.2.3'
depends 'yum', '~> 7.4.13'
depends 'yum-epel', '~> 5.0.2'
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-entrypoints/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cookbook "apt", path: "../third-party/apt-7.5.22"
cookbook "iptables", path: "../third-party/iptables-8.0.0"
cookbook "line", path: "../third-party/line-4.5.13"
cookbook "nfs", path: "../third-party/nfs-5.1.2"
cookbook "openssh", path: "../third-party/openssh-2.11.12"
cookbook "openssh", path: "../third-party/openssh-2.11.15"
cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
cookbook "yum", path: "../third-party/yum-7.4.13"
cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Copyright:: 2013-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the
# License. A copy of the License is located at
# License. A copy of the License is located atd
#
# http://aws.amazon.com/apache2.0/
#
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-slurm/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cookbook "apt", path: "../third-party/apt-7.5.22"
cookbook "iptables", path: "../third-party/iptables-8.0.0"
cookbook "line", path: "../third-party/line-4.5.13"
cookbook "nfs", path: "../third-party/nfs-5.1.2"
cookbook "openssh", path: "../third-party/openssh-2.11.12"
cookbook "openssh", path: "../third-party/openssh-2.11.15"
cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
cookbook "yum", path: "../third-party/yum-7.4.13"
cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-slurm/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
depends 'iptables', '~> 8.0.0'
depends 'line', '~> 4.5.13'
depends 'nfs', '~> 5.1.2'
depends 'openssh', '~> 2.11.12'
depends 'openssh', '~> 2.11.15'
depends 'pyenv', '~> 4.2.3'
depends 'yum', '~> 7.4.13'
depends 'yum-epel', '~> 5.0.2'
Expand Down
19 changes: 19 additions & 0 deletions cookbooks/third-party/openssh-2.11.15/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# https://EditorConfig.org

# top-most EditorConfig file
root=true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# 2 space indentation
indent_style = space
indent_size = 2

# Avoid issues parsing cookbook files later
charset = utf-8

# Avoid cookstyle warnings
trim_trailing_whitespace = true
2 changes: 2 additions & 0 deletions cookbooks/third-party/openssh-2.11.15/.envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
use chefworkstation
export KITCHEN_GLOBAL_YAML=kitchen.global.yml
1 change: 1 addition & 0 deletions cookbooks/third-party/openssh-2.11.15/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
1 change: 1 addition & 0 deletions cookbooks/third-party/openssh-2.11.15/.github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @sous-chefs/maintainers
147 changes: 147 additions & 0 deletions cookbooks/third-party/openssh-2.11.15/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
---
name: ci

"on":
pull_request:
push:
branches:
- main

jobs:
lint-unit:
uses: sous-chefs/.github/.github/workflows/[email protected]
permissions:
actions: write
checks: write
pull-requests: write
statuses: write
issues: write

integration:
needs: lint-unit
runs-on: ubuntu-latest
strategy:
matrix:
os:
- "almalinux-8"
- "amazonlinux-2"
- "centos-7"
- "centos-stream-8"
- "debian-10"
- "debian-11"
- "fedora-latest"
- "opensuse-leap-15"
- "ubuntu-1804"
- "ubuntu-2004"
- "rockylinux-8"
suite:
- "default"
- "iptables"
exclude:
- os: "almalinux-8"
suite: "iptables"
- os: "centos-7"
suite: "iptables"
- os: "centos-stream-8"
suite: "iptables"
- os: "opensuse-leap-15"
suite: "iptables"
- os: "rockylinux-8"
suite: "iptables"
fail-fast: false

steps:
- name: Check out code
uses: actions/checkout@v4
- name: Install Chef
uses: actionshub/[email protected]
- name: Dokken
uses: actionshub/[email protected]
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.dokken.yml
with:
suite: ${{ matrix.suite }}
os: ${{ matrix.os }}

integration-windows:
needs: lint-unit
runs-on: windows-latest
timeout-minutes: 20
strategy:
matrix:
os:
- "windows-latest"
suite:
- "windows-default"
fail-fast: false

steps:
- name: Check out code
uses: actions/checkout@v4
- name: Install Chef
uses: actionshub/[email protected]
- name: Download Openssh Installer
uses: suisei-cn/[email protected]
with:
url: https://github.com/PowerShell/Win32-OpenSSH/releases/download/v9.2.2.0p1-Beta/OpenSSH-Win64-v9.2.2.0.msi
target: installer/
- name: Install Openssh
run: |
echo %cd%
dir installer
$file = "installer\\OpenSSH-Win64-v9.2.2.0.msi"
$log = "installer\\install.log"
$procMain = Start-Process "msiexec" "/i `"$file`" /qn /l*! `"$log`"" -NoNewWindow -PassThru
$procLog = Start-Process "powershell" "Get-Content -Path `"$log`" -Wait" -NoNewWindow -PassThru
$procMain.WaitForExit()
$procLog.Kill()
- name: Kitchen Converge
uses: actionshub/[email protected]
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.exec.yml
with:
suite: ${{ matrix.suite }}
os: ${{ matrix.os }}
action: converge
- name: Kitchen Verify
uses: actionshub/[email protected]
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.exec.yml
with:
suite: ${{ matrix.suite }}
os: ${{ matrix.os }}
action: verify

# unable to get SSH service to start
# integration-macos:
# needs: [mdl, yamllint, delivery]
# runs-on: macos-latest
# strategy:
# matrix:
# os:
# - 'macos-latest'
# suite:
# - 'default'
# fail-fast: false
#
# steps:
# - name: Check out code
# uses: actions/checkout@v2
# - name: Install Chef
# uses: actionshub/[email protected]
# - name: test-kitchen
# uses: actionshub/[email protected]
# env:
# CHEF_LICENSE: accept-no-persist
# KITCHEN_LOCAL_YAML: kitchen.exec.yml
# with:
# suite: ${{ matrix.suite }}
# os: ${{ matrix.os }}
# - name: Print debug output on failure
# if: failure()
# run: |
# sudo syslog
25 changes: 25 additions & 0 deletions cookbooks/third-party/openssh-2.11.15/.github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: Mark stale issues and pull requests

"on":
schedule: [cron: "0 0 * * *"]

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
close-issue-message: >
Closing due to inactivity.
If this is still an issue please reopen or open another issue.
Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help!
Thanks, Sous-Chefs.
days-before-close: 7
days-before-stale: 365
stale-issue-message: >
Marking stale due to inactivity.
Remove stale label or comment or this will be closed in 7 days.
Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help!
Thanks, Sous-Chefs.
49 changes: 49 additions & 0 deletions cookbooks/third-party/openssh-2.11.15/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
*.rbc
.config
InstalledFiles
pkg
test/tmp
test/version_tmp
tmp
_Store
*~
*#
.#*
\#*#
*.un~
*.tmp
*.bk
*.bkup

# editor files
.idea
.*.sw[a-z]

# ruby/bundler/rspec files
.ruby-version
.ruby-gemset
.rvmrc
Gemfile.lock
.bundle
*.gem
coverage
spec/reports

# YARD / rdoc artifacts
.yardoc
_yardoc
doc/
rdoc

# chef infra stuff
Berksfile.lock
.kitchen
kitchen.local.yml
vendor/
.coverage/
.zero-knife.rb
Policyfile.lock.json

# vagrant stuff
.vagrant/
.vagrant.d/
7 changes: 7 additions & 0 deletions cookbooks/third-party/openssh-2.11.15/.markdownlint-cli2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
config:
ul-indent: false # MD007
line-length: false # MD013
no-duplicate-heading: false # MD024
reference-links-images: false # MD052
ignores:
- .github/copilot-instructions.md
1 change: 1 addition & 0 deletions cookbooks/third-party/openssh-2.11.15/.mdlrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rules "~MD013", "~MD024", "~MD025"
24 changes: 24 additions & 0 deletions cookbooks/third-party/openssh-2.11.15/.overcommit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
PreCommit:
TrailingWhitespace:
enabled: true
YamlLint:
enabled: true
required_executable: "yamllint"
ChefSpec:
enabled: true
required_executable: "chef"
command: ["chef", "exec", "rspec"]
Cookstyle:
enabled: true
required_executable: "cookstyle"
command: ["cookstyle"]
MarkdownLint:
enabled: false
required_executable: "npx"
command: ["npx", "markdownlint-cli2", "'**/*.md'"]
include: ["**/*.md"]

CommitMsg:
HardTabs:
enabled: true
15 changes: 15 additions & 0 deletions cookbooks/third-party/openssh-2.11.15/.yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
extends: default
rules:
line-length:
max: 256
level: warning
document-start: disable
braces:
forbid: false
min-spaces-inside: 0
max-spaces-inside: 1
min-spaces-inside-empty: -1
max-spaces-inside-empty: -1
comments:
min-spaces-from-content: 1
8 changes: 8 additions & 0 deletions cookbooks/third-party/openssh-2.11.15/Berksfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
source 'https://supermarket.chef.io'

metadata

group :integration do
cookbook 'apt'
cookbook 'homebrew'
end
Loading

0 comments on commit 22c336a

Please sign in to comment.