[neon/extras/qca2/Neon/unstable] debian: merge from salsa
Jonathan Esk-Riddell
null at kde.org
Mon Dec 12 12:39:11 GMT 2022
Git commit d8ddf113b177d3b88ae9c8d134e3743aa2871149 by Jonathan Esk-Riddell, on behalf of Carlos De Maine.
Committed on 12/12/2022 at 12:39.
Pushed by jriddell into branch 'Neon/unstable'.
merge from salsa
M +32 -0 debian/changelog
M +4 -4 debian/control
M +1 -8 debian/libqca-qt5-2-plugins.install
D +0 -15 debian/patches/define_qca_export.diff
A +18 -0 debian/patches/disable_pgpunittest.diff
M +6 -6 debian/patches/pipeunittest_more_wait.diff
M +2 -1 debian/patches/series
A +29 -0 debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
M +1 -1 debian/qca-qt5-2-utils.lintian-overrides
M +7 -1 debian/rules
M +0 -1 debian/salsa-ci.yml
https://invent.kde.org/neon/extras/qca2/commit/d8ddf113b177d3b88ae9c8d134e3743aa2871149
diff --git a/debian/changelog b/debian/changelog
index 4908cc1..cf62910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+qca2 (2.3.5-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update standards version to 4.6.1, no changes needed.
+ * CI: enable again the blhc job.
+ * Update the build dependencies according to the upstream build system:
+ - bump cmake to 3.16
+ * Update the patches:
+ - define_qca_export.diff: drop, fixed upstream
+ - pipeunittest_more_wait.diff: refresh
+ * Factorize the common cmake arguments for different Qt versions in a single
+ variable.
+ * Explicitly disable all the plugins which we currently do not want to build;
+ this way, having the dependencies for them installed will not cause a build
+ failure due to unhandled files (Closes: #1019464)
+ - pass to cmake: -DWITH_botan_PLUGIN=NO -DWITH_gcrypt_PLUGIN=NO
+ -DWITH_nss_PLUGIN=NO -DWITH_pkcs11_PLUGIN=NO
+ * Backport upstream commit 33a35a699928318032f62eab0e39e263c604ad9e to fix
+ a crash in hashunittest; patch
+ upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch.
+ * Update lintian overrides.
+ * Export QT_PLUGIN_PATH with the build location of the plugin when running
+ dh_auto_test: this way, the unit tests can use the plugins.
+ * Add the gnupg test-only build dependency, needed for the tests of the gnupg
+ plugin.
+ * Disable pgpunittest for now, as some tests fail in build-like environments;
+ patch disable_pgpunittest.diff.
+ * Remove inactive Uploaders, adding myself as one to avoid leaving the source
+ with no human maintainers.
+
+ -- Pino Toscano <pino at debian.org> Sat, 22 Oct 2022 16:37:05 +0200
+
qca2 (2.3.5-0neon) UNRELEASED; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index 32d7cd3..a271589 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: qca2
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Felix Geyer <fgeyer at debian.org>,
- Maximiliano Curia <maxy at debian.org>,
+Uploaders: Pino Toscano <pino at debian.org>,
Build-Depends: ca-certificates,
- cmake (>= 3.4~),
+ cmake (>= 3.16~),
debhelper-compat (= 13),
+ gnupg <!nocheck>,
libsasl2-dev,
libssl-dev (>= 1.1.1~),
pkg-config,
@@ -15,7 +15,7 @@ Build-Depends: ca-certificates,
Build-Depends-Indep: doxygen,
graphviz,
Build-Conflicts: libqca2-dev, qca-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Rules-Requires-Root: no
Homepage: https://userbase.kde.org/QCA
Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/qca2.git
diff --git a/debian/libqca-qt5-2-plugins.install b/debian/libqca-qt5-2-plugins.install
index aa1b15f..c3d0085 100644
--- a/debian/libqca-qt5-2-plugins.install
+++ b/debian/libqca-qt5-2-plugins.install
@@ -1,8 +1 @@
-usr/lib/*/qca-qt5/crypto/libqca-botan.so
-usr/lib/*/qca-qt5/crypto/libqca-cyrus-sasl.so
-usr/lib/*/qca-qt5/crypto/libqca-gcrypt.so
-usr/lib/*/qca-qt5/crypto/libqca-gnupg.so
-usr/lib/*/qca-qt5/crypto/libqca-logger.so
-usr/lib/*/qca-qt5/crypto/libqca-nss.so
-usr/lib/*/qca-qt5/crypto/libqca-ossl.so
-usr/lib/*/qca-qt5/crypto/libqca-softstore.so
+usr/lib/*/qca-qt5/crypto/
diff --git a/debian/patches/define_qca_export.diff b/debian/patches/define_qca_export.diff
deleted file mode 100644
index a274447..0000000
--- a/debian/patches/define_qca_export.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Define QCA_EXPORT as Q_DECL_EXPORT on non-Windows systems so we
- can build with -fvisibility=hidden.
-Author: Felix Geyer <debfx-pkg at fobos.de>
-
---- a/include/QtCrypto/qca_export.h
-+++ b/include/QtCrypto/qca_export.h
-@@ -44,6 +44,8 @@
- #define QCA_EXPORT Q_DECL_IMPORT
- #endif
- #endif
-+#else
-+#define QCA_EXPORT Q_DECL_EXPORT
- #endif
- #ifndef QCA_EXPORT
- #define QCA_EXPORT
diff --git a/debian/patches/disable_pgpunittest.diff b/debian/patches/disable_pgpunittest.diff
new file mode 100644
index 0000000..9907beb
--- /dev/null
+++ b/debian/patches/disable_pgpunittest.diff
@@ -0,0 +1,18 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Disable pgpunittest for now
+ It seems that, even with gnupg installed, some tests fail in build-like
+ environments. Hence, disable this test suite for now.
+Last-Update: 2022-10-22
+Forwarded: not-needed
+
+--- a/unittest/pgpunittest/pgpunittest.cpp
++++ b/unittest/pgpunittest/pgpunittest.cpp
+@@ -128,6 +128,8 @@ private Q_SLOTS:
+
+ void PgpUnitTest::initTestCase()
+ {
++ QSKIP("unreliable in build environments");
++
+ // Change current directory to executable directory
+ // it is need to find keys*_work directories
+ if (!QCoreApplication::applicationDirPath().isEmpty())
diff --git a/debian/patches/pipeunittest_more_wait.diff b/debian/patches/pipeunittest_more_wait.diff
index 82652f0..07e3c66 100644
--- a/debian/patches/pipeunittest_more_wait.diff
+++ b/debian/patches/pipeunittest_more_wait.diff
@@ -9,7 +9,7 @@ Forwarded: no
--- a/unittest/pipeunittest/pipeunittest.cpp
+++ b/unittest/pipeunittest/pipeunittest.cpp
-@@ -110,17 +110,17 @@ void PipeUnitTest::readWrite()
+@@ -112,17 +112,17 @@ void PipeUnitTest::readWrite()
pipe1.readEnd().enable();
pipe1.writeEnd().write(testData1);
@@ -31,7 +31,7 @@ Forwarded: no
QCOMPARE(pipe1.readEnd().bytesAvailable(), testData1.size() + testData2.size());
QByteArray thisRead = pipe1.readEnd().read(1);
QCOMPARE(thisRead, QByteArray("D"));
-@@ -145,17 +145,17 @@ void PipeUnitTest::readWriteSecure()
+@@ -147,17 +147,17 @@ void PipeUnitTest::readWriteSecure()
pipe1.readEnd().enable();
pipe1.writeEnd().writeSecure(testData1);
@@ -53,7 +53,7 @@ Forwarded: no
QCOMPARE(pipe1.readEnd().bytesAvailable(), testData1.size() + testData2.size());
QCA::SecureArray thisRead = pipe1.readEnd().readSecure(1);
QCOMPARE(thisRead, QCA::SecureArray("D"));
-@@ -191,8 +191,8 @@ void PipeUnitTest::signalTests()
+@@ -193,8 +193,8 @@ void PipeUnitTest::signalTests()
QByteArray data("Far better, it is, to dare mighty things");
pipe->writeEnd().write(data);
@@ -64,7 +64,7 @@ Forwarded: no
QCOMPARE(readyReadSpy.count(), 1);
QCOMPARE(bytesWrittenSpy.count(), 1);
// this pulls out the first argument to the first signal as an integer
-@@ -203,11 +203,11 @@ void PipeUnitTest::signalTests()
+@@ -205,11 +205,11 @@ void PipeUnitTest::signalTests()
QCOMPARE(closedReadSpy.count(), 0);
pipe->readEnd().close();
@@ -78,7 +78,7 @@ Forwarded: no
QCOMPARE(closedWriteSpy.count(), 1);
QCOMPARE(closedReadSpy.count(), 1);
}
-@@ -238,8 +238,8 @@ void PipeUnitTest::signalTestsSecure()
+@@ -240,8 +240,8 @@ void PipeUnitTest::signalTestsSecure()
QCA::SecureArray data("Far better, it is, to dare mighty things");
pipe->writeEnd().writeSecure(data);
@@ -89,7 +89,7 @@ Forwarded: no
QCOMPARE(readyReadSpy.count(), 1);
QCOMPARE(bytesWrittenSpy.count(), 1);
// this pulls out the first argument to the first signal as an integer
-@@ -250,11 +250,11 @@ void PipeUnitTest::signalTestsSecure()
+@@ -252,11 +252,11 @@ void PipeUnitTest::signalTestsSecure()
QCOMPARE(closedReadSpy.count(), 0);
pipe->readEnd().close();
diff --git a/debian/patches/series b/debian/patches/series
index 066a0d6..ac85b11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-define_qca_export.diff
+upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
pipeunittest_more_wait.diff
+disable_pgpunittest.diff
diff --git a/debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch b/debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
new file mode 100644
index 0000000..b18c237
--- /dev/null
+++ b/debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
@@ -0,0 +1,29 @@
+From 33a35a699928318032f62eab0e39e263c604ad9e Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 22 Oct 2022 13:51:17 +0200
+Subject: [PATCH] hashunittest: run sha384longtest only for providers that
+ support sha384
+
+Fixes commit bdb0e9d37d78ec8e01d4008dba5243afe9029346 that accidentally
+left the wrong logic when refactoring the file, and makes the check as
+done in the other longtest tests.
+---
+ unittest/hashunittest/hashunittest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unittest/hashunittest/hashunittest.cpp b/unittest/hashunittest/hashunittest.cpp
+index c2c25a0e..b208c94f 100644
+--- a/unittest/hashunittest/hashunittest.cpp
++++ b/unittest/hashunittest/hashunittest.cpp
+@@ -581,7 +581,7 @@ void HashUnitTest::sha384longtest()
+ fillerString.fill('a', 1000);
+
+ foreach (QString provider, providersToTest) {
+- if (!QCA::isSupported("sha384", provider)) {
++ if (QCA::isSupported("sha384", provider)) {
+ // QTime t;
+ // t.start();
+ QCA::Hash shaHash(QStringLiteral("sha384"), provider);
+--
+2.35.1
+
diff --git a/debian/qca-qt5-2-utils.lintian-overrides b/debian/qca-qt5-2-utils.lintian-overrides
index b42c12d..75b6123 100644
--- a/debian/qca-qt5-2-utils.lintian-overrides
+++ b/debian/qca-qt5-2-utils.lintian-overrides
@@ -1 +1 @@
-qca-qt5-2-utils: no-manual-page usr/bin/mozcerts-qt5
+qca-qt5-2-utils: no-manual-page [usr/bin/mozcerts-qt5]
diff --git a/debian/rules b/debian/rules
index cc3bb22..70069c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,15 @@ export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden -fvisibility-inlines-hidd
libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
+COMMON_CMAKE_ARGS = -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DWITH_botan_PLUGIN=NO -DWITH_gcrypt_PLUGIN=NO -DWITH_nss_PLUGIN=NO -DWITH_pkcs11_PLUGIN=NO
+
%:
dh $@ --builddirectory=build
override_dh_auto_configure:
QT_SELECT=qt5 dh_auto_configure --builddirectory=build -- \
- -DQT5_BUILD=ON -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
+ $(COMMON_CMAKE_ARGS) \
+ -DQT5_BUILD=ON \
-DQCA_FEATURE_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features"
override_dh_auto_build-arch:
@@ -26,6 +29,9 @@ override_dh_auto_build-indep:
override_dh_auto_install-indep:
+override_dh_auto_test-arch:
+ QT_PLUGIN_PATH=$(CURDIR)/build/lib/qca-qt5/ dh_auto_test -a
+
override_dh_auto_test-indep:
override_dh_gencontrol-arch: libpkgs_gen_strict_local_shlibs
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index d2fd341..f71bdf3 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -2,7 +2,6 @@ include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
variables:
- SALSA_CI_DISABLE_BLHC: 'yes'
SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
SALSA_CI_DISABLE_RC_BUGS: 'no'
SALSA_CI_REPROTEST_ARGS: '--variations=-build-path'
More information about the Neon-commits
mailing list