[arch-commits] Commit in openssh/trunk (PKGBUILD glibc-2.31.patch)

[Giancarlo Razzolini]

    Date: Wednesday, February 23, 2022 @ 18:53:55
  Author: grazzolini
Revision: 438016

upgpkg: openssh 8.9p1-1

Removed the old glibc 2.31 patch. As far as I can tell, it is not required
anymore. If it is still required for ARM, they can patch downstream.

Added sha1 sums, because upstream also publish those. And, added b2sums, since
it is not from the SHA family.

Modified:
  openssh/trunk/PKGBUILD
Deleted:
  openssh/trunk/glibc-2.31.patch

------------------+
 PKGBUILD         |   33 +++++++++++------
 glibc-2.31.patch |  100 -----------------------------------------------------
 2 files changed, 22 insertions(+), 111 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-23 13:09:32 UTC (rev 438015)
+++ PKGBUILD	2022-02-23 18:53:55 UTC (rev 438016)
@@ -5,7 +5,7 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=openssh
-pkgver=8.8p1
+pkgver=8.9p1
 pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
@@ -16,6 +16,7 @@
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X'
             'libfido2: FIDO/U2F support')
+options=('debug')
 validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA')
 #source=("git://anongit.mindrot.org/openssh.git?signed#tag=V_8_2_P1"
 source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
@@ -22,27 +23,37 @@
         'sshdgenkeys.service'
         'sshd.service'
         'sshd.conf'
-        'sshd.pam'
-        'glibc-2.31.patch')
-sha256sums=('4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9'
+        'sshd.pam')
+sha1sums=('205cdf0040a238047e2c49f43460e03d76e5d650'
+          'SKIP'
+          'caaa801da59a5d14c0c29c43e9de5fef281ea03e'
+          '8640ac6593602e74a863263223e92ab5c4711588'
+          'c9b2e4ce259cd62ddb00364d3ee6f00a8bf2d05f'
+          'd93dca5ebda4610ff7647187f8928a3de28703f3')
+sha256sums=('fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7'
             'SKIP'
             '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
             'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
             '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
-            '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846'
-            '25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93')
+            '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
+b2sums=('02934da7f7a2954141888e63e81e38fad4fb8558ddd1032de44f69684802c62771fdd7e9e470e0715059635999c8f9d2ab95f6351217e236573ead83a867f59b'
+        'SKIP'
+        '62f89107d3648a359b0307497a9f105d7ff1dddddb38a64afe3261000b5db494a5530e4b60a9aa1d7be4413599e54b72e2f53f0de8c1ff263a46a70bc5695c29'
+        '07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e'
+        '27571f728c3c10834a81652f3917188436474b588f8b047462e44b6c7a424f60d06ce8cb74839b691870177d7261592207d7f35d4ae6c79af87d6a7ea156d395'
+        '557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
 install=install
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+# prepare() {
+# 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	patch -p1 -i ../glibc-2.31.patch
+#       patch goes here
 
-	autoreconf
-}
+# 	autoreconf
+# }
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"

Deleted: glibc-2.31.patch
===================================================================
--- glibc-2.31.patch	2022-02-23 13:09:32 UTC (rev 438015)
+++ glibc-2.31.patch	2022-02-23 18:53:55 UTC (rev 438016)
@@ -1,100 +0,0 @@
-From beee0ef61866cb567b9abc23bd850f922e59e3f0 Mon Sep 17 00:00:00 2001
-From: Darren Tucker <dtucker at dtucker.net>
-Date: Wed, 13 Nov 2019 23:19:35 +1100
-Subject: [PATCH] seccomp: Allow clock_nanosleep() in sandbox.
-
-seccomp: Allow clock_nanosleep() to make OpenSSH working with latest
-glibc.  Patch from Jakub Jelen <jjelen at redhat.com> via bz #3093.
----
- sandbox-seccomp-filter.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index b5cda70bb..96ab141f7 100644
---- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -242,6 +242,12 @@ static const struct sock_filter preauth_insns[] = {
- #ifdef __NR_nanosleep
- 	SC_ALLOW(__NR_nanosleep),
- #endif
-+#ifdef __NR_clock_nanosleep
-+	SC_ALLOW(__NR_clock_nanosleep),
-+#endif
-+#ifdef __NR_clock_nanosleep
-+	SC_ALLOW(__NR_clock_nanosleep),
-+#endif
- #ifdef __NR__newselect
- 	SC_ALLOW(__NR__newselect),
- #endif
-From 69298ebfc2c066acee5d187eac8ce9f38c796630 Mon Sep 17 00:00:00 2001
-From: Darren Tucker <dtucker at dtucker.net>
-Date: Wed, 13 Nov 2019 23:27:31 +1100
-Subject: [PATCH] Remove duplicate __NR_clock_nanosleep
-
----
- sandbox-seccomp-filter.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 96ab141f7..be2397671 100644
---- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -245,9 +245,6 @@ static const struct sock_filter preauth_insns[] = {
- #ifdef __NR_clock_nanosleep
- 	SC_ALLOW(__NR_clock_nanosleep),
- #endif
--#ifdef __NR_clock_nanosleep
--	SC_ALLOW(__NR_clock_nanosleep),
--#endif
- #ifdef __NR__newselect
- 	SC_ALLOW(__NR__newselect),
- #endif
-From 030b4c2b8029563bc8a9fd764288fde08fa2347c Mon Sep 17 00:00:00 2001
-From: Darren Tucker <dtucker at dtucker.net>
-Date: Mon, 16 Dec 2019 13:55:56 +1100
-Subject: [PATCH] Allow clock_nanosleep_time64 in seccomp sandbox.
-
-Needed on Linux ARM.  bz#3100, patch from jjelen at redhat.com.
----
- sandbox-seccomp-filter.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index be2397671..3ef30c9d5 100644
---- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -245,6 +245,9 @@ static const struct sock_filter preauth_insns[] = {
- #ifdef __NR_clock_nanosleep
- 	SC_ALLOW(__NR_clock_nanosleep),
- #endif
-+#ifdef __NR_clock_nanosleep_time64
-+	SC_ALLOW(__NR_clock_nanosleep_time64),
-+#endif
- #ifdef __NR__newselect
- 	SC_ALLOW(__NR__newselect),
- #endif
-From a991cc5ed5a7c455fefe909a30cf082011ef5dff Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Tue, 7 Jan 2020 16:26:45 -0800
-Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox.
-
-This helps sshd accept connections on mips platforms with
-upcoming glibc ( 2.31 )
----
- sandbox-seccomp-filter.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 3ef30c9d5..999c46c9f 100644
---- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -248,6 +248,9 @@ static const struct sock_filter preauth_insns[] = {
- #ifdef __NR_clock_nanosleep_time64
- 	SC_ALLOW(__NR_clock_nanosleep_time64),
- #endif
-+#ifdef __NR_clock_gettime64
-+	SC_ALLOW(__NR_clock_gettime64),
-+#endif
- #ifdef __NR__newselect
- 	SC_ALLOW(__NR__newselect),
- #endif