[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: tilde-in-version.diff - allow tilde in version string

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
00f8ae6e by Michael Tokarev at 2024-06-20T09:49:33+03:00
tilde-in-version.diff - allow tilde in version string

- - - - -
f735219e by Michael Tokarev at 2024-06-20T09:49:53+03:00
update changelog; upload version 4.20.2+dfsg-2 to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/tilde-in-version.diff


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+samba (2:4.20.2+dfsg-2) unstable; urgency=medium
+
+  * tilde-in-version.diff - allow tilde in version string
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Thu, 20 Jun 2024 09:49:50 +0300
+
 samba (2:4.20.2+dfsg-1) unstable; urgency=medium
 
   * new upstream stable/bugfix release:


=====================================
debian/patches/series
=====================================
@@ -26,3 +26,4 @@ edns0.patch
 passchange-error-message.patch
 lower-dns-lookup-mismatch-messages.patch
 make-python-optional.diff
+tilde-in-version.diff


=====================================
debian/patches/tilde-in-version.diff
=====================================
@@ -0,0 +1,23 @@
+From: Michael Tokarev <mjt at tls.msk.ru>
+Subject: handle tilde in version string
+Date: Thu, 20 Jun 2024 09:47:47 +0300
+Forwarded: yes
+
+wafsamba dislikes when version string contains "special" chars.
+For some of them, upstream already has code to deal with.
+Add handling of tilde (~) to the same places too.
+
+diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
+index 2d9505d255c..cf7153f25f0 100644
+--- a/buildtools/wafsamba/samba_abi.py
++++ b/buildtools/wafsamba/samba_abi.py
+@@ -288,3 +288,3 @@ def abi_build_vscript(task):
+ def VSCRIPT_MAP_PRIVATE(bld, libname, orig_vscript, version, private_vscript):
+-    version = version.replace("-", "_").replace("+","_").upper()
++    version = version.replace("-", "_").replace("+","_").replace("~","_").upper()
+     t = bld.SAMBA_GENERATOR(private_vscript,
+@@ -317,3 +317,3 @@ def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript, abi_match=None, p
+     libname = libname.replace("-", "_").replace("+","_").upper()
+-    version = version.replace("-", "_").replace("+","_").upper()
++    version = version.replace("-", "_").replace("+","_").replace("~","_").upper()
+ 



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/d584eb868f45eba73dd3f092bd197c3fc7b79fbd...f735219e432ac43427ee3cc3f7bac4f577b0789b

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/d584eb868f45eba73dd3f092bd197c3fc7b79fbd...f735219e432ac43427ee3cc3f7bac4f577b0789b
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/20240620/1f8102c0/attachment-0001.htm>