The branch, v4-20-test has been updated
via 32545902ed6 VERSION: Bump version up to Samba 4.20.5...
via 8209a1035d3 VERSION: Disable GIT_SNAPSHOT for the 4.20.4 release.
via 9cb2fe46db9 WHATSNEW: Add release notes for Samba 4.20.4.
via 181b79a9ff6 wafsamba: Fix ABI symbol name generation
from f81fdcb2dfe VERSION: Bump version up to Samba 4.20.4...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-20-test
- Log -----------------------------------------------------------------
commit 32545902ed654431dc8cba8bd16412df716b7981
Author: Stefan Metzmacher <me...@samba.org>
Date: Tue Aug 6 09:55:23 2024 +0200
VERSION: Bump version up to Samba 4.20.5...
and re-enable GIT_SNAPSHOT.
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Autobuild-User(v4-20-test): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(v4-20-test): Tue Aug 6 09:21:35 UTC 2024 on atb-devel-224
commit 8209a1035d362673a87bccc9264efce05402a2f2
Author: Stefan Metzmacher <me...@samba.org>
Date: Tue Aug 6 09:54:43 2024 +0200
VERSION: Disable GIT_SNAPSHOT for the 4.20.4 release.
Signed-off-by: Stefan Metzmacher <me...@samba.org>
commit 9cb2fe46db952dd02b94479eca94f8de7bcdd912
Author: Stefan Metzmacher <me...@samba.org>
Date: Tue Aug 6 09:52:47 2024 +0200
WHATSNEW: Add release notes for Samba 4.20.4.
Signed-off-by: Stefan Metzmacher <me...@samba.org>
commit 181b79a9ff6f0971992f15b988d84b6caa8aa045
Author: Andreas Schneider <a...@samba.org>
Date: Mon Aug 5 14:51:01 2024 +0200
wafsamba: Fix ABI symbol name generation
Commit 0bc5b6f29307ce758774c1b2f48ce62315fdc7f9 changed the script
for generating the ABI symbol version. It broke the ABI by changing all
dots to underscores.
This reverts the commit partially to preserve the dots in the version
part.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15673
Pair-Programmed-With: Stefan Metzmacher <me...@samba.org>
Signed-off-by: Andreas Schneider <a...@samba.org>
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Günther Deschner <g...@samba.org>
Autobuild-User(master): Douglas Bagnall <dbagn...@samba.org>
Autobuild-Date(master): Tue Aug 6 00:42:56 UTC 2024 on atb-devel-224
(cherry picked from commit 46215ab1b34aa79c4c831ea1c12f73eacf1e8a12)
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 53 ++++++++++++++++++++++++++++++++++++++--
buildtools/wafsamba/samba_abi.py | 6 ++---
script/autobuild.py | 11 +++++++++
4 files changed, 66 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index 28e5aa22c01..e59d3c26f8a 100644
--- a/VERSION
+++ b/VERSION
@@ -27,7 +27,7 @@ SAMBA_COPYRIGHT_STRING="Copyright Andrew Tridgell and the
Samba Team 1992-2024"
########################################################
SAMBA_VERSION_MAJOR=4
SAMBA_VERSION_MINOR=20
-SAMBA_VERSION_RELEASE=4
+SAMBA_VERSION_RELEASE=5
########################################################
# If a official release has a serious bug #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 93dd250d052..4434acda2fb 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,3 +1,53 @@
+ ==============================
+ Release Notes for Samba 4.20.4
+ August 06, 2024
+ ==============================
+
+
+This is the latest stable release of the Samba 4.20 release series.
+
+Changes since 4.20.3
+--------------------
+
+This only fixes a regression in library version strings in Samba
+4.20.3, see: https://bugzilla.samba.org/show_bug.cgi?id=15673
+
+If you compiled Samba from the sources and don't have other
+applications relying on Samba's public libraries, there's
+no reason to upgrade from 4.20.3 to 4.20.4.
+
+o Andreas Schneider <a...@samba.org>
+ * BUG 15673: --version-* options are still not ergonomic, and they reject
+ tilde characters.
+
+o Stefan Metzmacher <me...@samba.org>
+ * BUG 15673: --version-* options are still not ergonomic, and they reject
+ tilde characters.
+
+
+#######################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical:matrix.org matrix room, or
+#samba-technical IRC channel on irc.libera.chat.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the Samba 4.1 and newer product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+----------------------------------------
==============================
Release Notes for Samba 4.20.3
August 02, 2024
@@ -99,8 +149,7 @@ database (https://bugzilla.samba.org/).
======================================================================
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
==============================
Release Notes for Samba 4.20.2
June 19, 2024
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index c82ba3424f9..e6deb839c0c 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -286,7 +286,7 @@ def abi_build_vscript(task):
f.close()
def VSCRIPT_MAP_PRIVATE(bld, libname, orig_vscript, version, private_vscript):
- version = re.sub(r'\W', '_', version).upper()
+ version = re.sub(r'[^.\w]', '_', version).upper()
t = bld.SAMBA_GENERATOR(private_vscript,
rule=abi_build_vscript,
source=orig_vscript,
@@ -314,8 +314,8 @@ def ABI_VSCRIPT(bld, libname, abi_directory, version,
vscript, abi_match=None, p
libname = os.path.basename(libname)
version = os.path.basename(version)
- libname = re.sub(r'\W', '_', libname).upper()
- version = re.sub(r'\W', '_', version).upper()
+ libname = re.sub(r'[^.\w]', '_', libname).upper()
+ version = re.sub(r'[^.\w]', '_', version).upper()
t = bld.SAMBA_GENERATOR(vscript,
rule=abi_build_vscript,
diff --git a/script/autobuild.py b/script/autobuild.py
index 0388342bc23..b3bd1914072 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -138,6 +138,13 @@ def check_symbols(sofile, expected_symbols=""):
return "objdump --dynamic-syms " + sofile + " | " + \
"awk \'$0 !~ /" + expected_symbols + "/ {if ($2 == \"g\" && $3 ~
/D(F|O)/ && $4 ~ /(.bss|.text)/ && $7 !~ /(__gcov_|mangle_path)/) exit 1}\'"
+def check_versioned_symbol(sofile, symvol, version):
+ return "objdump --dynamic-syms " + sofile + " | " + \
+ "awk \'$7 == \"" + symvol + "\" { " + \
+ "if ($2 == \"g\" && $3 ~ /D(F|O)/ && $4 ~ /(.bss|.text)/ && "
+ \
+ "$6 == \"" + version + "\") print $0 }\'" + \
+ "| wc -l | grep -q \'^1$\'"
+
if args:
# If we are only running specific test,
# do not sleep randomly to wait for it to start
@@ -910,12 +917,16 @@ tasks = {
check_symbols("./bin/plugins/libnss_wins.so.2", "_nss_wins_")),
("nondevel-no-public-libwbclient",
check_symbols("./bin/shared/libwbclient.so.0", "wbc")),
+ ("nondevel-libwbclient-wbcCtxPingDc2@WBCLIENT_0.12",
+ check_versioned_symbol("./bin/shared/libwbclient.so.0",
"wbcCtxPingDc2", "WBCLIENT_0.12")),
("nondevel-no-public-pam_winbind",
check_symbols("./bin/plugins/pam_winbind.so", "pam_sm_")),
("nondevel-no-public-winbind_krb5_locator",
check_symbols("./bin/plugins/winbind_krb5_locator.so",
"service_locator")),
("nondevel-no-public-async_dns_krb5_locator",
check_symbols("./bin/plugins/async_dns_krb5_locator.so",
"service_locator")),
+ ("nondevel-libndr-krb5pac-ndr_pull_PAC_DATA@NDR_KRB5PAC_0.0.1",
+ check_versioned_symbol("./bin/shared/libndr-krb5pac.so.0",
"ndr_pull_PAC_DATA", "NDR_KRB5PAC_0.0.1")),
("nondevel-install", "make -j install"),
("nondevel-dist", "make dist"),
--
Samba Shared Repository
