Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
qtbase
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Qt and KDE Team
Qt5
qtbase
Commits
531c31ae
Commit
531c31ae
authored
3 years ago
by
Dmitry Shachnev
Browse files
Options
Downloads
Patches
Plain Diff
Don't hardcode libssl version in Depends, fill it dynamically.
parent
387bd8f1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
debian/changelog
+1
-0
1 addition, 0 deletions
debian/changelog
debian/control
+1
-1
1 addition, 1 deletion
debian/control
debian/rules
+4
-0
4 additions, 0 deletions
debian/rules
with
6 additions
and
1 deletion
debian/changelog
+
1
−
0
View file @
531c31ae
...
...
@@ -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).
...
...
This diff is collapsed.
Click to expand it.
debian/control
+
1
−
1
View file @
531c31ae
...
...
@@ -157,7 +157,7 @@ Package: libqt5network5
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libssl
1.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.
...
...
This diff is collapsed.
Click to expand it.
debian/rules
+
4
−
0
View file @
531c31ae
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment