diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 399dabfc475783..3f80aae31002fa 100644 --- 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 @@ -174,7 +174,6 @@ CONFIGURE_ARGS += \ --disable-strip \ --disable-etc-default-login \ --disable-lastlog \ - --disable-utmp \ --disable-utmpx \ --disable-wtmp \ --disable-wtmpx \ 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 deleted file mode 100644 index df0a6afa1f6a05..00000000000000 --- a/net/openssh/patches/100-fix-incompatible-ptr-GCC-14.1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/openbsd-compat/port-linux.c -+++ b/openbsd-compat/port-linux.c -@@ -366,7 +366,7 @@ ssh_systemd_notify(const char *fmt, ...) - error_f("socket \"%s\": %s", path, strerror(errno)); - goto out; - } -- if (connect(fd, &addr, sizeof(addr)) != 0) { -+ if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) != 0) { - error_f("socket \"%s\" connect: %s", path, strerror(errno)); - goto out; - }