From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4848D158089 for ; Fri, 13 Oct 2023 11:04:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CC112BC014; Fri, 13 Oct 2023 11:04:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 411B22BC014 for ; Fri, 13 Oct 2023 11:04:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81579335C5D for ; Fri, 13 Oct 2023 11:04:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2AAC41149 for ; Fri, 13 Oct 2023 11:04:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1697195030.cd2fe0690ce131cc623a34eb8a9586f50d0737c9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/openssh-9.4_p1-r1.ebuild net-misc/openssh/openssh-9.4_p1.ebuild net-misc/openssh/openssh-9.5_p1-r1.ebuild net-misc/openssh/openssh-9.5_p1.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cd2fe0690ce131cc623a34eb8a9586f50d0737c9 X-VCS-Branch: master Date: Fri, 13 Oct 2023 11:04:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4bad6369-ad16-408d-a22b-9fb3fc8debdc X-Archives-Hash: 83e233183b986c87fad200a26b36f2c3 commit: cd2fe0690ce131cc623a34eb8a9586f50d0737c9 Author: Sam James gentoo org> AuthorDate: Fri Oct 13 11:00:39 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 13 11:03:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2fe069 net-misc/openssh: drop obsolete patch from 9.4, 9.5 This was fixed properly by upstream in 9.4 so the workaround isn't needed; openssh-9.3_p1-openssl-ignore-status.patch applies with fuzz to >=9.4 and does the wrong thing there as it touches the non-OpenSSL 3 case (upstream added a conditional above in >=9.4). Signed-off-by: Sam James gentoo.org> net-misc/openssh/{openssh-9.4_p1.ebuild => openssh-9.4_p1-r1.ebuild} | 1 - net-misc/openssh/{openssh-9.5_p1.ebuild => openssh-9.5_p1-r1.ebuild} | 1 - 2 files changed, 2 deletions(-) diff --git a/net-misc/openssh/openssh-9.4_p1.ebuild b/net-misc/openssh/openssh-9.4_p1-r1.ebuild similarity index 99% rename from net-misc/openssh/openssh-9.4_p1.ebuild rename to net-misc/openssh/openssh-9.4_p1-r1.ebuild index d57adca97bd1..edd62d7fd3da 100644 --- a/net-misc/openssh/openssh-9.4_p1.ebuild +++ b/net-misc/openssh/openssh-9.4_p1-r1.ebuild @@ -82,7 +82,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-9.3_p1-GSSAPI-dns.patch" #165444 integrated into gsskex - "${FILESDIR}/${PN}-9.3_p1-openssl-ignore-status.patch" "${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch" "${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch" "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" diff --git a/net-misc/openssh/openssh-9.5_p1.ebuild b/net-misc/openssh/openssh-9.5_p1-r1.ebuild similarity index 99% rename from net-misc/openssh/openssh-9.5_p1.ebuild rename to net-misc/openssh/openssh-9.5_p1-r1.ebuild index ec36f3445783..8ab790480184 100644 --- a/net-misc/openssh/openssh-9.5_p1.ebuild +++ b/net-misc/openssh/openssh-9.5_p1-r1.ebuild @@ -82,7 +82,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-9.3_p1-GSSAPI-dns.patch" #165444 integrated into gsskex - "${FILESDIR}/${PN}-9.3_p1-openssl-ignore-status.patch" "${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch" "${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch" "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"