CVS commit: pkgsrc/security/openssh

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Oct  5 18:08:15 UTC 2026

Modified Files:
        pkgsrc/security/openssh: Makefile distinfo
        pkgsrc/security/openssh/patches: patch-atomicio.c

Log Message:
security/openssh: pull in fix from the main NetBSD source tree for PR#60563.

This tests for vwrite() instead of read() in atomicio.c, so
as to avoid the renaming shenanigans done by SSP of read().

Thanks to riastradh@ for pointing me in the right direction.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 pkgsrc/security/openssh/Makefile
cvs rdiff -u -r1.133 -r1.134 pkgsrc/security/openssh/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/openssh/patches/patch-atomicio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssh/Makefile
diff -u pkgsrc/security/openssh/Makefile:1.296 pkgsrc/security/openssh/Makefile:1.297
--- pkgsrc/security/openssh/Makefile:1.296      Tue Sep 22 08:06:07 2026
+++ pkgsrc/security/openssh/Makefile    Mon Oct  5 18:08:15 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.296 2026/09/22 08:06:07 wiz Exp $
+# $NetBSD: Makefile,v 1.297 2026/10/05 18:08:15 he Exp $
 
 DISTNAME=              openssh-10.5p1
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_OPENBSD:=OpenSSH/portable/}
 
@@ -17,6 +17,10 @@ CONFLICTS+=          openssh+gssapi-[0-9]*
 CONFLICTS+=            lsh>2.0
 BROKEN_ON_PLATFORM+=   OpenBSD-*-*
 
+CFLAGS+=               -g
+# Causes problems on NetBSD < 11.0, ref. PR#60563
+PKGSRC_USE_FORTIFY=    no
+
 USE_GCC_RUNTIME=       yes
 USE_TOOLS+=            autoconf perl
 

Index: pkgsrc/security/openssh/distinfo
diff -u pkgsrc/security/openssh/distinfo:1.133 pkgsrc/security/openssh/distinfo:1.134
--- pkgsrc/security/openssh/distinfo:1.133      Tue Sep 22 08:03:59 2026
+++ pkgsrc/security/openssh/distinfo    Mon Oct  5 18:08:15 2026
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.133 2026/09/22 08:03:59 he Exp $
+$NetBSD: distinfo,v 1.134 2026/10/05 18:08:15 he Exp $
 
 BLAKE2s (openssh-10.5p1.tar.gz) = 0a7483f05aa98e39cd4c7c8f2c259a3f5dd96d784e8934f6a7e94d6bf0a47c83
 SHA512 (openssh-10.5p1.tar.gz) = 5336c1945527b29ed59cc500fa8bfbd918f5ba97e85512daad9ab7241418929bf7152d300e5f3c5f9a8c8d699dfde5a64c5faa4fc33b2758ab52dd04040d6284
 Size (openssh-10.5p1.tar.gz) = 2333659 bytes
 SHA1 (patch-Makefile.in) = d58adac52e169f25f0b0c3a321f154b44b0475e6
-SHA1 (patch-atomicio.c) = cfb54868643d946cded4f2f5d6054bc26d299290
+SHA1 (patch-atomicio.c) = 43b9f79b7f426605fc638216e9ee299ebdfa58d0
 SHA1 (patch-configure.ac) = ea50059cf979d5c00f8beae027e0419fbd68cdb2
 SHA1 (patch-defines.h) = c1dbb18076b4fa399b0f791bb543ef1e5cb0408e
 SHA1 (patch-sshkey.h) = aaaf622f377e455c49683fcc2ca42576ccd097bb

Index: pkgsrc/security/openssh/patches/patch-atomicio.c
diff -u pkgsrc/security/openssh/patches/patch-atomicio.c:1.4 pkgsrc/security/openssh/patches/patch-atomicio.c:1.5
--- pkgsrc/security/openssh/patches/patch-atomicio.c:1.4        Tue Sep 22 08:03:59 2026
+++ pkgsrc/security/openssh/patches/patch-atomicio.c    Mon Oct  5 18:08:15 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-atomicio.c,v 1.4 2026/09/22 08:03:59 he Exp $
+$NetBSD: patch-atomicio.c,v 1.5 2026/10/05 18:08:15 he Exp $
 
 Remove no-longer-needed BROKEN_READ_COMPARISON code, to mirror
 
@@ -15,10 +15,11 @@ ref. mailing list thread at
  
        pfd.fd = fd;
 -#ifndef BROKEN_READ_COMPARISON
-       pfd.events = f == read ? POLLIN : POLLOUT;
+-      pfd.events = f == read ? POLLIN : POLLOUT;
 -#else
 -      pfd.events = POLLIN|POLLOUT;
 -#endif
++      pfd.events = f != vwrite ? POLLIN : POLLOUT;
        while (n > pos) {
                res = (f) (fd, s + pos, n - pos);
                switch (res) {