Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • lts-team/packages/samba
  • thctlo/samba-lintianfix
  • arnaudr/samba
  • jrwren/samba
  • paride/samba
  • athos/samba
  • henrich/samba
  • cnotin/samba
  • mimi89999/samba
  • samba-team/samba
  • ahasenack/samba
  • jrtc27/samba
  • noel/samba
13 results
Show changes
Commits on Source (2)
samba (2:4.20.2+dfsg-2) unstable; urgency=medium
* tilde-in-version.diff - allow tilde in version string
-- Michael Tokarev <mjt@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:
......
......@@ -26,3 +26,4 @@ edns0.patch
passchange-error-message.patch
lower-dns-lookup-mismatch-messages.patch
make-python-optional.diff
tilde-in-version.diff
From: Michael Tokarev <mjt@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()