CVS commit: pkgsrc/security/openssh

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

Module Name:    pkgsrc
Committed By:   he
Date:           Tue Sep 22 08:03:59 UTC 2026

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

Log Message:
security/openssh: remove no-longer-needed BROKEN_READ_COMPARISON code.

This mirrors upstream change:

  https://github.com/openssh/openssh-portable/commit/a765b86d

ref. mailing list thread at

  https://lists.mindrot.org/pipermail/openssh-unix-dev/2026-September/042758.html

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 pkgsrc/security/openssh/Makefile
cvs rdiff -u -r1.132 -r1.133 pkgsrc/security/openssh/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/security/openssh/patches/patch-atomicio.c
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/openssh/patches/patch-configure.ac

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.294 pkgsrc/security/openssh/Makefile:1.295
--- pkgsrc/security/openssh/Makefile:1.294      Tue Aug 11 07:16:40 2026
+++ pkgsrc/security/openssh/Makefile    Tue Sep 22 08:03:59 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.294 2026/08/11 07:16:40 wiz Exp $
+# $NetBSD: Makefile,v 1.295 2026/09/22 08:03:59 he Exp $
 
 DISTNAME=              openssh-10.5p1
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_OPENBSD:=OpenSSH/portable/}
 
@@ -19,6 +20,8 @@ BROKEN_ON_PLATFORM+=  OpenBSD-*-*
 USE_GCC_RUNTIME=       yes
 USE_TOOLS+=            autoconf perl
 
+CFLAGS+=               -g
+
 # retain the following line, for IPv6-ready pkgsrc webpage
 BUILD_DEFS+=           IPV6_READY
 

Index: pkgsrc/security/openssh/distinfo
diff -u pkgsrc/security/openssh/distinfo:1.132 pkgsrc/security/openssh/distinfo:1.133
--- pkgsrc/security/openssh/distinfo:1.132      Tue Aug 11 07:16:40 2026
+++ pkgsrc/security/openssh/distinfo    Tue Sep 22 08:03:59 2026
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.132 2026/08/11 07:16:40 wiz Exp $
+$NetBSD: distinfo,v 1.133 2026/09/22 08:03:59 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-configure.ac) = 10894c1b98298a1672ec151a223f6180bf841fa4
+SHA1 (patch-atomicio.c) = cfb54868643d946cded4f2f5d6054bc26d299290
+SHA1 (patch-configure.ac) = ea50059cf979d5c00f8beae027e0419fbd68cdb2
 SHA1 (patch-defines.h) = c1dbb18076b4fa399b0f791bb543ef1e5cb0408e
 SHA1 (patch-sshkey.h) = aaaf622f377e455c49683fcc2ca42576ccd097bb

Index: pkgsrc/security/openssh/patches/patch-configure.ac
diff -u pkgsrc/security/openssh/patches/patch-configure.ac:1.11 pkgsrc/security/openssh/patches/patch-configure.ac:1.12
--- pkgsrc/security/openssh/patches/patch-configure.ac:1.11     Tue Feb 18 09:33:07 2025
+++ pkgsrc/security/openssh/patches/patch-configure.ac  Tue Sep 22 08:03:59 2026
@@ -1,8 +1,13 @@
-$NetBSD: patch-configure.ac,v 1.11 2025/02/18 09:33:07 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.12 2026/09/22 08:03:59 he Exp $
+
+Remove no-longer-needed BROKEN_READ_COMPARISON, ref.
+   https://github.com/openssh/openssh-portable/commit/a765b86d
+
+Tweak for wtmpx location probing.
 
 --- configure.ac.orig  2024-07-01 04:36:28.000000000 +0000
 +++ configure.ac
-@@ -380,6 +380,9 @@ AC_ARG_WITH([rpath],
+@@ -388,6 +388,9 @@ AC_ARG_WITH([rpath],
        ]
  )
  
@@ -12,7 +17,16 @@ $NetBSD: patch-configure.ac,v 1.11 2025/
  # Allow user to specify flags
  AC_ARG_WITH([cflags],
        [  --with-cflags           Specify additional flags to pass to compiler],
-@@ -5568,9 +5571,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@@ -1144,8 +1147,6 @@ mips-sony-bsd|mips-sony-newsos4)
+       AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
+           [Prepend the address family to IP tunnel traffic])
+       TEST_MALLOC_OPTIONS="AJRX"
+-      AC_DEFINE([BROKEN_READ_COMPARISON], [1],
+-          [NetBSD read function is sometimes redirected, breaking atomicio comparisons against it])
+       ;;
+ *-*-freebsd*)
+       AC_DEFINE([LOCKED_PASSWD_PREFIX], ["*LOCKED*"], [Account locked with pw(1)])
+@@ -5742,9 +5743,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  ])
  if test -z "$conf_wtmpx_location"; then
        if test x"$system_wtmpx_path" = x"no" ; then
@@ -32,7 +46,7 @@ $NetBSD: patch-configure.ac,v 1.11 2025/
        AC_DEFINE_UNQUOTED([CONF_WTMPX_FILE], ["$conf_wtmpx_location"],
                [Define if you want to specify the path to your wtmpx file])
  fi
-@@ -5677,7 +5688,7 @@ echo "OpenSSH has been configured with t
+@@ -5853,7 +5862,7 @@ echo "OpenSSH has been configured with t
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"

Added files:

Index: pkgsrc/security/openssh/patches/patch-atomicio.c
diff -u /dev/null pkgsrc/security/openssh/patches/patch-atomicio.c:1.4
--- /dev/null   Tue Sep 22 08:03:59 2026
+++ pkgsrc/security/openssh/patches/patch-atomicio.c    Tue Sep 22 08:03:59 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-atomicio.c,v 1.4 2026/09/22 08:03:59 he Exp $
+
+Remove no-longer-needed BROKEN_READ_COMPARISON code, to mirror
+
+  https://github.com/openssh/openssh-portable/commit/a765b86d
+
+ref. mailing list thread at
+
+  https://lists.mindrot.org/pipermail/openssh-unix-dev/2026-September/042758.html
+
+--- atomicio.c.orig    2026-09-22 07:42:45.683284535 +0000
++++ atomicio.c
+@@ -51,11 +51,7 @@ atomicio6(ssize_t (*f) (int, void *, siz
+       struct pollfd pfd;
+ 
+       pfd.fd = fd;
+-#ifndef BROKEN_READ_COMPARISON
+       pfd.events = f == read ? POLLIN : POLLOUT;
+-#else
+-      pfd.events = POLLIN|POLLOUT;
+-#endif
+       while (n > pos) {
+               res = (f) (fd, s + pos, n - pos);
+               switch (res) {