commit qca for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qca for openSUSE:Factory checked in at 2024-06-27 15:57:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qca (Old) and /work/SRC/openSUSE:Factory/.qca.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qca" Thu Jun 27 15:57:48 2024 rev:13 rq:1183253 version:2.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/qca/qca.changes 2024-01-21 23:08:10.337103040 +0100 +++ /work/SRC/openSUSE:Factory/.qca.new.18349/qca.changes 2024-06-27 15:57:50.862568372 +0200 @@ -1,0 +2,14 @@ +Mon Jun 24 17:51:06 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de> + +- Update to version 2.3.9: + * Increase version number + * Update rootcerts.pem + * cmake: Remove old way to find gcrypt + * Fix build with libgcrypt-1.11 + * CI: Build all plugins + * gitignore: add VS Code dir + * Replace deprecated qAsConst() with std::as_const() + * cmake: Enable C++17 + * Fix use of deprecated QString::count() + +------------------------------------------------------------------- Old: ---- qca-2.3.8+git1.obscpio New: ---- qca-2.3.9.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qca.spec ++++++ --- /var/tmp/diff_new_pack.8lfpxV/_old 2024-06-27 15:57:52.194617451 +0200 +++ /var/tmp/diff_new_pack.8lfpxV/_new 2024-06-27 15:57:52.194617451 +0200 @@ -1,5 +1,5 @@ # -# spec file +# spec file for package qca # # Copyright (c) 2024 SUSE LLC # @@ -36,10 +36,10 @@ %endif # %define _soversion 2 -%define realversion 2.3.8 +%define realversion 2.3.9 %bcond_without pkcs11 Name: qca%{pkgname_suffix} -Version: 2.3.8+git1 +Version: 2.3.9 Release: 0 Summary: Qt Cryptographic Architecture 2 License: LGPL-2.1-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.8lfpxV/_old 2024-06-27 15:57:52.254619662 +0200 +++ /var/tmp/diff_new_pack.8lfpxV/_new 2024-06-27 15:57:52.258619809 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://invent.kde.org/libraries/qca.git</param> - <param name="changesrevision">c3deedaaba48c34e599c9bdf9061e0a97ebf77f7</param></service></servicedata> + <param name="changesrevision">461942af6641a6dabe444a22675909dc2d4a8ded</param></service></servicedata> (No newline at EOF) ++++++ qca-2.3.8+git1.obscpio -> qca-2.3.9.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-2.3.8+git1/.gitignore new/qca-2.3.9/.gitignore --- old/qca-2.3.8+git1/.gitignore 2024-01-15 07:22:49.000000000 +0100 +++ new/qca-2.3.9/.gitignore 2024-06-24 10:54:04.000000000 +0200 @@ -3,4 +3,5 @@ .clangd .cache .idea +.vscode /cmake-build* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-2.3.8+git1/.gitlab-ci.yml new/qca-2.3.9/.gitlab-ci.yml --- old/qca-2.3.8+git1/.gitlab-ci.yml 2024-01-15 07:22:49.000000000 +0100 +++ new/qca-2.3.9/.gitlab-ci.yml 2024-06-24 10:54:04.000000000 +0200 @@ -11,6 +11,8 @@ build_ubuntu_20_10: stage: build image: ubuntu:groovy + tags: + - Linux only: - merge_requests before_script: @@ -24,26 +26,30 @@ - eatmydata apt install --yes --no-install-recommends ninja-build libbotan-2-dev libnss3-dev libgcrypt20-dev libpkcs11-helper1-dev gnupg script: - mkdir -p build && cd build - - cmake -G Ninja .. + - cmake -G Ninja .. -DBUILD_PLUGINS=all - ninja - QT_PLUGIN_PATH=`pwd`/lib/qca-qt5/ ctest -V build_fedora_34: stage: build image: fedora:34 + tags: + - Linux only: - merge_requests before_script: - dnf -y --setopt=install_weak_deps=False install git gcc-c++ make cmake ninja-build qt6-qtbase-devel qt6-qt5compat-devel botan2-devel cyrus-sasl-devel nss-devel libgcrypt-devel pkcs11-helper-devel gnupg script: - mkdir -p build && cd build - - cmake -G Ninja -DBUILD_WITH_QT6=ON .. + - cmake -G Ninja -DBUILD_WITH_QT6=ON .. -DBUILD_PLUGINS=all - ninja - QT_PLUGIN_PATH=`pwd`/lib/qca-qt6/ ctest -V build_clazy_clang_tidy: stage: build image: debian:unstable + tags: + - Linux only: - merge_requests before_script: @@ -53,7 +59,7 @@ - eatmydata apt-get build-dep --yes --no-install-recommends qca2 - eatmydata apt-get install --yes --no-install-recommends ninja-build libbotan-2-dev libnss3-dev libgcrypt20-dev libpkcs11-helper1-dev clazy clang clang-tidy-14 jq gnupg script: - - srcdir=`pwd` && mkdir -p /tmp/qca_build && cd /tmp/qca_build && CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja $srcdir && cat compile_commands.json | jq '[.[] | select(.file | contains("'"$srcdir"'"))]' > compile_commands.aux.json && mv compile_commands.aux.json compile_commands.json + - srcdir=`pwd` && mkdir -p /tmp/qca_build && cd /tmp/qca_build && CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -DBUILD_PLUGINS=all -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja $srcdir && cat compile_commands.json | jq '[.[] | select(.file | contains("'"$srcdir"'"))]' > compile_commands.aux.json && mv compile_commands.aux.json compile_commands.json - CLAZY_CHECKS="level0,level1,level2,no-copyable-polymorphic,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,qproperty-type-mismatch,qrequiredresult-candidates,signal-with-return-value,thread-with-slots,tr-non-literal,unneeded-cast" ninja - "run-clang-tidy-14 -header-filter='.*/qca/.*' -checks='-*,performance-*,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,modernize-use-nullptr,-performance-no-automatic-move,-performance-no-int-to-ptr' -config=\"{WarningsAsErrors: '*'}\"" - QT_PLUGIN_PATH=`pwd`/lib/qca-qt5/ ctest -V @@ -61,6 +67,8 @@ build_openssl3_botan3: stage: build image: debian:unstable + tags: + - Linux only: - merge_requests before_script: @@ -77,7 +85,7 @@ - time make -j `nproc` install - cd .. - mkdir -p build && cd build - - cmake -G Ninja .. + - cmake -G Ninja .. -DBUILD_PLUGINS=all - ninja - QT_PLUGIN_PATH=`pwd`/lib/qca-qt5/ bin/qcatool* --debug plugins > features-with-legacy - QT_PLUGIN_PATH=`pwd`/lib/qca-qt5/ ctest -V @@ -92,6 +100,8 @@ clang_format: stage: build image: debian:testing + tags: + - Linux only: - merge_requests before_script: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-2.3.8+git1/CMakeLists.txt new/qca-2.3.9/CMakeLists.txt --- old/qca-2.3.8+git1/CMakeLists.txt 2024-01-15 07:22:49.000000000 +0100 +++ new/qca-2.3.9/CMakeLists.txt 2024-06-24 10:54:04.000000000 +0200 @@ -13,7 +13,7 @@ set(QCA_LIB_MAJOR_VERSION "2") set(QCA_LIB_MINOR_VERSION "3") -set(QCA_LIB_PATCH_VERSION "8") +set(QCA_LIB_PATCH_VERSION "9") if(POLICY CMP0042) cmake_policy(SET CMP0042 OLD) @@ -107,6 +107,10 @@ set(CMAKE_DEBUG_POSTFIX "_debug") endif() +# C++ standard +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (CMAKE_SYSTEM_NAME MATCHES Linux) add_definitions (-D_DEFAULT_SOURCE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-2.3.8+git1/certs/README new/qca-2.3.9/certs/README --- old/qca-2.3.8+git1/certs/README 2024-01-15 07:22:49.000000000 +0100 +++ new/qca-2.3.9/certs/README 2024-06-24 10:54:04.000000000 +0200 @@ -1,5 +1,5 @@ rootcerts.pem is created by qca/tools/mozcerts File: https://hg.mozilla.org/mozilla-central/log/tip/security/nss/lib/ckfw/builtin... -Date: January 1, 2024 +Date: June 24, 2024 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-2.3.8+git1/certs/rootcerts.pem new/qca-2.3.9/certs/rootcerts.pem --- old/qca-2.3.8+git1/certs/rootcerts.pem 2024-01-15 07:22:49.000000000 +0100 +++ new/qca-2.3.9/certs/rootcerts.pem 2024-06-24 10:54:04.000000000 +0200 @@ -208,27 +208,6 @@ 4SVhM7JZG+Ju1zdXtg2pEto= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY -MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t -dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5 -WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD -VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8 -9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ -DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9 -Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N -QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ -xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G -A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T -AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG -kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr -Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5 -Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU -JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot -RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw== - ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY @@ -4111,3 +4090,163 @@ rg3bhzjlP1v9mxnhMUF6cKojawHhRUzNlM47ni3niAIi9G7oyOzWPPO5std3eqx7 -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICXjCCAeOgAwIBAgIQUs/kjG2gSvc/gpcMgAmMlTAKBggqhkjOPQQDAzBJMQsw +CQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSMwIQYDVQQDExpELVRy +dXN0IFNCUiBSb290IENBIDEgMjAyMjAeFw0yMjA3MDYxMTMwMDBaFw0zNzA3MDYx +MTI5NTlaMEkxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxIzAh +BgNVBAMTGkQtVHJ1c3QgU0JSIFJvb3QgQ0EgMSAyMDIyMHYwEAYHKoZIzj0CAQYF +K4EEACIDYgAEWZM59oxJZijXYQzIq38Moy3foqR8kito1S5+HkDLtGhJfxKhq39X +nxkuYy5b/mZxDDMPud5rxIjDse/sOUDjlqvb5XuuH9z5r0aaakYGL8c3ZIsXYv6W +w6LuhOCwlzm8o4GPMIGMMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPEpox4B +Eh09dVZNx1B8xRmqDxi3MA4GA1UdDwEB/wQEAwIBBjBKBgNVHR8EQzBBMD+gPaA7 +hjlodHRwOi8vY3JsLmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Nicl9yb290X2Nh +XzFfMjAyMi5jcmwwCgYIKoZIzj0EAwMDaQAwZgIxAJf53q5Lj5i1HkB/Mn1NVEPa +ic3CqpI80YIec8/6TJIg+2MnxfVzPQk996dhhozzagIxAOcvfLj1JYw7OR82q431 +hqIu4Xpk2mc5Av7+Mz/Zc7ZYWzr8sqTZYHh3zHmnpq5VvQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFrDCCA5SgAwIBAgIQVNWjlR49lbpyG5rQMSFKujANBgkqhkiG9w0BAQ0FADBJ +MQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSMwIQYDVQQDExpE +LVRydXN0IFNCUiBSb290IENBIDIgMjAyMjAeFw0yMjA3MDcwNzMwMDBaFw0zNzA3 +MDcwNzI5NTlaMEkxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgx +IzAhBgNVBAMTGkQtVHJ1c3QgU0JSIFJvb3QgQ0EgMiAyMDIyMIICIjANBgkqhkiG +9w0BAQEFAAOCAg8AMIICCgKCAgEAryy8jjaM62SvUWrWbjxekTrqmsPKbPuqJ55k +IqlA37koRVrsU2EWKJjCiqR1eFCE3fogSJIHZUE1ZlESdGGdBwaFOTFXeyg/1Zyl +7FrpHEsnn84nBvM39VLYETMWQTof9WN4ZWOGyb/IAQQfbu7i7KwM7oKS4vYaDT85 ++Z1lk634uQXBPfg3gVbDoP4F7OCUFjojFgTapgqThXJtYTuhjUXW43++Fb02hAj2 +C4NrJqqiveCw56rgrmfE04KlDKmk8DN5DVA/8O+QPSS5f9IgbOqX87+c3EfeCWG9 +lHmVWgJ2NWDERyIN93ZjA9PG+4PGXaut7WklKwNbTSUAQeOMhxdSqOAFK0NNFBPK +5z9DIrw3pHXx9r867zIeru5YhpByugSsQEjvXMR4p6mPJ1rLeuxY8sIIWJBtTQOF +eXEVBQ5OPvnfDwX3XxRIViENM5KxrIzlGP6/D+7gBKq9IfJYtlyJCosYCSIaszXG +ZsL1MxWZgOAI+ZYvE4zu2reIxOk3tddq1zqETatwjNNOFFWgohD8ZNpn6PHLM93J +moqPli9Ygdn4mgBDzJD7VXb7huM3ASgMb/TpWU0Vd1FCSsw0uIBDUIHvV6UT26eU +eQ9Lyn4Xfa+jIWTocVVWjwawR+xZD11wWywWQvCGnnXea01ImITiVxi2nIKZZTqL +gHhXDEkCAwEAAaOBjzCBjDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRds4CU +G+WGv2i6FDSk9u5t8t3f5zAOBgNVHQ8BAf8EBAMCAQYwSgYDVR0fBEMwQTA/oD2g +O4Y5aHR0cDovL2NybC5kLXRydXN0Lm5ldC9jcmwvZC10cnVzdF9zYnJfcm9vdF9j +YV8yXzIwMjIuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQA0VC5YGFbNSr2X0/V9K9yv +D1HhTbwhS5P0AEQTBxALJRg+SFmW96Hhk5B4Zho9I+siqwGmjgxRM+ZtjDHurKQB +cDlI3sdmLGsNy3Ofh5LpPkcfuO8v7rdWjEiJ8DinFTmy7sA/F6RzAgicvAaKpMK3 +YWH5w9vE0Hp8Yd6xWJH13WVMLwv46z217Yq+dxy6WQISZnHlmCfODj2vUaJF+YL7 +WqWUcPeLhMNMZSWbe+IfMHCzQI467r3052jFnckpR3EOk8i1SE71ZrsHiHFpa3tI +jm/wEcS0yXAUmCC97afqAdpupZsS/j5EMLPw63VSwPTD+ncmpHeCLW/zKB5OlfAw +94n4LKJQW/K+Mn5sVNtyySpa4By2C9hSmlmh47ABJ8WgFlBm3OuubfSbWz2EbVuH +56mJu2644JtTicD/LkAaiUQuGENnOOR8cl/ZoyklQUE9HHcbZKjDVe5jcWZig/R/ +JpmgVDuhEm1wYs7T+bi9IvzUmtS74jgWL7d9OcKwqQPpnM9+GI123F8Ru+tC7FAJ +PlzskDHYGnK6P2kH7pg0wjSk1toT1qmE8gCGwFS6HhGw4rnEB7SR56rmMVZvsUTE +KmK8ybBlnDT8DBpT3yEXu8JtoQrm8bCqRAlQSTh6XXHiMS4ZsN+VQgR9hIjOCiNn +azidFt4G/ihwOKVarvyD7Q== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICRzCCAc2gAwIBAgIQFSrdFMkY0aRWQIamJa8HXzAKBggqhkjOPQQDAzBlMQsw +CQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBH +bWJIMS0wKwYDVQQDDCRUZWxla29tIFNlY3VyaXR5IFNNSU1FIEVDQyBSb290IDIw +MjEwHhcNMjEwMzE4MTEwODMwWhcNNDYwMzE3MjM1OTU5WjBlMQswCQYDVQQGEwJE +RTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBHbWJIMS0wKwYD +VQQDDCRUZWxla29tIFNlY3VyaXR5IFNNSU1FIEVDQyBSb290IDIwMjEwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAASwGY+ia7XHzQ8wmTcMw2Bb8fEnIFU9wJKLq1ehb3OD +IcJDEwxeiarHBTV5k2KQ1l0TH9F6oLyeEKdmfEYKsFdsv+ZUOTghbBJccczTWl9t +t6eG37Pf7sLniUGWNfYvSrWjQjBAMB0GA1UdDgQWBBQrywEMY8NTEqWoV6/QnIP7 +vZA6SzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQD +AwNoADBlAjEA1rxIkodHA8dwOyW2H65GZ3N0ACdL5KUEogPfXiitbl4DyN1onLa/ +lBBIlS8P/xiLAjABQDOel5dNBfJ0VAzNOf1qawnBJD9hjjiht+jXRBURYv8OYTdH +S0B/Sl+yZ1pzdcI= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICQjCCAcmgAwIBAgIQNjqWjMlcsljN0AFdxeVXADAKBggqhkjOPQQDAzBjMQsw +CQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBH +bWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBFQ0MgUm9vdCAyMDIw +MB4XDTIwMDgyNTA3NDgyMFoXDTQ1MDgyNTIzNTk1OVowYzELMAkGA1UEBhMCREUx +JzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkGA1UE +AwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgRUNDIFJvb3QgMjAyMDB2MBAGByqGSM49 +AgEGBSuBBAAiA2IABM6//leov9Wq9xCazbzREaK9Z0LMkOsVGJDZos0MKiXrPk/O +tdKPD/M12kOLAoC+b1EkHQ9rK8qfwm9QMuU3ILYg/4gND21Ju9sGpIeQkpT0CdDP +f8iAC8GXs7s1J8nCG6NCMEAwHQYDVR0OBBYEFONyzG6VmUex5rNhTNHLq+O6zd6f +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2cA +MGQCMHVSi7ekEE+uShCLsoRbQuHmKjYC2qBuGT8lv9pZMo7k+5Dck2TOrbRBR2Di +z6fLHgIwN0GMZt9Ba9aDAEH9L1r3ULRn0SyocddDypwnJJGDSA3PzfdUga/sf+Rn +27iQ7t0l +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFtzCCA5+gAwIBAgIQDH5i9XlzO51Djotj7ZGVuDANBgkqhkiG9w0BAQwFADBl +MQswCQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0 +eSBHbWJIMS0wKwYDVQQDDCRUZWxla29tIFNlY3VyaXR5IFNNSU1FIFJTQSBSb290 +IDIwMjMwHhcNMjMwMzI4MTIwOTIyWhcNNDgwMzI3MjM1OTU5WjBlMQswCQYDVQQG +EwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBHbWJIMS0w +KwYDVQQDDCRUZWxla29tIFNlY3VyaXR5IFNNSU1FIFJTQSBSb290IDIwMjMwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDvxQ6LvjLSZ0f/Ckxnsyq/yMPF +keu1xx6R4WaoiItVIIAfUV53l54ZClzHazchfAM2AfSIJdmoLkGq/Ngm4JZAYnmu +V54DOBocsncUPumhctDk4DfRF0btUFx6WMX4K/d1L8+BnlostzqsoFmYBFEM/0nF +UP0e00eFSzNPoje1rwSaJzKdVtU/VWHji2+uUf6X/mkH+mJbJuYUeRWlEziuXze+ +lErWDYAWaaSRsjpJmHWdRhCKXHp/hKXorx7Hq7NaRrWjS/WmIzYARrHbBbYbzp56 +Mlya1XLDnYZNK4TTHrWI2hB4nCLDOyO16xMHvW9T7Jvsm9Nl9QcJ412nmbV+ho7V +Av+3hQnjRxTdlmYYNN4I1d/LGJliCyvsAF1SRNPGlvwyViWRz80ZO5U5PgKHmWO2 +1T40eg8RdYG8fQTKYLQoddcCUd1SAC7H/YnxXPPLpCcSOI+7+4nw5MQ4LL6CoHFh +YpGPSAwvK6mw8csQBOd0vzeQ708qQzWXEsYqcA3eLFVHeWMp9cofagZSHK4tJCKD +Iq/QqjC3Kh//ZSNYZZPIjn1AEDGGeNlVyzww8N5RKgA20idFX9jooSE9fkZWOylF +8R0FCc62QzDcRZAQMEyka4aLPz0vMZFx7ya59r6dsGzfEe5YP0N5hjmA8SYXB5jw +maowLENZFM7t4kAThQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE +FJrOrCrsAfplcN6XnfHSAIylo2S7MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgw +FoAUms6sKuwB+mVw3ped8dIAjKWjZLswDQYJKoZIhvcNAQEMBQADggIBAONQ/fVA +FiIJljoNqe+B5y4y8KHxSV57iA0Ecte+Z6i6He5Qu3JuetG7DHIwRsjV1wISFplO +Ht9alu6Pkb6uhvgQd6XEbkdhwPIm2U9haAVIdQgVpaF71biziXnm7fHzYQCGey4x +/qNc+Hk9tFuIe+Ajuw2hF/rLaA2Yd3EI4m1DdGvENsWUQaQA1lctmYqLIBIVAjIO +0knsgUjFaidS17JzVVOWPJ5PTLWg0E9X0GcoSGS+xri67GTPyHvFaucq5llXttbU +1sBnXNmeKAlAv/OpNTFlYAPLGWyClQMeXz/hvepJceVbtwtHFhsgiW2UmQx+iGwd +DfS3IRpZl6zL6L4XH5V8U5uvUFKqjQsur1rXYPIqaSq57lRwGKq99aE/0t2hYxkA ++KcM66N58nBZo/iiEgPsE//kAoY218HDpLXUpMI3RbaUcD3FveujFR3jNnoVaSpW +NDnPpZo2qsjtebzP9s4EUwvaslAjfLw+Jq3wDkO7JsuuwkDeNx8KoFHNY522T9jG +R3y82LTtnovzEeKotT7srnA+fiK7NUgXYGIUkTCjdj2mUTaLHw3dajEcpe3dlqNu +cg8TTaqnqVx4+QMSGJM3RRKJPfi+yr3ZvgzZGGSnyEE+dYIhOH1l9KDUE0sHeCn5 +nX7Mhz/E2i6I3eML3FpRWunZEk+eAtv3BSVR +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFszCCA5ugAwIBAgIQIZxULej27HF3+k7ow3BXlzANBgkqhkiG9w0BAQwFADBj +MQswCQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0 +eSBHbWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBSU0EgUm9vdCAy +MDIzMB4XDTIzMDMyODEyMTY0NVoXDTQ4MDMyNzIzNTk1OVowYzELMAkGA1UEBhMC +REUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkG +A1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgUlNBIFJvb3QgMjAyMzCCAiIwDQYJ +KoZIhvcNAQEBBQADggIPADCCAgoCggIBAO01oYGA88tKaVvC+1GDrib94W7zgRJ9 +cUD/h3VCKSHtgVIs3xLBGYSJwb3FKNXVS2xE1kzbB5ZKVXrKNoIENqil/Cf2SfHV +cp6R+SPWcHu79ZvB7JPPGeplfohwoHP89v+1VmLhc2o0mD6CuKyVU/QBoCcHcqMA +U6DksquDOFczJZSfvkgdmOGjup5czQRxUX11eKvzWarE4GC+j4NSuHUaQTXtvPM6 +Y+mpFEXX5lLRbtLevOP1Czvm4MS9Q2QTps70mDdsipWol8hHD/BeEIvnHRz+sTug +BTNoBUGCwQMrAcjnj02r6LX2zWtEtefdi+zqJbQAIldNsLGyMcEWzv/9FIS3R/qy +8XDe24tsNlikfLMR0cN3f1+2JeANxdKz+bi4d9s3cXFH42AYTyS2dTd4uaNir73J +co4vzLuu2+QVUhkHM/tqty1LkCiCc/4YizWN26cEar7qwU02OxY2kTLvtkCJkUPg +8qKrBC7m8kwOFjQgrIfBLX7JZkcXFBGk8/ehJImr2BrIoVyxo/eMbcgByU/J7MT8 +rFEz0ciD0cmfHdRHNCk+y7AO+oMLKFjlKdw/fKifybYKu6boRhYPluV75Gp6SG12 +mAWl3G0eQh5C2hrgUve1g8Aae3g1LDj1H/1Joy7SWWO/gLCMk3PLNaaZlSJhZQNg ++y+TS/qanIA7AgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtqeX +gj10hZv3PJ+TmpV5dVKMbUcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS2 +p5eCPXSFm/c8n5OalXl1UoxtRzANBgkqhkiG9w0BAQwFAAOCAgEAqMxhpr51nhVQ +pGv7qHBFfLp+sVr8WyP6Cnf4mHGCDG3gXkaqk/QeoMPhk9tLrbKmXauw1GLLXrtm +9S3ul0A8Yute1hTWjOKWi0FpkzXmuZlrYrShF2Y0pmtjxrlO8iLpWA1WQdH6DErw +M807u20hOq6OcrXDSvvpfeWxm4bu4uB9tPcy/SKE8YXJN3nptT+/XOR0so8RYgDd +GGah2XsjX/GO1WfoVNpbOms2b/mBsTNHM3dA+VKq3dSDz4V4mZqTuXNnQkYRIer+ +CqkbGmVps4+uFrb2S1ayLfmlyOw7YqPta9BO1UAJpB+Y1zqlklkg5LB9zVtzaL1t +xKITDmcZuI1CfmwMmm6gJC3VRRvcxAIU/oVbZZfKTpBQCHpCNfnqwmbU+AGuHrS+ +w6jv/naaoqYfRvaE7fzbzsQCzndILIyy7MMAo+wsVRjBfhnu4S/yrYObnqsZ38aK +L4x35bcF7DvB7L6Gs4a8wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+lj +X273CXE2whJdV/LItM3z7gLfEdxquVeEHVlNjM7IDiPCtyaaEBRx/pOyiriA8A4Q +ntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0o82bNSQ3+pCTE4FCxpgm +dTdmQRCsu/WU48IxK63nI1bMNSWSs1A= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICejCCAgCgAwIBAgIQMZch7a+JQn81QYehZ1ZMbTAKBggqhkjOPQQDAzBuMQsw +CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE +YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB +IFJPT1QtQSBXRUIwHhcNMjIwNDA2MDkwMTM2WhcNNDcwMzMxMDkwMTM2WjBuMQsw +CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE +YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB +IFJPT1QtQSBXRUIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHU+osEaR3xyrq89Zf +e9MEkVz6iMYiuYMQYneEMy3pA4jU4DP37XcsSmDq5G+tbbT4TIqk5B/K6k84Si6C +cyvHZpsKjECcfIr28jlgst7L7Ljkb+qbXbdTkBgyVcUgt5SjYzBhMA8GA1UdEwEB +/wQFMAMBAf8wHwYDVR0jBBgwFoAUk+FDY1w8ndYn81LsF7Kpryz3dvgwHQYDVR0O +BBYEFJPhQ2NcPJ3WJ/NS7Beyqa8s93b4MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO +PQQDAwNoADBlAjAdfKR7w4l1M+E7qUW/Runpod3JIha3RxEL2Jq68cgLcFBTApFw +hVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dG +XSaQpYXFuXqUPoeovQA= +-----END CERTIFICATE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-2.3.8+git1/cmake/modules/FindLibGcrypt.cmake new/qca-2.3.9/cmake/modules/FindLibGcrypt.cmake --- old/qca-2.3.8+git1/cmake/modules/FindLibGcrypt.cmake 2024-01-15 07:22:49.000000000 +0100 +++ new/qca-2.3.9/cmake/modules/FindLibGcrypt.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ - -# - Try to find the Gcrypt library -# Once run this will define -# -# LIBGCRYPT_FOUND - set if the system has the gcrypt library -# LIBGCRYPT_CFLAGS - the required gcrypt compilation flags -# LIBGCRYPT_LIBRARIES - the linker libraries needed to use the gcrypt library -# -# Copyright (c) 2006 Brad Hards <bradh@kde.org> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -# libgcrypt is moving to pkg-config, but earlier version don't have it - -#search in typical paths for libgcrypt-config -FIND_PROGRAM(LIBGCRYPTCONFIG_EXECUTABLE NAMES libgcrypt-config) -mark_as_advanced(LIBGCRYPTCONFIG_EXECUTABLE) - -#reset variables -set(LIBGCRYPT_LIBRARIES) -set(LIBGCRYPT_CFLAGS) - -# if libgcrypt-config has been found -IF(LIBGCRYPTCONFIG_EXECUTABLE) - - # workaround for MinGW/MSYS - # CMake can't starts shell scripts on windows so it need to use sh.exe - EXECUTE_PROCESS(COMMAND sh ${LIBGCRYPTCONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE) - EXECUTE_PROCESS(COMMAND sh ${LIBGCRYPTCONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) - - IF(NOT LIBGCRYPT_CFLAGS AND NOT _return_VALUE) - SET(LIBGCRYPT_CFLAGS " ") - ENDIF(NOT LIBGCRYPT_CFLAGS AND NOT _return_VALUE) - - IF(LIBGCRYPT_LIBRARIES AND LIBGCRYPT_CFLAGS) - SET(LIBGCRYPT_FOUND TRUE) - ENDIF(LIBGCRYPT_LIBRARIES AND LIBGCRYPT_CFLAGS) - -ENDIF(LIBGCRYPTCONFIG_EXECUTABLE) - -if (LIBGCRYPT_FOUND) - if (NOT LibGcrypt_FIND_QUIETLY) - message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}") - endif() -else() - if (LibGcrypt_FIND_REQUIRED) - message(FATAL_ERROR "Could not find libgcrypt libraries") - endif() -endif() - -MARK_AS_ADVANCED(LIBGCRYPT_CFLAGS LIBGCRYPT_LIBRARIES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-2.3.8+git1/plugins/qca-botan/qca-botan.cpp new/qca-2.3.9/plugins/qca-botan/qca-botan.cpp --- old/qca-2.3.8+git1/plugins/qca-botan/qca-botan.cpp 2024-01-15 07:22:49.000000000 +0100 +++ new/qca-2.3.9/plugins/qca-botan/qca-botan.cpp 2024-06-24 10:54:04.000000000 +0200 @@ -34,6 +34,7 @@ #include <cstdlib> #include <iostream> +#include <utility> //----------------------------------------------------------- class botanRandomContext : public QCA::RandomContext @@ -631,7 +632,7 @@ list += QStringLiteral("sha512"); list += QStringLiteral("ripemd160"); - for (const QString &hash : qAsConst(list)) { + for (const QString &hash : std::as_const(list)) { std::unique_ptr<BotanHashContext> hashContext(new BotanHashContext(nullptr, hash)); if (hashContext->isOk()) { supported << hash; @@ -671,7 +672,7 @@ list += QStringLiteral("blowfish-cfb"); list += QStringLiteral("blowfish-ofb"); - for (const QString &cipher : qAsConst(list)) { + for (const QString &cipher : std::as_const(list)) { const std::string bothanCipher = qcaCipherToBotanCipher(cipher); try { std::unique_ptr<Botan::Keyed_Filter> enc( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-2.3.8+git1/plugins/qca-gcrypt/CMakeLists.txt new/qca-2.3.9/plugins/qca-gcrypt/CMakeLists.txt --- old/qca-2.3.8+git1/plugins/qca-gcrypt/CMakeLists.txt 2024-01-15 07:22:49.000000000 +0100 +++ new/qca-2.3.9/plugins/qca-gcrypt/CMakeLists.txt 2024-06-24 10:54:04.000000000 +0200 @@ -1,7 +1,9 @@ +find_package(PkgConfig REQUIRED) + if(WITH_gcrypt_PLUGIN STREQUAL "yes") - find_package(LibGcrypt REQUIRED) + pkg_check_modules(LIBGCRYPT REQUIRED IMPORTED_TARGET libgcrypt) else() - find_package(LibGcrypt) + pkg_check_modules(LIBGCRYPT IMPORTED_TARGET libgcrypt) endif() if(LIBGCRYPT_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-2.3.8+git1/src/support/logger.cpp new/qca-2.3.9/src/support/logger.cpp --- old/qca-2.3.8+git1/src/support/logger.cpp 2024-01-15 07:22:49.000000000 +0100 +++ new/qca-2.3.9/src/support/logger.cpp 2024-06-24 10:54:04.000000000 +0200 @@ -20,6 +20,8 @@ #include "qca_support.h" +#include <utility> + namespace QCA { AbstractLogDevice::AbstractLogDevice(const QString &name, QObject *parent) @@ -95,7 +97,7 @@ void Logger::logTextMessage(const QString &message, Severity severity) { if (severity <= level()) { - for (AbstractLogDevice *logger : qAsConst(m_loggers)) { + for (AbstractLogDevice *logger : std::as_const(m_loggers)) { logger->logTextMessage(message, severity); } } @@ -104,7 +106,7 @@ void Logger::logBinaryMessage(const QByteArray &blob, Severity severity) { if (severity <= level()) { - for (AbstractLogDevice *logger : qAsConst(m_loggers)) { + for (AbstractLogDevice *logger : std::as_const(m_loggers)) { logger->logBinaryMessage(blob, severity); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-2.3.8+git1/tools/qcatool/main.cpp new/qca-2.3.9/tools/qcatool/main.cpp --- old/qca-2.3.8+git1/tools/qcatool/main.cpp 2024-01-15 07:22:49.000000000 +0100 +++ new/qca-2.3.9/tools/qcatool/main.cpp 2024-06-24 10:54:04.000000000 +0200 @@ -1828,7 +1828,7 @@ { QString hex = QCA::Hash(hashType).hashToString(cert.toDER()); QString out; - for (int n = 0; n < hex.count(); ++n) { + for (int n = 0; n < hex.size(); ++n) { if (n != 0 && n % 2 == 0) out += QLatin1Char(':'); out += hex[n]; ++++++ qca.obsinfo ++++++ --- /var/tmp/diff_new_pack.8lfpxV/_old 2024-06-27 15:57:52.594632189 +0200 +++ /var/tmp/diff_new_pack.8lfpxV/_new 2024-06-27 15:57:52.598632337 +0200 @@ -1,5 +1,5 @@ name: qca -version: 2.3.8+git1 -mtime: 1705299769 -commit: c3deedaaba48c34e599c9bdf9061e0a97ebf77f7 +version: 2.3.9 +mtime: 1719219244 +commit: 461942af6641a6dabe444a22675909dc2d4a8ded
participants (1)
-
Source-Sync