git: 135b4febde36 - main - net/samba416: Security update for the recent Heimdal/KRB5 related vulnerabilities.

The branch main has been updated by timur:

URL: https://cgit.FreeBSD.org/ports/commit/?id=135b4febde36816397bbaf11538e2dc014849a72

commit 135b4febde36816397bbaf11538e2dc014849a72
Author:     Timur I. Bakeyev <timur@FreeBSD.org>
AuthorDate: 2022-12-19 01:42:08 +0000
Commit:     Timur I. Bakeyev <timur@FreeBSD.org>
CommitDate: 2022-12-19 01:42:08 +0000

    net/samba416: Security update for the recent Heimdal/KRB5 related vulnerabilities.
    
    Security:       CVE-2022-38023
                    CVE-2022-37966
                    CVE-2022-37967
                    CVE-2022-45141
---
 net/samba416/Makefile                                         |  2 +-
 net/samba416/distinfo                                         |  6 +++---
 .../0099-s4-mitkdc-Add-support-for-MIT-Kerberos-1.20.patch    | 11 +++--------
 net/samba416/pkg-plist.python                                 |  2 ++
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/net/samba416/Makefile b/net/samba416/Makefile
index a65c319d59fd..ee739448679f 100644
--- a/net/samba416/Makefile
+++ b/net/samba416/Makefile
@@ -50,7 +50,7 @@ EXTRA_PATCHES=			\
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.16.7
+SAMBA4_VERSION=			4.16.8
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
diff --git a/net/samba416/distinfo b/net/samba416/distinfo
index 861116a873b6..ce567ea5e5e4 100644
--- a/net/samba416/distinfo
+++ b/net/samba416/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668648463
-SHA256 (samba-4.16.7.tar.gz) = 02d38d5f9edcc776be3a7d60ad470b43980af2ba13c244fb78a57a41792734a6
-SIZE (samba-4.16.7.tar.gz) = 30622700
+TIMESTAMP = 1671402791
+SHA256 (samba-4.16.8.tar.gz) = bbb2959c86b3f220f59be8a3cecd26a8bf22ec8e0526f2343b58c9b866dc4185
+SIZE (samba-4.16.8.tar.gz) = 30682100
diff --git a/net/samba416/files/0099-s4-mitkdc-Add-support-for-MIT-Kerberos-1.20.patch b/net/samba416/files/0099-s4-mitkdc-Add-support-for-MIT-Kerberos-1.20.patch
index e38cf5214696..4507dc599075 100644
--- a/net/samba416/files/0099-s4-mitkdc-Add-support-for-MIT-Kerberos-1.20.patch
+++ b/net/samba416/files/0099-s4-mitkdc-Add-support-for-MIT-Kerberos-1.20.patch
@@ -913,20 +913,15 @@ diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
 index 3af8e92d7f2..f451ad1cec2 100755
 --- a/source4/selftest/tests.py
 +++ b/source4/selftest/tests.py
-@@ -963,7 +963,12 @@ for env in ['fileserver_smb1', 'nt4_member', 'clusteredmember', 'ktest', 'nt4_dc
+@@ -964,7 +964,7 @@ for env in ['fileserver_smb1', 'nt4_member', 'clustere
  have_fast_support = 1
  claims_support = 0
  compound_id_support = 0
 -tkt_sig_support = int('SAMBA4_USES_HEIMDAL' in config_hash)
-+if ('SAMBA4_USES_HEIMDAL' in config_hash or
-+    'HAVE_MIT_KRB5_1_20' in config_hash):
-+    tkt_sig_support = 1
-+else:
-+    tkt_sig_support = 0
-+
++tkt_sig_support = 1 if('SAMBA4_USES_HEIMDAL' in config_hash or 'HAVE_MIT_KRB5_1_20' in config_hash) else 0
+ full_sig_support = int('SAMBA4_USES_HEIMDAL' in config_hash)
  expect_pac = int('SAMBA4_USES_HEIMDAL' in config_hash)
  extra_pac_buffers = int('SAMBA4_USES_HEIMDAL' in config_hash)
- check_cname = int('SAMBA4_USES_HEIMDAL' in config_hash)
 diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
 index efdbced6e78..b0640654260 100644
 --- a/wscript_configure_system_mitkrb5
diff --git a/net/samba416/pkg-plist.python b/net/samba416/pkg-plist.python
index 9b475e5d2dc0..7d86c1cb2e48 100644
--- a/net/samba416/pkg-plist.python
+++ b/net/samba416/pkg-plist.python
@@ -274,12 +274,14 @@ lib/samba4/private/libsamba-python%%PYTHON_EXT_SUFFIX%%-samba4.so
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/as_canonicalization_tests.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/as_req_tests.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/compatability_tests.py
+%%PYTHON_SITELIBDIR%%/samba/tests/krb5/etype_tests.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/fast_tests.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/kcrypto.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/kdc_base_test.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/kdc_tests.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/kdc_tgs_tests.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/kpasswd_tests.py
+%%PYTHON_SITELIBDIR%%/samba/tests/krb5/lockout_tests.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/pac_align_tests.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5/raw_testcase.py