Skip to content

Commit

Permalink
main/openssh: update to 9.9_p1
Browse files Browse the repository at this point in the history
  • Loading branch information
nekopsykose committed Sep 25, 2024
1 parent 8f1bf07 commit 44569d1
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 3 deletions.
34 changes: 34 additions & 0 deletions main/openssh/patches/btmp.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Patch-Source: https://github.com/openssh/openssh-portable/commit/76a618d2842c34c16cd21a4efc7230e2f459008d
--
From 76a618d2842c34c16cd21a4efc7230e2f459008d Mon Sep 17 00:00:00 2001
From: Damien Miller <[email protected]>
Date: Wed, 25 Sep 2024 11:13:05 +1000
Subject: [PATCH] build construct_utmp() when USE_BTMP is set

Fixes compile error on Void Linux/Musl
---
loginrec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/loginrec.c b/loginrec.c
index 45f13dee8b1..7b1818b8675 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
@@ -698,7 +698,7 @@ construct_utmp(struct logininfo *li,
}
# endif
}
-#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */
+#endif /* USE_BTMP || USE_UTMP || USE_WTMP || USE_LOGIN */

/**
** utmpx utility functions
6 changes: 3 additions & 3 deletions main/openssh/template.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgname = "openssh"
pkgver = "9.8_p1"
pkgrel = 1
pkgver = "9.9_p1"
pkgrel = 0
build_style = "gnu_configure"
configure_args = [
"--datadir=/usr/share/openssh",
Expand Down Expand Up @@ -43,7 +43,7 @@
license = "SSH-OpenSSH"
url = "https://www.openssh.com"
source = f"https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-{pkgver.replace('_', '')}.tar.gz"
sha256 = "dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3"
sha256 = "b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02"
file_modes = {"usr/libexec/ssh-keysign": ("root", "root", 0o4755)}
# CFI: does not work; maybe make testsuite work first
hardening = ["vis", "!cfi"]
Expand Down

0 comments on commit 44569d1

Please sign in to comment.