[Pkg-samba-maint] [Git][samba-team/samba][master] 5 commits: d/changelog: document a change in previous upload

Michael Tokarev (@mjt) gitlab at salsa.debian.org
Wed Jul 9 15:14:23 BST 2025 


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


Commits:
3331c2eb by Michael Tokarev at 2025-07-09T17:07:57+03:00
d/changelog: document a change in previous upload

- - - - -
4df15fb1 by Michael Tokarev at 2025-07-09T17:08:03+03:00
Revert "d/control,d/rules: ensure we use the most recent libtalloc/libtevent/libtdb"

This reverts commit 4e271b30392d4b9e311f6f02d2564b680301b31f.

There's no need for samba-libs to depend on exact versions of support libs
anymore, since 4.21.3+dfsg-5 (where the mistake has been made) is long gone.

- - - - -
a2537cf5 by Michael Tokarev at 2025-07-09T17:08:04+03:00
Revert "d/control: add conflicts/breaks for libtevent0t64 on mjt repo"

This reverts two commits -- 25d38c4a068aa57118e86c4388530932465fbd2a
and 00d3f1bba6c4e0534d2ebae33adbf2fb44173e6f.

This Breaks was special and temporary, and not useful for debian
archive at all (it was only needed for mjt's own repository where
the wrong package name slipped out once).  Remove this cruft for
trixie.

- - - - -
0855c98e by Michael Tokarev at 2025-07-09T17:08:04+03:00
python3-talloc: generate the long-forgotten symbols file

the python bindings for libtalloc provides a cython library (.so)
with symbols. Add (dynamic, due to cython suffix being dependent
on python version and architecture) symbols file to provide less
strict versioned dependencies on python3-talloc, to smooth upgrades.

- - - - -
a88e34b1 by Michael Tokarev at 2025-07-09T17:09:09+03:00
update changelog; upload version 4.22.3+dfsg-2 to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/python3-talloc.symbols.in
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+samba (2:4.22.3+dfsg-2) unstable; urgency=medium
+
+  * Revert "d/control,d/rules: ensure we use the most recent talloc/tevent/tdb"
+    There's no need for samba-libs to depend on exact versions of support libs
+    anymore, since 4.21.3+dfsg-5 (where the mistake has been made) is long gone
+  * Revert "d/control: add conflicts/breaks for libtevent0t64 on mjt repo"
+    This Breaks was special and temporary, and not useful for debian archive at
+    all (it was only needed for mjt's own repository where the wrong package
+    name slipped out once).  Remove this cruft for trixie
+  * python3-talloc.symbols[.in] -- provide long-forgotten symbols file, so that
+    versioned dependency on python3-talloc (mostly for python3-samba) will be
+    less strict.  For smoother upgrades
+  * document forgotten change in previous changelog entry
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Wed, 09 Jul 2025 17:08:31 +0300
+
 samba (2:4.22.3+dfsg-1) unstable; urgency=medium
 
   * new upstream stable/bugfix release, mostly targetting the Jul-08 update
@@ -13,6 +29,14 @@ samba (2:4.22.3+dfsg-1) unstable; urgency=medium
      dc calls like netr_DsRGetDCName
   * update d/copyright to point to https://www.gnu.org/licenses/
     instead of FSF postal address
+  * d/control: stop depending on exact same version of samba-common
+    Package samba-common contains a few files/dirs common for several samba
+    packages.  Its contents hasn't changed for quite some time.  There's
+    definitely no need to depend on exact version of this package - eg, 4.17
+    (from bookworm) will work just fine with samba version 4.22.  Drop version
+    requirement for samba-common dep entirely.  If/when we have real change in
+    samba-common which is needed by other packages, we can specify particular
+    version there.  For smoother upgrades
 
  -- Michael Tokarev <mjt at tls.msk.ru>  Mon, 07 Jul 2025 23:16:23 +0300
 


=====================================
debian/control
=====================================
@@ -136,12 +136,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
 # just require libldb version of the same build
 # https://lists.samba.org/archive/samba-technical/2023-September/138422.html
  libldb2 (= ${ldb:Version}),
-# other libs built from samba sources (it'd be nice to have dpkg-shlibdeps generate these).
-# this helps to overcome the wrong version mishap (4.21.3+dfsg-5), can be dropped for trixie
- libtalloc2 (>= ${talloc:Version}),
- libtevent0t64 (>= ${tevent:Version}) <!pkg.samba.before-trixie>,
- libtevent0    (>= ${tevent:Version}) < pkg.samba.before-trixie>,
- libtdb1 (>= ${tdb:Version}),
 Replaces:
 # libsamba-util.so &deps moved from libwbclient0 to samba-libs in 4.16.1+dfsg-7
  libwbclient0 (<< 2:4.16.1+dfsg-7~),
@@ -753,9 +747,6 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-# libtevent0t64 slipped out into mjt repository (for a short while). Drop this for trixie
-Replaces: libtevent0t64 (<< 2:0.16.1) <pkg.samba.before-trixie>
-Breaks:   libtevent0t64 (<< 2:0.16.1) <pkg.samba.before-trixie>
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: talloc-based event loop library - shared library
  tevent is a simple library that can handle the main event loop for an


=====================================
debian/python3-talloc.symbols.in
=====================================
@@ -0,0 +1,49 @@
+#libpyldb-util${DEB_PY3_EXTENSION_SUFFIX}.2 #PACKAGE# #MINVER#
+# PYTALLOC_UTIL${DEB_PY3_EXTENSION_UPCASE}_2.4.3 at PYTALLOC_UTIL${DEB_PY3_EXTENSION_UPCASE}_2.4.3 2:2.4.3
+ PYTALLOC_UTIL_2.0.6 at PYTALLOC_UTIL_2.0.6 2.0.6
+ PYTALLOC_UTIL_2.0.7 at PYTALLOC_UTIL_2.0.7 2.0.7
+ PYTALLOC_UTIL_2.0.8 at PYTALLOC_UTIL_2.0.8 2.0.8
+ PYTALLOC_UTIL_2.1.0 at PYTALLOC_UTIL_2.1.0 2.1.0
+ PYTALLOC_UTIL_2.1.1 at PYTALLOC_UTIL_2.1.1 2.1.1
+ PYTALLOC_UTIL_2.1.2 at PYTALLOC_UTIL_2.1.2 2.1.2
+ PYTALLOC_UTIL_2.1.3 at PYTALLOC_UTIL_2.1.3 2.1.3
+ PYTALLOC_UTIL_2.1.4 at PYTALLOC_UTIL_2.1.4 2.1.4
+ PYTALLOC_UTIL_2.1.5 at PYTALLOC_UTIL_2.1.5 2.1.5
+ PYTALLOC_UTIL_2.1.6 at PYTALLOC_UTIL_2.1.6 2.1.6
+ PYTALLOC_UTIL_2.1.7 at PYTALLOC_UTIL_2.1.7 2.1.7
+ PYTALLOC_UTIL_2.1.8 at PYTALLOC_UTIL_2.1.8 2.1.8
+ PYTALLOC_UTIL_2.1.9 at PYTALLOC_UTIL_2.1.9 2.1.9
+ PYTALLOC_UTIL_2.1.10 at PYTALLOC_UTIL_2.1.10 2.1.10
+ PYTALLOC_UTIL_2.1.11 at PYTALLOC_UTIL_2.1.11 2.1.11
+ PYTALLOC_UTIL_2.1.12 at PYTALLOC_UTIL_2.1.12 2.1.12
+ PYTALLOC_UTIL_2.1.13 at PYTALLOC_UTIL_2.1.13 2.1.13
+ PYTALLOC_UTIL_2.1.14 at PYTALLOC_UTIL_2.1.14 2.1.14
+ PYTALLOC_UTIL_2.1.15 at PYTALLOC_UTIL_2.1.15 2.1.15
+ PYTALLOC_UTIL_2.1.16 at PYTALLOC_UTIL_2.1.16 2.1.16
+ PYTALLOC_UTIL_2.2.0 at PYTALLOC_UTIL_2.2.0 2.2.0
+ PYTALLOC_UTIL_2.3.0 at PYTALLOC_UTIL_2.3.0 2.3.0
+ PYTALLOC_UTIL_2.3.1 at PYTALLOC_UTIL_2.3.1 2.3.1
+ PYTALLOC_UTIL_2.3.2 at PYTALLOC_UTIL_2.3.2 2.3.2
+ PYTALLOC_UTIL_2.3.3 at PYTALLOC_UTIL_2.3.3 2.3.3
+ PYTALLOC_UTIL_2.3.4 at PYTALLOC_UTIL_2.3.4 2.3.4
+ PYTALLOC_UTIL_2.3.5 at PYTALLOC_UTIL_2.3.5 2.3.5
+ PYTALLOC_UTIL_2.4.0 at PYTALLOC_UTIL_2.4.0 2.4.0
+ PYTALLOC_UTIL_2.4.1 at PYTALLOC_UTIL_2.4.1 2.4.1
+ PYTALLOC_UTIL_2.4.2 at PYTALLOC_UTIL_2.4.2 2.4.2
+ PYTALLOC_UTIL_2.4.3 at PYTALLOC_UTIL_2.4.3 2.4.3
+ _pytalloc_check_type at PYTALLOC_UTIL_2.1.9 2.1.9
+ _pytalloc_get_mem_ctx at PYTALLOC_UTIL_2.1.6 2.1.6
+ _pytalloc_get_name at PYTALLOC_UTIL_2.3.0 2.3.0
+ _pytalloc_get_ptr at PYTALLOC_UTIL_2.1.6 2.1.6
+ _pytalloc_get_type at PYTALLOC_UTIL_2.1.6 2.1.6
+ pytalloc_BaseObject_PyType_Ready at PYTALLOC_UTIL_2.1.6 2.1.6
+ pytalloc_BaseObject_check at PYTALLOC_UTIL_2.1.6 2.1.6
+ pytalloc_BaseObject_size at PYTALLOC_UTIL_2.1.6 2.1.6
+ pytalloc_Check at PYTALLOC_UTIL_2.0.6 2.0.6
+ pytalloc_GenericObject_reference_ex at PYTALLOC_UTIL_2.1.9 2.1.9
+ pytalloc_GenericObject_steal_ex at PYTALLOC_UTIL_2.1.9 2.1.9
+ pytalloc_GetBaseObjectType at PYTALLOC_UTIL_2.1.6 2.1.6
+ pytalloc_GetObjectType at PYTALLOC_UTIL_2.0.6 2.0.6
+ pytalloc_reference_ex at PYTALLOC_UTIL_2.0.6 2.0.6
+ pytalloc_steal at PYTALLOC_UTIL_2.0.6 2.0.6
+ pytalloc_steal_ex at PYTALLOC_UTIL_2.0.6 2.0.6


=====================================
debian/rules
=====================================
@@ -80,9 +80,6 @@ tdb-packages := libtdb1 tdb-tools libtdb-dev python3-tdb
 
 extra-version-vars = \
 	-Vldb:Version=${ldb-version} \
-	-Vtalloc:Version=${talloc-version} \
-	-Vtevent:Version=${tevent-version} \
-	-Vtdb:Version=${tdb-version} \
 
 omit-pkgs =
 
@@ -369,6 +366,15 @@ execute_after_dh_fixperms-arch:
 	$(call ifpkg, smbclient, chmod 0700 debian/smbclient/usr/libexec/samba/smbspool_krb5_wrapper)
 
 override_dh_makeshlibs:
+	# generate symbols file with correct cpython suffix in there
+	{ \
+	   suff=$$(${DEB_HOST_MULTIARCH}-python3-config --extension-suffix | tr _ -); \
+	   SUFF=$$(echo "$${suff%.so}" | tr a-z- A-Z_); \
+	   echo "libpytalloc-util$${suff}.2 #PACKAGE# #MINVER#"; \
+	   echo " PYTALLOC_UTIL$${SUFF}_${talloc-upstream-version}@PYTALLOC_UTIL$${SUFF}_${talloc-upstream-version} ${talloc-version}"; \
+	   cat debian/python3-talloc.symbols.in; \
+	} > debian/python3-talloc.symbols
+
 	# create symbols and shlibs files in separate wrapper script
 	# to deal with private libraries
 	debian/genshlibs \
@@ -378,6 +384,8 @@ override_dh_makeshlibs:
 		$(addsuffix =${tdb-version},${tdb-packages}) \
 		$(addsuffix =${mitkrb5-samba-ver}, ${mitkrb5-dep-pkgs})
 
+	rm -f debian/python3-talloc.symbols
+
 # depcheck package, dep1|dep2... -- dependencies which should NOT be there
 depcheck = if egrep '^shlibs.Depends=.* ($(strip $2)) ' debian/$(strip $1).substvars; \
 	then echo 'E: $(strip $1) should not depend on $(strip $2)' >&2; exit 1; fi



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/45eef146d4ddb581a4f1ebd3d4365a614bf43281...a88e34b1574d0af43fa61500bf6d735124522a0a

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/45eef146d4ddb581a4f1ebd3d4365a614bf43281...a88e34b1574d0af43fa61500bf6d735124522a0a
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/20250709/b3f5315a/attachment-0001.htm>

More information about the Pkg-samba-maint mailing list