[Pkg-samba-maint] [Git][samba-team/samba][upstream_4.20] 5 commits: VERSION: Bump version up to Samba 4.20.4...
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Tue Aug 6 15:26:37 BST 2024
Michael Tokarev pushed to branch upstream_4.20 at Debian Samba Team / samba
Commits:
f81fdcb2 by Stefan Metzmacher at 2024-08-02T13:50:36+02:00
VERSION: Bump version up to Samba 4.20.4...
and re-enable GIT_SNAPSHOT.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
- - - - -
181b79a9 by Andreas Schneider at 2024-08-06T08:03:15+00:00
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 <metze at samba.org>
Signed-off-by: Andreas Schneider <asn at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Günther Deschner <gd at samba.org>
Autobuild-User(master): Douglas Bagnall <dbagnall at samba.org>
Autobuild-Date(master): Tue Aug 6 00:42:56 UTC 2024 on atb-devel-224
(cherry picked from commit 46215ab1b34aa79c4c831ea1c12f73eacf1e8a12)
- - - - -
9cb2fe46 by Stefan Metzmacher at 2024-08-06T08:03:15+00:00
WHATSNEW: Add release notes for Samba 4.20.4.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
- - - - -
8209a103 by Stefan Metzmacher at 2024-08-06T08:03:15+00:00
VERSION: Disable GIT_SNAPSHOT for the 4.20.4 release.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
- - - - -
5eb4ab08 by Michael Tokarev at 2024-08-06T16:54:18+03:00
New upstream version 4.20.4+dfsg
- - - - -
4 changed files:
- VERSION
- WHATSNEW.txt
- buildtools/wafsamba/samba_abi.py
- script/autobuild.py
Changes:
=====================================
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=3
+SAMBA_VERSION_RELEASE=4
########################################################
# If a official release has a serious bug #
=====================================
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 <asn at samba.org>
+ * BUG 15673: --version-* options are still not ergonomic, and they reject
+ tilde characters.
+
+o Stefan Metzmacher <metze at 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
=====================================
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,
=====================================
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 at 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 at 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"),
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/5b88b71a6a4f8e74aa3267e81fc51e4d8f52f691...5eb4ab08d30973570e5d21a5ce8fd34657b7fab6
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/5b88b71a6a4f8e74aa3267e81fc51e4d8f52f691...5eb4ab08d30973570e5d21a5ce8fd34657b7fab6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20240806/35bc0674/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list