commit: a24b943d59cec0db23e92ab2b35a4d6fb3e7c0ab Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Wed Feb 11 10:16:28 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 11 23:41:13 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a24b943d
app-crypt/zulucrypt: add 7.1.0 update LICENSE for 3rdparty use bundled-modified-lxqt-wallet fix use of kf6 add lvm2 for devmapper add util-linux for blkid and uuid Closes: https://bugs.gentoo.org/957688 Closes: https://bugs.gentoo.org/944343 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/45763 Closes: https://github.com/gentoo/gentoo/pull/45763 Signed-off-by: Sam James <sam <AT> gentoo.org> app-crypt/zulucrypt/Manifest | 1 + .../files/zulucrypt-7.1.0-bump_cmake.patch | 48 ++++++++++++++++ .../files/zulucrypt-7.1.0-filter_flag.patch | 11 ++++ .../zulucrypt/files/zulucrypt-7.1.0-fix_kf6.patch | 12 ++++ app-crypt/zulucrypt/zulucrypt-7.1.0.ebuild | 65 ++++++++++++++++++++++ 5 files changed, 137 insertions(+) diff --git a/app-crypt/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest index 85569e67cec4..06e715c628be 100644 --- a/app-crypt/zulucrypt/Manifest +++ b/app-crypt/zulucrypt/Manifest @@ -1 +1,2 @@ DIST zulucrypt-7.0.0.tar.xz 1159544 BLAKE2B 9ba2aa751f4224a87636993983523d25dbcf23e70bc9dfbe5476cb44e1af8cc1b75ac450f77997fb6e3cf65ec3425d424c325dfdb4e4da9ec39e100e623cff9c SHA512 f131f423da2796d760e4eaa50a7e56e0283bdf6d5e46ff32bd9bf0edc127a087e947e0f7d39fd99fd28cc4566c89cde9e1a85dd67e50e1cb7d6c9de31d7918bf +DIST zulucrypt-7.1.0.tar.xz 1159564 BLAKE2B a1dd8f7d33d5a2404352ca4c3e783955fdb9d3f24e4a2bac4d50c5a304b5efcd4a32e1f7129cb9ef5f1b4e6b8faea1c69213151f4e35a4fab07e573b6289b373 SHA512 d9d8dfb9e417ed803558a5c39a27f6888de00435c159570e333c51a86264cef74be415095fef036d65c64d50c1c1c558729865babbbc9c4f74101dae29a20feb diff --git a/app-crypt/zulucrypt/files/zulucrypt-7.1.0-bump_cmake.patch b/app-crypt/zulucrypt/files/zulucrypt-7.1.0-bump_cmake.patch new file mode 100644 index 000000000000..418d874fa006 --- /dev/null +++ b/app-crypt/zulucrypt/files/zulucrypt-7.1.0-bump_cmake.patch @@ -0,0 +1,48 @@ +bump cmake_min for bundled libs, use 3.26 as the main CMakeLists.txt +--- a/external_libraries/tcplay/CMakeLists.txt ++++ b/external_libraries/tcplay/CMakeLists.txt +@@ -1,5 +1,5 @@ + if(${CMAKE_VERSION} VERSION_GREATER "3.26") +- cmake_minimum_required(VERSION 3.5.0) ++ cmake_minimum_required(VERSION 3.26.0) + else() + cmake_minimum_required(VERSION 3.0.2) + endif() +--- a/external_libraries/lxqt_wallet/CMakeLists.txt ++++ b/external_libraries/lxqt_wallet/CMakeLists.txt +@@ -1,5 +1,5 @@ + if(${CMAKE_VERSION} VERSION_GREATER "3.26") +- cmake_minimum_required(VERSION 3.5.0) ++ cmake_minimum_required(VERSION 3.26.0) + else() + cmake_minimum_required(VERSION 3.0.2) + endif() +--- a/external_libraries/lxqt_wallet/backend/CMakeLists.txt ++++ b/external_libraries/lxqt_wallet/backend/CMakeLists.txt +@@ -1,5 +1,5 @@ + if(${CMAKE_VERSION} VERSION_GREATER "3.26") +- cmake_minimum_required(VERSION 3.5.0) ++ cmake_minimum_required(VERSION 3.26.0) + else() + cmake_minimum_required(VERSION 3.0.2) + endif() +--- a/external_libraries/lxqt_wallet/frontend/CMakeLists.txt ++++ b/external_libraries/lxqt_wallet/frontend/CMakeLists.txt +@@ -1,5 +1,5 @@ + if(${CMAKE_VERSION} VERSION_GREATER "3.26") +- cmake_minimum_required(VERSION 3.5.0) ++ cmake_minimum_required(VERSION 3.26.0) + else() + cmake_minimum_required(VERSION 3.0.2) + endif() +diff --git a/external_libraries/lxqt_wallet/frontend/libsecret/CMakeLists.txt b/external_libraries/lxqt_wallet/frontend/libsecret/CMakeLists.txt +index 3d2055b9..cb070209 100644 +--- a/external_libraries/lxqt_wallet/frontend/libsecret/CMakeLists.txt ++++ b/external_libraries/lxqt_wallet/frontend/libsecret/CMakeLists.txt +@@ -1,5 +1,5 @@ + if(${CMAKE_VERSION} VERSION_GREATER "3.26") +- cmake_minimum_required(VERSION 3.5.0) ++ cmake_minimum_required(VERSION 3.26.0) + else() + cmake_minimum_required(VERSION 3.0.2) + endif() diff --git a/app-crypt/zulucrypt/files/zulucrypt-7.1.0-filter_flag.patch b/app-crypt/zulucrypt/files/zulucrypt-7.1.0-filter_flag.patch new file mode 100644 index 000000000000..d7e38b0d76ce --- /dev/null +++ b/app-crypt/zulucrypt/files/zulucrypt-7.1.0-filter_flag.patch @@ -0,0 +1,11 @@ +respect userflag for optimization +--- a/external_libraries/tcplay/CMakeLists.txt ++++ b/external_libraries/tcplay/CMakeLists.txt +@@ -17,7 +17,6 @@ set (SRCS_LINUX crypto-gcrypt.c) + set (CFLAGS_LINUX "-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE") + set (CFLAGS_WARN "-w") + set (CFLAGS_DEBUG "-O0 -g3 -DDEBUG") +-set (CFLAGS_OPT "-O3") + set (CFLAGS_VER "-DMAJ_VER=${VERSION_MAJOR} -DMIN_VER=${VERSION_MINOR}") + set (CFLAGS_COMMON "-std=c99 -fPIC ${CFLAGS_LINUX} ${CFLAGS_WARN} ${CFLAGS_VER}") + if ($ENV{DEBUG}) diff --git a/app-crypt/zulucrypt/files/zulucrypt-7.1.0-fix_kf6.patch b/app-crypt/zulucrypt/files/zulucrypt-7.1.0-fix_kf6.patch new file mode 100644 index 000000000000..eec0f36958e3 --- /dev/null +++ b/app-crypt/zulucrypt/files/zulucrypt-7.1.0-fix_kf6.patch @@ -0,0 +1,12 @@ +# PR merged https://github.com/mhogomchungu/zuluCrypt/pull/244.patch +--- a/external_libraries/lxqt_wallet/frontend/CMakeLists.txt ++++ b/external_libraries/lxqt_wallet/frontend/CMakeLists.txt +@@ -106,7 +106,7 @@ else() + find_package(KF6Wallet QUIET) + find_package(KF6Notifications QUIET) + +- if(KF5Wallet_FOUND AND KF5Notifications_FOUND ) ++ if(KF6Wallet_FOUND AND KF6Notifications_FOUND ) + file(APPEND ${PROJECT_BINARY_DIR}/storage_manager.h "\n#define HAS_KWALLET_SUPPORT 1\n") + SET(KDE_SUPPORT "true") + SET(KWALLET_SUPPORT "true") diff --git a/app-crypt/zulucrypt/zulucrypt-7.1.0.ebuild b/app-crypt/zulucrypt/zulucrypt-7.1.0.ebuild new file mode 100644 index 000000000000..46da9f824cf0 --- /dev/null +++ b/app-crypt/zulucrypt/zulucrypt-7.1.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# skip obsolete plugins +CMAKE_QA_COMPAT_SKIP=1 +inherit cmake xdg + +DESCRIPTION="Front end to cryptsetup" +HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"; +SRC_URI="https://github.com/mhogomchungu/${PN}/releases/download/${PV}/${P}.tar.xz"; +S="${WORKDIR}/zuluCrypt-${PV}" + +# BSD-2 for bundled libs lxqt-wallet and tcplay +LICENSE="GPL-2+ BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="keyring kwallet +qt6 udev" +REQUIRED_USE="kwallet? ( qt6 )" + +DEPEND=" + dev-libs/libgcrypt:0= + sys-apps/util-linux + sys-fs/cryptsetup:= + sys-fs/lvm2 + keyring? ( app-crypt/libsecret ) + qt6? ( + dev-libs/libpwquality + dev-qt/qtbase:6[dbus,gui,network,widgets] + kwallet? ( + kde-frameworks/knotifications:6 + kde-frameworks/kwallet:6 + ) + ) +" +RDEPEND=" + ${DEPEND} + udev? ( virtual/libudev ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-7.1.0-filter_flag.patch + "${FILESDIR}"/${PN}-7.1.0-bump_cmake.patch + # both merged + "${FILESDIR}"/${PN}-7.0.0-fix_linking.patch + "${FILESDIR}"/${PN}-7.1.0-fix_kf6.patch +) + +src_configure() { + local mycmakeargs=( + -DINTERNAL_ZULUPLAY=ON + # fix tcplay + -DLIB_SUFFIX=$(get_libdir) + -DNOGNOME=$(usex !keyring) + -DNOKDE=$(usex !kwallet) + -DNOGUI=$(usex !qt6) + # TODO: unbundle lxqt-wallet + # see https://github.com/mhogomchungu/zuluCrypt/issues/242 + $(usev qt6 '-DBUILD_WITH_QT6=ON -DINTERNAL_LXQT_WALLET=ON') + -DUDEVSUPPORT=$(usex udev) + ) + cmake_src_configure +}
