Diff below updates samba to the first release of the 4.22 branch. Changes are listed in [0]. I have been running the 4.22 branch since the first release candidate and found one issue that has been resolved by upstream [1].
Bumped several shared libraries (based on output of check_sym). Please note that this release of samba depends on an update of databases/tdb to 1.4.13 and devel/libtalloc to 2.4.3, which are part of the diff below. Comments/ ok? [0] https://www.samba.org/samba/history/samba-4.22.0.html [1] https://bugzilla.samba.org/show_bug.cgi?id=15801 diff --git databases/tdb/Makefile databases/tdb/Makefile index c31cda7d932..660e336f8ad 100644 --- databases/tdb/Makefile +++ databases/tdb/Makefile @@ -2,11 +2,10 @@ COMMENT-main= trivial database library COMMENT-python= Python ${MODPY_VERSION} bindings for tdb # Keep in sync with the version bundled in net/samba -V= 1.4.12 +V= 1.4.13 DISTNAME= tdb-$V PKGNAME-python= py3-${DISTNAME} -REVISION-python= 0 MULTI_PACKAGES= -main -python diff --git databases/tdb/distinfo databases/tdb/distinfo index 6471965a4ec..a91530cb950 100644 --- databases/tdb/distinfo +++ databases/tdb/distinfo @@ -1,2 +1,2 @@ -SHA256 (tdb-1.4.12.tar.gz) = bOSydJiBLQkjfs5loNbfrAlBYQ5wmEjsuCKqJBCEzXo= -SIZE (tdb-1.4.12.tar.gz) = 748827 +SHA256 (tdb-1.4.13.tar.gz) = XuJ252RNcT4Z5LatwAtECvtYUf8h5lgh/67YnhWl4Wc= +SIZE (tdb-1.4.13.tar.gz) = 751677 diff --git databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py index ae284e72547..dcf0d205a9c 100644 --- databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py +++ databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py @@ -4,7 +4,7 @@ Index: buildtools/wafsamba/wafsamba.py --- buildtools/wafsamba/wafsamba.py.orig +++ buildtools/wafsamba/wafsamba.py -@@ -294,6 +294,13 @@ def SAMBA_LIBRARY(bld, libname, source, +@@ -295,6 +295,13 @@ def SAMBA_LIBRARY(bld, libname, source, realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON')) link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON')) @@ -18,7 +18,7 @@ Index: buildtools/wafsamba/wafsamba.py # we don't want any public libraries without version numbers if (not private_library and target_type != 'PYTHON' and not realname): if vnum is None and soname is None: -@@ -410,9 +417,9 @@ def SAMBA_LIBRARY(bld, libname, source, +@@ -411,9 +418,9 @@ def SAMBA_LIBRARY(bld, libname, source, if pc_files is not None and not private_library: if pyembed: diff --git devel/libtalloc/Makefile devel/libtalloc/Makefile index d18ae741159..e97feae1c8c 100644 --- devel/libtalloc/Makefile +++ devel/libtalloc/Makefile @@ -2,13 +2,11 @@ COMMENT-main= hierarchical memory pool system with destructors COMMENT-python= Python ${MODPY_VERSION} bindings for talloc # Keep in sync with the version bundled in net/samba -V= 2.4.2 +V= 2.4.3 DISTNAME= talloc-$V PKGNAME-main= lib${DISTNAME} PKGNAME-python= py3-${DISTNAME} -REVISION-main= 0 -REVISION-python=1 MULTI_PACKAGES= -main -python diff --git devel/libtalloc/distinfo devel/libtalloc/distinfo index dab0d3b4e1d..e36eef91099 100644 --- devel/libtalloc/distinfo +++ devel/libtalloc/distinfo @@ -1,2 +1,2 @@ -SHA256 (talloc-2.4.2.tar.gz) = hez55GXiD5j5lQpS6aQR4UMgvFVfolfYdpe356mx2KY= -SIZE (talloc-2.4.2.tar.gz) = 679750 +SHA256 (talloc-2.4.3.tar.gz) = 3EbEC59GuzTdl/5B9Uiw6LJHt3qRhXZzPFKOg6vYVN0= +SIZE (talloc-2.4.3.tar.gz) = 684092 diff --git devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py index 98e0fbc18f6..5dbb96aa9e4 100644 --- devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py +++ devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py @@ -3,7 +3,7 @@ Index: buildtools/wafsamba/wafsamba.py --- buildtools/wafsamba/wafsamba.py.orig +++ buildtools/wafsamba/wafsamba.py -@@ -292,6 +292,16 @@ def SAMBA_LIBRARY(bld, libname, source, +@@ -295,6 +295,16 @@ def SAMBA_LIBRARY(bld, libname, source, realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON')) link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON')) diff --git net/samba/Makefile net/samba/Makefile index 133fc240454..82b6285302f 100644 --- net/samba/Makefile +++ net/samba/Makefile @@ -1,4 +1,4 @@ -VERSION = 4.21.4 +VERSION = 4.22.0 DISTNAME = samba-${VERSION} EPOCH = 0 @@ -10,25 +10,25 @@ PKGNAME-docs = samba-docs-${VERSION} PKG_ARCH-docs = * -SHARED_LIBS = dcerpc 1.2 \ - dcerpc-binding 5.0 \ +SHARED_LIBS = dcerpc 2.0 \ + dcerpc-binding 5.1 \ dcerpc-samr 1.0 \ dcerpc-server-core 3.2 \ ldb 2.4 \ - ndr 3.2 \ + ndr 4.0 \ ndr-krb5pac 1.3 \ ndr-nbt 2.1 \ - ndr-standard 6.1 \ + ndr-standard 6.2 \ netapi 3.4 \ - samba-credentials 2.0 \ + samba-credentials 3.0 \ samba-errors 2.1 \ - samba-hostconfig 15.0 \ + samba-hostconfig 16.0 \ samba-passdb 3.1 \ samba-policy 0.0 \ - samba-util 11.0 \ + samba-util 11.1 \ samdb 4.0 \ smbclient 6.2 \ - smbconf 16.1 \ + smbconf 17.0 \ smbldap 1.0 \ tevent 2.3 \ tevent-util 2.0 \ @@ -78,10 +78,10 @@ RUN_DEPENDS-docs = LIB_DEPENDS-main = archivers/libarchive \ converters/libiconv \ databases/openldap \ - databases/tdb>=1.4.12 \ + databases/tdb>=1.4.13 \ devel/jansson \ devel/libinotify \ - devel/libtalloc>=2.4.2 \ + devel/libtalloc>=2.4.3 \ devel/libtalloc,-python \ devel/popt \ net/avahi,-libs \ diff --git net/samba/distinfo net/samba/distinfo index cd174ab48cd..5331cc85999 100644 --- net/samba/distinfo +++ net/samba/distinfo @@ -1,2 +1,2 @@ -SHA256 (samba-4.21.4.tar.gz) = UKzwMNsM5r4e6KbDp2NuVFdsYKf4FOZL7PqED3sw7O0= -SIZE (samba-4.21.4.tar.gz) = 42669530 +SHA256 (samba-4.22.0.tar.gz) = s5JC4awfVGnmNMlLLkcgReUGCXXC3WxM3N/ODFWGzXY= +SIZE (samba-4.22.0.tar.gz) = 42860320 diff --git net/samba/patches/patch-auth_auth_log_c net/samba/patches/patch-auth_auth_log_c index 6591391b870..0b23acd7add 100644 --- net/samba/patches/patch-auth_auth_log_c +++ net/samba/patches/patch-auth_auth_log_c @@ -3,7 +3,7 @@ Avoid printf("%s", NULL); Index: auth/auth_log.c --- auth/auth_log.c.orig +++ auth/auth_log.c -@@ -833,7 +833,8 @@ static void log_authentication_event_human_readable( +@@ -835,7 +835,8 @@ static void log_authentication_event_human_readable( ui->netlogon_trust_account.account_name); nl = talloc_asprintf(frame, " NETLOGON computer [%s] trust account [%s]", @@ -13,7 +13,7 @@ Index: auth/auth_log.c } remote = tsocket_address_string(ui->remote_host, frame); -@@ -851,8 +852,10 @@ static void log_authentication_event_human_readable( +@@ -853,8 +854,10 @@ static void log_authentication_event_human_readable( logon_line = talloc_asprintf( frame, " mapped to [%s]\\[%s].", @@ -26,7 +26,7 @@ Index: auth/auth_log.c } DEBUGC(DBGC_AUTH_AUDIT, debug_level, -@@ -862,13 +865,14 @@ static void log_authentication_event_human_readable( +@@ -864,13 +867,14 @@ static void log_authentication_event_human_readable( "%s local host [%s]" " %s\n", ui->service_description, diff --git net/samba/patches/patch-buildtools_wafsamba_wafsamba_py net/samba/patches/patch-buildtools_wafsamba_wafsamba_py index 97c08f391d7..80f1bfbec72 100644 --- net/samba/patches/patch-buildtools_wafsamba_wafsamba_py +++ net/samba/patches/patch-buildtools_wafsamba_wafsamba_py @@ -7,7 +7,7 @@ Index: buildtools/wafsamba/wafsamba.py --- buildtools/wafsamba/wafsamba.py.orig +++ buildtools/wafsamba/wafsamba.py -@@ -291,6 +291,17 @@ def SAMBA_LIBRARY(bld, libname, source, +@@ -292,6 +292,17 @@ def SAMBA_LIBRARY(bld, libname, source, # the library itself will depend on that object target samba_deps.append(dep_target) @@ -25,7 +25,7 @@ Index: buildtools/wafsamba/wafsamba.py realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON')) link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON')) -@@ -410,9 +421,9 @@ def SAMBA_LIBRARY(bld, libname, source, +@@ -411,9 +422,9 @@ def SAMBA_LIBRARY(bld, libname, source, if pc_files is not None and not private_library: if pyembed: diff --git net/samba/patches/patch-buildtools_wafsamba_wscript net/samba/patches/patch-buildtools_wafsamba_wscript index e8629023ddb..79f91531d3a 100644 --- net/samba/patches/patch-buildtools_wafsamba_wscript +++ net/samba/patches/patch-buildtools_wafsamba_wscript @@ -3,7 +3,7 @@ Add a hack to force addition of -I/usr/include before any other include path dis Index: buildtools/wafsamba/wscript --- buildtools/wafsamba/wscript.orig +++ buildtools/wafsamba/wscript -@@ -148,6 +148,11 @@ Currently the only tested value is 'smbtorture,smbd/sm +@@ -155,6 +155,11 @@ Currently the only tested value is 'smbtorture,smbd/sm help=("Disable use of gettext"), action="store_true", dest='disable_gettext', default=False) diff --git net/samba/patches/patch-lib_util_charset_wscript_configure net/samba/patches/patch-lib_util_charset_wscript_configure index ff83a95c296..70f63fbdecb 100644 --- net/samba/patches/patch-lib_util_charset_wscript_configure +++ net/samba/patches/patch-lib_util_charset_wscript_configure @@ -4,9 +4,9 @@ is reenabled. Index: lib/util/charset/wscript_configure --- lib/util/charset/wscript_configure.orig +++ lib/util/charset/wscript_configure -@@ -37,7 +37,7 @@ conf.CHECK_CODE(''' - lib='iconv', - headers='errno.h iconv.h') +@@ -41,7 +41,7 @@ conf.CHECK_CODE(''' + # as a single group. This had the benefit of working around ICU-22610, and also + # works with the fix that was merged to ICU main in commit 199bc827. -if conf.CHECK_CFG(package='icu-i18n icu-uc', +if False and conf.CHECK_CFG(package='icu-i18n icu-uc', diff --git net/samba/patches/patch-python_samba_provision___init___py net/samba/patches/patch-python_samba_provision___init___py index 424104fc3a9..934f82202ee 100644 --- net/samba/patches/patch-python_samba_provision___init___py +++ net/samba/patches/patch-python_samba_provision___init___py @@ -3,7 +3,7 @@ Index: python/samba/provision/__init__.py --- python/samba/provision/__init__.py.orig +++ python/samba/provision/__init__.py -@@ -2206,7 +2206,7 @@ def provision(logger, session_info, smbconf=None, +@@ -2203,7 +2203,7 @@ def provision(logger, session_info, smbconf=None, root_gid = pwd.getpwuid(root_uid).pw_gid try: diff --git net/samba/patches/patch-source3_wscript net/samba/patches/patch-source3_wscript index d5d8754a9c2..c0e0551ac29 100644 --- net/samba/patches/patch-source3_wscript +++ net/samba/patches/patch-source3_wscript @@ -21,7 +21,7 @@ Index: source3/wscript conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True) # We crash without vfs_default -@@ -1732,7 +1733,7 @@ int main(void) { +@@ -1745,7 +1746,7 @@ int main(void) { else: conf.fatal('AFS headers not available, but --with-fake-kaserver was specified') diff --git net/samba/patches/patch-source3_wscript_build net/samba/patches/patch-source3_wscript_build index 2ca904cede7..446aae7d0b6 100644 --- net/samba/patches/patch-source3_wscript_build +++ net/samba/patches/patch-source3_wscript_build @@ -4,7 +4,7 @@ interface used at least by pdbedit. Index: source3/wscript_build --- source3/wscript_build.orig +++ source3/wscript_build -@@ -137,7 +137,9 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma +@@ -138,7 +138,9 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma '!get_attr_list'] private_pdb_match.append('!pdb_nds_*') private_pdb_match.append('!pdb_ldapsam_init*') diff --git net/samba/pkg/PLIST-main net/samba/pkg/PLIST-main index 278daa6c94a..f6f36c73af9 100644 --- net/samba/pkg/PLIST-main +++ net/samba/pkg/PLIST-main @@ -1138,6 +1138,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}registry.${ lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}reparsepoints.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}reparsepoints.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}rust.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}rust.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}s3_net_join.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}s3_net_join.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}s3idmapdb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -1486,6 +1488,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}lockou lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}lockout_tests.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}ms_kile_client_principal_lookup_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}ms_kile_client_principal_lookup_tests.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}netlogon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}netlogon.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}nt_hash_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}nt_hash_tests.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}pac_align_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -1548,6 +1552,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kdc_tgt_tests.py lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kpasswd_tests.py lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/lockout_tests.py lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py +lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/netlogon.py lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/nt_hash_tests.py lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/pac_align_tests.py lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/pkinit_tests.py @@ -1626,6 +1631,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/pso.py lib/python${MODPY_VERSION}/site-packages/samba/tests/py_credentials.py lib/python${MODPY_VERSION}/site-packages/samba/tests/registry.py lib/python${MODPY_VERSION}/site-packages/samba/tests/reparsepoints.py +lib/python${MODPY_VERSION}/site-packages/samba/tests/rust.py lib/python${MODPY_VERSION}/site-packages/samba/tests/s3_net_join.py lib/python${MODPY_VERSION}/site-packages/samba/tests/s3idmapdb.py lib/python${MODPY_VERSION}/site-packages/samba/tests/s3param.py
