From 125ed23f31a85711d8f9d908c4c78dddc0dc4de0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 May 2026 14:32:31 +0200 Subject: [PATCH] samba: 4.23.5 -> 4.23.8 https://www.samba.org/samba/history/samba-4.23.6.html https://www.samba.org/samba/history/samba-4.23.7.html https://www.samba.org/samba/history/samba-4.23.8.html Fixes: CVE-2026-1933, CVE-2026-2340, CVE-2026-3012, CVE-2026-3238, CVE-2026-4408, CVE-2026-4480 --- pkgs/servers/samba/4.x-fix-makeflags-parsing.patch | 11 ----------- pkgs/servers/samba/4.x.nix | 5 ++--- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 pkgs/servers/samba/4.x-fix-makeflags-parsing.patch diff --git a/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch b/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch deleted file mode 100644 index 7c973e5bd26a..000000000000 --- a/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/buildtools/wafsamba/samba_utils.py 2019-04-08 01:13:47.525306574 +0000 -+++ b/buildtools/wafsamba/samba_utils.py 2019-04-08 01:14:34.805245676 +0000 -@@ -495,7 +495,7 @@ - Logs.zones = ['runner'] - if Logs.verbose > 2: - Logs.zones = ['*'] -- elif opt[0].isupper() and opt.find('=') != -1: -+ elif opt[0] and opt.find('=') != -1: - # this allows us to set waf options on the make command line - # for example, if you do "make FOO=blah", then we set the - # option 'FOO' in Options.options, to blah. If you look in wafsamba/wscript diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 69df70b61d3e..22f9cbf3aba3 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -81,11 +81,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "samba"; - version = "4.23.5"; + version = "4.23.8"; src = fetchurl { url = "https://download.samba.org/pub/samba/stable/samba-${finalAttrs.version}.tar.gz"; - hash = "sha256-WTpD3dDVeQIjffp2iI97Ast/x3RxETacsx4SbbSDa58="; + hash = "sha256-l2EphHRW3Ft4wA+P+3ncYFxJ1qrKiyqncv0i27afrgE="; }; outputs = [ @@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./4.x-no-persistent-install.patch ./4.x-no-persistent-install-dynconfig.patch - ./4.x-fix-makeflags-parsing.patch ./4.x-fix-systemd-detection.patch (fetchpatch { # workaround for https://bugzilla.samba.org/show_bug.cgi?id=14164