UPDATE net/samba-4.21.4

[Bjorn Ketelaars]

Diff below updates samba to 4.21.4. Release notes:
https://www.samba.org/samba/history/samba-4.21.4.html.

libsmbconf requires a minor bump.

Run tested on amd64.

OK?


diff --git Makefile Makefile
index c36d91941e3..133fc240454 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,6 @@
-VERSION =              4.21.3
+VERSION =              4.21.4
 DISTNAME =             samba-${VERSION}
 EPOCH =                        0
-REVISION =             0
 
 COMMENT-main =         SMB and CIFS client and server for UNIX
 COMMENT-docs =         additional documentation and examples for Samba
@@ -29,7 +28,7 @@ SHARED_LIBS =         dcerpc                  1.2 \
                        samba-util              11.0 \
                        samdb                   4.0 \
                        smbclient               6.2 \
-                       smbconf                 16.0 \
+                       smbconf                 16.1 \
                        smbldap                 1.0 \
                        tevent                  2.3 \
                        tevent-util             2.0 \
diff --git distinfo distinfo
index 3c0384eafda..cd174ab48cd 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.21.3.tar.gz) = riF5phPnpdQIhzWrEA1Mocrg+SN01jB+IursE62QElw=
-SIZE (samba-4.21.3.tar.gz) = 42654317
+SHA256 (samba-4.21.4.tar.gz) = UKzwMNsM5r4e6KbDp2NuVFdsYKf4FOZL7PqED3sw7O0=
+SIZE (samba-4.21.4.tar.gz) = 42669530
diff --git patches/patch-lib_util_util_crypt_c 
patches/patch-lib_util_util_crypt_c
new file mode 100644
index 00000000000..b1c348297cf
--- /dev/null
+++ patches/patch-lib_util_util_crypt_c
@@ -0,0 +1,15 @@
+Index: lib/util/util_crypt.c
+--- lib/util/util_crypt.c.orig
++++ lib/util/util_crypt.c
+@@ -2,7 +2,11 @@
+ #include "data_blob.h"
+ #include "discard.h"
+ #include <talloc.h>
++#ifdef __OpenBSD__
++#include <unistd.h>
++#else
+ #include <crypt.h>
++#endif
+ #include "util_crypt.h"
+ 
+ 
diff --git pkg/PLIST-main pkg/PLIST-main
index e27b96f174a..278daa6c94a 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -1586,10 +1586,13 @@ 
lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}gkdi.${
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}gkdi.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}gmsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}gmsa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}sd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}sd.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}wbint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}wbint.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/gkdi.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/gmsa.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/sd.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/wbint.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/net_join.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/net_join_no_spnego.py
@@ -1950,6 +1953,7 @@ lib/samba/ldb/
 @so lib/samba/libtdb-wrap-private-samba.so
 @so lib/samba/libtime-basic-private-samba.so
 @so lib/samba/libtorture-private-samba.so
+@so lib/samba/libutil-crypt-private-samba.so
 @so lib/samba/libutil-reg-private-samba.so
 @so lib/samba/libutil-setid-private-samba.so
 @so lib/samba/libutil-tdb-private-samba.so