From e2e717de7c80d7852ebc2984bf1399751bd30519 Mon Sep 17 00:00:00 2001 From: iigs <2274777+iigs@users.noreply.github.com> Date: Mon, 11 Mar 2024 19:08:18 +0000 Subject: [PATCH] keepassxc: update to 2.7.7 --- components/desktop/keepassxc/Makefile | 6 +- .../keepassxc/manifests/sample-manifest.p5m | 2 +- .../keepassxc/patches/02-pow-totp.cpp.patch | 6 +- components/desktop/keepassxc/pkg5 | 3 +- .../desktop/keepassxc/test/results-all.master | 144 ++++++++++----------- 5 files changed, 81 insertions(+), 80 deletions(-) rewrite components/desktop/keepassxc/test/results-all.master (67%) diff --git a/components/desktop/keepassxc/Makefile b/components/desktop/keepassxc/Makefile index bc41237714..b3fcc0a204 100644 --- a/components/desktop/keepassxc/Makefile +++ b/components/desktop/keepassxc/Makefile @@ -19,13 +19,12 @@ USE_DEFAULT_TEST_TRANSFORMS= yes include ../../../make-rules/shared-macros.mk COMPONENT_NAME= keepassxc -COMPONENT_VERSION= 2.7.6 -COMPONENT_REVISION= 1 +COMPONENT_VERSION= 2.7.7 COMPONENT_SUMMARY= Cross-platform community-driven port of Keepass password manager COMPONENT_PROJECT_URL= https://keepassxc.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC)-src.tar.xz -COMPONENT_ARCHIVE_HASH= sha256:a58074509fa8e90f152c6247f73e75e126303081f55eedb4ea0cbb6fa980d670 +COMPONENT_ARCHIVE_HASH= sha256:58fc45ae98e4b3ffb052103014f5b97a41fefd17102c7f56073934dd3a82ee67 COMPONENT_ARCHIVE_URL= https://github.com/keepassxreboot/keepassxc/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_FMRI= desktop/$(COMPONENT_NAME) COMPONENT_CLASSIFICATION=Applications/System Utilities @@ -51,6 +50,7 @@ CMAKE_OPTIONS += -DCMAKE_LIBRARY_PATH=$(QT5_LIBDIR) REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG) REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG) REQUIRED_PACKAGES += library/libqrencode +REQUIRED_PACKAGES += library/minizip-ng REQUIRED_PACKAGES += library/qt5 REQUIRED_PACKAGES += library/readline REQUIRED_PACKAGES += library/security/botan diff --git a/components/desktop/keepassxc/manifests/sample-manifest.p5m b/components/desktop/keepassxc/manifests/sample-manifest.p5m index 9dc051bff1..9831864417 100644 --- a/components/desktop/keepassxc/manifests/sample-manifest.p5m +++ b/components/desktop/keepassxc/manifests/sample-manifest.p5m @@ -10,7 +10,7 @@ # # -# Copyright 2023 +# Copyright 2024 # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) diff --git a/components/desktop/keepassxc/patches/02-pow-totp.cpp.patch b/components/desktop/keepassxc/patches/02-pow-totp.cpp.patch index b5c58ca127..5b09ba9147 100644 --- a/components/desktop/keepassxc/patches/02-pow-totp.cpp.patch +++ b/components/desktop/keepassxc/patches/02-pow-totp.cpp.patch @@ -1,7 +1,7 @@ -diff --git a/src/totp/totp.cpp b/src/totp/totp.cpp +diff --git a/src/core/Totp.cpp b/src/core/Totp.cpp index 82d9bb8..07f5287 100644 ---- a/src/totp/totp.cpp -+++ b/src/totp/totp.cpp +--- a/src/core/Totp.cpp ++++ b/src/core/Totp.cpp @@ -238,7 +238,7 @@ QString Totp::generateTotp(const QSharedPointer& settings, const direction = 1; startpos = 0; diff --git a/components/desktop/keepassxc/pkg5 b/components/desktop/keepassxc/pkg5 index cba40cae49..65f0b9406f 100644 --- a/components/desktop/keepassxc/pkg5 +++ b/components/desktop/keepassxc/pkg5 @@ -1,6 +1,7 @@ { "dependencies": [ "library/libqrencode", + "library/minizip-ng", "library/qt5", "library/readline", "library/security/botan", @@ -17,4 +18,4 @@ "desktop/keepassxc" ], "name": "keepassxc" -} \ No newline at end of file +} diff --git a/components/desktop/keepassxc/test/results-all.master b/components/desktop/keepassxc/test/results-all.master dissimilarity index 67% index ffe7e0a995..9647cecb9f 100644 --- a/components/desktop/keepassxc/test/results-all.master +++ b/components/desktop/keepassxc/test/results-all.master @@ -1,72 +1,72 @@ - Start 1: testgroup - 1/34 Test #1: testgroup ........................ Passed - Start 2: testkdbx2 - 2/34 Test #2: testkdbx2 ........................ Passed - Start 3: testkdbx3 - 3/34 Test #3: testkdbx3 ........................ Passed - Start 4: testkdbx4 - 4/34 Test #4: testkdbx4 ........................ Passed - Start 5: testkeys - 5/34 Test #5: testkeys ......................... Passed - Start 6: testgroupmodel - 6/34 Test #6: testgroupmodel ................... Passed - Start 7: testentrymodel - 7/34 Test #7: testentrymodel ................... Passed - Start 8: testcryptohash - 8/34 Test #8: testcryptohash ................... Passed - Start 9: testsymmetriccipher - 9/34 Test #9: testsymmetriccipher .............. Passed - Start 10: testhashedblockstream -10/34 Test #10: testhashedblockstream ............ Passed - Start 11: testkeepass2randomstream -11/34 Test #11: testkeepass2randomstream ......... Passed - Start 12: testmodified -12/34 Test #12: testmodified ..................... Passed - Start 13: testdeletedobjects -13/34 Test #13: testdeletedobjects ............... Passed - Start 14: testkeepass1reader -14/34 Test #14: testkeepass1reader ............... Passed - Start 15: testopvaultreader -15/34 Test #15: testopvaultreader ................ Passed - Start 16: testautotype -16/34 Test #16: testautotype .....................***Failed - Start 17: testentry -17/34 Test #17: testentry ........................ Passed - Start 18: testmerge -18/34 Test #18: testmerge ........................ Passed - Start 19: testpasswordgenerator -19/34 Test #19: testpasswordgenerator ............ Passed - Start 20: testpasswordhealth -20/34 Test #20: testpasswordhealth ............... Passed - Start 21: testpassphrasegenerator -21/34 Test #21: testpassphrasegenerator .......... Passed - Start 22: testhibp -22/34 Test #22: testhibp ......................... Passed - Start 23: testtotp -23/34 Test #23: testtotp ......................... Passed - Start 24: testbase32 -24/34 Test #24: testbase32 ....................... Passed - Start 25: testcsvparser -25/34 Test #25: testcsvparser .................... Passed - Start 26: testrandomgenerator -26/34 Test #26: testrandomgenerator .............. Passed - Start 27: testentrysearcher -27/34 Test #27: testentrysearcher ................ Passed - Start 28: testcsvexporter -28/34 Test #28: testcsvexporter .................. Passed - Start 29: testdatabase -29/34 Test #29: testdatabase ..................... Passed - Start 30: testtools -30/34 Test #30: testtools ........................ Passed - Start 31: testconfig -31/34 Test #31: testconfig ....................... Passed - Start 32: testfdosecrets -32/34 Test #32: testfdosecrets ................... Passed - Start 33: testbrowser -33/34 Test #33: testbrowser ...................... Passed - Start 34: testcli -34/34 Test #34: testcli ..........................***Failed -94% tests passed, 2 tests failed out of 34 - 16 - testautotype (Failed) - 34 - testcli (Failed) -Use "--rerun-failed --output-on-failure" to re-run the failed cases verbosely. + Start 1: testgroup + 1/35 Test #1: testgroup ........................ Passed + Start 2: testkdbx2 + 2/35 Test #2: testkdbx2 ........................ Passed + Start 3: testkdbx3 + 3/35 Test #3: testkdbx3 ........................ Passed + Start 4: testkdbx4 + 4/35 Test #4: testkdbx4 ........................ Passed + Start 5: testkeys + 5/35 Test #5: testkeys ......................... Passed + Start 6: testgroupmodel + 6/35 Test #6: testgroupmodel ................... Passed + Start 7: testentrymodel + 7/35 Test #7: testentrymodel ................... Passed + Start 8: testcryptohash + 8/35 Test #8: testcryptohash ................... Passed + Start 9: testsymmetriccipher + 9/35 Test #9: testsymmetriccipher .............. Passed + Start 10: testhashedblockstream +10/35 Test #10: testhashedblockstream ............ Passed + Start 11: testkeepass2randomstream +11/35 Test #11: testkeepass2randomstream ......... Passed + Start 12: testmodified +12/35 Test #12: testmodified ..................... Passed + Start 13: testdeletedobjects +13/35 Test #13: testdeletedobjects ............... Passed + Start 14: testkeepass1reader +14/35 Test #14: testkeepass1reader ............... Passed + Start 15: testimports +15/35 Test #15: testimports ...................... Passed + Start 16: testautotype +16/35 Test #16: testautotype .....................***Failed + Start 17: testentry +17/35 Test #17: testentry ........................ Passed + Start 18: testmerge +18/35 Test #18: testmerge ........................ Passed + Start 19: testpasswordgenerator +19/35 Test #19: testpasswordgenerator ............ Passed + Start 20: testpasswordhealth +20/35 Test #20: testpasswordhealth ............... Passed + Start 21: testpassphrasegenerator +21/35 Test #21: testpassphrasegenerator .......... Passed + Start 22: testhibp +22/35 Test #22: testhibp ......................... Passed + Start 23: testtotp +23/35 Test #23: testtotp ......................... Passed + Start 24: testbase32 +24/35 Test #24: testbase32 ....................... Passed + Start 25: testcsvparser +25/35 Test #25: testcsvparser .................... Passed + Start 26: testrandomgenerator +26/35 Test #26: testrandomgenerator .............. Passed + Start 27: testentrysearcher +27/35 Test #27: testentrysearcher ................ Passed + Start 28: testcsvexporter +28/35 Test #28: testcsvexporter .................. Passed + Start 29: testdatabase +29/35 Test #29: testdatabase ..................... Passed + Start 30: testtools +30/35 Test #30: testtools ........................ Passed + Start 31: testconfig +31/35 Test #31: testconfig ....................... Passed + Start 32: testfdosecrets +32/35 Test #32: testfdosecrets ................... Passed + Start 33: testbrowser +33/35 Test #33: testbrowser ...................... Passed + Start 34: testurltools +34/35 Test #34: testurltools ..................... Passed + Start 35: testcli +94% tests passed, 2 tests failed out of 35 + 16 - testautotype (Failed) +Use "--rerun-failed --output-on-failure" to re-run the failed cases verbosely. -- 2.11.4.GIT