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 26338158020 for ; Sun, 30 Oct 2022 09:28:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A3A2E0877; Sun, 30 Oct 2022 09:28:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30F2BE0877 for ; Sun, 30 Oct 2022 09:28:32 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B447340FE4 for ; Sun, 30 Oct 2022 09:28:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71B84644 for ; Sun, 30 Oct 2022 09:28: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: <1667122020.591c528cc536c3e28daaf6356084d356c5e82eec.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.3.2.patch X-VCS-Directories: net-misc/openssh/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 591c528cc536c3e28daaf6356084d356c5e82eec X-VCS-Branch: master Date: Sun, 30 Oct 2022 09:28: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: 91fffcef-b26d-4a9f-8f3f-ef67fcaa1d98 X-Archives-Hash: fde132c61e790ed5cdc30cdfba8031d5 commit: 591c528cc536c3e28daaf6356084d356c5e82eec Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Oct 30 07:55:44 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 30 09:27:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591c528c net-misc/openssh: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28031 Signed-off-by: Sam James gentoo.org> .../files/openssh-9.0_p1-X509-glue-13.3.2.patch | 54 ---------------------- 1 file changed, 54 deletions(-) diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.3.2.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.3.2.patch deleted file mode 100644 index 3d702eb35be8..000000000000 --- a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.3.2.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ur '--exclude=.*.un~' a/openssh-9.0p1+x509-13.3.2.diff b/openssh-9.0p1+x509-13.3.2.diff ---- a/openssh-9.0p1+x509-13.3.2.diff 2022-04-11 10:32:02.364576985 -0700 -+++ b/openssh-9.0p1+x509-13.3.2.diff 2022-04-11 10:38:29.267348410 -0700 -@@ -47526,8 +47526,8 @@ - gss_create_empty_oid_set(&status, &oidset); - gss_add_oid_set_member(&status, ctx->oid, &oidset); - --- if (gethostname(lname, MAXHOSTNAMELEN)) { --+ if (gethostname(lname, MAXHOSTNAMELEN) == -1) { -+- if (gethostname(lname, HOST_NAME_MAX)) { -++ if (gethostname(lname, HOST_NAME_MAX) == -1) { - gss_release_oid_set(&status, &oidset); - return (-1); - } -@@ -55662,12 +55662,11 @@ - - install-files: - $(MKDIR_P) $(DESTDIR)$(bindir) --@@ -395,6 +372,8 @@ -+@@ -395,6 +372,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) -@@ -76764,7 +76763,7 @@ - +if test "$sshd_type" = "pkix" ; then - + unset_arg='' - +else --+ unset_arg=none -++ unset_arg='' - +fi - + - cat > $OBJ/sshd_config.i << _EOF -@@ -141144,16 +141143,6 @@ - +int asnmprintf(char **, size_t, int *, const char *, ...) - __attribute__((format(printf, 4, 5))); - void msetlocale(void); --diff -ruN openssh-9.0p1/version.h openssh-9.0p1+x509-13.3.2/version.h ----- openssh-9.0p1/version.h 2022-04-06 03:47:48.000000000 +0300 --+++ openssh-9.0p1+x509-13.3.2/version.h 2022-04-11 09:07:00.000000000 +0300 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_9.0" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-9.0p1/version.m4 openssh-9.0p1+x509-13.3.2/version.m4 - --- openssh-9.0p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-9.0p1+x509-13.3.2/version.m4 2022-04-11 09:07:00.000000000 +0300