Date: Tuesday, November 1, 2022 @ 20:34:34
Author: foutrelis
Revision: 459973
archrelease: copy trunk to staging-x86_64
Added:
openssh/repos/staging-x86_64/PKGBUILD
(from rev 459972, openssh/trunk/PKGBUILD)
openssh/repos/staging-x86_64/keys/
openssh/repos/staging-x86_64/openssh-9.0p1-sshd_config.patch
(from rev 459972, openssh/trunk/openssh-9.0p1-sshd_config.patch)
openssh/repos/staging-x86_64/sshd.conf
(from rev 459972, openssh/trunk/sshd.conf)
openssh/repos/staging-x86_64/sshd.pam
(from rev 459972, openssh/trunk/sshd.pam)
openssh/repos/staging-x86_64/sshd.service
(from rev 459972, openssh/trunk/sshd.service)
openssh/repos/staging-x86_64/sshdgenkeys.service
(from rev 459972, openssh/trunk/sshdgenkeys.service)
Deleted:
openssh/repos/staging-x86_64/PKGBUILD
openssh/repos/staging-x86_64/keys/
openssh/repos/staging-x86_64/openssh-9.0p1-sshd_config.patch
openssh/repos/staging-x86_64/sshd.conf
openssh/repos/staging-x86_64/sshd.pam
openssh/repos/staging-x86_64/sshd.service
openssh/repos/staging-x86_64/sshdgenkeys.service
---------------------------------+
PKGBUILD | 224 +++++++++++++++++++-------------------
openssh-9.0p1-sshd_config.patch | 60 +++++-----
sshd.conf | 2
sshd.pam | 12 +-
sshd.service | 28 ++--
sshdgenkeys.service | 26 ++--
6 files changed, 176 insertions(+), 176 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-01 20:34:26 UTC (rev 459972)
+++ PKGBUILD 2022-11-01 20:34:34 UTC (rev 459973)
@@ -1,112 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Giancarlo Razzolini <[email protected]>
-# Contributor: Gaetan Bisson <[email protected]>
-# Contributor: Aaron Griffin <[email protected]>
-# Contributor: judd <[email protected]>
-
-pkgname=openssh
-pkgver=9.1p1
-pkgrel=2
-pkgdesc="SSH protocol implementation for remote login, command execution and
file transfer"
-arch=('x86_64')
-url='https://www.openssh.com/portable.html'
-license=('custom:BSD')
-depends=(
- 'glibc'
- 'krb5' 'libkrb5.so' 'libgssapi_krb5.so'
- 'ldns'
- 'libedit'
- 'libxcrypt' 'libcrypt.so'
- 'openssl'
- 'pam' 'libpam.so'
- 'zlib'
-)
-makedepends=('libfido2' 'linux-headers')
-optdepends=(
- 'libfido2: FIDO/U2F support'
- 'x11-ssh-askpass: input passphrase in X'
- 'xorg-xauth: X11 forwarding'
-)
-backup=(
- 'etc/pam.d/sshd'
- 'etc/ssh/ssh_config'
- 'etc/ssh/sshd_config'
-)
-options=('debug')
-source=(
-
"https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
- "$pkgname-9.0p1-sshd_config.patch"
- 'sshdgenkeys.service'
- 'sshd.service'
- 'sshd.conf'
- 'sshd.pam'
-)
-sha256sums=('19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288'
- 'SKIP'
- '27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f'
- 'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611'
- 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
- '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
- '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
-b2sums=('287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5'
- 'SKIP'
-
'29e1a1c2744e0234830c6f93a46338ea8dc943370e20a24883d207d611025e54643da678f2826050c073a36be48dfdc7329d4cfb144c2ff90607a5f10f73dc59'
-
'09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50'
-
'07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e'
-
'27571f728c3c10834a81652f3917188436474b588f8b047462e44b6c7a424f60d06ce8cb74839b691870177d7261592207d7f35d4ae6c79af87d6a7ea156d395'
-
'557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930')
-validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # Damien Miller
<[email protected]>
-
-prepare() {
- patch -Np1 -d "$pkgname-$pkgver" -i ../$pkgname-9.0p1-sshd_config.patch
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
-
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib/ssh \
- --sysconfdir=/etc/ssh \
- --disable-strip \
- --with-ldns \
- --with-libedit \
- --with-security-key-builtin \
- --with-ssl-engine \
- --with-pam \
- --with-privsep-user=nobody \
- --with-kerberos5=/usr \
- --with-xauth=/usr/bin/xauth \
- --with-pid-dir=/run \
- --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \
-
- make
-}
-
-check() {
- cd "${pkgname}-${pkgver}"
-
- # NOTE: make t-exec does not work in our build environment
- make file-tests interop-tests unit
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
- install -Dm644 LICENCE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-
- install -Dm644 ../sshdgenkeys.service -t "${pkgdir}"/usr/lib/systemd/system/
- install -Dm644 ../sshd.service -t "${pkgdir}"/usr/lib/systemd/system/
- install -Dm644 ../sshd.conf -t "${pkgdir}"/usr/lib/tmpfiles.d/
- install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
-
- install -Dm755 contrib/findssl.sh -t "${pkgdir}"/usr/bin/
- install -Dm755 contrib/ssh-copy-id -t "${pkgdir}"/usr/bin/
- install -Dm644 contrib/ssh-copy-id.1 -t "${pkgdir}"/usr/share/man/man1/
-}
-
-# vim: ts=2 sw=2 et:
Copied: openssh/repos/staging-x86_64/PKGBUILD (from rev 459972,
openssh/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-11-01 20:34:34 UTC (rev 459973)
@@ -0,0 +1,112 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Giancarlo Razzolini <[email protected]>
+# Contributor: Gaetan Bisson <[email protected]>
+# Contributor: Aaron Griffin <[email protected]>
+# Contributor: judd <[email protected]>
+
+pkgname=openssh
+pkgver=9.1p1
+pkgrel=3
+pkgdesc="SSH protocol implementation for remote login, command execution and
file transfer"
+arch=('x86_64')
+url='https://www.openssh.com/portable.html'
+license=('custom:BSD')
+depends=(
+ 'glibc'
+ 'krb5' 'libkrb5.so' 'libgssapi_krb5.so'
+ 'ldns'
+ 'libedit'
+ 'libxcrypt' 'libcrypt.so'
+ 'openssl'
+ 'pam' 'libpam.so'
+ 'zlib'
+)
+makedepends=('libfido2' 'linux-headers')
+optdepends=(
+ 'libfido2: FIDO/U2F support'
+ 'x11-ssh-askpass: input passphrase in X'
+ 'xorg-xauth: X11 forwarding'
+)
+backup=(
+ 'etc/pam.d/sshd'
+ 'etc/ssh/ssh_config'
+ 'etc/ssh/sshd_config'
+)
+options=('debug')
+source=(
+
"https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
+ "$pkgname-9.0p1-sshd_config.patch"
+ 'sshdgenkeys.service'
+ 'sshd.service'
+ 'sshd.conf'
+ 'sshd.pam'
+)
+sha256sums=('19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288'
+ 'SKIP'
+ '27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f'
+ 'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611'
+ 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
+ '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
+ '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
+b2sums=('287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5'
+ 'SKIP'
+
'29e1a1c2744e0234830c6f93a46338ea8dc943370e20a24883d207d611025e54643da678f2826050c073a36be48dfdc7329d4cfb144c2ff90607a5f10f73dc59'
+
'09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50'
+
'07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e'
+
'27571f728c3c10834a81652f3917188436474b588f8b047462e44b6c7a424f60d06ce8cb74839b691870177d7261592207d7f35d4ae6c79af87d6a7ea156d395'
+
'557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930')
+validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # Damien Miller
<[email protected]>
+
+prepare() {
+ patch -Np1 -d "$pkgname-$pkgver" -i ../$pkgname-9.0p1-sshd_config.patch
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib/ssh \
+ --sysconfdir=/etc/ssh \
+ --disable-strip \
+ --with-ldns \
+ --with-libedit \
+ --with-security-key-builtin \
+ --with-ssl-engine \
+ --with-pam \
+ --with-privsep-user=nobody \
+ --with-kerberos5=/usr \
+ --with-xauth=/usr/bin/xauth \
+ --with-pid-dir=/run \
+ --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \
+
+ make
+}
+
+check() {
+ cd "${pkgname}-${pkgver}"
+
+ # NOTE: make t-exec does not work in our build environment
+ make file-tests interop-tests unit
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
+ install -Dm644 LICENCE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+ install -Dm644 ../sshdgenkeys.service -t "${pkgdir}"/usr/lib/systemd/system/
+ install -Dm644 ../sshd.service -t "${pkgdir}"/usr/lib/systemd/system/
+ install -Dm644 ../sshd.conf -t "${pkgdir}"/usr/lib/tmpfiles.d/
+ install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
+
+ install -Dm755 contrib/findssl.sh -t "${pkgdir}"/usr/bin/
+ install -Dm755 contrib/ssh-copy-id -t "${pkgdir}"/usr/bin/
+ install -Dm644 contrib/ssh-copy-id.1 -t "${pkgdir}"/usr/share/man/man1/
+}
+
+# vim: ts=2 sw=2 et:
Deleted: openssh-9.0p1-sshd_config.patch
===================================================================
--- openssh-9.0p1-sshd_config.patch 2022-11-01 20:34:26 UTC (rev 459972)
+++ openssh-9.0p1-sshd_config.patch 2022-11-01 20:34:34 UTC (rev 459973)
@@ -1,30 +0,0 @@
-diff -ruN a/sshd_config b/sshd_config
---- a/sshd_config 2022-04-06 02:47:48.000000000 +0200
-+++ b/sshd_config 2022-10-10 19:55:58.961117951 +0200
-@@ -58,7 +58,7 @@
- #PermitEmptyPasswords no
-
- # Change to no to disable s/key passwords
--#KbdInteractiveAuthentication yes
-+KbdInteractiveAuthentication no
-
- # Kerberos options
- #KerberosAuthentication no
-@@ -79,7 +79,7 @@
- # If you just want the PAM account and session checks to run without
- # PAM authentication, then enable this but set PasswordAuthentication
- # and KbdInteractiveAuthentication to 'no'.
--#UsePAM no
-+UsePAM yes
-
- #AllowAgentForwarding yes
- #AllowTcpForwarding yes
-@@ -88,7 +88,7 @@
- #X11DisplayOffset 10
- #X11UseLocalhost yes
- #PermitTTY yes
--#PrintMotd yes
-+PrintMotd no
- #PrintLastLog yes
- #TCPKeepAlive yes
- #PermitUserEnvironment no
Copied: openssh/repos/staging-x86_64/openssh-9.0p1-sshd_config.patch (from rev
459972, openssh/trunk/openssh-9.0p1-sshd_config.patch)
===================================================================
--- openssh-9.0p1-sshd_config.patch (rev 0)
+++ openssh-9.0p1-sshd_config.patch 2022-11-01 20:34:34 UTC (rev 459973)
@@ -0,0 +1,30 @@
+diff -ruN a/sshd_config b/sshd_config
+--- a/sshd_config 2022-04-06 02:47:48.000000000 +0200
++++ b/sshd_config 2022-10-10 19:55:58.961117951 +0200
+@@ -58,7 +58,7 @@
+ #PermitEmptyPasswords no
+
+ # Change to no to disable s/key passwords
+-#KbdInteractiveAuthentication yes
++KbdInteractiveAuthentication no
+
+ # Kerberos options
+ #KerberosAuthentication no
+@@ -79,7 +79,7 @@
+ # If you just want the PAM account and session checks to run without
+ # PAM authentication, then enable this but set PasswordAuthentication
+ # and KbdInteractiveAuthentication to 'no'.
+-#UsePAM no
++UsePAM yes
+
+ #AllowAgentForwarding yes
+ #AllowTcpForwarding yes
+@@ -88,7 +88,7 @@
+ #X11DisplayOffset 10
+ #X11UseLocalhost yes
+ #PermitTTY yes
+-#PrintMotd yes
++PrintMotd no
+ #PrintLastLog yes
+ #TCPKeepAlive yes
+ #PermitUserEnvironment no
Deleted: sshd.conf
===================================================================
--- sshd.conf 2022-11-01 20:34:26 UTC (rev 459972)
+++ sshd.conf 2022-11-01 20:34:34 UTC (rev 459973)
@@ -1 +0,0 @@
-d /var/empty 0755 root root
Copied: openssh/repos/staging-x86_64/sshd.conf (from rev 459972,
openssh/trunk/sshd.conf)
===================================================================
--- sshd.conf (rev 0)
+++ sshd.conf 2022-11-01 20:34:34 UTC (rev 459973)
@@ -0,0 +1 @@
+d /var/empty 0755 root root
Deleted: sshd.pam
===================================================================
--- sshd.pam 2022-11-01 20:34:26 UTC (rev 459972)
+++ sshd.pam 2022-11-01 20:34:34 UTC (rev 459973)
@@ -1,6 +0,0 @@
-#%PAM-1.0
-#auth required pam_securetty.so #disable remote root
-auth include system-remote-login
-account include system-remote-login
-password include system-remote-login
-session include system-remote-login
Copied: openssh/repos/staging-x86_64/sshd.pam (from rev 459972,
openssh/trunk/sshd.pam)
===================================================================
--- sshd.pam (rev 0)
+++ sshd.pam 2022-11-01 20:34:34 UTC (rev 459973)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+#auth required pam_securetty.so #disable remote root
+auth include system-remote-login
+account include system-remote-login
+password include system-remote-login
+session include system-remote-login
Deleted: sshd.service
===================================================================
--- sshd.service 2022-11-01 20:34:26 UTC (rev 459972)
+++ sshd.service 2022-11-01 20:34:34 UTC (rev 459973)
@@ -1,14 +0,0 @@
-[Unit]
-Description=OpenSSH Daemon
-Wants=sshdgenkeys.service
-After=sshdgenkeys.service
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/sshd -D
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: openssh/repos/staging-x86_64/sshd.service (from rev 459972,
openssh/trunk/sshd.service)
===================================================================
--- sshd.service (rev 0)
+++ sshd.service 2022-11-01 20:34:34 UTC (rev 459973)
@@ -0,0 +1,14 @@
+[Unit]
+Description=OpenSSH Daemon
+Wants=sshdgenkeys.service
+After=sshdgenkeys.service
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sshd -D
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Deleted: sshdgenkeys.service
===================================================================
--- sshdgenkeys.service 2022-11-01 20:34:26 UTC (rev 459972)
+++ sshdgenkeys.service 2022-11-01 20:34:34 UTC (rev 459973)
@@ -1,13 +0,0 @@
-[Unit]
-Description=SSH Key Generation
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
-
-[Service]
-ExecStart=/usr/bin/ssh-keygen -A
-Type=oneshot
-RemainAfterExit=yes
Copied: openssh/repos/staging-x86_64/sshdgenkeys.service (from rev 459972,
openssh/trunk/sshdgenkeys.service)
===================================================================
--- sshdgenkeys.service (rev 0)
+++ sshdgenkeys.service 2022-11-01 20:34:34 UTC (rev 459973)
@@ -0,0 +1,13 @@
+[Unit]
+Description=SSH Key Generation
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
+
+[Service]
+ExecStart=/usr/bin/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes
