Merging debian version 2:4.20.2+dfsg-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 59 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index af74eee..c7de8c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,56 @@
+samba (2:4.20.2+dfsg-1) unstable; urgency=medium
+
+  * new upstream stable/bugfix release:
+   - https://bugzilla.samba.org/show_bug.cgi?id=13019
+     Dynamic DNS updates with the internal DNS are not working
+   - https://bugzilla.samba.org/show_bug.cgi?id=13213
+     Samba build is not reproducible
+   - https://bugzilla.samba.org/show_bug.cgi?id=14981
+     netr_LogonSamLogonEx returns NR_STATUS_ACCESS_DENIED with SysvolReady=0
+   - https://bugzilla.samba.org/show_bug.cgi?id=15412 Anonymous smb3
+     signing/encryption should be allowed (similar to Windows Server 2022)
+   - https://bugzilla.samba.org/show_bug.cgi?id=15435
+     Regression DFS not working with widelinks = true
+   - https://bugzilla.samba.org/show_bug.cgi?id=15569
+     ldb qsort might r/w out of bounds with an intransitive compare function
+   - https://bugzilla.samba.org/show_bug.cgi?id=15573
+     Panic in dreplsrv_op_pull_source_apply_changes_trigger
+   - https://bugzilla.samba.org/show_bug.cgi?id=15620
+     s4:nbt_server: does not provide unexpected handling, so winbindd
+     can't use nmb requests instead cldap
+   - https://bugzilla.samba.org/show_bug.cgi?id=15625
+     Many qsort() comparison functions are non-transitive, which can lead
+     to out-of-bounds access in some circumstances
+   - https://bugzilla.samba.org/show_bug.cgi?id=15633
+     samba-gpupdate - Invalid NtVer in netlogon_samlogon_response
+   - https://bugzilla.samba.org/show_bug.cgi?id=15638
+     Need to change gitlab-ci.yml tags in all branches to avoid CI bill
+   - https://bugzilla.samba.org/show_bug.cgi?id=15642 winbindd,
+     net ads join and other things don't work on an ipv6 only host
+   - https://bugzilla.samba.org/show_bug.cgi?id=15653 idmap_ad creates
+     an incorrect local krb5.conf in case of trusted domain lookups
+   - https://bugzilla.samba.org/show_bug.cgi?id=15654
+     new --vendor-name and --vendor-patch-revision options for ./configure
+   - https://bugzilla.samba.org/show_bug.cgi?id=15659
+     Segmentation fault when deleting files in vfs_recycle
+     Closes: #1073252
+   - https://bugzilla.samba.org/show_bug.cgi?id=15660 The images don't build
+     after the git security release and CentOS 8 Stream is EOL
+   - https://bugzilla.samba.org/show_bug.cgi?id=15662
+     vfs_widelinks with DFS shares breaks case insensitivity
+   - https://bugzilla.samba.org/show_bug.cgi?id=15664
+     Panic in vfs_offload_token_db_fetch_fsp()
+   - https://bugzilla.samba.org/show_bug.cgi?id=15665
+     CTDB RADOS mutex helper misses namespace support
+   - https://bugzilla.samba.org/show_bug.cgi?id=15666 "client use kerberos"
+     and --use-kerberos is ignored for the machine account
+  * d/libldb2.symbols,d.python3-ldb.symbols.in: add new version (2.9.1)
+  * use ./configure --vendor-name= instead of patching ./VERSION
+  * omit samba-ad-dc for i386 ubuntu
+  * samba-ad-dc: usr-move compensation maintscripts: add "set -e"
+
+ -- Michael Tokarev <mjt@tls.msk.ru>  Wed, 19 Jun 2024 23:59:36 +0300
+
 samba (2:4.20.1+dfsg-5~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/libldb2.symbols b/debian/libldb2.symbols
index 8a94567..6625db8 100644
--- a/debian/libldb2.symbols
+++ b/debian/libldb2.symbols
@@ -80,6 +80,7 @@ libldb.so.2 #PACKAGE# #MINVER#
  LDB_2.7.0@LDB_2.7.0 2:2.7.0
  LDB_2.8.0@LDB_2.8.0 2:2.8.0
  LDB_2.9.0@LDB_2.9.0 2:2.9.0
+ LDB_2.9.1@LDB_2.9.1 2:2.9.1
  ldb_check_critical_controls@LDB_0.9.22 0.9.22
  ldb_controls_except_specified@LDB_0.9.22 0.9.22
  ldb_control_to_string@LDB_1.0.2 1.0.2~git20110403
diff --git a/debian/python3-ldb.symbols.in b/debian/python3-ldb.symbols.in
index ac2e51a..69b236b 100755
--- a/debian/python3-ldb.symbols.in
+++ b/debian/python3-ldb.symbols.in
@@ -64,6 +64,7 @@
  PYLDB_UTIL_2.7.0@PYLDB_UTIL_2.7.0 2:2.7.0
  PYLDB_UTIL_2.8.0@PYLDB_UTIL_2.8.0 2:2.8.0
  PYLDB_UTIL_2.9.0@PYLDB_UTIL_2.9.0 2:2.9.0
+ PYLDB_UTIL_2.9.1@PYLDB_UTIL_2.9.1 2:2.9.1
  pyldb_Dn_FromDn@PYLDB_UTIL_1.1.2 2:2.0.7
  pyldb_Object_AsDn@PYLDB_UTIL_1.1.2 2:2.0.7
  pyldb_check_type@PYLDB_UTIL_2.1.0 2:2.1.0
diff --git a/debian/rules b/debian/rules
index 1142fe1..cbc2168 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ with-ceph =
 with-snapper =
 
 config-args = \
+	--vendor-name=${DEB_VENDOR}-${DEB_VERSION_UPSTREAM_REVISION} \
 	--prefix=/usr \
 	--enable-fhs \
 	--sysconfdir=/etc \
@@ -90,7 +91,7 @@ endif
 
 # Ubuntu i386 binary compatibility only effort: Disable some i386 packages and modules
 ifeq (${DEB_VENDOR}-${DEB_HOST_ARCH}, Ubuntu-i386)
-omit-pkgs += ctdb libpam-winbind samba samba-testsuite samba-vfs-modules
+omit-pkgs += ctdb libpam-winbind samba samba-ad-dc samba-testsuite samba-vfs-modules
 endif
 
 ifneq (,$(filter armel mipsel m68k powerpc sh4,${DEB_HOST_ARCH}))
@@ -162,12 +163,6 @@ install install-arch install-indep: %:
 configure: bin/configured.stamp
 .PHONY: configure
 bin/configured.stamp:
-# branding
-	if [ ! -f VERSION.orig ]; then \
-	  mv VERSION VERSION.orig; \
-	  sed -r -e 's/^(SAMBA_VERSION_VENDOR_SUFFIX).*/\1=${DEB_VENDOR}/' \
-		VERSION.orig > VERSION; \
-	fi
 	CC="${CC}" CPP="${CPP}" LD="${LD}" PKGCONFIG="${PKG_CONFIG}" \
 	CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 	PYTHON=python3 PYTHON_CONFIG=${DEB_HOST_MULTIARCH}-python3-config \
@@ -392,7 +387,6 @@ endif
 clean:
 	# see also debian/clean
 	dh_clean bin/ testbuild/
-	[ ! -f VERSION.orig ] || mv -f VERSION.orig VERSION
 ifneq (,${with_mitkrb5})
 	[ ! -d third_party/heimdal-build-with-mitkrb5 ] || \
 		mv third_party/heimdal-build-with-mitkrb5 third_party/heimdal
diff --git a/debian/samba-ad-dc.postinst b/debian/samba-ad-dc.postinst
index ddc75ea..5427d99 100644
--- a/debian/samba-ad-dc.postinst
+++ b/debian/samba-ad-dc.postinst
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # begin-remove-after: released:trixie
 # protective diversion of files moved from / to /usr, to avoid file loss.
diff --git a/debian/samba-ad-dc.preinst b/debian/samba-ad-dc.preinst
index b6f6b71..a799680 100644
--- a/debian/samba-ad-dc.preinst
+++ b/debian/samba-ad-dc.preinst
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # begin-remove-after: released:trixie
 # protective diversion of files moved from / to /usr, to avoid file loss.