From 515bbb11220726d529aecd5f079971f2ab5569ef Mon Sep 17 00:00:00 2001 From: kth5 Date: Mon, 23 Sep 2024 23:10:36 +0200 Subject: [PATCH] * update openssh to 9.9p1-1 --- openssh/.SRCINFO | 68 +++++++++++++++++++++++++++++++++++++ openssh/.nvchecker.toml | 5 +++ openssh/PKGBUILD | 24 ++++++------- openssh/openssh.tmpfiles | 1 - openssh/ssh-agent.service | 3 +- openssh/sshdgenkeys.service | 1 - 6 files changed, 86 insertions(+), 16 deletions(-) create mode 100644 openssh/.SRCINFO create mode 100644 openssh/.nvchecker.toml diff --git a/openssh/.SRCINFO b/openssh/.SRCINFO new file mode 100644 index 0000000000..c2580beec5 --- /dev/null +++ b/openssh/.SRCINFO @@ -0,0 +1,68 @@ +pkgbase = openssh + pkgdesc = SSH protocol implementation for remote login, command execution and file transfer + pkgver = 9.9p1 + pkgrel = 1 + url = https://www.openssh.com/portable.html + arch = x86_64 + license = BSD-2-Clause + license = BSD-3-Clause + license = ISC + license = LicenseRef-Public-Domain + license = MIT + makedepends = krb5 + makedepends = libedit + makedepends = libfido2 + makedepends = libxcrypt + makedepends = linux-headers + makedepends = openssl + makedepends = pam + makedepends = zlib + depends = glibc + optdepends = libfido2: FIDO/U2F support + optdepends = sh: for ssh-copy-id and findssl.sh + optdepends = x11-ssh-askpass: input passphrase in X + optdepends = xorg-xauth: X11 forwarding + backup = etc/pam.d/sshd + backup = etc/ssh/ssh_config + backup = etc/ssh/sshd_config + source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.9p1.tar.gz + source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.9p1.tar.gz.asc + source = 99-archlinux.conf + source = openssh.tmpfiles + source = sshdgenkeys.service + source = sshd.service + source = ssh-agent.service + source = sshd.pam + validpgpkeys = 7168B983815A5EEF59A4ADFD2A3F414E736060BA + sha256sums = b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02 + sha256sums = SKIP + sha256sums = 78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30 + sha256sums = fadd31c107aee3fc6b501ca046aeb5e6fb1b0256cc5cdcade4e2c95205823a28 + sha256sums = a76ffd6701768cfc2a2d3701dcc46d48ee1399ee51664746e61783c61c223ab1 + sha256sums = 201af9f6e00700ebbfd3600c0025c022bff28f9bfd073e1a55756bfdf3bb2d5a + sha256sums = fc70b23ec083a5fc45f37049ba7fa12164a800d83c701e852a8315d48a0ff13e + sha256sums = 633e24cbfcb045ba777d3e06d5f85dfaa06d44f4727d38c7fb2187c57498221d + b2sums = 817d267e42b8be74a13e0cfd7999bdb4dab6355c7f62c1a4dd89adad310c5fb7fe3f17109ce1a36cd269a3639c1b8f1d18330c615ab3b419253ec027cfa20997 + b2sums = SKIP + b2sums = 1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97 + b2sums = 57e77e55fcbd9d7b9951adbafe11ba62e4b8b7338c2a6fe3f163afe5b84458db042024cefbc55f9393cf17d97d067f1c2d9c61880516501bfa4e5c92371e494a + b2sums = abae43979222b7c24452ee128df5c02e8a07a355e797824eedea6282eb4054a1a81686089d8a6a62416536435f8fa25bbb330d11b532877da526bbe8800692da + b2sums = 6faea668a21c3f2c3e8cb973a55e53ccef6037a1d772d18e71d545b18bf63e7c9618f416c1b6e93672aadbdd9024408d41bfba69ddfe3d3ed9e42964130c968a + b2sums = 12a02423bfdbe79f528ea06d70746362ea6aaaf07f28bb4a7efe707ace06429e86e4f5fe7758c3e865c20976faa614102b924725ea0e833690d3732e386fee33 + b2sums = 1d24cc029eccf71cee54dda84371cf9aa8d805433e751575ab237df654055dd869024b50facd8b73390717e63100c76bca28b493e0c8be9791c76a2e0d60990a + +pkgname = openssh + depends = glibc + depends = krb5 + depends = libkrb5.so + depends = libgssapi_krb5.so + depends = libedit + depends = libedit.so + depends = libxcrypt + depends = libcrypt.so + depends = openssl + depends = libcrypto.so + depends = pam + depends = libpam.so + depends = zlib + depends = libz.so diff --git a/openssh/.nvchecker.toml b/openssh/.nvchecker.toml new file mode 100644 index 0000000000..fcb03c9f53 --- /dev/null +++ b/openssh/.nvchecker.toml @@ -0,0 +1,5 @@ +[openssh] +source = "git" +git = "https://github.com/openssh/openssh-portable" +from_pattern = 'V_(\d+)_(\d+)_P(\d+)' +to_pattern = '\1.\2p\3' diff --git a/openssh/PKGBUILD b/openssh/PKGBUILD index cbf88bfce1..c86fb6652e 100644 --- a/openssh/PKGBUILD +++ b/openssh/PKGBUILD @@ -1,4 +1,5 @@ # POWER Maintainer: Alexander Baldeck +# Maintainer: David Runge # Maintainer: Levente Polyak # Maintainer: Giancarlo Razzolini # Contributor: Gaetan Bisson @@ -6,7 +7,7 @@ # Contributor: judd pkgname=openssh -pkgver=9.8p1 +pkgver=9.9p1 pkgrel=1 pkgdesc="SSH protocol implementation for remote login, command execution and file transfer" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) @@ -28,8 +29,7 @@ makedepends=( libxcrypt openssl pam - zlib -) + zlib) makedepends_powerpc=(linux-headers) makedepends_powerpc64=(linux-ppc64-headers) makedepends_powerpc64le=(linux-headers) @@ -55,21 +55,21 @@ source=( ssh-agent.service sshd.pam ) -sha256sums=('dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3' +sha256sums=('b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02' 'SKIP' 'c7c86656d03e1fd9d78bde01aa781176147c6dce4651b1b64f0e06bbad9950d5' - '975904668c3c98fff5dbf840717ae959593fa05e90e215e67bf7ee24369d6369' - 'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611' + 'fadd31c107aee3fc6b501ca046aeb5e6fb1b0256cc5cdcade4e2c95205823a28' + 'a76ffd6701768cfc2a2d3701dcc46d48ee1399ee51664746e61783c61c223ab1' '201af9f6e00700ebbfd3600c0025c022bff28f9bfd073e1a55756bfdf3bb2d5a' - 'b3b1e4f7af169cd5fccdcdf9538ef37fc919c79a9905f797925153a94e723998' + 'fc70b23ec083a5fc45f37049ba7fa12164a800d83c701e852a8315d48a0ff13e' '633e24cbfcb045ba777d3e06d5f85dfaa06d44f4727d38c7fb2187c57498221d') -b2sums=('3bf983c4ef5358054ed0104cd51d3e0069fbc2b80d8522d0df644d5508ec1d26a67bf061b1b5698d1cdf0d2cbba16b4cdca12a4ce30da24429094576a075e192' +b2sums=('817d267e42b8be74a13e0cfd7999bdb4dab6355c7f62c1a4dd89adad310c5fb7fe3f17109ce1a36cd269a3639c1b8f1d18330c615ab3b419253ec027cfa20997' 'SKIP' '79f45478d1a1d23f004a01c6737d883ccff3a6954a4215150486e7bc22c70b680bb70f668cd1cc154f6bce83c654a455d7f5ea57a0a68b41b4bdbd2ee88dad97' - '43bf32158d6b14cf298e5e92a54d93577d6a45b32b3c0fad7a3722e55a53e446fd30df10002bc945c71528904bb397aaadc4f439dd81e5a87263a31b1daa7fc2' - '09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50' + '57e77e55fcbd9d7b9951adbafe11ba62e4b8b7338c2a6fe3f163afe5b84458db042024cefbc55f9393cf17d97d067f1c2d9c61880516501bfa4e5c92371e494a' + 'abae43979222b7c24452ee128df5c02e8a07a355e797824eedea6282eb4054a1a81686089d8a6a62416536435f8fa25bbb330d11b532877da526bbe8800692da' '6faea668a21c3f2c3e8cb973a55e53ccef6037a1d772d18e71d545b18bf63e7c9618f416c1b6e93672aadbdd9024408d41bfba69ddfe3d3ed9e42964130c968a' - '046ea6bd6aa00440991e5f7998db33864a7baa353ec6071f96a3ccb5cca5b548cb9e75f9dee56022ca39daa977d18452851d91e6ba36a66028b84b375ded9bc5' + '12a02423bfdbe79f528ea06d70746362ea6aaaf07f28bb4a7efe707ace06429e86e4f5fe7758c3e865c20976faa614102b924725ea0e833690d3732e386fee33' '1d24cc029eccf71cee54dda84371cf9aa8d805433e751575ab237df654055dd869024b50facd8b73390717e63100c76bca28b493e0c8be9791c76a2e0d60990a') validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # Damien Miller @@ -110,12 +110,12 @@ build() { --with-ssl-engine --with-pam --with-privsep-user=nobody + --with-privsep-path=/usr/share/empty.sshd --with-kerberos5=/usr --with-xauth=/usr/bin/xauth --with-pid-dir=/run --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' --without-zlib-version-check -# --without-hardening ) cd $pkgname-$pkgver diff --git a/openssh/openssh.tmpfiles b/openssh/openssh.tmpfiles index 0bf3870972..aa496ba1f9 100644 --- a/openssh/openssh.tmpfiles +++ b/openssh/openssh.tmpfiles @@ -6,4 +6,3 @@ C /etc/ssh/sshd_config.d/99-archlinux.conf d /etc/ssh/ssh_config.d d /etc/ssh/sshd_config.d -d /var/empty diff --git a/openssh/ssh-agent.service b/openssh/ssh-agent.service index 4a5fe5543c..99f26fc3b9 100644 --- a/openssh/ssh-agent.service +++ b/openssh/ssh-agent.service @@ -6,8 +6,7 @@ Documentation=man:ssh-agent(1) man:ssh-add(1) man:ssh(1) [Service] Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket -ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK -PassEnvironment=SSH_AGENT_PID +ExecStart=/usr/bin/ssh-agent -D -a ${SSH_AUTH_SOCK} SuccessExitStatus=2 Type=simple diff --git a/openssh/sshdgenkeys.service b/openssh/sshdgenkeys.service index 83230084f5..900cb22c2f 100644 --- a/openssh/sshdgenkeys.service +++ b/openssh/sshdgenkeys.service @@ -10,4 +10,3 @@ ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub [Service] ExecStart=/usr/bin/ssh-keygen -A Type=oneshot -RemainAfterExit=yes