[Pkg-samba-maint] [Git][samba-team/samba][bullseye] 2 commits: d/rules: use dpkg-query instead of pkg-config to find debian package version of libldb-dev

[Michael Tokarev (@mjt)]

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


Commits:
a3aca81d by Michael Tokarev at 2022-08-09T17:53:53+03:00
d/rules: use dpkg-query instead of pkg-config to find debian package version of libldb-dev

- - - - -
bbe69895 by Michael Tokarev at 2022-08-10T00:20:21+03:00
update changelog; upload 4.13.13+dfsg-1~deb11u5 to bullseye-security (again)

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -23,8 +23,11 @@ samba (2:4.13.13+dfsg-1~deb11u5) bullseye-security; urgency=medium
      CVE-2022-32745, CVE-2022-32746
    * Build-Depend on libldb-dev >= 2.2.3-2~deb11u2
      (which includes the new symbols in libldb used by this update)
+   * d/rules: use dpkg-query instead of pkg-config to find debian package
+     version of libldb-dev, since this is what we actually want, not the
+     internal version libldb thinks it is at.
 
- -- Michael Tokarev <mjt at tls.msk.ru>  Mon, 01 Aug 2022 17:48:14 +0300
+ -- Michael Tokarev <mjt at tls.msk.ru>  Wed, 10 Aug 2022 00:19:38 +0300
 
 samba (2:4.13.13+dfsg-1~deb11u4) bullseye-proposed-updates; urgency=medium
 


=====================================
debian/rules
=====================================
@@ -15,13 +15,12 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-LDB_VERSION = $(shell pkg-config --modversion ldb)
-LDB_EPOCH = $(shell dpkg-query -f '$${Version}' -W libldb-dev | sed 's/:.*//')
+LDB_VERSION = $(shell dpkg-query -f '$${Version}' -W libldb-dev | sed 's/-.*//')
 LDB_NEXT_VERSION = $(shell python3 -c "x = '$(LDB_VERSION)'.split('.'); x[-1] = str(int(x[-1])+1); print('.'.join(x))")
 # samba ships ldb modules, which are specific to the ldb version, so we need a
 # strict dependency on the upstream ldb version
 # this also mean samba needs a rebuild when the upstream ldb version changes
-LDB_DEPENDS = "libldb2 (<< $(LDB_EPOCH):$(LDB_NEXT_VERSION)~), libldb2 (>> $(LDB_EPOCH):$(LDB_VERSION)~)"
+LDB_DEPENDS = "libldb2 (<< $(LDB_NEXT_VERSION)~), libldb2 (>> $(LDB_VERSION)~)"
 export PYSHORT=python3
 export PYTHON=$(shell which $(PYSHORT))
 export PYTHON_CONFIG="$(PYTHON)-config"



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/ff19901eda4c985c1dc0df6e926d58dd8b060ddc...bbe698952df6725706d5a2b4a13a3e3fbefc5fef

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/ff19901eda4c985c1dc0df6e926d58dd8b060ddc...bbe698952df6725706d5a2b4a13a3e3fbefc5fef
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/20220812/899393be/attachment-0001.htm>