Skip to content
Snippets Groups Projects
Commit 531c31ae authored by Dmitry Shachnev's avatar Dmitry Shachnev :penguin:
Browse files

Don't hardcode libssl version in Depends, fill it dynamically.

parent 387bd8f1
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@ qtbase-opensource-src (5.15.2+dfsg-15) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* Backport upstream changes to improve support for OpenSSL 3.0.
- Don't hardcode libssl version in Depends, fill it dynamically.
* Replace -ffile-prefix-map in qmodule.pri.
* Backport upstream patch to make QProcess not search for executables in
CWD unless explicitly told so (CVE-2022-25255).
......
......@@ -157,7 +157,7 @@ Package: libqt5network5
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libssl1.1, ${misc:Depends}, ${shlibs:Depends}
Depends: ${libssl:Depends}, ${misc:Depends}, ${shlibs:Depends}
Description: Qt 5 network module
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
......
......@@ -14,6 +14,7 @@ export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags -
export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) $(shell getconf LFS_CFLAGS)
export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
export PKG_CONFIG := /usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config
sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
# Upstream changelog
upstream_changes := dist/changes-$(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/+dfsg//' | sed -e 's/+git.*//')
......@@ -313,3 +314,6 @@ override_dh_auto_test:
override_dh_strip_nondeterminism:
dh_strip_nondeterminism --verbose -X.png
execute_after_dh_shlibdeps-arch:
echo libssl:Depends=$(sslpkgname) >> debian/libqt5network5.substvars
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment