19 files changed, 414 insertions, 14 deletions
diff --git a/metadata/md5-cache/sys-fs/cryfs-1.0.1-r1 b/metadata/md5-cache/sys-fs/cryfs-1.0.1-r1
new file mode 100644
index 00000000..2b616931
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cryfs-1.0.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) virtual/pkgconfig || ( ( dev-lang/python:3.13 dev-python/versioneer[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/versioneer[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/versioneer[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/versioneer[python_targets_python3_10(-)] ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/boost:= dev-libs/crypto++:= dev-libs/libfmt:= dev-libs/spdlog:= >=sys-fs/fuse-2.8.6:0 dev-cpp/range-v3 net-misc/curl test? ( dev-cpp/gtest )
+DESCRIPTION=Encrypted FUSE filesystem that conceals metadata
+EAPI=8
+HOMEPAGE=https://www.cryfs.org/
+INHERIT=cmake eapi9-ver flag-o-matic linux-info python-any-r1
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3 MIT
+RDEPEND=dev-libs/boost:= dev-libs/crypto++:= dev-libs/libfmt:= dev-libs/spdlog:= >=sys-fs/fuse-2.8.6:0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cryfs/cryfs/archive/refs/tags/1.0.1.tar.gz -> cryfs-1.0.1.tar.gz
+_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	eapi9-ver	6a71fa30cdb3fe445114fdeab156c1f0	flag-o-matic	357f1a896fbedcd06e5ce55419c49eb9	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	891415dfe39ad9b41b461f2b86354af0	python-utils-r1	b7726144f5af59e186d66746d0f513e5	toolchain-funcs	6afdb6107430c1832ca7e16aacbf8fa1	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
+_md5_=07960d3dc2f4e0a6f6b77567a6523ecc
diff --git a/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.1.129-r1 b/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.1.130-r1
index a91bebeb..dcbdf299 100644
--- a/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.1.129-r1
+++ b/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.1.130-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4 app-arch/xz-utils dev-build/autoconf dev-build/make sys-devel/bc cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( sys-fs/dmraid ) dracut? ( >=sys-kernel/dracut-0.44-r8 ) dkms? ( sys-kernel/dkms sys-kernel/linux-sources-redcore-lts:6.1 ) mdadm? ( sys-fs/mdadm ) >=sys-kernel/linux-firmware-20180314
 RESTRICT=binchecks strip mirror
 SLOT=6.1
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.129.tar.xz
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.130.tar.xz
 _md5_=c0990c65f9f897629a99cf1f58b57fc7
diff --git a/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.12.17-r1 b/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.12.18-r1
index 8d3af3e1..16360e49 100644
--- a/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.12.17-r1
+++ b/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.12.18-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4 app-arch/xz-utils dev-build/autoconf dev-build/make sys-devel/bc cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( sys-fs/dmraid ) dracut? ( >=sys-kernel/dracut-0.44-r8 ) dkms? ( sys-kernel/dkms sys-kernel/linux-sources-redcore-lts:6.12 ) mdadm? ( sys-fs/mdadm ) >=sys-kernel/linux-firmware-20180314
 RESTRICT=binchecks strip mirror
 SLOT=6.12
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.17.tar.xz
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.18.tar.xz
 _md5_=0bca6418f861608da5753da8624067cb
diff --git a/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.6.80-r1 b/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.6.81-r1
index 5b5ac743..93051ba6 100644
--- a/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.6.80-r1
+++ b/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-6.6.81-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4 app-arch/xz-utils dev-build/autoconf dev-build/make sys-devel/bc cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( sys-fs/dmraid ) dracut? ( >=sys-kernel/dracut-0.44-r8 ) dkms? ( sys-kernel/dkms sys-kernel/linux-sources-redcore-lts:6.6 ) mdadm? ( sys-fs/mdadm ) >=sys-kernel/linux-firmware-20180314
 RESTRICT=binchecks strip mirror
 SLOT=6.6
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.80.tar.xz
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.81.tar.xz
 _md5_=5908e99b33813897ec8da148e171557b
diff --git a/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.1.129-r1 b/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.1.130-r1
index d02bb835..5162e304 100644
--- a/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.1.129-r1
+++ b/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.1.130-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4 app-arch/xz-utils dev-build/autoconf dev-build/make sys-devel/bc
 RESTRICT=strip mirror
 SLOT=6.1
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.129.tar.xz
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.130.tar.xz
 _md5_=027ec10530fa41b75d5ae4008cd686cb
diff --git a/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.12.17-r1 b/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.12.18-r1
index a0a31aa6..9ae10799 100644
--- a/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.12.17-r1
+++ b/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.12.18-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4 app-arch/xz-utils dev-build/autoconf dev-build/make sys-devel/bc
 RESTRICT=strip mirror
 SLOT=6.12
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.17.tar.xz
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.18.tar.xz
 _md5_=7599ec281a4b7ed5b2c739ec2afe65e2
diff --git a/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.6.80-r1 b/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.6.81-r1
index d76b4a78..b1ab1462 100644
--- a/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.6.80-r1
+++ b/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-6.6.81-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4 app-arch/xz-utils dev-build/autoconf dev-build/make sys-devel/bc
 RESTRICT=strip mirror
 SLOT=6.6
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.80.tar.xz
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.81.tar.xz
 _md5_=362a1646cd1d140ce85afe0e2ef10db8
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 5b31319d..8e48223a 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -58,6 +58,7 @@ sys-boot/plymouth 0.9.4-r11: Graphical boot animation (splash) and logger
 sys-boot/rpi-imager 1.8.5: Raspberry Pi Imaging Utility
 sys-boot/unetbootin-static 625-r5: Universal Netboot Installer creates Live USB systems for various OS distributions
 sys-devel/gcc 13.2.1_p20240210-r5: The GNU Compiler Collection
+sys-fs/cryfs 1.0.1-r1: Encrypted FUSE filesystem that conceals metadata
 sys-fs/cryptsetup 2.6.1-r5: Tool to setup encrypted devices with dm-crypt
 sys-fs/vhba 20240917: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
 sys-fs/zfs 2.3.0: ZFS meta-package (Gentoo compatibility ebuild)
@@ -66,9 +67,9 @@ sys-kernel/bcmwl-dkms 6.30.223.271-r14: Broadcom's IEEE 802.11a/b/g/n hybrid Lin
 sys-kernel/dkms 2.3-r4: Dynamic Kernel Module Support
 sys-kernel/dracut 059-r15: Generic initramfs generation tool
 sys-kernel/linux-image-redcore 6.10.14-r1 6.11.10-r1: Redcore Linux Kernel Image
-sys-kernel/linux-image-redcore-lts 5.15.178-r1 6.1.129-r1 6.6.80-r1 6.12.17-r1: Redcore Linux Kernel Image
+sys-kernel/linux-image-redcore-lts 5.15.178-r1 6.1.130-r1 6.6.81-r1 6.12.18-r1: Redcore Linux Kernel Image
 sys-kernel/linux-sources-redcore 6.10.14-r1 6.11.10-r1: Redcore Linux Kernel Sources
-sys-kernel/linux-sources-redcore-lts 5.15.178-r1 6.1.129-r1 6.6.80-r1 6.12.17-r1: Redcore Linux Kernel Sources
+sys-kernel/linux-sources-redcore-lts 5.15.178-r1 6.1.130-r1 6.6.81-r1 6.12.18-r1: Redcore Linux Kernel Sources
 sys-kernel/nvidia-drivers-dkms 390.157-r8 470.256.02-r1 550.144.03: NVIDIA driver sources for linux
 sys-kernel/tp_smapi-dkms 0.44-r4: IBM ThinkPad SMAPI BIOS driver sources
 sys-kernel/vhba-dkms 20240917-r1: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
new file mode 100644
index 00000000..5075d78d
--- /dev/null
+++ b/sys-fs/cryfs/Manifest
@@ -0,0 +1 @@
+DIST cryfs-1.0.1.tar.gz 9527514 BLAKE2B 6bf6d82bcca46e7db1583e997e979fb8977202f24ee113f137f301849c806ffb8120de002e92e1c15040bb5b74a78f7ce535f22c1c59874530c053257031d8fa SHA512 04877832ad155806720fbfe27508ce546dd9dfdd4a44382412152459c24f509e5ae47447b85676acd26df800996893662b74c996da1edd52aa890ddb05cd34db
diff --git a/sys-fs/cryfs/cryfs-1.0.1-r1.ebuild b/sys-fs/cryfs/cryfs-1.0.1-r1.ebuild
new file mode 100644
index 00000000..9841e149
--- /dev/null
+++ b/sys-fs/cryfs/cryfs-1.0.1-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake eapi9-ver flag-o-matic linux-info python-any-r1
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
+else
+	SRC_URI="
+		https://github.com/cryfs/cryfs/archive/refs/tags/${PV}.tar.gz
+			-> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
+HOMEPAGE="https://www.cryfs.org/"
+
+LICENSE="LGPL-3 MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/crypto++:=
+	dev-libs/libfmt:=
+	dev-libs/spdlog:=
+	>=sys-fs/fuse-2.8.6:0
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/range-v3
+	net-misc/curl
+	test? (
+		dev-cpp/gtest
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/versioneer[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	# TODO: upstream:
+	"${FILESDIR}"/cryfs-1.0.1-unbundle-vendored-libs.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/versioneer[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~FUSE_FS"
+	local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
+
+	check_extra_config
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# don't install compressed manpage
+	cmake_comment_add_subdirectory doc
+
+	# We use the package instead for >=py3.12 compat, bug #908997
+	rm src/gitversion/versioneer.py || die
+
+	# Hook up ctest properly for better maintainer quality of life
+	sed -i -e '/option(BUILD_TESTING/aenable_testing()' CMakeLists.txt || die
+	sed -i -e '/BUILD_TESTING/a  include(GoogleTest)' test/CMakeLists.txt || die
+	sed -i -e 's/add_test/gtest_discover_tests/' test/*/CMakeLists.txt || die
+}
+
+src_configure() {
+	# ODR violations (bug #880563)
+	# ./CMakeLists.txt
+	# """
+	# We don't use LTO because crypto++ has problems with it,
+	# see https://github.com/weidai11/cryptopp/issues/1031 and
+	# https://www.cryptopp.com/wiki/Link_Time_Optimization
+	# """
+	filter-lto
+
+	local mycmakeargs=(
+		# Upstream inconsistently specifies their libraries as STATIC
+		# Leading to issues when static libraries without PIC are linked
+		# with PIC shared libraries.
+		-DBUILD_SHARED_LIBS=OFF
+		-DBUILD_TESTING=$(usex test)
+		-DCRYFS_UPDATE_CHECKS=OFF
+		-DUSE_SYSTEM_LIBS=ON
+	)
+
+	append-cppflags -DNDEBUG
+
+	# bug 907096
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+	cmake_src_configure
+}
+
+src_test() {
+	local TMPDIR="${T}"
+
+	local CMAKE_SKIP_TESTS=(
+		# Cannot test mounting filesystems in sandbox
+		# Filesystem did not call onMounted callback, probably wasn't successfully mounted.
+		# bug #808849
+		CliTest.WorksWithCommasInBasedir
+		CliTest_IntegrityCheck.givenIncorrectFilesystemId_thenFails
+		CliTest_IntegrityCheck.givenIncorrectFilesystemKey_thenFails
+		CliTest_Setup.AutocreateBasedir
+		CliTest_Setup.AutocreateMountpoint
+		CliTest_Setup.ConfigfileGiven
+		CliTest_Setup.ExistingLogfileGiven
+		CliTest_Setup.NoSpecialOptions
+		CliTest_Setup.NotexistingLogfileGiven
+		CliTest_Unmount.givenMountedFilesystem_whenUnmounting_thenSucceeds
+		RunningInForeground/CliTest_WrongEnvironment.BaseDir_AllPermissions
+		RunningInForeground/CliTest_WrongEnvironment.BaseDir_DoesntExist_Create
+		RunningInForeground/CliTest_WrongEnvironment.MountDir_AllPermissions
+		RunningInForeground/CliTest_WrongEnvironment.MountDir_DoesntExist_Create
+		RunningInForeground/CliTest_WrongEnvironment.NoErrorCondition
+		RunningInForeground_ExternalConfigfile/CliTest_WrongEnvironment.BaseDir_AllPermissions
+		RunningInForeground_ExternalConfigfile/CliTest_WrongEnvironment.BaseDir_DoesntExist_Create
+		RunningInForeground_ExternalConfigfile/CliTest_WrongEnvironment.MountDir_AllPermissions
+		RunningInForeground_ExternalConfigfile/CliTest_WrongEnvironment.MountDir_DoesntExist_Create
+		RunningInForeground_ExternalConfigfile/CliTest_WrongEnvironment.NoErrorCondition
+		RunningInForeground_ExternalConfigfile_LogIsNotStderr/CliTest_WrongEnvironment.BaseDir_AllPermissions
+		RunningInForeground_ExternalConfigfile_LogIsNotStderr/CliTest_WrongEnvironment.BaseDir_DoesntExist_Create
+		RunningInForeground_ExternalConfigfile_LogIsNotStderr/CliTest_WrongEnvironment.MountDir_AllPermissions
+		RunningInForeground_ExternalConfigfile_LogIsNotStderr/CliTest_WrongEnvironment.MountDir_DoesntExist_Create
+		RunningInForeground_ExternalConfigfile_LogIsNotStderr/CliTest_WrongEnvironment.NoErrorCondition
+		RunningInForeground_LogIsNotStderr/CliTest_WrongEnvironment.BaseDir_AllPermissions
+		RunningInForeground_LogIsNotStderr/CliTest_WrongEnvironment.BaseDir_DoesntExist_Create
+		RunningInForeground_LogIsNotStderr/CliTest_WrongEnvironment.MountDir_AllPermissions
+		RunningInForeground_LogIsNotStderr/CliTest_WrongEnvironment.MountDir_DoesntExist_Create
+		RunningInForeground_LogIsNotStderr/CliTest_WrongEnvironment.NoErrorCondition
+		# Filesystem did not call onMounted callback, probably wasn't successfully mounted.
+		# fuse: failed to open /dev/fuse: Permission denied
+		CliTest_IntegrityCheck.givenFilesystemWithRolledBackBasedir_whenMounting_thenFails
+		CliTest_IntegrityCheck.whenRollingBackBasedirWhileMounted_thenUnmounts
+		# Tests that hang due to being unable to open fuse
+		# bug #699044
+		# fuse: failed to open /dev/fuse: Permission denied
+		Fuse*
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	doman doc/man/cryfs.1
+	doman doc/man/cryfs-unmount.1
+}
+
+pkg_postinst() {
+	elog "Filesystems created with CryFS 0.11.x and CryFS 1.0.0 are fully compatible with each other."
+	elog "This means filesystems created with 0.10.x or 0.11.x can be mounted without requiring a migration."
+	elog "Filesystems created with 1.0.0 or 0.11.x can be mounted by CryFS 0.10.x,"
+	elog "but only if you configure it to use a cipher supported by CryFS 0.10.x, e.g. AES-256-GCM."
+	elog "The new default, XChaCha20-Poly1305, is not supported by CryFS 0.10.x."
+}
diff --git a/sys-fs/cryfs/files/cryfs-1.0.1-unbundle-vendored-libs.patch b/sys-fs/cryfs/files/cryfs-1.0.1-unbundle-vendored-libs.patch
new file mode 100644
index 00000000..bfb5d497
--- /dev/null
+++ b/sys-fs/cryfs/files/cryfs-1.0.1-unbundle-vendored-libs.patch
@@ -0,0 +1,209 @@
+From a1973df742bbdac335b28786f4d429e522bcf411 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Mon, 3 Jun 2024 15:05:01 +0300
+Subject: [PATCH] Add USE_SYSTEM_LIBS option to build without bundled libs
+
+* Based on a patch by Andreas Sturmlechner.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,6 +16,7 @@ require_clang_version(7.0)
+ option(BUILD_TESTING "build test cases" OFF)
+ option(CRYFS_UPDATE_CHECKS "let cryfs check for updates and security vulnerabilities" ON)
+ option(DISABLE_OPENMP "allow building without OpenMP libraries. This will cause performance degradations." OFF)
++option(USE_SYSTEM_LIBS "build with system libs instead of bundled libs" OFF)
+ 
+ # The following options are helpful for development and/or CI
+ option(USE_WERROR "build with -Werror flag")
+@@ -41,7 +42,15 @@ endif()
+ 
+ include(cmake-utils/Dependencies.cmake)
+ 
+-add_subdirectory(vendor EXCLUDE_FROM_ALL)
++if(USE_SYSTEM_LIBS)
++    include(FindPkgConfig)
++    pkg_check_modules(CRYPTOPP REQUIRED IMPORTED_TARGET libcryptopp>=8.9)
++    add_library(cryfs_vendor_cryptopp ALIAS PkgConfig::CRYPTOPP)
++    add_definitions(-DUSE_SYSTEM_LIBS)
++else()
++    add_subdirectory(vendor EXCLUDE_FROM_ALL)
++endif()
++
+ add_subdirectory(src)
+ add_subdirectory(doc)
+ add_subdirectory(test)
+--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp
++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp
+@@ -1,5 +1,9 @@
+ #include "Gzip.h"
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/gzip.h>
++#else
+ #include <vendor_cryptopp/gzip.h>
++#endif
+ 
+ using cpputils::Data;
+ 
+--- a/src/cpp-utils/crypto/hash/Hash.cpp
++++ b/src/cpp-utils/crypto/hash/Hash.cpp
+@@ -1,6 +1,10 @@
+ #include "Hash.h"
+ #include <cpp-utils/random/Random.h>
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/sha.h>
++#else
+ #include <vendor_cryptopp/sha.h>
++#endif
+ 
+ using CryptoPP::SHA512;
+ 
+--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp
++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp
+@@ -1,5 +1,9 @@
+ #include "Scrypt.h"
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/scrypt.h>
++#else
+ #include <vendor_cryptopp/scrypt.h>
++#endif
+ 
+ using std::string;
+ 
+--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
+@@ -6,7 +6,11 @@
+ #include "../../data/Data.h"
+ #include "../../random/Random.h"
+ #include <boost/optional.hpp>
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/modes.h>
++#else
+ #include <vendor_cryptopp/modes.h>
++#endif
+ #include "Cipher.h"
+ #include "EncryptionKey.h"
+ 
+--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
+@@ -3,7 +3,12 @@
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_
+ 
+ #include "AEAD_Cipher.h"
++
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/gcm.h>
++#else
+ #include <vendor_cryptopp/gcm.h>
++#endif
+ 
+ namespace cpputils {
+ 
+--- a/src/cpp-utils/crypto/symmetric/ciphers.h
++++ b/src/cpp-utils/crypto/symmetric/ciphers.h
+@@ -2,12 +2,21 @@
+ #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
+ 
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/aes.h>
++#include <cryptopp/twofish.h>
++#include <cryptopp/serpent.h>
++#include <cryptopp/cast.h>
++#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.h>
++#else
+ #include <vendor_cryptopp/aes.h>
+ #include <vendor_cryptopp/twofish.h>
+ #include <vendor_cryptopp/serpent.h>
+ #include <vendor_cryptopp/cast.h>
+ #include <vendor_cryptopp/mars.h>
+ #include <vendor_cryptopp/chachapoly.h>
++#endif
+ #include "GCM_Cipher.h"
+ #include "CFB_Cipher.h"
+ 
+--- a/src/cpp-utils/data/Data.cpp
++++ b/src/cpp-utils/data/Data.cpp
+@@ -1,6 +1,10 @@
+ #include "Data.h"
+ #include <stdexcept>
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/hex.h>
++#else
+ #include <vendor_cryptopp/hex.h>
++#endif
+ 
+ using std::istream;
+ using std::ofstream;
+--- a/src/cpp-utils/data/FixedSizeData.h
++++ b/src/cpp-utils/data/FixedSizeData.h
+@@ -2,7 +2,11 @@
+ #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
+ #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
+ 
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/hex.h>
++#else
+ #include <vendor_cryptopp/hex.h>
++#endif
+ #include <string>
+ #include <array>
+ #include <cstring>
+--- a/src/cpp-utils/random/OSRandomGenerator.h
++++ b/src/cpp-utils/random/OSRandomGenerator.h
+@@ -3,7 +3,11 @@
+ #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H
+ 
+ #include "RandomGenerator.h"
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/osrng.h>
++#else
+ #include <vendor_cryptopp/osrng.h>
++#endif
+ 
+ namespace cpputils {
+     class OSRandomGenerator final : public RandomGenerator {
+--- a/src/cpp-utils/random/RandomGeneratorThread.h
++++ b/src/cpp-utils/random/RandomGeneratorThread.h
+@@ -4,7 +4,11 @@
+ 
+ #include "../thread/LoopThread.h"
+ #include "ThreadsafeRandomDataBuffer.h"
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/osrng.h>
++#else
+ #include <vendor_cryptopp/osrng.h>
++#endif
+ 
+ namespace cpputils {
+     //TODO Test
+--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp
++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp
+@@ -1,7 +1,11 @@
+ #include "BasedirMetadata.h"
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/json_parser.hpp>
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/sha.h>
++#else
+ #include <vendor_cryptopp/sha.h>
++#endif
+ #include <boost/filesystem/operations.hpp>
+ #include "LocalStateDir.h"
+ #include <cpp-utils/logging/logging.h>
+--- a/test/cryfs/impl/config/CompatibilityTest.cpp
++++ b/test/cryfs/impl/config/CompatibilityTest.cpp
+@@ -2,7 +2,11 @@
+ #include <vector>
+ #include <boost/filesystem.hpp>
+ #include <cpp-utils/data/Data.h>
++#if defined(USE_SYSTEM_LIBS)
++#include <cryptopp/hex.h>
++#else
+ #include <vendor_cryptopp/hex.h>
++#endif
+ #include <cpp-utils/crypto/symmetric/ciphers.h>
+ #include <cpp-utils/tempfile/TempFile.h>
+ #include <cryfs/impl/config/CryConfigFile.h>
+-- 
+2.48.0
+
diff --git a/sys-kernel/linux-image-redcore-lts/Manifest b/sys-kernel/linux-image-redcore-lts/Manifest
index eb2a2b1d..ae92d4d9 100644
--- a/sys-kernel/linux-image-redcore-lts/Manifest
+++ b/sys-kernel/linux-image-redcore-lts/Manifest
@@ -1,4 +1,4 @@
 DIST linux-5.15.178.tar.xz 126714520 BLAKE2B 6310e6f2fb5d8167374d3aa2f73f543447d60a72f939f509fea5ac88c9a01ab8b29b102149eb91c151e24af7b6036068033eba9ad4d3150f86e2b8f938f1e399 SHA512 6ee4890ec988a44158fd42d54308184ac7c697f1c0d0a69836401e42d422de5872965fc8f09c7032a069392af575e0f31303113fe354a9c9f8105102717bfa2e
-DIST linux-6.1.129.tar.xz 135266412 BLAKE2B 9e865a581cad529fc7109cb3e33f3cfaa428b2b6dd236789488e834b080ae2c2a155aa326663fdac11f374f61a223a1e216c6f9d496aee5e903f25df4961d01a SHA512 dbeace0a2a3601219ec927df31158f4f83a8c4830ec41a59b5c60cbfe2b5363f02586257ba47abcf09c26f0f8fa5a6a77db97f9aca2337841ab80aeb0637aaf1
-DIST linux-6.12.17.tar.xz 147988256 BLAKE2B 70025e9fb55dd808e43f58e5584d46932ac2463203b5c9f86ac5685f59ddadcc22b0b63bf388ce373ae1a9412fe1c19373084b7ea25b493efc20de07f39726a5 SHA512 16f1c0b5f54a9e9af4b41eaf43a3189ede80a03b4caf6430b563b7f1a09258b831e64517e788b57a49755b8e3e3828bd9d92892a3b858fa1c0359ad50585449a
-DIST linux-6.6.80.tar.xz 140482588 BLAKE2B 002049e9374dfeb2c5bfef12dda421a830d6a8be045876361cb6fa6113e2241282d5ef06a8560d5cc449c9272e829e6073f5de211f99565e31131085c94fc624 SHA512 0764061d5e1a3f66d3429acd92c95bdadd7f7314e90b33d95d7cd2eb749ced94467c1dc216e81a79b98722f9ecf37c177e14e42811766241e5f6434463868fb4
+DIST linux-6.1.130.tar.xz 135258000 BLAKE2B 04c4826d015c7f0d38ee67f1a139c60d3f863d215352fc7cac85a2f907db6f09d02c7d6fb2c85306d3333d8a7baf7be96450702a8ff75453b6108f3573e3d809 SHA512 546aa361cdda1721509064c8b8a2e05197b4f06d36d84af3c7fd9c165cf72bd2ba6143a902a6c0f6400b38bd0090a67b751b80638c178e56f7f72f87e8a5c538
+DIST linux-6.12.18.tar.xz 148052104 BLAKE2B d6c751915032c43c7558d85295c106d9ec4e5b93c828bc44058fe953de7c82b68fde2b6f295054f69fd1db3ae889a90de21cafc42099def3a87f41d977ffb48b SHA512 451641642da2a93f64cbe92a4b810cd56d4761e928f194f4e7ef35995bc2884706975043f2975ee354ed54178285463e8a3facfc98bc127309ebe5bee60f7d21
+DIST linux-6.6.81.tar.xz 140494088 BLAKE2B e4471a537fe0192d34c3b60dd884413e3d03b6c2d6157de81c0e0ac549cbbf1bd4c0ad245546a1248cfda9f2dddee15ea46ae28e25b21e1d4d68449b0661ae37 SHA512 093c57cdb4863aac08db71b21bf008b01eefea63512deaab310c0b750571325f70f2e0c69d15badd3d9528e4821aadffc0f150c7e0ee71098498362649b5f310
diff --git a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.1.129-r1.ebuild b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.1.130-r1.ebuild
index 2f8f0c05..2f8f0c05 100644
--- a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.1.129-r1.ebuild
+++ b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.1.130-r1.ebuild
diff --git a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.12.17-r1.ebuild b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.12.18-r1.ebuild
index 044398f7..044398f7 100644
--- a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.12.17-r1.ebuild
+++ b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.12.18-r1.ebuild
diff --git a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.6.80-r1.ebuild b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.6.81-r1.ebuild
index 958dda08..958dda08 100644
--- a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.6.80-r1.ebuild
+++ b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.6.81-r1.ebuild
diff --git a/sys-kernel/linux-sources-redcore-lts/Manifest b/sys-kernel/linux-sources-redcore-lts/Manifest
index eb2a2b1d..ae92d4d9 100644
--- a/sys-kernel/linux-sources-redcore-lts/Manifest
+++ b/sys-kernel/linux-sources-redcore-lts/Manifest
@@ -1,4 +1,4 @@
 DIST linux-5.15.178.tar.xz 126714520 BLAKE2B 6310e6f2fb5d8167374d3aa2f73f543447d60a72f939f509fea5ac88c9a01ab8b29b102149eb91c151e24af7b6036068033eba9ad4d3150f86e2b8f938f1e399 SHA512 6ee4890ec988a44158fd42d54308184ac7c697f1c0d0a69836401e42d422de5872965fc8f09c7032a069392af575e0f31303113fe354a9c9f8105102717bfa2e
-DIST linux-6.1.129.tar.xz 135266412 BLAKE2B 9e865a581cad529fc7109cb3e33f3cfaa428b2b6dd236789488e834b080ae2c2a155aa326663fdac11f374f61a223a1e216c6f9d496aee5e903f25df4961d01a SHA512 dbeace0a2a3601219ec927df31158f4f83a8c4830ec41a59b5c60cbfe2b5363f02586257ba47abcf09c26f0f8fa5a6a77db97f9aca2337841ab80aeb0637aaf1
-DIST linux-6.12.17.tar.xz 147988256 BLAKE2B 70025e9fb55dd808e43f58e5584d46932ac2463203b5c9f86ac5685f59ddadcc22b0b63bf388ce373ae1a9412fe1c19373084b7ea25b493efc20de07f39726a5 SHA512 16f1c0b5f54a9e9af4b41eaf43a3189ede80a03b4caf6430b563b7f1a09258b831e64517e788b57a49755b8e3e3828bd9d92892a3b858fa1c0359ad50585449a
-DIST linux-6.6.80.tar.xz 140482588 BLAKE2B 002049e9374dfeb2c5bfef12dda421a830d6a8be045876361cb6fa6113e2241282d5ef06a8560d5cc449c9272e829e6073f5de211f99565e31131085c94fc624 SHA512 0764061d5e1a3f66d3429acd92c95bdadd7f7314e90b33d95d7cd2eb749ced94467c1dc216e81a79b98722f9ecf37c177e14e42811766241e5f6434463868fb4
+DIST linux-6.1.130.tar.xz 135258000 BLAKE2B 04c4826d015c7f0d38ee67f1a139c60d3f863d215352fc7cac85a2f907db6f09d02c7d6fb2c85306d3333d8a7baf7be96450702a8ff75453b6108f3573e3d809 SHA512 546aa361cdda1721509064c8b8a2e05197b4f06d36d84af3c7fd9c165cf72bd2ba6143a902a6c0f6400b38bd0090a67b751b80638c178e56f7f72f87e8a5c538
+DIST linux-6.12.18.tar.xz 148052104 BLAKE2B d6c751915032c43c7558d85295c106d9ec4e5b93c828bc44058fe953de7c82b68fde2b6f295054f69fd1db3ae889a90de21cafc42099def3a87f41d977ffb48b SHA512 451641642da2a93f64cbe92a4b810cd56d4761e928f194f4e7ef35995bc2884706975043f2975ee354ed54178285463e8a3facfc98bc127309ebe5bee60f7d21
+DIST linux-6.6.81.tar.xz 140494088 BLAKE2B e4471a537fe0192d34c3b60dd884413e3d03b6c2d6157de81c0e0ac549cbbf1bd4c0ad245546a1248cfda9f2dddee15ea46ae28e25b21e1d4d68449b0661ae37 SHA512 093c57cdb4863aac08db71b21bf008b01eefea63512deaab310c0b750571325f70f2e0c69d15badd3d9528e4821aadffc0f150c7e0ee71098498362649b5f310
diff --git a/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.1.129-r1.ebuild b/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.1.130-r1.ebuild
index d8982cf9..d8982cf9 100644
--- a/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.1.129-r1.ebuild
+++ b/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.1.130-r1.ebuild
diff --git a/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.12.17-r1.ebuild b/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.12.18-r1.ebuild
index af42f777..af42f777 100644
--- a/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.12.17-r1.ebuild
+++ b/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.12.18-r1.ebuild
diff --git a/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.6.80-r1.ebuild b/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.6.81-r1.ebuild
index 7726f2c2..7726f2c2 100644
--- a/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.6.80-r1.ebuild
+++ b/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-6.6.81-r1.ebuild