From 073076ff12b8b5f66827d2c3b8ac79822d6499d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Tue, 15 Feb 2022 08:57:37 +0100 Subject: [PATCH 01/31] Update to Samba 4.16.0rc3 resolves: #2042518 pfilipen --- .gitignore | 2 ++ samba.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9cb3e5a..33ed91b 100644 --- a/.gitignore +++ b/.gitignore @@ -281,3 +281,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.0rc1.tar.asc /samba-4.16.0rc2.tar.xz /samba-4.16.0rc2.tar.asc +/samba-4.16.0rc3.tar.xz +/samba-4.16.0rc3.tar.asc diff --git a/samba.spec b/samba.spec index 2ed6b5c..2bb8381 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 1 +%global baserelease 2 %global samba_version 4.16.0 %global talloc_version 2.3.3 @@ -142,7 +142,7 @@ %global tevent_version 0.11.0 %global ldb_version 2.5.0 # This should be rc1 or nil -%global pre_release rc2 +%global pre_release rc3 %global samba_release %{baserelease} %if "x%{?pre_release}" != "x" @@ -4131,6 +4131,10 @@ fi %endif %changelog +* Tue Feb 15 2022 Pavel Filipenský - 4.16.0rc3 +- Update to Samba 4.16.0rc3 +- resolves: #2042518 + * Tue Feb 01 2022 Pavel Filipenský - 4.16.0rc2 - Update to Samba 4.16.0rc2 - resolves: #2046120, #2048566 - Security fixes for CVE-2021-44141 diff --git a/sources b/sources index 1877757..311b8ae 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.0rc2.tar.asc) = ee4fd216f0ea6851c089e6ea0959638a5d62d403303b2a2a7a3e8cf97924969607fae0c520156c4076d41a6ccc52630364497c134ea547e950465a96b66532a1 -SHA512 (samba-4.16.0rc2.tar.xz) = 6b6326d4ae962a01f699a6cc144bac8847281fc85ae1a5d77c71be3f59630c7864832297a9369a5ff83bff0d0c80d03ebfecfdd5d706ec86fc400112ecd6f657 +SHA512 (samba-4.16.0rc3.tar.xz) = 797153d362d5bcfe3678a7870dce13a6d4770c8c8165ba64caf30195321448b2f35e2c0f51554648f1d7dd5413e22727dd53d3c378fcd0985c4c297ab2ad4a52 +SHA512 (samba-4.16.0rc3.tar.asc) = 6f4d0e81e2c2e2aec2d0418ae56790dde315c5ebeea45b17195e82d463ca22c601c28d188b1bc37969bc9496f4a951d65fed0c6283886c1ee60bac4504e8fbf4 From c42829d1ad1abc4fe8a8993043a47fda5ba3142a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 23 Feb 2022 11:49:53 +0100 Subject: [PATCH 02/31] Fix samba-tool on builds with samba-dc resolves: rhbz#2036443 --- samba.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/samba.spec b/samba.spec index 2bb8381..a88b18f 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 2 +%global baserelease 3 %global samba_version 4.16.0 %global talloc_version 2.3.3 @@ -490,6 +490,8 @@ Requires: python3-%{name} = %{samba_depver} # samba-tool needs tdbbackup Requires: tdb-tools %if %{with dc} +# samba-tool needs python3-samba-dc on a full build +Requires: python3-%{name}-dc = %{samba_depver} # samba-tool needs mdb_copy for domain backup or upgrade provision Requires: lmdb %endif @@ -4131,6 +4133,9 @@ fi %endif %changelog +* Wed Feb 23 2022 Andreas Schneider - 4.16.0-0.3.rc3 +- resolves: rhbz#2036443 - Fix samba-tool on builds with samba-dc + * Tue Feb 15 2022 Pavel Filipenský - 4.16.0rc3 - Update to Samba 4.16.0rc3 - resolves: #2042518 From 482970ccc51d9173e08f2e1f5780da6dfaa95020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Tue, 1 Mar 2022 12:37:00 +0100 Subject: [PATCH 03/31] Update to Samba 4.16.0rc4 resolves: #2042518 pfilipen --- .gitignore | 2 ++ samba.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 33ed91b..9589b5f 100644 --- a/.gitignore +++ b/.gitignore @@ -283,3 +283,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.0rc2.tar.asc /samba-4.16.0rc3.tar.xz /samba-4.16.0rc3.tar.asc +/samba-4.16.0rc4.tar.xz +/samba-4.16.0rc4.tar.asc diff --git a/samba.spec b/samba.spec index a88b18f..97a4640 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 3 +%global baserelease 4 %global samba_version 4.16.0 %global talloc_version 2.3.3 @@ -142,7 +142,7 @@ %global tevent_version 0.11.0 %global ldb_version 2.5.0 # This should be rc1 or nil -%global pre_release rc3 +%global pre_release rc4 %global samba_release %{baserelease} %if "x%{?pre_release}" != "x" @@ -4133,6 +4133,10 @@ fi %endif %changelog +* Tue Mar 01 2022 Pavel Filipenský - 4.16.0-0.4.rc4 +- Update to Samba 4.16.0rc4 +- resolves: #2042518 + * Wed Feb 23 2022 Andreas Schneider - 4.16.0-0.3.rc3 - resolves: rhbz#2036443 - Fix samba-tool on builds with samba-dc diff --git a/sources b/sources index 311b8ae..fc0f4e5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.0rc3.tar.xz) = 797153d362d5bcfe3678a7870dce13a6d4770c8c8165ba64caf30195321448b2f35e2c0f51554648f1d7dd5413e22727dd53d3c378fcd0985c4c297ab2ad4a52 -SHA512 (samba-4.16.0rc3.tar.asc) = 6f4d0e81e2c2e2aec2d0418ae56790dde315c5ebeea45b17195e82d463ca22c601c28d188b1bc37969bc9496f4a951d65fed0c6283886c1ee60bac4504e8fbf4 +SHA512 (samba-4.16.0rc4.tar.xz) = 7326c9690309eadff7fe01d914105e9cd7e225ba0cce57855e0ad308b35404a384519e383d279c26430eae796df46f1431a8b0b142c7a3c8c474f1977dd3e150 +SHA512 (samba-4.16.0rc4.tar.asc) = 5914d3108ed65fa5e9a68efefae5ca8da48cda4ca7b29c876b89d9c18d994a7dc11876c66cb7e011ad4a5c59650ec9511353a9b0eba7a19c0c56042c6cf734cd From 45747d75592ff2dba717c6844e99368e98e2d336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Wed, 9 Mar 2022 14:21:48 +0100 Subject: [PATCH 04/31] Update to Samba 4.16.0rc5 resolves: #2042518 Guenther --- .gitignore | 2 ++ samba.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9589b5f..d7625b4 100644 --- a/.gitignore +++ b/.gitignore @@ -285,3 +285,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.0rc3.tar.asc /samba-4.16.0rc4.tar.xz /samba-4.16.0rc4.tar.asc +/samba-4.16.0rc5.tar.xz +/samba-4.16.0rc5.tar.asc diff --git a/samba.spec b/samba.spec index 97a4640..7046999 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 4 +%global baserelease 5 %global samba_version 4.16.0 %global talloc_version 2.3.3 @@ -142,7 +142,7 @@ %global tevent_version 0.11.0 %global ldb_version 2.5.0 # This should be rc1 or nil -%global pre_release rc4 +%global pre_release rc5 %global samba_release %{baserelease} %if "x%{?pre_release}" != "x" @@ -4133,6 +4133,10 @@ fi %endif %changelog +* Wed Mar 09 2022 Guenther Deschner - 4.16.0-0.5.rc5 +- Update to Samba 4.16.0rc5 +- resolves: #2042518 + * Tue Mar 01 2022 Pavel Filipenský - 4.16.0-0.4.rc4 - Update to Samba 4.16.0rc4 - resolves: #2042518 diff --git a/sources b/sources index fc0f4e5..b0b6528 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.0rc4.tar.xz) = 7326c9690309eadff7fe01d914105e9cd7e225ba0cce57855e0ad308b35404a384519e383d279c26430eae796df46f1431a8b0b142c7a3c8c474f1977dd3e150 -SHA512 (samba-4.16.0rc4.tar.asc) = 5914d3108ed65fa5e9a68efefae5ca8da48cda4ca7b29c876b89d9c18d994a7dc11876c66cb7e011ad4a5c59650ec9511353a9b0eba7a19c0c56042c6cf734cd +SHA512 (samba-4.16.0rc5.tar.xz) = 6d29f852613a46f23e95630b0b7236240155698e7a057953d4a7cb9de015b30c279e95fe084c2a0e448bab30df50789b8629a05bba1b1c8e2f6d8e9e4d3d56c6 +SHA512 (samba-4.16.0rc5.tar.asc) = f1448bf87a02e5207199358418138d48cc726425167adcd900c02c95bdbaa7692079c75f7db9df683b07fd83594d3a0b544c202c55a10ce368ca2747c34f1702 From e81f157454b63804fd00a88ff0d5faf6642d9869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Tue, 22 Mar 2022 10:27:37 +0100 Subject: [PATCH 05/31] Update to Samba 4.16.0 resolves: #2066290 Guenther --- .gitignore | 2 ++ samba.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d7625b4..aa6195d 100644 --- a/.gitignore +++ b/.gitignore @@ -287,3 +287,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.0rc4.tar.asc /samba-4.16.0rc5.tar.xz /samba-4.16.0rc5.tar.asc +/samba-4.16.0.tar.xz +/samba-4.16.0.tar.asc diff --git a/samba.spec b/samba.spec index 7046999..56c7d74 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 5 +%global baserelease 6 %global samba_version 4.16.0 %global talloc_version 2.3.3 @@ -142,7 +142,7 @@ %global tevent_version 0.11.0 %global ldb_version 2.5.0 # This should be rc1 or nil -%global pre_release rc5 +%global pre_release %nil %global samba_release %{baserelease} %if "x%{?pre_release}" != "x" @@ -4133,6 +4133,10 @@ fi %endif %changelog +* Tue Mar 22 2022 Guenther Deschner - 4.16.0-6 +- Update to Samba 4.16.0 +- resolves: #2066290 + * Wed Mar 09 2022 Guenther Deschner - 4.16.0-0.5.rc5 - Update to Samba 4.16.0rc5 - resolves: #2042518 diff --git a/sources b/sources index b0b6528..f23b12e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.0rc5.tar.xz) = 6d29f852613a46f23e95630b0b7236240155698e7a057953d4a7cb9de015b30c279e95fe084c2a0e448bab30df50789b8629a05bba1b1c8e2f6d8e9e4d3d56c6 -SHA512 (samba-4.16.0rc5.tar.asc) = f1448bf87a02e5207199358418138d48cc726425167adcd900c02c95bdbaa7692079c75f7db9df683b07fd83594d3a0b544c202c55a10ce368ca2747c34f1702 +SHA512 (samba-4.16.0.tar.xz) = e824906f7c1e01e84c306967f6bc31ca7600851b8bd5998454a2f987483ec25dcf78b4fc1201bfe28d8bdc6f2533ab2c8a2f3dee938eba21c3bb8ad50aedaf24 +SHA512 (samba-4.16.0.tar.asc) = d3f5b0f2f338826348b723c646a254ecab87205aaa97d8b22ca37f7babd0e86382e709c8ee4820c9b11609bb6b8e4f3de9ae78ab664ad30260bb0f42ee75e5e1 From f258fd426962a065e5e5e6c98e3012eb0d00bad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Mon, 2 May 2022 13:16:49 +0200 Subject: [PATCH 06/31] Update to Samba 4.16.1 resolves: #2080915 pfilipen --- .gitignore | 2 ++ samba.spec | 10 +++++++--- sources | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index aa6195d..f49bf1c 100644 --- a/.gitignore +++ b/.gitignore @@ -289,3 +289,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.0rc5.tar.asc /samba-4.16.0.tar.xz /samba-4.16.0.tar.asc +/samba-4.16.1.tar.xz +/samba-4.16.1.tar.asc diff --git a/samba.spec b/samba.spec index 56c7d74..1cec5c9 100644 --- a/samba.spec +++ b/samba.spec @@ -134,12 +134,12 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 6 +%global baserelease 0 -%global samba_version 4.16.0 +%global samba_version 4.16.1 %global talloc_version 2.3.3 %global tdb_version 1.4.6 -%global tevent_version 0.11.0 +%global tevent_version 0.12.0 %global ldb_version 2.5.0 # This should be rc1 or nil %global pre_release %nil @@ -4133,6 +4133,10 @@ fi %endif %changelog +* Mon May 02 2022 Pavel Filipenský - 4.16.1-0 +- Update to Samba 4.16.1 +- resolves: #2080915 + * Tue Mar 22 2022 Guenther Deschner - 4.16.0-6 - Update to Samba 4.16.0 - resolves: #2066290 diff --git a/sources b/sources index f23b12e..f094ef6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.0.tar.xz) = e824906f7c1e01e84c306967f6bc31ca7600851b8bd5998454a2f987483ec25dcf78b4fc1201bfe28d8bdc6f2533ab2c8a2f3dee938eba21c3bb8ad50aedaf24 -SHA512 (samba-4.16.0.tar.asc) = d3f5b0f2f338826348b723c646a254ecab87205aaa97d8b22ca37f7babd0e86382e709c8ee4820c9b11609bb6b8e4f3de9ae78ab664ad30260bb0f42ee75e5e1 +SHA512 (samba-4.16.1.tar.xz) = a6c54d5f8796b353fce1467a81293491fd2a1c221eba1271a4ee0b9020ff5137d5dba68c8de5e65ab127ab908a403a0b59102def1f675f26f0322a2f7bc41c6f +SHA512 (samba-4.16.1.tar.asc) = 71895a0626dce7fe42f0370190dd4b5f7eb5ce0359bacfe779642c5915a6290d8d4f841f3c258a774829a03fa59be6353863494d2f0cf6bc7640a98af7e928e8 From 89a3ad9ef4ab3b44a32ffd6b2f1948a920033651 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 4 Apr 2022 11:32:12 +0200 Subject: [PATCH 07/31] Make sure we do not build Heimdal or crypto code As we need to rely on GnuTLS for FIPS, remove heimdal and other unused crypto code to ensure we do not build it! --- samba-4.16-waf-crypto.patch | 77 +++++++++++++++++++++++++++++++++++++ samba.spec | 7 ++++ 2 files changed, 84 insertions(+) create mode 100644 samba-4.16-waf-crypto.patch diff --git a/samba-4.16-waf-crypto.patch b/samba-4.16-waf-crypto.patch new file mode 100644 index 0000000..337be97 --- /dev/null +++ b/samba-4.16-waf-crypto.patch @@ -0,0 +1,77 @@ +From 41d3efebcf6abab9119f9b0f97c86c1c48739fee Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Mon, 4 Apr 2022 11:24:04 +0200 +Subject: [PATCH 1/2] waf: Check for GnuTLS earlier + +As GnuTLS is an essential part we need to check for it early so we can react on +GnuTLS features in other wscripts. + +Signed-off-by: Andreas Schneider +--- + wscript | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/wscript b/wscript +index d8220b35095..5b85d9a1682 100644 +--- a/wscript ++++ b/wscript +@@ -189,6 +189,8 @@ def configure(conf): + conf.RECURSE('dynconfig') + conf.RECURSE('selftest') + ++ conf.PROCESS_SEPARATE_RULE('system_gnutls') ++ + conf.CHECK_CFG(package='zlib', minversion='1.2.3', + args='--cflags --libs', + mandatory=True) +@@ -297,8 +299,6 @@ def configure(conf): + if not conf.CONFIG_GET('KRB5_VENDOR'): + conf.PROCESS_SEPARATE_RULE('embedded_heimdal') + +- conf.PROCESS_SEPARATE_RULE('system_gnutls') +- + conf.RECURSE('source4/dsdb/samdb/ldb_modules') + conf.RECURSE('source4/ntvfs/sysdep') + conf.RECURSE('lib/util') +-- +2.35.1 + + +From 63701a28116afc1550c23cb5f7b9d6e366fd1270 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Mon, 4 Apr 2022 11:25:31 +0200 +Subject: [PATCH 2/2] third_party:waf: Do not recurse in aesni-intel if GnuTLS + provides the cipher + +Signed-off-by: Andreas Schneider +--- + third_party/wscript | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/third_party/wscript b/third_party/wscript +index 1f4bc1ce1d7..a17c15bcaa7 100644 +--- a/third_party/wscript ++++ b/third_party/wscript +@@ -5,7 +5,8 @@ from waflib import Options + def configure(conf): + conf.RECURSE('cmocka') + conf.RECURSE('popt') +- conf.RECURSE('aesni-intel') ++ if not conf.CONFIG_SET('HAVE_GNUTLS_AES_CMAC'): ++ conf.RECURSE('aesni-intel') + if conf.CONFIG_GET('ENABLE_SELFTEST'): + conf.RECURSE('socket_wrapper') + conf.RECURSE('nss_wrapper') +@@ -18,7 +19,8 @@ def configure(conf): + def build(bld): + bld.RECURSE('cmocka') + bld.RECURSE('popt') +- bld.RECURSE('aesni-intel') ++ if not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC'): ++ bld.RECURSE('aesni-intel') + if bld.CONFIG_GET('SOCKET_WRAPPER'): + bld.RECURSE('socket_wrapper') + if bld.CONFIG_GET('NSS_WRAPPER'): +-- +2.35.1 + diff --git a/samba.spec b/samba.spec index 1cec5c9..ef80aef 100644 --- a/samba.spec +++ b/samba.spec @@ -204,6 +204,8 @@ Source14: samba.pamd Source201: README.downgrade Patch0: samba-s4u.patch +# https://gitlab.com/samba-team/samba/-/merge_requests/2477 +Patch1: samba-4.16-waf-crypto.patch Requires(pre): /usr/sbin/groupadd Requires(post): systemd @@ -1062,6 +1064,11 @@ Support for using an existing CEPH cluster as a mutex helper for CTDB xzcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} - %autosetup -n samba-%{version}%{pre_release} -p1 +# Ensure we rely on GnuTLS and do not build any other crypto code shipping with +# the sources. +rm -rf third_party/{aesni-intel,heimdal} +rm -f lib/crypto/{aes,rijndael}*.c + %build %if %{with includelibs} %global _talloc_lib ,talloc,pytalloc,pytalloc-util From aa08f6aa443a626bf4c5114486776e8de555f5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Tue, 3 May 2022 13:08:58 +0200 Subject: [PATCH 08/31] Delete no longer needed comments pfilipen --- samba.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/samba.spec b/samba.spec index ef80aef..16d1611 100644 --- a/samba.spec +++ b/samba.spec @@ -1873,7 +1873,6 @@ fi %if %{without libwbclient} %{_libdir}/samba/libwbclient.so.* -#%%{_libdir}/samba/libwinbind-client-samba4.so #endif without libwbclient %endif @@ -2275,7 +2274,6 @@ fi %if %{with libwbclient} %files -n libwbclient %{_libdir}/samba/wbclient/libwbclient.so.* -#%%{_libdir}/samba/libwinbind-client-samba4.so ### LIBWBCLIENT-DEVEL %files -n libwbclient-devel From e515cbc876cb290deef69e88ad21cad43e583729 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 5 May 2022 14:41:17 +0200 Subject: [PATCH 09/31] Don't require full systemd for tmp file handling in samba-common Otherwise the full systemd is being pulled into Fedora Flatpak runtime, but this change benefits other uses as well. --- samba.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/samba.spec b/samba.spec index 16d1611..e1f7113 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 0 +%global baserelease 1 %global samba_version 4.16.1 %global talloc_version 2.3.3 @@ -428,7 +428,7 @@ SMB/CIFS clients. Summary: Files used by both Samba servers and clients BuildArch: noarch -Requires(post): systemd +Requires(post): (systemd-standalone-tmpfiles or systemd) Recommends: logrotate Provides: samba4-common = %{samba_depver} @@ -4138,6 +4138,9 @@ fi %endif %changelog +* Thu May 05 2022 Tomas Popela - 4.16.1-1 +- Don't require full systemd for tmp files handling in samba-common + * Mon May 02 2022 Pavel Filipenský - 4.16.1-0 - Update to Samba 4.16.1 - resolves: #2080915 From 206378cd5ba68097f01b44eac1aa1093258d9b8c Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 5 May 2022 19:45:16 +0200 Subject: [PATCH 10/31] Add .abignore file for abidiff abidiff complains: abidiff: failed to read input file /usr/lib/libdcerpc-samr.so.0.0.1 abidiff: could not find the debug info This is a grouping library which doesn't have any source code, so just ignore it with a suppression file (.abignore). Example for .abignore: https://sourceware.org/git/?p=libabigail.git;a=blob;f=default.abignore --- .abignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .abignore diff --git a/.abignore b/.abignore new file mode 100644 index 0000000..466d190 --- /dev/null +++ b/.abignore @@ -0,0 +1,5 @@ +################################################# +# This is a grouping library without any code +################################################# +[suppress_file] + file_name_regexp = libdcerpc-samr\\.so.* From 17040e7063328c5057112ce5fec311b3b10492ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Thu, 5 May 2022 16:48:23 +0200 Subject: [PATCH 11/31] rpminspect: ignore inet_ntoa() from /usr/lib*/samba/service/nbtd.so --- rpminspect.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/rpminspect.yaml b/rpminspect.yaml index 6de38d7..ff0361f 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -7,6 +7,7 @@ badfuncs: - /usr/lib*/libsmbconf.so.* - /usr/lib*/samba/libgse-samba4.so - /usr/lib*/samba/libsamba-sockets-samba4.so + - /usr/lib*/samba/service/nbtd.so - /usr/libexec/ctdb/smnotify - /usr/sbin/nmbd From 8bf014646d8507fe96ab372fce5d52527be923f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Fri, 6 May 2022 10:10:06 +0200 Subject: [PATCH 12/31] Update requires for packages pfilipen --- samba.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/samba.spec b/samba.spec index e1f7113..4423acb 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 1 +%global baserelease 2 %global samba_version 4.16.1 %global talloc_version 2.3.3 @@ -509,6 +509,8 @@ SMB/CIFS clients. %package dc Summary: Samba AD Domain Controller Requires: %{name} = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} +Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} Requires: %{name}-dc-provision = %{samba_depver} Requires: %{name}-dc-libs = %{samba_depver} @@ -549,6 +551,7 @@ The samba-dc-provision package provides files to setup a domain controller ### DC-LIBS %package dc-libs Summary: Samba AD Domain Controller Libraries +Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} @@ -564,9 +567,11 @@ link against the SMB, RPC and other protocols. ### DC-BIND %package dc-bind-dlz Summary: Bind DLZ module for Samba AD +Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-common = %{samba_depver} Requires: %{name}-dc-libs = %{samba_depver} Requires: %{name}-dc = %{samba_depver} +Requires: %{name}-libs = %{samba_depver} Requires: bind Provides: bundled(libreplace) @@ -582,6 +587,9 @@ name server related details of Samba AD. Summary: Developer tools for Samba libraries Requires: %{name}-libs = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver} +%if %{with dc} +Requires: %{name}-dc-libs = %{samba_depver} +%endif Provides: samba4-devel = %{samba_depver} Obsoletes: samba4-devel < %{samba_depver} @@ -596,6 +604,7 @@ libraries in the Samba suite. %package vfs-cephfs Summary: Samba VFS module for Ceph distributed storage system Requires: %{name} = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} Provides: bundled(libreplace) @@ -732,6 +741,9 @@ Requires: %{name} = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} +%if %{with dc} +Requires: %{name}-dc-libs = %{samba_depver} +%endif Requires: python3-talloc Requires: python3-tevent Requires: python3-tdb @@ -770,6 +782,8 @@ If you want to run full set of Samba tests, you need to install this package. %if %{with dc} || %{with testsuite} %package -n python3-samba-dc Summary: Samba Python libraries for Samba AD +Requires: %{name}-client-libs = %{samba_depver} +Requires: %{name}-dc-libs = %{samba_depver} Requires: python3-%{name} = %{samba_depver} %description -n python3-samba-dc @@ -1023,6 +1037,7 @@ and use CTDB instead. Summary: CTDB PCP pmda support Requires: ctdb = %{samba_depver} Requires: pcp-libs +Requires: %{name}-client-libs = %{samba_depver} %description -n ctdb-pcp-pmda Performance Co-Pilot (PCP) support for CTDB @@ -4138,6 +4153,9 @@ fi %endif %changelog +* Fri May 06 2022 Pavel Filipenský - 4.16.1-2 +- Update requires for packages + * Thu May 05 2022 Tomas Popela - 4.16.1-1 - Don't require full systemd for tmp files handling in samba-common From d9948a0633f0133a70038b9338c9f2257686f187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Fri, 6 May 2022 14:31:07 +0200 Subject: [PATCH 13/31] Rename from .abignore to samba.abignore --- .abignore => samba.abignore | 0 samba.spec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .abignore => samba.abignore (100%) diff --git a/.abignore b/samba.abignore similarity index 100% rename from .abignore rename to samba.abignore diff --git a/samba.spec b/samba.spec index 4423acb..1abda85 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 2 +%global baserelease 3 %global samba_version 4.16.1 %global talloc_version 2.3.3 From bcf6a6c2dfddacbeadb28878af18e4c0ace810de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Fri, 6 May 2022 17:05:02 +0200 Subject: [PATCH 14/31] Fix samba.abignore --- samba.abignore | 2 +- samba.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samba.abignore b/samba.abignore index 466d190..718059d 100644 --- a/samba.abignore +++ b/samba.abignore @@ -2,4 +2,4 @@ # This is a grouping library without any code ################################################# [suppress_file] - file_name_regexp = libdcerpc-samr\\.so.* +file_name_regexp=.*libdcerpc-samr\\.so.* diff --git a/samba.spec b/samba.spec index 1abda85..f1fff1c 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 3 +%global baserelease 4 %global samba_version 4.16.1 %global talloc_version 2.3.3 From ac5a9f04ff5250a9e0570d874e14190909110d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Fri, 13 May 2022 09:04:45 +0200 Subject: [PATCH 15/31] Fix rpminspect abidiff pfilipen --- rpminspect.yaml | 3 +++ samba.spec | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/rpminspect.yaml b/rpminspect.yaml index ff0361f..9c56e6c 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -15,3 +15,6 @@ runpath: allowed_paths: - /usr/lib/samba - /usr/lib64/samba + +abidiff: + suppression_file: samba.abignore diff --git a/samba.spec b/samba.spec index f1fff1c..f8bc92f 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 4 +%global baserelease 5 %global samba_version 4.16.1 %global talloc_version 2.3.3 @@ -200,6 +200,7 @@ Source11: smb.conf.vendor Source12: smb.conf.example Source13: pam_winbind.conf Source14: samba.pamd +Source15: samba.abignore Source201: README.downgrade @@ -4153,6 +4154,9 @@ fi %endif %changelog +* Fri May 13 2022 Pavel Filipenský - 4.16.1-5 +- Fix rpminspect abidiff + * Fri May 06 2022 Pavel Filipenský - 4.16.1-2 - Update requires for packages From 83abd721bee3c112d03cab7dacb5f52379009e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Mon, 13 Jun 2022 12:42:08 +0200 Subject: [PATCH 16/31] Update to Samba 4.16.2 resolves: #2096167 Guenther --- .gitignore | 2 ++ samba.spec | 10 +++++++--- sources | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f49bf1c..18704d2 100644 --- a/.gitignore +++ b/.gitignore @@ -291,3 +291,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.0.tar.asc /samba-4.16.1.tar.xz /samba-4.16.1.tar.asc +/samba-4.16.2.tar.xz +/samba-4.16.2.tar.asc diff --git a/samba.spec b/samba.spec index f8bc92f..d5158b2 100644 --- a/samba.spec +++ b/samba.spec @@ -134,13 +134,13 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 5 +%global baserelease 0 -%global samba_version 4.16.1 +%global samba_version 4.16.2 %global talloc_version 2.3.3 %global tdb_version 1.4.6 %global tevent_version 0.12.0 -%global ldb_version 2.5.0 +%global ldb_version 2.5.1 # This should be rc1 or nil %global pre_release %nil @@ -4154,6 +4154,10 @@ fi %endif %changelog +* Mon Jun 13 2022 Guenther Deschner - 4.16.2-0 +- Update to Samba 4.16.2 +- resolves: #2096167 + * Fri May 13 2022 Pavel Filipenský - 4.16.1-5 - Fix rpminspect abidiff diff --git a/sources b/sources index f094ef6..f34d266 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.1.tar.xz) = a6c54d5f8796b353fce1467a81293491fd2a1c221eba1271a4ee0b9020ff5137d5dba68c8de5e65ab127ab908a403a0b59102def1f675f26f0322a2f7bc41c6f -SHA512 (samba-4.16.1.tar.asc) = 71895a0626dce7fe42f0370190dd4b5f7eb5ce0359bacfe779642c5915a6290d8d4f841f3c258a774829a03fa59be6353863494d2f0cf6bc7640a98af7e928e8 +SHA512 (samba-4.16.2.tar.xz) = f29a49b119b55db063bf69a6df57fd29667bb3ee7a22f3af7ea9cafa88b05ce21cae11464de073c1f0c963e46b571c94a5ccaed3f364f851fe8a4b5d5064e794 +SHA512 (samba-4.16.2.tar.asc) = bb22bb3da89bffdc213ed240204f8f801291db4ee0df73aa814e222355da5f774997a7a4f0a0685743a660bb4540e4b168dc2d3cd00bc22b9735caf140a3bfa0 From d8effb3e4d8c5d519458a2b8735cddacb945bfb8 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 18 Jul 2022 17:37:37 +0200 Subject: [PATCH 17/31] Update to version 4.16.3 --- .gitignore | 2 ++ samba.spec | 6 +++++- sources | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 18704d2..b916f33 100644 --- a/.gitignore +++ b/.gitignore @@ -293,3 +293,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.1.tar.asc /samba-4.16.2.tar.xz /samba-4.16.2.tar.asc +/samba-4.16.3.tar.xz +/samba-4.16.3.tar.asc diff --git a/samba.spec b/samba.spec index d5158b2..a4d92d8 100644 --- a/samba.spec +++ b/samba.spec @@ -136,7 +136,7 @@ %global baserelease 0 -%global samba_version 4.16.2 +%global samba_version 4.16.3 %global talloc_version 2.3.3 %global tdb_version 1.4.6 %global tevent_version 0.12.0 @@ -2096,6 +2096,7 @@ fi %{_libdir}/samba/bind9/dlz_bind9_12.so %{_libdir}/samba/bind9/dlz_bind9_14.so %{_libdir}/samba/bind9/dlz_bind9_16.so +%{_libdir}/samba/bind9/dlz_bind9_18.so #endif with dc %endif @@ -4154,6 +4155,9 @@ fi %endif %changelog +* Mon Jul 18 2022 Andreas Schneider - 4.16.3-1 +- Update to version 4.16.3 + * Mon Jun 13 2022 Guenther Deschner - 4.16.2-0 - Update to Samba 4.16.2 - resolves: #2096167 diff --git a/sources b/sources index f34d266..433dbb4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.2.tar.xz) = f29a49b119b55db063bf69a6df57fd29667bb3ee7a22f3af7ea9cafa88b05ce21cae11464de073c1f0c963e46b571c94a5ccaed3f364f851fe8a4b5d5064e794 -SHA512 (samba-4.16.2.tar.asc) = bb22bb3da89bffdc213ed240204f8f801291db4ee0df73aa814e222355da5f774997a7a4f0a0685743a660bb4540e4b168dc2d3cd00bc22b9735caf140a3bfa0 +SHA512 (samba-4.16.3.tar.xz) = aa11e65e52f57fd940d6b381fff7bac77bf94b421c1980b3731b36b815d27b6218f3192a7a8a1b9c7d27f80e381c9a7c8b7a0f76a2ec6cfad6b8748bbfd958cc +SHA512 (samba-4.16.3.tar.asc) = 98f07c312263e3ff4594fa1204184f15212f0c4771d45b349ab48981caefaa94aa7ae5223922d1cbaac9f423554b7a5c4107cb3a3599041cf38af6f665a9289a From 87360b3db357d991703d339e66aae35a641c59bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Wed, 27 Jul 2022 14:36:13 +0200 Subject: [PATCH 18/31] Update to version 4.16.4 resolves: #2111490 resolves: #2108196, #2111729 - Security fixes for CVE-2022-32742 resolves: #2108205, #2111731 - Security fixes for CVE-2022-32744 resolves: #2108211, #2111732 - Security fixes for CVE-2022-32745 resolves: #2108215, #2111734 - Security fixes for CVE-2022-32746 Guenther --- .gitignore | 2 ++ samba-s4u.patch | 58 +++++++++++++------------------------------------ samba.spec | 13 +++++++++-- sources | 4 ++-- 4 files changed, 30 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index b916f33..477e1dc 100644 --- a/.gitignore +++ b/.gitignore @@ -295,3 +295,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.2.tar.asc /samba-4.16.3.tar.xz /samba-4.16.3.tar.asc +/samba-4.16.4.tar.xz +/samba-4.16.4.tar.asc diff --git a/samba-s4u.patch b/samba-s4u.patch index f447b86..5d3cb55 100644 --- a/samba-s4u.patch +++ b/samba-s4u.patch @@ -1,7 +1,7 @@ -From 17eb98d3f8ebd0fe48e218bb03a3c0165b9b6e95 Mon Sep 17 00:00:00 2001 +From 5d7ec9a00b6f4c6768c606d37d235415f2006445 Mon Sep 17 00:00:00 2001 From: Isaac Boukris Date: Fri, 27 Sep 2019 18:25:03 +0300 -Subject: [PATCH 1/4] mit-kdc: add basic loacl realm S4U support +Subject: [PATCH 1/3] mit-kdc: add basic loacl realm S4U support Signed-off-by: Isaac Boukris Pair-Programmed-With: Andreas Schneider @@ -236,7 +236,7 @@ index 793fe366c35..22534c09974 100644 diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c -index 27b15828468..994dfed312b 100644 +index cb72b5de294..03c2c2ea1de 100644 --- a/source4/kdc/mit_samba.c +++ b/source4/kdc/mit_samba.c @@ -517,7 +517,6 @@ int mit_samba_get_pac(struct mit_samba_context *smb_ctx, @@ -247,7 +247,7 @@ index 27b15828468..994dfed312b 100644 krb5_db_entry *client, krb5_db_entry *server, krb5_db_entry *krbtgt, -@@ -682,7 +681,7 @@ krb5_error_code mit_samba_reget_pac(struct mit_samba_context *ctx, +@@ -689,7 +688,7 @@ krb5_error_code mit_samba_reget_pac(struct mit_samba_context *ctx, context, *pac, server->princ, @@ -256,7 +256,7 @@ index 27b15828468..994dfed312b 100644 deleg_blob); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Update delegation info failed: %s\n", -@@ -1004,41 +1003,17 @@ int mit_samba_check_client_access(struct mit_samba_context *ctx, +@@ -1081,41 +1080,17 @@ int mit_samba_check_client_access(struct mit_samba_context *ctx, } int mit_samba_check_s4u2proxy(struct mit_samba_context *ctx, @@ -333,13 +333,13 @@ index 4431e82a1b2..9370ab533af 100644 int mit_samba_kpasswd_change_password(struct mit_samba_context *ctx, char *pwd, -- -2.33.1 +2.37.1 -From f4fc23103f47b712baf3b4b0ebcb42d0f3f3fd42 Mon Sep 17 00:00:00 2001 +From 325912375cf54743ab8ea557172a72b870002e9f Mon Sep 17 00:00:00 2001 From: Isaac Boukris Date: Fri, 27 Sep 2019 18:35:30 +0300 -Subject: [PATCH 2/4] krb5-mit: enable S4U client support for MIT build +Subject: [PATCH 2/3] krb5-mit: enable S4U client support for MIT build Signed-off-by: Isaac Boukris Pair-Programmed-With: Andreas Schneider @@ -350,10 +350,10 @@ Pair-Programmed-With: Andreas Schneider 3 files changed, 185 insertions(+), 13 deletions(-) diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c -index 61d651b4d5f..462acec90b6 100644 +index 4321f07ca09..3fd95e47fca 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c -@@ -2699,6 +2699,191 @@ krb5_error_code smb_krb5_kinit_s4u2_ccache(krb5_context ctx, +@@ -2702,6 +2702,191 @@ krb5_error_code smb_krb5_kinit_s4u2_ccache(krb5_context ctx, return 0; } @@ -611,20 +611,20 @@ index 544d9d853cc..c14d8c72d8c 100644 ret = smb_krb5_kinit_password_ccache(smb_krb5_context->krb5_context, ccache, -- -2.33.1 +2.37.1 -From 48d73d552f2fbbdb07bd9aff4d0294883b70417f Mon Sep 17 00:00:00 2001 +From a5713b1558192f24348f7794da84bf65cf78e6ec Mon Sep 17 00:00:00 2001 From: Isaac Boukris Date: Sat, 19 Sep 2020 14:16:20 +0200 -Subject: [PATCH 3/4] wip: for canonicalization with new MIT kdc code +Subject: [PATCH 3/3] wip: for canonicalization with new MIT kdc code --- source4/kdc/mit_samba.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c -index 994dfed312b..9d039e5601b 100644 +index 03c2c2ea1de..30fade56531 100644 --- a/source4/kdc/mit_samba.c +++ b/source4/kdc/mit_samba.c @@ -232,6 +232,9 @@ int mit_samba_get_principal(struct mit_samba_context *ctx, @@ -638,33 +638,5 @@ index 994dfed312b..9d039e5601b 100644 KRB5_KDB_FLAG_INCLUDE_PAC)) { /* -- -2.33.1 - - -From f5f54026d151f6d899e8ff52d8829a2f9cf57f25 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Tue, 21 Dec 2021 12:17:11 +0100 -Subject: [PATCH 4/4] s4:kdc: Also cannoicalize krbtgt principals when - enforcing canonicalization - -Signed-off-by: Andreas Schneider ---- - source4/kdc/db-glue.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c -index 8d17038cfe6..77c0c0e4746 100644 ---- a/source4/kdc/db-glue.c -+++ b/source4/kdc/db-glue.c -@@ -946,7 +946,7 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context, - if (ent_type == SAMBA_KDC_ENT_TYPE_KRBTGT) { - p->is_krbtgt = true; - -- if (flags & (SDB_F_CANON)) { -+ if (flags & (SDB_F_CANON|SDB_F_FORCE_CANON)) { - /* - * When requested to do so, ensure that the - * both realm values in the principal are set --- -2.33.1 +2.37.1 diff --git a/samba.spec b/samba.spec index a4d92d8..fa2ee19 100644 --- a/samba.spec +++ b/samba.spec @@ -136,11 +136,11 @@ %global baserelease 0 -%global samba_version 4.16.3 +%global samba_version 4.16.4 %global talloc_version 2.3.3 %global tdb_version 1.4.6 %global tevent_version 0.12.0 -%global ldb_version 2.5.1 +%global ldb_version 2.5.2 # This should be rc1 or nil %global pre_release %nil @@ -2971,6 +2971,7 @@ fi %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_base_test.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tgs_tests.*.pyc +%{python3_sitearch}/samba/tests/krb5/__pycache__/kpasswd_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/ms_kile_client_principal_lookup_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/pac_align_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/raw_testcase.*.pyc @@ -2997,6 +2998,7 @@ fi %{python3_sitearch}/samba/tests/krb5/kdc_base_test.py %{python3_sitearch}/samba/tests/krb5/kdc_tests.py %{python3_sitearch}/samba/tests/krb5/kdc_tgs_tests.py +%{python3_sitearch}/samba/tests/krb5/kpasswd_tests.py %{python3_sitearch}/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py %{python3_sitearch}/samba/tests/krb5/pac_align_tests.py %{python3_sitearch}/samba/tests/krb5/raw_testcase.py @@ -4155,6 +4157,13 @@ fi %endif %changelog +* Wed Jul 27 2022 Guenther Deschner - 4.16.4-0 +- resolves: #2111490 - Update to version 4.16.4 +- resolves: #2108196, #2111729 - Security fixes for CVE-2022-32742 +- resolves: #2108205, #2111731 - Security fixes for CVE-2022-32744 +- resolves: #2108211, #2111732 - Security fixes for CVE-2022-32745 +- resolves: #2108215, #2111734 - Security fixes for CVE-2022-32746 + * Mon Jul 18 2022 Andreas Schneider - 4.16.3-1 - Update to version 4.16.3 diff --git a/sources b/sources index 433dbb4..851386b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.3.tar.xz) = aa11e65e52f57fd940d6b381fff7bac77bf94b421c1980b3731b36b815d27b6218f3192a7a8a1b9c7d27f80e381c9a7c8b7a0f76a2ec6cfad6b8748bbfd958cc -SHA512 (samba-4.16.3.tar.asc) = 98f07c312263e3ff4594fa1204184f15212f0c4771d45b349ab48981caefaa94aa7ae5223922d1cbaac9f423554b7a5c4107cb3a3599041cf38af6f665a9289a +SHA512 (samba-4.16.4.tar.xz) = 263c33f202462c50ba9205232cc59f17eef6526bbe97cc1c6be6606e5e2fa8e235f24693da5ef00106ed126c5e2e1d83e2cfc0d2a690303ac94a8737e6760e95 +SHA512 (samba-4.16.4.tar.asc) = aec1d0dc15169dfa0f68776cff083b8a9ecfeb348d20cde02e236eda3548e1df13f6df3e9275ede6e8fdc6193b2fd304d2f493507b49f5877dbb6b7181d90367 From 9884bc0a06f3dd5b0125b0f0d95e3861d8f4525d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Thu, 8 Sep 2022 15:44:08 +0200 Subject: [PATCH 19/31] Update to version 4.16.5 Guenther --- .gitignore | 2 ++ samba.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 477e1dc..6efae17 100644 --- a/.gitignore +++ b/.gitignore @@ -297,3 +297,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.3.tar.asc /samba-4.16.4.tar.xz /samba-4.16.4.tar.asc +/samba-4.16.5.tar.xz +/samba-4.16.5.tar.asc diff --git a/samba.spec b/samba.spec index fa2ee19..c6d59ae 100644 --- a/samba.spec +++ b/samba.spec @@ -136,7 +136,7 @@ %global baserelease 0 -%global samba_version 4.16.4 +%global samba_version 4.16.5 %global talloc_version 2.3.3 %global tdb_version 1.4.6 %global tevent_version 0.12.0 @@ -4157,6 +4157,9 @@ fi %endif %changelog +* Thu Sep 08 2022 Guenther Deschner - 4.16.5-0 +- Update to version 4.16.5 + * Wed Jul 27 2022 Guenther Deschner - 4.16.4-0 - resolves: #2111490 - Update to version 4.16.4 - resolves: #2108196, #2111729 - Security fixes for CVE-2022-32742 diff --git a/sources b/sources index 851386b..2099f6b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.4.tar.xz) = 263c33f202462c50ba9205232cc59f17eef6526bbe97cc1c6be6606e5e2fa8e235f24693da5ef00106ed126c5e2e1d83e2cfc0d2a690303ac94a8737e6760e95 -SHA512 (samba-4.16.4.tar.asc) = aec1d0dc15169dfa0f68776cff083b8a9ecfeb348d20cde02e236eda3548e1df13f6df3e9275ede6e8fdc6193b2fd304d2f493507b49f5877dbb6b7181d90367 +SHA512 (samba-4.16.5.tar.xz) = 3ecd123e12a16ffa815e6901ca137def692c84035656b1f0ff7dd4ef097af65db4e1fde8c26fc50d71fd4cf46e2121de797fc536f0e741fe26b39267e6c02728 +SHA512 (samba-4.16.5.tar.asc) = c5e5ec841bc5679d92a836b33729a048210b289b234fd8dd01b56046d599468b62bb2b6a22cf7398ee95336ec00591f8ef140ffb7a958653bc15a83422fbbb3e From 53c12663f07c5a02635cb64a947438f9307d2e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Wed, 26 Oct 2022 14:06:51 +0200 Subject: [PATCH 20/31] Update to version 4.16.6 resolves: #2137776, #2137778 - Security fixes for CVE-2022-3592 resolves: #2137774, #2137777 - Security fixes for CVE-2022-3437 Guenther --- .gitignore | 2 ++ samba.spec | 7 ++++++- sources | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6efae17..79d67f0 100644 --- a/.gitignore +++ b/.gitignore @@ -299,3 +299,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.4.tar.asc /samba-4.16.5.tar.xz /samba-4.16.5.tar.asc +/samba-4.16.6.tar.xz +/samba-4.16.6.tar.asc diff --git a/samba.spec b/samba.spec index c6d59ae..f779e63 100644 --- a/samba.spec +++ b/samba.spec @@ -136,7 +136,7 @@ %global baserelease 0 -%global samba_version 4.16.5 +%global samba_version 4.16.6 %global talloc_version 2.3.3 %global tdb_version 1.4.6 %global tevent_version 0.12.0 @@ -4157,6 +4157,11 @@ fi %endif %changelog +* Wed Oct 26 2022 Guenther Deschner - 4.16.6-0 +- Update to version 4.16.6 +- resolves: #2137776, #2137778 - Security fixes for CVE-2022-3592 +- resolves: #2137774, #2137777 - Security fixes for CVE-2022-3437 + * Thu Sep 08 2022 Guenther Deschner - 4.16.5-0 - Update to version 4.16.5 diff --git a/sources b/sources index 2099f6b..90a3390 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.5.tar.xz) = 3ecd123e12a16ffa815e6901ca137def692c84035656b1f0ff7dd4ef097af65db4e1fde8c26fc50d71fd4cf46e2121de797fc536f0e741fe26b39267e6c02728 -SHA512 (samba-4.16.5.tar.asc) = c5e5ec841bc5679d92a836b33729a048210b289b234fd8dd01b56046d599468b62bb2b6a22cf7398ee95336ec00591f8ef140ffb7a958653bc15a83422fbbb3e +SHA512 (samba-4.16.6.tar.xz) = 8ed8c578ab952bc7f372c38589258a41abad92870d53486ad282cd96e1d3c0f77ef66f051e8b952d3a502d110f728944722800029a3d4cd15f891939040dc648 +SHA512 (samba-4.16.6.tar.asc) = 997caa205d0722722a01a14503fb9ad95a968e43612d74e7784b41b30231a30914d4e60b831e58bcbde0dc1e7105b6dbff5c4c3460664e15062e4d83a41d10bf From 345db31405166563ea7cc3011a73b63afb229d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Wed, 16 Nov 2022 00:41:58 +0100 Subject: [PATCH 21/31] Update to version 4.16.7 resolves: #2140960, #2143116 - Security fixes for CVE-2022-42898 Guenther --- .gitignore | 2 ++ samba.spec | 6 +++++- sources | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 79d67f0..e5d90b5 100644 --- a/.gitignore +++ b/.gitignore @@ -301,3 +301,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.5.tar.asc /samba-4.16.6.tar.xz /samba-4.16.6.tar.asc +/samba-4.16.7.tar.xz +/samba-4.16.7.tar.asc diff --git a/samba.spec b/samba.spec index f779e63..7ff2fe7 100644 --- a/samba.spec +++ b/samba.spec @@ -136,7 +136,7 @@ %global baserelease 0 -%global samba_version 4.16.6 +%global samba_version 4.16.7 %global talloc_version 2.3.3 %global tdb_version 1.4.6 %global tevent_version 0.12.0 @@ -4157,6 +4157,10 @@ fi %endif %changelog +* Tue Nov 15 2022 Guenther Deschner - 4.16.7-0 +- Update to version 4.16.7 +- resolves: #2140960, #2143116 - Security fixes for CVE-2022-42898 + * Wed Oct 26 2022 Guenther Deschner - 4.16.6-0 - Update to version 4.16.6 - resolves: #2137776, #2137778 - Security fixes for CVE-2022-3592 diff --git a/sources b/sources index 90a3390..6b51acf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.6.tar.xz) = 8ed8c578ab952bc7f372c38589258a41abad92870d53486ad282cd96e1d3c0f77ef66f051e8b952d3a502d110f728944722800029a3d4cd15f891939040dc648 -SHA512 (samba-4.16.6.tar.asc) = 997caa205d0722722a01a14503fb9ad95a968e43612d74e7784b41b30231a30914d4e60b831e58bcbde0dc1e7105b6dbff5c4c3460664e15062e4d83a41d10bf +SHA512 (samba-4.16.7.tar.xz) = 9a2c62b1ab55df3597d3f3182791e201501a8f13e46a9a18b5e3516da9061d6fd451c0da1f7d9ad09de0bbcdcd310c6f4c7d1ccffd67c284b1795d737862b4a2 +SHA512 (samba-4.16.7.tar.asc) = be3221efa6212dfd7ad22febfdb789f3e7566c4c34e6df2afb1f55d66040bc0081e2dbdfb91c40419c51c1755922248c16490f5d7e4e60442dc2e054b1235851 From 0582429c2163660850c21cc5289e27885f976a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Fri, 16 Dec 2022 17:11:52 +0100 Subject: [PATCH 22/31] Update to 4.16.8 resolves: #2154303, #2154304 - Security fixes for CVE-2022-37966 resolves: #2154320, #2154322 - Security fixes for CVE-2022-37967 resolves: #2154362, #2154363 - Security fixes for CVE-2022-38023 Guenther --- .gitignore | 2 ++ samba.spec | 11 ++++++++++- sources | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e5d90b5..360d63e 100644 --- a/.gitignore +++ b/.gitignore @@ -303,3 +303,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.6.tar.asc /samba-4.16.7.tar.xz /samba-4.16.7.tar.asc +/samba-4.16.8.tar.xz +/samba-4.16.8.tar.asc diff --git a/samba.spec b/samba.spec index 7ff2fe7..4d354ba 100644 --- a/samba.spec +++ b/samba.spec @@ -136,7 +136,7 @@ %global baserelease 0 -%global samba_version 4.16.7 +%global samba_version 4.16.8 %global talloc_version 2.3.3 %global tdb_version 1.4.6 %global tevent_version 0.12.0 @@ -2966,12 +2966,14 @@ fi %{python3_sitearch}/samba/tests/krb5/__pycache__/as_canonicalization_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/as_req_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/compatability_tests.*.pyc +%{python3_sitearch}/samba/tests/krb5/__pycache__/etype_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/fast_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/kcrypto.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_base_test.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tgs_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/kpasswd_tests.*.pyc +%{python3_sitearch}/samba/tests/krb5/__pycache__/lockout_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/ms_kile_client_principal_lookup_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/pac_align_tests.*.pyc %{python3_sitearch}/samba/tests/krb5/__pycache__/raw_testcase.*.pyc @@ -2993,12 +2995,14 @@ fi %{python3_sitearch}/samba/tests/krb5/as_canonicalization_tests.py %{python3_sitearch}/samba/tests/krb5/as_req_tests.py %{python3_sitearch}/samba/tests/krb5/compatability_tests.py +%{python3_sitearch}/samba/tests/krb5/etype_tests.py %{python3_sitearch}/samba/tests/krb5/fast_tests.py %{python3_sitearch}/samba/tests/krb5/kcrypto.py %{python3_sitearch}/samba/tests/krb5/kdc_base_test.py %{python3_sitearch}/samba/tests/krb5/kdc_tests.py %{python3_sitearch}/samba/tests/krb5/kdc_tgs_tests.py %{python3_sitearch}/samba/tests/krb5/kpasswd_tests.py +%{python3_sitearch}/samba/tests/krb5/lockout_tests.py %{python3_sitearch}/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py %{python3_sitearch}/samba/tests/krb5/pac_align_tests.py %{python3_sitearch}/samba/tests/krb5/raw_testcase.py @@ -4157,6 +4161,11 @@ fi %endif %changelog +* Fri Dec 16 2022 Guenther Deschner - 4.16.8-0 +- resolves: #2154303, #2154304 - Security fixes for CVE-2022-37966 +- resolves: #2154320, #2154322 - Security fixes for CVE-2022-37967 +- resolves: #2154362, #2154363 - Security fixes for CVE-2022-38023 + * Tue Nov 15 2022 Guenther Deschner - 4.16.7-0 - Update to version 4.16.7 - resolves: #2140960, #2143116 - Security fixes for CVE-2022-42898 diff --git a/sources b/sources index 6b51acf..f0f18e7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.7.tar.xz) = 9a2c62b1ab55df3597d3f3182791e201501a8f13e46a9a18b5e3516da9061d6fd451c0da1f7d9ad09de0bbcdcd310c6f4c7d1ccffd67c284b1795d737862b4a2 -SHA512 (samba-4.16.7.tar.asc) = be3221efa6212dfd7ad22febfdb789f3e7566c4c34e6df2afb1f55d66040bc0081e2dbdfb91c40419c51c1755922248c16490f5d7e4e60442dc2e054b1235851 +SHA512 (samba-4.16.8.tar.xz) = 5efb32db6a54d23c69a0e6ec5696a0f7c8688e44fcc69e1f01fe8aa2c163d74b2fb257711aebd97d4023e8be2211f4ee5e95b168ed4365d7e2cc8eda96b063a7 +SHA512 (samba-4.16.8.tar.asc) = ce4d013616cd536c7964ac8e989beab6d247067da65512f401661cb1cd395c21ff8a19d9cf296fec4991912b1e7137f7856b33f681da56cb2a29be538442f6c8 From 143a40a9cb95f67480a73064126765dcc6060cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Mon, 19 Dec 2022 10:22:17 +0100 Subject: [PATCH 23/31] Move libpac and libauth4 to dc-libs This allows us to not install the samba and samba-dc packages. They are not needed for domain member which just want to have samba-winbind related packages installed. --- samba.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/samba.spec b/samba.spec index 4d354ba..2498738 100644 --- a/samba.spec +++ b/samba.spec @@ -1284,6 +1284,7 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so %if %{without dc} && %{without testsuite} for i in \ + %{_libdir}/samba/libauth4-samba4.so \ %{_libdir}/samba/libdfs-server-ad-samba4.so \ %{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so \ %{_libdir}/samba/libscavenge-dns-records-samba4.so \ @@ -1985,7 +1986,6 @@ fi %{_libdir}/krb5/plugins/kdb/samba.so %{_libdir}/samba/auth/samba4.so -%{_libdir}/samba/libpac-samba4.so %dir %{_libdir}/samba/gensec %{_libdir}/samba/gensec/krb5.so %{_libdir}/samba/ldb/acl.so @@ -2052,7 +2052,9 @@ fi ### DC-LIBS %files dc-libs +%{_libdir}/samba/libauth4-samba4.so %{_libdir}/samba/libdb-glue-samba4.so +%{_libdir}/samba/libpac-samba4.so %{_libdir}/samba/libprocess-model-samba4.so %{_libdir}/samba/libservice-samba4.so @@ -2262,7 +2264,6 @@ fi %{_libdir}/libdcerpc-samr.so.* %{_libdir}/samba/libLIBWBCLIENT-OLD-samba4.so -%{_libdir}/samba/libauth4-samba4.so %{_libdir}/samba/libauth-unix-token-samba4.so %{_libdir}/samba/libdcerpc-samba4.so %{_libdir}/samba/libdnsserver-common-samba4.so From 3d20282019fb805e787714bfaebae6e8c0747413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Wed, 14 Dec 2022 14:26:12 +0100 Subject: [PATCH 24/31] Create a new 'samba-dcerpc' sub-package for DCERPC services --- samba.spec | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/samba.spec b/samba.spec index 2498738..b746292 100644 --- a/samba.spec +++ b/samba.spec @@ -219,6 +219,7 @@ Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-common-tools = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} +Requires: %{name}-dcerpc = %{samba_depver} %if %{with libwbclient} Requires(post): libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver} @@ -505,6 +506,19 @@ Provides: bundled(libreplace) The samba-common-tools package contains tools for Samba servers and SMB/CIFS clients. +### RPC +%package dcerpc +Summary: DCE RPC binaries +Requires: samba-common-libs = %{samba_depver} +Requires: samba-client-libs = %{samba_depver} +Requires: samba-libs = %{samba_depver} +%if %{with libwbclient} +Requires: libwbclient = %{samba_depver} +%endif + +%description dcerpc +The samba-dcerpc package contains binaries that serve DCERPC over named pipes. + ### DC %if %{with dc} || %{with testsuite} %package dc @@ -877,6 +891,7 @@ Requires: %{name}-winbind-modules = %{samba_depver} Requires(post): libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver} %endif +Requires: %{name}-dcerpc = %{samba_depver} Provides: samba4-winbind = %{samba_depver} Obsoletes: samba4-winbind < %{samba_depver} @@ -1642,15 +1657,6 @@ fi %dir %{_libexecdir}/samba %{_libexecdir}/samba/samba-bgqd -%{_libexecdir}/samba/samba-dcerpcd -%{_libexecdir}/samba/rpcd_classic -%{_libexecdir}/samba/rpcd_epmapper -%{_libexecdir}/samba/rpcd_fsrvp -%{_libexecdir}/samba/rpcd_lsad -%{_libexecdir}/samba/rpcd_mdssvc -%{_libexecdir}/samba/rpcd_rpcecho -%{_libexecdir}/samba/rpcd_spoolss -%{_libexecdir}/samba/rpcd_winreg %dir %{_datadir}/samba %dir %{_datadir}/samba/mdssvc @@ -1664,7 +1670,6 @@ fi %{_mandir}/man1/smbstatus.1* %{_mandir}/man8/eventlogadm.8* %{_mandir}/man8/samba-bgqd.8* -%{_mandir}/man8/samba-dcerpcd.8* %{_mandir}/man8/smbd.8* %{_mandir}/man8/nmbd.8* %{_mandir}/man8/vfs_acl_tdb.8* @@ -1971,6 +1976,20 @@ fi %{_mandir}/man8/samba-tool.8* %{_mandir}/man8/smbpasswd.8* +### RPC +%files dcerpc +%dir %{_libexecdir}/samba +%{_libexecdir}/samba/samba-dcerpcd +%{_libexecdir}/samba/rpcd_classic +%{_libexecdir}/samba/rpcd_epmapper +%{_libexecdir}/samba/rpcd_fsrvp +%{_libexecdir}/samba/rpcd_lsad +%{_libexecdir}/samba/rpcd_mdssvc +%{_libexecdir}/samba/rpcd_rpcecho +%{_libexecdir}/samba/rpcd_spoolss +%{_libexecdir}/samba/rpcd_winreg +%{_mandir}/man8/samba-dcerpcd.8* + ### DC %if %{with dc} || %{with testsuite} %files dc From 15b4b0f68d7e2abd498329693e11c1e7520c1049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Tue, 20 Dec 2022 17:52:41 +0100 Subject: [PATCH 25/31] Bump baserelease and update %changelog --- samba.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samba.spec b/samba.spec index b746292..d4320de 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 0 +%global baserelease 1 %global samba_version 4.16.8 %global talloc_version 2.3.3 @@ -4181,6 +4181,10 @@ fi %endif %changelog +* Tue Dec 20 2022 Pavel Filipenský - 4.16.8-1 +- Move libpac and libauth4 to dc-libs +- Create a new 'samba-dcerpc' sub-package for DCERPC services + * Fri Dec 16 2022 Guenther Deschner - 4.16.8-0 - resolves: #2154303, #2154304 - Security fixes for CVE-2022-37966 - resolves: #2154320, #2154322 - Security fixes for CVE-2022-37967 From 71db3a433069f23c147e0e06ac52092bd544ec05 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 21 Nov 2022 15:28:44 +0100 Subject: [PATCH 26/31] Memoize python3_sitearch for faster RPM spec file processing This greatly speeds up the creation of source RPMs, among other things. --- samba.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/samba.spec b/samba.spec index d4320de..bea45f9 100644 --- a/samba.spec +++ b/samba.spec @@ -169,6 +169,10 @@ %global _systemd_extra "Environment=KRB5CCNAME=FILE:/run/samba/krb5cc_samba" +# Make a copy of this variable to prevent repeated evaluation of the +# embedded shell command. +%global python3_sitearch %{python3_sitearch} + Name: samba Version: %{samba_version} Release: %{samba_release}%{?dist} From 4cccd21d6153e0b53790663d00b721e5a1cad119 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 21 Nov 2022 15:44:40 +0100 Subject: [PATCH 27/31] Avoid recursive python3_sitearch expansion even if undefined Fixes an error during SRPM construction if not enough dependencies are installed (e.g., during the first build stage in mock): error: /builddir/build/SPECS/samba.spec: line 2478: Too many levels of recursion in macro expansion. It is likely caused by recursive macro declaration. --- samba.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samba.spec b/samba.spec index bea45f9..cad8ab6 100644 --- a/samba.spec +++ b/samba.spec @@ -170,8 +170,8 @@ %global _systemd_extra "Environment=KRB5CCNAME=FILE:/run/samba/krb5cc_samba" # Make a copy of this variable to prevent repeated evaluation of the -# embedded shell command. -%global python3_sitearch %{python3_sitearch} +# embedded shell command. Avoid recursive macro definition if undefined. +%{?python3_sitearch: %global python3_sitearch %{python3_sitearch}} Name: samba Version: %{samba_version} From f94f6a54d442ba56522c56fbfb0071afcb72eb3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Wed, 2 Nov 2022 15:56:16 +0100 Subject: [PATCH 28/31] Always add epoch to samba_depver to fix osci.brew-build.rpmdeplint.functional --- samba.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/samba.spec b/samba.spec index cad8ab6..dd86899 100644 --- a/samba.spec +++ b/samba.spec @@ -177,17 +177,13 @@ Name: samba Version: %{samba_version} Release: %{samba_release}%{?dist} -%if 0%{?rhel} -Epoch: 0 -%else +%if 0%{?fedora} Epoch: 2 +%else +Epoch: 0 %endif -%if 0%{?epoch} > 0 %global samba_depver %{epoch}:%{version}-%{release} -%else -%global samba_depver %{version}-%{release} -%endif Summary: Server and Client software to interoperate with Windows machines License: GPLv3+ and LGPLv3+ @@ -4185,6 +4181,9 @@ fi %endif %changelog +* Thu Dec 22 2022 Pavel Filipenský - 4.16.8-1 +- Always add epoch to samba_depver to fix osci.brew-build.rpmdeplint.functional + * Tue Dec 20 2022 Pavel Filipenský - 4.16.8-1 - Move libpac and libauth4 to dc-libs - Create a new 'samba-dcerpc' sub-package for DCERPC services From 0ee138228a467688cd8a07531bf408e88c468965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Thu, 22 Dec 2022 15:06:03 +0100 Subject: [PATCH 29/31] Create package dc-libs also for 'non-dc' build --- samba.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/samba.spec b/samba.spec index dd86899..f7b9e69 100644 --- a/samba.spec +++ b/samba.spec @@ -134,7 +134,7 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 1 +%global baserelease 2 %global samba_version 4.16.8 %global talloc_version 2.3.3 @@ -563,6 +563,9 @@ BuildArch: noarch %description dc-provision The samba-dc-provision package provides files to setup a domain controller +#endif with dc || with testsuite +%endif + ### DC-LIBS %package dc-libs Summary: Samba AD Domain Controller Libraries @@ -579,6 +582,7 @@ Provides: bundled(libreplace) The %{name}-dc-libs package contains the libraries needed by the DC to link against the SMB, RPC and other protocols. +%if %{with dc} || %{with testsuite} ### DC-BIND %package dc-bind-dlz Summary: Bind DLZ module for Samba AD @@ -756,9 +760,7 @@ Requires: %{name} = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} -%if %{with dc} Requires: %{name}-dc-libs = %{samba_depver} -%endif Requires: python3-talloc Requires: python3-tevent Requires: python3-tdb @@ -1299,7 +1301,6 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so %if %{without dc} && %{without testsuite} for i in \ - %{_libdir}/samba/libauth4-samba4.so \ %{_libdir}/samba/libdfs-server-ad-samba4.so \ %{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so \ %{_libdir}/samba/libscavenge-dns-records-samba4.so \ @@ -2069,9 +2070,13 @@ fi %license source4/setup/ad-schema/licence.txt %{_datadir}/samba/setup +#endif with dc || with testsuite +%endif ### DC-LIBS %files dc-libs %{_libdir}/samba/libauth4-samba4.so + +%if %{with dc} || %{with testsuite} %{_libdir}/samba/libdb-glue-samba4.so %{_libdir}/samba/libpac-samba4.so %{_libdir}/samba/libprocess-model-samba4.so @@ -4181,8 +4186,9 @@ fi %endif %changelog -* Thu Dec 22 2022 Pavel Filipenský - 4.16.8-1 +* Thu Dec 22 2022 Pavel Filipenský - 4.16.8-2 - Always add epoch to samba_depver to fix osci.brew-build.rpmdeplint.functional +- Create package dc-libs also for 'non-dc build' * Tue Dec 20 2022 Pavel Filipenský - 4.16.8-1 - Move libpac and libauth4 to dc-libs From 4ed526a34975e5a406b146f0c2511969673471ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Thu, 16 Feb 2023 23:00:07 +0100 Subject: [PATCH 30/31] Update to version 4.16.9 Guenther --- .gitignore | 2 ++ samba.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 360d63e..aaf697b 100644 --- a/.gitignore +++ b/.gitignore @@ -305,3 +305,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.7.tar.asc /samba-4.16.8.tar.xz /samba-4.16.8.tar.asc +/samba-4.16.9.tar.xz +/samba-4.16.9.tar.asc diff --git a/samba.spec b/samba.spec index f7b9e69..17e1ea4 100644 --- a/samba.spec +++ b/samba.spec @@ -134,9 +134,9 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 2 +%global baserelease 0 -%global samba_version 4.16.8 +%global samba_version 4.16.9 %global talloc_version 2.3.3 %global tdb_version 1.4.6 %global tevent_version 0.12.0 @@ -4186,6 +4186,9 @@ fi %endif %changelog +* Thu Feb 16 2023 Guenther Deschner - 4.16.9-0 +- Update to version 4.16.9 + * Thu Dec 22 2022 Pavel Filipenský - 4.16.8-2 - Always add epoch to samba_depver to fix osci.brew-build.rpmdeplint.functional - Create package dc-libs also for 'non-dc build' diff --git a/sources b/sources index f0f18e7..f13023c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.8.tar.xz) = 5efb32db6a54d23c69a0e6ec5696a0f7c8688e44fcc69e1f01fe8aa2c163d74b2fb257711aebd97d4023e8be2211f4ee5e95b168ed4365d7e2cc8eda96b063a7 -SHA512 (samba-4.16.8.tar.asc) = ce4d013616cd536c7964ac8e989beab6d247067da65512f401661cb1cd395c21ff8a19d9cf296fec4991912b1e7137f7856b33f681da56cb2a29be538442f6c8 +SHA512 (samba-4.16.9.tar.xz) = 5ec51b7576b6171bc15653906ed3412ccb7ab383e93791723d5845b7181395473a88be51d19c28bf6b212ca903dea3c24cdd1449222e6f3643bc7cda10049d84 +SHA512 (samba-4.16.9.tar.asc) = 75409da7d935185f567c9342175ba967dd068067a727e2adb9cbfb333c1789a9d9f8d365abbade8f29de4eceadf0f3e9c349e5fab9384adc1750a9459a995174 From 01bdef954fdbbcdf4dba40e74dcccb28813c7687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Wed, 29 Mar 2023 16:18:16 +0200 Subject: [PATCH 31/31] Update to version 4.16.10 resolves: #2182774, #2182775 - Security fixes for CVE-2023-0922 resolves: #2182776, #2182777 - Security fixes for CVE-2023-0614 Guenther --- .gitignore | 2 ++ samba.spec | 9 +++++++-- sources | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index aaf697b..3199251 100644 --- a/.gitignore +++ b/.gitignore @@ -307,3 +307,5 @@ samba-3.6.0pre1.tar.gz /samba-4.16.8.tar.asc /samba-4.16.9.tar.xz /samba-4.16.9.tar.asc +/samba-4.16.10.tar.xz +/samba-4.16.10.tar.asc diff --git a/samba.spec b/samba.spec index 17e1ea4..58523d9 100644 --- a/samba.spec +++ b/samba.spec @@ -136,11 +136,11 @@ %global baserelease 0 -%global samba_version 4.16.9 +%global samba_version 4.16.10 %global talloc_version 2.3.3 %global tdb_version 1.4.6 %global tevent_version 0.12.0 -%global ldb_version 2.5.2 +%global ldb_version 2.5.3 # This should be rc1 or nil %global pre_release %nil @@ -4186,6 +4186,11 @@ fi %endif %changelog +* Wed Mar 29 2023 Guenther Deschner - 4.16.10-0 +- Update to version 4.16.10 +- resolves: #2182774, #2182775 - Security fixes for CVE-2023-0922 +- resolves: #2182776, #2182777 - Security fixes for CVE-2023-0614 + * Thu Feb 16 2023 Guenther Deschner - 4.16.9-0 - Update to version 4.16.9 diff --git a/sources b/sources index f13023c..7872fe3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.9.tar.xz) = 5ec51b7576b6171bc15653906ed3412ccb7ab383e93791723d5845b7181395473a88be51d19c28bf6b212ca903dea3c24cdd1449222e6f3643bc7cda10049d84 -SHA512 (samba-4.16.9.tar.asc) = 75409da7d935185f567c9342175ba967dd068067a727e2adb9cbfb333c1789a9d9f8d365abbade8f29de4eceadf0f3e9c349e5fab9384adc1750a9459a995174 +SHA512 (samba-4.16.10.tar.xz) = 933b04ed25c853264bf36a6a79db6d2f61e890ef76b8bcd2f9116d7dd6ee3112bc9a36ae9e0ad8c75b60b18ca6027572e7f514980479a9f0ae35a4219ff06471 +SHA512 (samba-4.16.10.tar.asc) = deeabf207148761c6c95aa1d5cf38e24bef11648fbc95e345802f05937db95009d6f900ba67f0f197d08bbfe8bc649a61c23cb92fa895246e4b3844ba93d4083