CVS commit: pkgsrc/security/openssh

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 18 09:33:07 UTC 2025

Modified Files:
        pkgsrc/security/openssh: Makefile distinfo
        pkgsrc/security/openssh/patches: patch-Makefile.in patch-configure.ac
            patch-defines.h

Log Message:
openssh: update to 9.9p2.

pkgsrc: fix patch offsets

Changes:

    openssh-9.9p2

    upstream: Fix cases where error codes were not correctly set
    Reported by the Qualys Security Advisory team. ok markus@

    upstream: Don't reply to PING in preauth phase or during KEX
    Reported by the Qualys Security Advisory team. ok markus@

    upstream: fix "Match invalid-user" from incorrectly being activated
    in initial configuration pass when no other predicates were present on the
    match line

    fix uint64_t types; reported by Tom G. Christensen

    htole64() etc for systems without endian.h

    upstream: explicitly include endian.h

    upstream: fix ML-KEM768x25519 KEX on big-endian systems; spotted by
    jsg@ feedback/ok deraadt@

    upstream: fix previous change to ssh_config Match, which broken on
    negated Matches; spotted by phessler@ ok deraadt@

    upstream: fix regression introduced when I switched the "Match"
    criteria tokeniser to a more shell-like one. Apparently the old tokeniser
    (accidentally?) allowed "Match criteria=argument" as well as the "Match
    criteria argument" syntax that we tested for.
    People were using this syntax so this adds back support for
    "Match criteria=argument"
    bz3739 ok dtucker

    gss-serv.c needs sys/param.h
    From Void Linux

    build construct_utmp() when USE_BTMP is set
    Fixes compile error on Void Linux/Musl

    fix utmpx ifdef
    02e16ad95fb1f56ab004b01a10aab89f7103c55d did a copy-paste for
    utmpx, but forgot to change the ifdef appropriately

    Remove non-9.9 branch statuses.

    Add 9.9 branch to CI status console.

    autogenerated files for release

    update version numbers


To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 pkgsrc/security/openssh/Makefile
cvs rdiff -u -r1.125 -r1.126 pkgsrc/security/openssh/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/openssh/patches/patch-Makefile.in
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/openssh/patches/patch-configure.ac
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/openssh/patches/patch-defines.h

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.286 pkgsrc/security/openssh/Makefile:1.287
--- pkgsrc/security/openssh/Makefile:1.286      Tue Sep 24 21:43:13 2024
+++ pkgsrc/security/openssh/Makefile    Tue Feb 18 09:33:07 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.286 2024/09/24 21:43:13 wiz Exp $
+# $NetBSD: Makefile,v 1.287 2025/02/18 09:33:07 wiz Exp $
 
-DISTNAME=              openssh-9.9p1
+DISTNAME=              openssh-9.9p2
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_OPENBSD:=OpenSSH/portable/}
 

Index: pkgsrc/security/openssh/distinfo
diff -u pkgsrc/security/openssh/distinfo:1.125 pkgsrc/security/openssh/distinfo:1.126
--- pkgsrc/security/openssh/distinfo:1.125      Tue Sep 24 21:43:13 2024
+++ pkgsrc/security/openssh/distinfo    Tue Feb 18 09:33:07 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.125 2024/09/24 21:43:13 wiz Exp $
+$NetBSD: distinfo,v 1.126 2025/02/18 09:33:07 wiz Exp $
 
-BLAKE2s (openssh-9.9p1.tar.gz) = 915490e437430a87ec8077f062c195e9eb7da2455f5cd035f541a9f81d43ff70
-SHA512 (openssh-9.9p1.tar.gz) = 3cc0ed97f3e29ecbd882eca79239f02eb5a1606fce4f3119ddc3c5e86128aa3ff12dc85000879fccc87b60e7d651cfe37376607ac66075fede2118deaa685d6d
-Size (openssh-9.9p1.tar.gz) = 1964864 bytes
-SHA1 (patch-Makefile.in) = 38df2aa7aaeeaac660763724188852bdb8bdcd24
-SHA1 (patch-configure.ac) = eb759d065e296a5fdf1e8925308e6e77ea2c60a8
-SHA1 (patch-defines.h) = 5424b1b24f1d4bbd47efa614ee180a45e7b9a54e
+BLAKE2s (openssh-9.9p2.tar.gz) = 6a453c920f5aa087d39c2978ca14cfb6bd4915fbf3801b7cd395be7f2b018f86
+SHA512 (openssh-9.9p2.tar.gz) = 4c6d839aa3189cd5254c745f2bd51cd3f468b02f8e427b8d7a16b9ad017888a41178d2746dc51fb2d3fec5be00e54b9ab7c32c472ca7dec57a1dea4fc9840278
+Size (openssh-9.9p2.tar.gz) = 1944499 bytes
+SHA1 (patch-Makefile.in) = d10cb9d8deb2600b0bfe865d5ff2050ac7808bca
+SHA1 (patch-configure.ac) = 10894c1b98298a1672ec151a223f6180bf841fa4
+SHA1 (patch-defines.h) = c1dbb18076b4fa399b0f791bb543ef1e5cb0408e
 SHA1 (patch-sshkey.h) = aaaf622f377e455c49683fcc2ca42576ccd097bb

Index: pkgsrc/security/openssh/patches/patch-Makefile.in
diff -u pkgsrc/security/openssh/patches/patch-Makefile.in:1.8 pkgsrc/security/openssh/patches/patch-Makefile.in:1.9
--- pkgsrc/security/openssh/patches/patch-Makefile.in:1.8       Mon Jul  1 09:19:40 2024
+++ pkgsrc/security/openssh/patches/patch-Makefile.in   Tue Feb 18 09:33:07 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in,v 1.8 2024/07/01 09:19:40 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.9 2025/02/18 09:33:07 wiz Exp $
 
 Use askpass provided by pkgsrc.
 
@@ -15,7 +15,7 @@ Removed install-sysconf as we handle tha
  SFTP_SERVER=$(libexecdir)/sftp-server
  SSH_KEYSIGN=$(libexecdir)/ssh-keysign
  SSHD_SESSION=$(libexecdir)/sshd-session
-@@ -389,7 +390,7 @@ distprep: catman-do depend-check
+@@ -389,7 +389,7 @@ distprep: catman-do depend-check
        -rm -rf autom4te.cache .depend.bak
  
  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config

Index: pkgsrc/security/openssh/patches/patch-configure.ac
diff -u pkgsrc/security/openssh/patches/patch-configure.ac:1.10 pkgsrc/security/openssh/patches/patch-configure.ac:1.11
--- pkgsrc/security/openssh/patches/patch-configure.ac:1.10     Mon Jul  1 09:19:40 2024
+++ pkgsrc/security/openssh/patches/patch-configure.ac  Tue Feb 18 09:33:07 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.10 2024/07/01 09:19:40 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.11 2025/02/18 09:33:07 wiz Exp $
 
 --- configure.ac.orig  2024-07-01 04:36:28.000000000 +0000
 +++ configure.ac
@@ -12,7 +12,7 @@ $NetBSD: patch-configure.ac,v 1.10 2024/
  # Allow user to specify flags
  AC_ARG_WITH([cflags],
        [  --with-cflags           Specify additional flags to pass to compiler],
-@@ -5568,9 +5628,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@@ -5568,9 +5571,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 +32,7 @@ $NetBSD: patch-configure.ac,v 1.10 2024/
        AC_DEFINE_UNQUOTED([CONF_WTMPX_FILE], ["$conf_wtmpx_location"],
                [Define if you want to specify the path to your wtmpx file])
  fi
-@@ -5677,7 +5745,7 @@ echo "OpenSSH has been configured with t
+@@ -5677,7 +5688,7 @@ echo "OpenSSH has been configured with t
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"

Index: pkgsrc/security/openssh/patches/patch-defines.h
diff -u pkgsrc/security/openssh/patches/patch-defines.h:1.5 pkgsrc/security/openssh/patches/patch-defines.h:1.6
--- pkgsrc/security/openssh/patches/patch-defines.h:1.5 Mon Jul  1 09:19:40 2024
+++ pkgsrc/security/openssh/patches/patch-defines.h     Tue Feb 18 09:33:07 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-defines.h,v 1.5 2024/07/01 09:19:40 wiz Exp $
+$NetBSD: patch-defines.h,v 1.6 2025/02/18 09:33:07 wiz Exp $
 
 Define ROOTUID, UTMPX_FILE and WTMPX_FILE
 
 --- defines.h.orig     2015-08-21 04:49:03.000000000 +0000
 +++ defines.h
-@@ -721,6 +730,24 @@ struct winsize {
+@@ -721,6 +721,24 @@ struct winsize {
  #    endif
  #  endif
  #endif