From 50a3bfb64f7922b1f6056bc78c6e1a0cf0202ba2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 22 Feb 2024 14:14:04 +0100 Subject: samba: update to 4.19.4 --- package/samba/Makefile | 7 ++++--- package/samba/files/cache.txt | 13 +++++++++---- package/samba/patches/patch-nsswitch_wins_c | 17 ----------------- package/samba/patches/patch-source3_lib_util_c | 18 ------------------ 4 files changed, 13 insertions(+), 42 deletions(-) delete mode 100644 package/samba/patches/patch-nsswitch_wins_c delete mode 100644 package/samba/patches/patch-source3_lib_util_c (limited to 'package/samba') diff --git a/package/samba/Makefile b/package/samba/Makefile index cd6944476..e47d34af3 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= samba -PKG_VERSION:= 4.13.2 -PKG_RELEASE:= 2 -PKG_HASH:= 276464396a05d88b775bda01ac2eb1e5a636ccf7010b0fd28efc3d85583af2b4 +PKG_VERSION:= 4.19.4 +PKG_RELEASE:= 1 +PKG_HASH:= 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c PKG_DESCR:= file and print server PKG_SECTION:= net/fs PKG_DEPENDS:= libuuid libpopt libgnutls libtirpc @@ -33,6 +33,7 @@ CONFIGURE_ARGS+= --enable-fhs \ --cross-answers=$(WRKSRC)/cache.txt \ --hostcc=gcc \ --with-system-mitkrb5 \ + --without-libunwind \ --without-pie \ --without-gettext \ --without-relro \ diff --git a/package/samba/files/cache.txt b/package/samba/files/cache.txt index f750653d9..9ab9fcd5b 100644 --- a/package/samba/files/cache.txt +++ b/package/samba/files/cache.txt @@ -37,7 +37,12 @@ Checking value of NSIG: "65" Checking value of _NSIG: "65" Checking value of SIGRTMAX: "64" Checking value of SIGRTMIN: "34" -Checking whether the WRFILE -keytab is supported: OK -Checking errno of iconv for illegal multibyte sequence: OK -Checking value of GNUTLS_CIPHER_AES_128_CFB8: "29" -Checking value of GNUTLS_MAC_AES_CMAC_128: "203" +Checking errno of iconv for illegal multibyte sequence: "0" +checking for clnt_create(): OK +Checking for a 64-bit host to support lmdb: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29 +Checking value of GNUTLS_MAC_AES_CMAC_128: 203 +Checking whether fcntl supports flags to send direct I/O availability signals: OK +Checking for gnutls fips mode support: NO +Checking for readlink breakage: NO +Checking whether the WRFILE -keytab is supported: NO diff --git a/package/samba/patches/patch-nsswitch_wins_c b/package/samba/patches/patch-nsswitch_wins_c deleted file mode 100644 index 92aa624f5..000000000 --- a/package/samba/patches/patch-nsswitch_wins_c +++ /dev/null @@ -1,17 +0,0 @@ ---- samba-4.6.6.orig/nsswitch/wins.c 2017-01-09 09:12:30.000000000 +0100 -+++ samba-4.6.6/nsswitch/wins.c 2017-08-02 22:28:16.616627669 +0200 -@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = - #define INADDRSZ 4 - #endif - -+#ifndef NETDB_INTERNAL -+#define NETDB_INTERNAL -1 -+#endif -+ -+#ifndef NETDB_SUCCESS -+#define NETDB_SUCCESS 0 -+#endif -+ - NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, - struct hostent *he, - char *buffer, diff --git a/package/samba/patches/patch-source3_lib_util_c b/package/samba/patches/patch-source3_lib_util_c deleted file mode 100644 index 5755bb837..000000000 --- a/package/samba/patches/patch-source3_lib_util_c +++ /dev/null @@ -1,18 +0,0 @@ ---- samba-4.6.6.orig/source3/lib/util.c 2017-02-09 08:45:27.000000000 +0100 -+++ samba-4.6.6/source3/lib/util.c 2017-08-02 21:54:59.695281066 +0200 -@@ -565,6 +565,7 @@ char *get_mydnsdomname(TALLOC_CTX *ctx) - } - } - -+#if 0 - #if (defined(HAVE_NETGROUP) && defined(WITH_AUTOMOUNT)) - /****************************************************************** - Remove any mount options such as -rsize=2048,wsize=2048 etc. -@@ -687,6 +688,7 @@ char *automount_lookup(TALLOC_CTX *ctx, - } - #endif /* WITH_NISPLUS_HOME */ - #endif -+#endif - - bool process_exists(const struct server_id pid) - { -- cgit v1.2.3