commit: 614a75bfd1c16a9098e563ff131516da57b6474d Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Tue Jun 17 15:23:39 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Tue Jun 17 15:54:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=614a75bf
app-admin/keepassxc: build with dev-libs/zxcvbn-c Closes: https://bugs.gentoo.org/958062 Co-authored-by: quilosaq <quilosaq <AT> gmail.com> Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../keepassxc/files/keepassxc-2.7.10-zxcvbn.patch | 24 ++++++++++++++++++++++ ...ssxc-9999.ebuild => keepassxc-2.7.10-r1.ebuild} | 19 +++++++++++------ app-admin/keepassxc/keepassxc-9999.ebuild | 19 +++++++++++------ 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/app-admin/keepassxc/files/keepassxc-2.7.10-zxcvbn.patch b/app-admin/keepassxc/files/keepassxc-2.7.10-zxcvbn.patch new file mode 100644 index 000000000000..3b78bb3a5c46 --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.7.10-zxcvbn.patch @@ -0,0 +1,24 @@ +diff '--color=auto' -ur a/src/cli/Estimate.cpp b/src/cli/Estimate.cpp +--- a/src/cli/Estimate.cpp 2025-03-02 23:31:21.000000000 +0100 ++++ b/src/cli/Estimate.cpp 2025-06-17 12:59:03.804029600 +0200 +@@ -21,7 +21,7 @@ + #include "core/PasswordHealth.h" + + #include <QCommandLineParser> +-#include <zxcvbn.h> ++#include <zxcvbn/zxcvbn.h> + + const QCommandLineOption Estimate::AdvancedOption = + QCommandLineOption(QStringList() << "a" << "advanced", QObject::tr("Perform advanced analysis on the password.")); +diff '--color=auto' -ur a/src/core/PasswordHealth.cpp b/src/core/PasswordHealth.cpp +--- a/src/core/PasswordHealth.cpp 2025-03-02 23:31:21.000000000 +0100 ++++ b/src/core/PasswordHealth.cpp 2025-06-17 13:08:45.962190595 +0200 +@@ -19,7 +19,7 @@ + + #include "Group.h" + #include "PasswordHealth.h" +-#include "zxcvbn.h" ++#include "zxcvbn/zxcvbn.h" + + namespace + { diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-2.7.10-r1.ebuild similarity index 84% copy from app-admin/keepassxc/keepassxc-9999.ebuild copy to app-admin/keepassxc/keepassxc-2.7.10-r1.ebuild index 8f3602fcce5a..1990d70166c4 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-2.7.10-r1.ebuild @@ -6,8 +6,7 @@ EAPI=8 inherit cmake xdg DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org/ - https://github.com/keepassxreboot/keepassxc/"; +HOMEPAGE="https://keepassxc.org"; if [[ "${PV}" = *9999* ]] ; then inherit git-r3 @@ -27,7 +26,8 @@ else KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi -LICENSE="LGPL-2.1 GPL-2 GPL-3" +# COPYING order +LICENSE="|| ( GPL-2 GPL-3 ) BSD LGPL-2.1 MIT LGPL-2 CC0-1.0 Apache-2.0 GPL-2+ BSD-2" SLOT="0" IUSE="X autotype browser doc keeshare +keyring +network +ssh-agent test yubikey" @@ -37,6 +37,7 @@ REQUIRED_USE="autotype? ( X )" RDEPEND=" app-crypt/argon2:= dev-libs/botan:3= + dev-libs/zxcvbn-c dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -70,13 +71,19 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-2.7.10-tests.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-2.7.10-tests.patch" + "${FILESDIR}/${PN}-2.7.10-zxcvbn.patch" +) src_prepare() { - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] ; then - printf '%s' "${PV}" > .version || die + if ! [[ "${PV}" =~ _beta|9999 ]]; then + echo "${PV}" > .version || die fi + # Unbundle zxcvbn, bug 958062 + rm -r ./src/thirdparty/zxcvbn || die + cmake_src_prepare } diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 8f3602fcce5a..1990d70166c4 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -6,8 +6,7 @@ EAPI=8 inherit cmake xdg DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org/ - https://github.com/keepassxreboot/keepassxc/"; +HOMEPAGE="https://keepassxc.org"; if [[ "${PV}" = *9999* ]] ; then inherit git-r3 @@ -27,7 +26,8 @@ else KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi -LICENSE="LGPL-2.1 GPL-2 GPL-3" +# COPYING order +LICENSE="|| ( GPL-2 GPL-3 ) BSD LGPL-2.1 MIT LGPL-2 CC0-1.0 Apache-2.0 GPL-2+ BSD-2" SLOT="0" IUSE="X autotype browser doc keeshare +keyring +network +ssh-agent test yubikey" @@ -37,6 +37,7 @@ REQUIRED_USE="autotype? ( X )" RDEPEND=" app-crypt/argon2:= dev-libs/botan:3= + dev-libs/zxcvbn-c dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -70,13 +71,19 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-2.7.10-tests.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-2.7.10-tests.patch" + "${FILESDIR}/${PN}-2.7.10-zxcvbn.patch" +) src_prepare() { - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] ; then - printf '%s' "${PV}" > .version || die + if ! [[ "${PV}" =~ _beta|9999 ]]; then + echo "${PV}" > .version || die fi + # Unbundle zxcvbn, bug 958062 + rm -r ./src/thirdparty/zxcvbn || die + cmake_src_prepare }
