CVS commit: pkgsrc/net/samba4

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Apr 29 15:21:16 UTC 2021

Modified Files:
        pkgsrc/net/samba4: Makefile distinfo
        pkgsrc/net/samba4/patches: patch-lib_pthreadpool_pthreadpool.c
            patch-lib_tdb_common_mutex.c patch-lib_tevent_tevent.c
            patch-lib_tevent_tevent__threads.c patch-lib_util_smb__threads.h
            patch-lib_util_tfork.c patch-nsswitch_stress-nss-libwbclient.c
            patch-source3_libsmb_pylibsmb.c patch-source3_smbd_process.c
            patch-source4_heimdal_include_heim__threads.h

Log Message:
net/samba4: update to 4.14.4

pkgsrc changes: remove extra spaces in some patch files.

                   ==============================
                   Release Notes for Samba 4.14.4
                           April 29, 2021
                   ==============================

This is a security release in order to address the following defect:

o CVE-2021-20254: Negative idmap cache entries can cause incorrect group entries
  in the Samba file server process token.

=======
Details
=======

o  CVE-2021-20254:
   The Samba smbd file server must map Windows group identities (SIDs) into unix
   group ids (gids). The code that performs this had a flaw that could allow it
   to read data beyond the end of the array in the case where a negative cache
   entry had been added to the mapping cache. This could cause the calling code
   to return those values into the process token that stores the group
   membership for a user.

   Most commonly this flaw caused the calling code to crash, but an alert user
   (Peter Eriksson, IT Department, Linköping University) found this flaw by
   noticing an unprivileged user was able to delete a file within a network
   share that they should have been disallowed access to.

   Analysis of the code paths has not allowed us to discover a way for a
   remote user to be able to trigger this flaw reproducibly or on demand,
   but this CVE has been issued out of an abundance of caution.

Changes since 4.14.3
--------------------

o  Volker Lendecke <vl%samba.org@localhost>
   * BUG 14571: CVE-2021-20254: Fix buffer overrun in sids_to_unixids().


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/samba4/patches/patch-lib_pthreadpool_pthreadpool.c \
    pkgsrc/net/samba4/patches/patch-lib_tdb_common_mutex.c \
    pkgsrc/net/samba4/patches/patch-lib_tevent_tevent.c \
    pkgsrc/net/samba4/patches/patch-lib_tevent_tevent__threads.c \
    pkgsrc/net/samba4/patches/patch-lib_util_smb__threads.h \
    pkgsrc/net/samba4/patches/patch-lib_util_tfork.c \
    pkgsrc/net/samba4/patches/patch-nsswitch_stress-nss-libwbclient.c \
    pkgsrc/net/samba4/patches/patch-source3_libsmb_pylibsmb.c \
    pkgsrc/net/samba4/patches/patch-source3_smbd_process.c \
    pkgsrc/net/samba4/patches/patch-source4_heimdal_include_heim__threads.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.121 pkgsrc/net/samba4/Makefile:1.122
--- pkgsrc/net/samba4/Makefile:1.121    Wed Apr 28 09:03:49 2021
+++ pkgsrc/net/samba4/Makefile  Thu Apr 29 15:21:16 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.121 2021/04/28 09:03:49 nia Exp $
+# $NetBSD: Makefile,v 1.122 2021/04/29 15:21:16 taca Exp $
 
-DISTNAME=      samba-4.14.3
+DISTNAME=      samba-4.14.4
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 

Index: pkgsrc/net/samba4/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.60 pkgsrc/net/samba4/distinfo:1.61
--- pkgsrc/net/samba4/distinfo:1.60     Thu Apr 22 15:47:45 2021
+++ pkgsrc/net/samba4/distinfo  Thu Apr 29 15:21:16 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.60 2021/04/22 15:47:45 adam Exp $
+$NetBSD: distinfo,v 1.61 2021/04/29 15:21:16 taca Exp $
 
-SHA1 (samba-4.14.3.tar.gz) = 33520e1a6bdec0f85a521129bb6dbc4575e27175
-RMD160 (samba-4.14.3.tar.gz) = 7e03b9f45c58458dae5aeaf02571536cb8fce806
-SHA512 (samba-4.14.3.tar.gz) = b8cd12c65d2a34c71a40c18eb2c74e86b75be734437ba71106e41352691359fbaf7e5ce7e386846fd84d4c19d100e02ea74dfd6f1ec34f66a10e5c20c0fb3cc6
-Size (samba-4.14.3.tar.gz) = 18643265 bytes
+SHA1 (samba-4.14.4.tar.gz) = 123281ce6b0049648be3bd4fe7094057526d6340
+RMD160 (samba-4.14.4.tar.gz) = ee779e5f3b2b32516b6b59761659c6fa3a2c3f10
+SHA512 (samba-4.14.4.tar.gz) = 200b2b2b08b369915e045f22ee993d5deea7a2533c6c582d4b88c614adcad5529109d449e843a2a1f292e5cfb1877d66421b5b0801ad988896cbe5413717e4dc
+Size (samba-4.14.4.tar.gz) = 18645552 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7
@@ -11,24 +11,24 @@ SHA1 (patch-buildtools_wafsamba_samba__u
 SHA1 (patch-buildtools_wafsamba_wscript) = 0ca4c3a9d2e07f9165784e495f6f6b2b21db2758
 SHA1 (patch-dynconfig_wscript) = 1858e5fcca913f21aa3e7868d9760b9c40c9f5c4
 SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18
-SHA1 (patch-lib_pthreadpool_pthreadpool.c) = c29490473063d6bdbe5c50780a21bf2869ae959f
+SHA1 (patch-lib_pthreadpool_pthreadpool.c) = 4b0c3d49d578b5ab12f5bad1ebeb50efb43e756c
 SHA1 (patch-lib_replace_system_passwd.h) = 652be067b2560310ce3a4bbf37c24cb2fa8eb82d
 SHA1 (patch-lib_replace_wscript) = 2a754e7310850b376d5881b82a8467041284fce9
-SHA1 (patch-lib_tdb_common_mutex.c) = 12dbcf870e6ba17ef7f92a8ce7f0b7462f820232
-SHA1 (patch-lib_tevent_tevent.c) = 4a20506e2bfbab85bad664299b884575326e73fd
-SHA1 (patch-lib_tevent_tevent__threads.c) = 14867888dd0b7c4613914752ab368c39bfdbb943
+SHA1 (patch-lib_tdb_common_mutex.c) = 74162bf9dfd440fc0b9782982e83776c9671a983
+SHA1 (patch-lib_tevent_tevent.c) = c5100a1ab65ab5a645901e9a9fb021a6f38cc2c5
+SHA1 (patch-lib_tevent_tevent__threads.c) = e5e82db82cff4d550451cd9290b3a351b25d4de4
 SHA1 (patch-lib_tevent_wscript) = fbbe2024096b57d651d90064f53489a974db9d7a
 SHA1 (patch-lib_util_charset_charset__macosxfs.c) = 9772fc52fff48aec2a7e279223f73bb791217c26
-SHA1 (patch-lib_util_smb__threads.h) = 93bbc4276ad927ad6faf305af093064f47c09254
-SHA1 (patch-lib_util_tfork.c) = cd70dcff5f2ce94ffe642e0f029f03ee07dff27d
+SHA1 (patch-lib_util_smb__threads.h) = ee8366e4d68d1c8965e9d86bdade965822133ca6
+SHA1 (patch-lib_util_tfork.c) = a9acb5561c5bba76450c48904a22019c8b14cbec
 SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89
-SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = bf327282a59aefeeb2d6bf9eccf9b3a832033066
+SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = c546f00184b0d22b6c150e210962cdfc6fc12df2
 SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 2773ec9269d1fe0d7ce7ed220f6a7122d187fabe
 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
-SHA1 (patch-source3_libsmb_pylibsmb.c) = 50c3aaecf345449e02642e387eeac3dd7043e77a
-SHA1 (patch-source3_smbd_process.c) = 532d2426b9bd2a215d133bc489741558aa07f849
+SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f
+SHA1 (patch-source3_smbd_process.c) = 3a6f9682aca6473e364d0be0f601774df4fd1296
 SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898
 SHA1 (patch-source4_heimdal__build_roken.h) = f467a541fa09e2aa483d10ed9d49df9167a3443a
-SHA1 (patch-source4_heimdal_include_heim__threads.h) = c93e0c80790ea2045333822c80e66d371bf2249c
+SHA1 (patch-source4_heimdal_include_heim__threads.h) = 1108fe804f235c72a93bcda0ec14454828ed030f
 SHA1 (patch-source4_scripting_wsript_build) = bd4feddcaadf1c3d2d25eb7914e7b5843e4e9511
 SHA1 (patch-source4_utils_oLschema2ldif_wscript__build) = b0cbbcd4ebedd443dc9f9a59d1dad2e039bb9663

Index: pkgsrc/net/samba4/patches/patch-lib_pthreadpool_pthreadpool.c
diff -u pkgsrc/net/samba4/patches/patch-lib_pthreadpool_pthreadpool.c:1.1 pkgsrc/net/samba4/patches/patch-lib_pthreadpool_pthreadpool.c:1.2
--- pkgsrc/net/samba4/patches/patch-lib_pthreadpool_pthreadpool.c:1.1   Thu Sep  5 12:39:56 2019
+++ pkgsrc/net/samba4/patches/patch-lib_pthreadpool_pthreadpool.c       Thu Apr 29 15:21:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_pthreadpool_pthreadpool.c,v 1.1 2019/09/05 12:39:56 hauke Exp $
+$NetBSD: patch-lib_pthreadpool_pthreadpool.c,v 1.2 2021/04/29 15:21:16 taca Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
-    
+
 --- lib/pthreadpool/pthreadpool.c.orig 2019-01-15 10:07:00.000000000 +0000
 +++ lib/pthreadpool/pthreadpool.c
 @@ -153,6 +153,7 @@ int pthreadpool_init(unsigned max_thread
Index: pkgsrc/net/samba4/patches/patch-lib_tdb_common_mutex.c
diff -u pkgsrc/net/samba4/patches/patch-lib_tdb_common_mutex.c:1.1 pkgsrc/net/samba4/patches/patch-lib_tdb_common_mutex.c:1.2
--- pkgsrc/net/samba4/patches/patch-lib_tdb_common_mutex.c:1.1  Thu Sep  5 12:39:56 2019
+++ pkgsrc/net/samba4/patches/patch-lib_tdb_common_mutex.c      Thu Apr 29 15:21:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_tdb_common_mutex.c,v 1.1 2019/09/05 12:39:56 hauke Exp $
+$NetBSD: patch-lib_tdb_common_mutex.c,v 1.2 2021/04/29 15:21:16 taca Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
-    
+
 --- lib/tdb/common/mutex.c.orig        2019-01-15 10:07:00.000000000 +0000
 +++ lib/tdb/common/mutex.c
 @@ -567,6 +567,7 @@ int tdb_mutex_init(struct tdb_context *t
Index: pkgsrc/net/samba4/patches/patch-lib_tevent_tevent.c
diff -u pkgsrc/net/samba4/patches/patch-lib_tevent_tevent.c:1.1 pkgsrc/net/samba4/patches/patch-lib_tevent_tevent.c:1.2
--- pkgsrc/net/samba4/patches/patch-lib_tevent_tevent.c:1.1     Thu Sep  5 12:39:56 2019
+++ pkgsrc/net/samba4/patches/patch-lib_tevent_tevent.c Thu Apr 29 15:21:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_tevent_tevent.c,v 1.1 2019/09/05 12:39:56 hauke Exp $
+$NetBSD: patch-lib_tevent_tevent.c,v 1.2 2021/04/29 15:21:16 taca Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
-    
+
 --- lib/tevent/tevent.c.orig   2019-01-15 10:07:00.000000000 +0000
 +++ lib/tevent/tevent.c
 @@ -423,6 +423,7 @@ static int tevent_common_context_constru
Index: pkgsrc/net/samba4/patches/patch-lib_tevent_tevent__threads.c
diff -u pkgsrc/net/samba4/patches/patch-lib_tevent_tevent__threads.c:1.1 pkgsrc/net/samba4/patches/patch-lib_tevent_tevent__threads.c:1.2
--- pkgsrc/net/samba4/patches/patch-lib_tevent_tevent__threads.c:1.1    Thu Sep  5 12:39:56 2019
+++ pkgsrc/net/samba4/patches/patch-lib_tevent_tevent__threads.c        Thu Apr 29 15:21:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_tevent_tevent__threads.c,v 1.1 2019/09/05 12:39:56 hauke Exp $
+$NetBSD: patch-lib_tevent_tevent__threads.c,v 1.2 2021/04/29 15:21:16 taca Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
-    
+
 --- lib/tevent/tevent_threads.c.orig   2019-01-15 10:07:00.000000000 +0000
 +++ lib/tevent/tevent_threads.c
 @@ -234,6 +234,7 @@ struct tevent_thread_proxy *tevent_threa
Index: pkgsrc/net/samba4/patches/patch-lib_util_smb__threads.h
diff -u pkgsrc/net/samba4/patches/patch-lib_util_smb__threads.h:1.1 pkgsrc/net/samba4/patches/patch-lib_util_smb__threads.h:1.2
--- pkgsrc/net/samba4/patches/patch-lib_util_smb__threads.h:1.1 Thu Sep  5 12:39:56 2019
+++ pkgsrc/net/samba4/patches/patch-lib_util_smb__threads.h     Thu Apr 29 15:21:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_util_smb__threads.h,v 1.1 2019/09/05 12:39:56 hauke Exp $
+$NetBSD: patch-lib_util_smb__threads.h,v 1.2 2021/04/29 15:21:16 taca Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
-    
+
 --- lib/util/smb_threads.h.orig        2019-01-15 10:07:00.000000000 +0000
 +++ lib/util/smb_threads.h
 @@ -66,6 +66,7 @@ static int smb_create_mutex_pthread(cons
Index: pkgsrc/net/samba4/patches/patch-lib_util_tfork.c
diff -u pkgsrc/net/samba4/patches/patch-lib_util_tfork.c:1.1 pkgsrc/net/samba4/patches/patch-lib_util_tfork.c:1.2
--- pkgsrc/net/samba4/patches/patch-lib_util_tfork.c:1.1        Thu Sep  5 12:39:56 2019
+++ pkgsrc/net/samba4/patches/patch-lib_util_tfork.c    Thu Apr 29 15:21:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_util_tfork.c,v 1.1 2019/09/05 12:39:56 hauke Exp $
+$NetBSD: patch-lib_util_tfork.c,v 1.2 2021/04/29 15:21:16 taca Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
-    
+
 --- lib/util/tfork.c.orig      2019-01-15 10:07:00.000000000 +0000
 +++ lib/util/tfork.c
 @@ -281,6 +281,7 @@ static void tfork_global_initialize(void
Index: pkgsrc/net/samba4/patches/patch-nsswitch_stress-nss-libwbclient.c
diff -u pkgsrc/net/samba4/patches/patch-nsswitch_stress-nss-libwbclient.c:1.1 pkgsrc/net/samba4/patches/patch-nsswitch_stress-nss-libwbclient.c:1.2
--- pkgsrc/net/samba4/patches/patch-nsswitch_stress-nss-libwbclient.c:1.1       Thu Sep  5 12:39:56 2019
+++ pkgsrc/net/samba4/patches/patch-nsswitch_stress-nss-libwbclient.c   Thu Apr 29 15:21:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-nsswitch_stress-nss-libwbclient.c,v 1.1 2019/09/05 12:39:56 hauke Exp $
+$NetBSD: patch-nsswitch_stress-nss-libwbclient.c,v 1.2 2021/04/29 15:21:16 taca Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
-    
+
 --- nsswitch/stress-nss-libwbclient.c.orig     2019-01-15 10:07:00.000000000 +0000
 +++ nsswitch/stress-nss-libwbclient.c
 @@ -118,6 +118,7 @@ int main(int argc, char *argv[])
Index: pkgsrc/net/samba4/patches/patch-source3_libsmb_pylibsmb.c
diff -u pkgsrc/net/samba4/patches/patch-source3_libsmb_pylibsmb.c:1.1 pkgsrc/net/samba4/patches/patch-source3_libsmb_pylibsmb.c:1.2
--- pkgsrc/net/samba4/patches/patch-source3_libsmb_pylibsmb.c:1.1       Thu Sep  5 12:39:56 2019
+++ pkgsrc/net/samba4/patches/patch-source3_libsmb_pylibsmb.c   Thu Apr 29 15:21:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-source3_libsmb_pylibsmb.c,v 1.1 2019/09/05 12:39:56 hauke Exp $
+$NetBSD: patch-source3_libsmb_pylibsmb.c,v 1.2 2021/04/29 15:21:16 taca Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
-    
+
 --- source3/libsmb/pylibsmb.c.orig     2019-05-07 08:38:21.000000000 +0000
 +++ source3/libsmb/pylibsmb.c
 @@ -285,6 +285,7 @@ static int py_tevent_cond_wait(struct py
Index: pkgsrc/net/samba4/patches/patch-source3_smbd_process.c
diff -u pkgsrc/net/samba4/patches/patch-source3_smbd_process.c:1.1 pkgsrc/net/samba4/patches/patch-source3_smbd_process.c:1.2
--- pkgsrc/net/samba4/patches/patch-source3_smbd_process.c:1.1  Thu Sep  5 12:39:56 2019
+++ pkgsrc/net/samba4/patches/patch-source3_smbd_process.c      Thu Apr 29 15:21:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-source3_smbd_process.c,v 1.1 2019/09/05 12:39:56 hauke Exp $
+$NetBSD: patch-source3_smbd_process.c,v 1.2 2021/04/29 15:21:16 taca Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
-    
+
 --- source3/smbd/process.c.orig        2019-01-15 10:07:00.000000000 +0000
 +++ source3/smbd/process.c
 @@ -3342,6 +3342,7 @@ bool fork_echo_handler(struct smbXsrv_co
Index: pkgsrc/net/samba4/patches/patch-source4_heimdal_include_heim__threads.h
diff -u pkgsrc/net/samba4/patches/patch-source4_heimdal_include_heim__threads.h:1.1 pkgsrc/net/samba4/patches/patch-source4_heimdal_include_heim__threads.h:1.2
--- pkgsrc/net/samba4/patches/patch-source4_heimdal_include_heim__threads.h:1.1 Thu Sep  5 12:39:56 2019
+++ pkgsrc/net/samba4/patches/patch-source4_heimdal_include_heim__threads.h     Thu Apr 29 15:21:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-source4_heimdal_include_heim__threads.h,v 1.1 2019/09/05 12:39:56 hauke Exp $
+$NetBSD: patch-source4_heimdal_include_heim__threads.h,v 1.2 2021/04/29 15:21:16 taca Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
-    
+
 --- source4/heimdal/include/heim_threads.h.orig        2019-01-15 10:07:00.000000000 +0000
 +++ source4/heimdal/include/heim_threads.h
 @@ -87,7 +87,7 @@