From 74bec51799ede2f8c677525e21bb0b848b6310cd Mon Sep 17 00:00:00 2001 From: Mats Date: Thu, 20 Jul 2023 17:02:20 +0200 Subject: samba: 4.17.7 -> 4.18.5 --- pkgs/servers/samba/4.x.nix | 4 +-- ...pre-built-heimdal-build-tools-in-case-of-.patch | 40 +++------------------- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index b426e64e208..9a5ebd9f63e 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -51,11 +51,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.17.7"; + version = "4.18.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-lcnBa2VKiM+u/ZWAUt1XPi+F7N8RTk7Owxh1N6CU2Rk="; + hash = "sha256-CVJWrDMuHZ+/m3/3gj+SoyM9PtZYzn/JszkFwiQ/RH8="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch index 60b215b718f..1c333bc6adb 100644 --- a/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ b/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -1,4 +1,4 @@ -From 9287fcfc36ed9f2bb936ec2253244f60df80711f Mon Sep 17 00:00:00 2001 +From 7e3c8ba66b86a21fe8e5bd9a595dd6fc03fa26d4 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 22 Sep 2021 09:42:42 +0200 Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded @@ -34,13 +34,10 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 Signed-off-by: Uri Simchoni Signed-off-by: Bernd Kuhls [Bachp: rebased for version 4.15.0] - -# Conflicts: -# wscript_configure_system_heimdal +[Mats: rebased for version 4.18.5] --- wscript_configure_embedded_heimdal | 11 +++++++++++ - wscript_configure_system_heimdal | 11 ----------- - 2 files changed, 11 insertions(+), 11 deletions(-) + 1 file changed, 11 insertions(+) diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal index 6066f2b39d7..e92cabad65f 100644 @@ -61,35 +58,6 @@ index 6066f2b39d7..e92cabad65f 100644 + +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") -diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal -index 6033dad08dc..c0a9bb95e87 100644 ---- a/wscript_configure_system_heimdal -+++ b/wscript_configure_system_heimdal -@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): - conf.define('USING_SYSTEM_%s' % name.upper(), 1) - return True - --def check_system_heimdal_binary(name): -- if conf.LIB_MAY_BE_BUNDLED(name): -- return False -- if not conf.find_program(name, var=name.upper()): -- return False -- conf.define('USING_SYSTEM_%s' % name.upper(), 1) -- return True -- - check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") - - if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): -@@ -86,9 +78,6 @@ finally: - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): - # conf.define('USING_SYSTEM_TOMMATH', 1) - --check_system_heimdal_binary("compile_et") --check_system_heimdal_binary("asn1_compile") -- - conf.env.KRB5_VENDOR = 'heimdal' - conf.define('USING_SYSTEM_KRB5', 1) - conf.define('USING_SYSTEM_HEIMDAL', 1) -- -2.37.3 +2.41.0 -- cgit 1.4.1