diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-28 20:40:51 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-28 20:40:51 +0000 |
commit | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (patch) | |
tree | 47c9d6e4243f39a1f48afd54c969b65b00a5c649 /dev-libs/volume_key | |
parent | d934827bf44b7cfcf6711964418148fa60877668 (diff) |
gentoo resync : 28.11.2020
Diffstat (limited to 'dev-libs/volume_key')
-rw-r--r-- | dev-libs/volume_key/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/volume_key/files/volume_key-0.3.12-support_higher_LUKS_versions.patch | 33 | ||||
-rw-r--r-- | dev-libs/volume_key/volume_key-0.3.12-r2.ebuild | 55 |
3 files changed, 90 insertions, 0 deletions
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest index 9704187b8a46..8c4fb1497067 100644 --- a/dev-libs/volume_key/Manifest +++ b/dev-libs/volume_key/Manifest @@ -1,5 +1,7 @@ +AUX volume_key-0.3.12-support_higher_LUKS_versions.patch 917 BLAKE2B a637ba7d7761032bbbae34378a1cd8da57cd96c762ebeb50fce0ca28b7b154df11bda89af203d18833e7841fbd9181c01ee5fcb11d80d765fd147e82440becca SHA512 e784115d85f782db46dbd67c40c3a6b0864b69ce8d13b6a67d70471d39079e9fc0d9d263bd543556d645d7dc922ef22f641491051dd736128cdaecd63df2ff22 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c EBUILD volume_key-0.3.11.ebuild 883 BLAKE2B 08ea62d2a68987cca931a9c561787d3594764b6b9ac452f45d71c5b7a102eba24807ed878a6ae8aa79a3d4f4efc9baceed974d00f2c0e2491a4de90d43e8cf3e SHA512 6a67cab22720560ceb03e54bd4d4614dc5f3ab561a508557df71465d375f4ab4c9a5bbbb096570c2e52f4e6c8197f9addf288488e1aeaceb3dbe6c3020b0f78a EBUILD volume_key-0.3.12-r1.ebuild 975 BLAKE2B d3008a2bdc868297cf8c40c52a0908b80b667195aeedac9ac7b9fe3666f398617c95f79094d69a5fd5946552e31a8a18762908b22eed5d06d2a8680d769a649b SHA512 4903d03944d47ccae8d4cc39f0ee262db47eadd09aeb264ef530c1df7fba477647f826884b3ae7e6eca5e4a6981addcb76f839c18607e44a54d7b509642c6c00 +EBUILD volume_key-0.3.12-r2.ebuild 1050 BLAKE2B a728cf5978b592976ece161d05e1d20a502beaf31668ade53125dd42ed950f856adef9ce4d0cace156dd55f4a5e211d29c5a0fd1ce6b25966313962995a9bff4 SHA512 093b7b8e1eea57b0452acec1992c53182d221fdd5cb40df3f4730746d8021d8b12ea3c279de57e39433a56174232a32728d5117a53a8c5283331e325afee4d36 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea diff --git a/dev-libs/volume_key/files/volume_key-0.3.12-support_higher_LUKS_versions.patch b/dev-libs/volume_key/files/volume_key-0.3.12-support_higher_LUKS_versions.patch new file mode 100644 index 000000000000..6f5aec1dfe5a --- /dev/null +++ b/dev-libs/volume_key/files/volume_key-0.3.12-support_higher_LUKS_versions.patch @@ -0,0 +1,33 @@ +From 26c09768662d8958debe8c9410dae9fda02292c3 Mon Sep 17 00:00:00 2001 +From: Jiri Kucera <jkucera@redhat.com> +Date: Jan 23 2019 13:35:52 +0000 +Subject: Add support for higher versions of LUKS + + +--- + +diff --git a/lib/volume_luks.c b/lib/volume_luks.c +index f4bf2c8..d1c5d47 100644 +--- a/lib/volume_luks.c ++++ b/lib/volume_luks.c +@@ -30,6 +30,10 @@ Author: Miloslav Trmač <mitr@redhat.com> */ + #include "volume.h" + #include "volume_luks.h" + ++#ifndef CRYPT_LUKS ++#define CRYPT_LUKS NULL ++#endif ++ + /* LUKS - specific code */ + + /* Return an error message for ERR_NO, for g_free (). */ +@@ -105,7 +109,7 @@ open_crypt_device (const char *path, char **last_log_entry, GError **error) + if (r < 0) + goto err; + crypt_set_log_callback(cd, record_cryptsetup_log_entry, last_log_entry); +- r = crypt_load (cd, CRYPT_LUKS1, NULL); ++ r = crypt_load (cd, CRYPT_LUKS, NULL); + if (r < 0) + goto err_cd; + return cd; + diff --git a/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild new file mode 100644 index 000000000000..90c67ed022e2 --- /dev/null +++ b/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit python-single-r1 + +DESCRIPTION="Library for manipulating and storing storage volume encryption keys" +HOMEPAGE="https://pagure.io/volume_key" +SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + app-crypt/gpgme + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + sys-apps/util-linux + sys-fs/cryptsetup:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext + test? ( dev-libs/nss[utils] ) +" + +PATCHES=( + "${FILESDIR}/${P}-support_higher_LUKS_versions.patch" +) + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_configure() { + # --without-python disables python2 + econf --without-python --with-python3 +} + +src_install() { + default + find "${ED}" -type f -name "*.la" -delete || die + + python_optimize +} |