openssh: bump to 9.9p1

Release notes: https://www.openssh.com/txt/release-9.9 Had to remove the configure option --disable-wtmp to get it to build. Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <[email protected]> Signed-off-by: Sibren Vasse <[email protected]>
SibrenVasse · Sep 23, 2024 · 6881995 · 6881995
1 parent 446c9dd
commit 6881995
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/net/openssh/Makefile b/net/openssh/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_REALVERSION:=9.8p1
-PKG_VERSION:=9.8_p1
-PKG_RELEASE:=2
+PKG_REALVERSION:=9.9p1
+PKG_VERSION:=9.9_p1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_REALVERSION).tar.gz
 PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 		https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
-PKG_HASH:=dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3
+PKG_HASH:=b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(if $(BUILD_VARIANT),$(PKG_NAME)-$(BUILD_VARIANT)/)$(PKG_NAME)-$(PKG_REALVERSION)
 
 PKG_LICENSE:=BSD ISC

diff --git a/net/openssh/patches/100-fix-incompatible-ptr-GCC-14.1.patch b/net/openssh/patches/100-fix-incompatible-ptr-GCC-14.1.patch
diff --git a/net/openssh/patches/musl-btmp.patch b/net/openssh/patches/musl-btmp.patch
@@ -0,0 +1,13 @@
+diff --git a/loginrec.c b/loginrec.c
+index 7460bb2..795b5b5 100644
+--- a/loginrec.c
++++ b/loginrec.c
+@@ -614,7 +614,7 @@ line_abbrevname(char *dst, const char *src, int dstsize)
+  ** into account.
+  **/
+
+-#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
++#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
+
+ /* build the utmp structure */
+ void