mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-17 18:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-fs/cryptsetup: update to 2.3.2

Browse Source 
Since cryptsetup 1.7.5 cannot be built with json-c 0.15,
we need to also update cryptsetup to 2.3.2.
This commit is contained in:
Dongsu Park 2020-10-21 14:41:00 +02:00
parent 1bc50f2cd2
commit 6c98682dd6
7 changed files with 141 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/Manifest vendored
View File

@ -1,3 +1,3 @@
DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1 SHA512 c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f
DIST cryptsetup-2.0.2.tar.xz 10122404 BLAKE2B ac2391cdef387c403a8477467fb8fa36850d38ad3759639326f10ecd2b475bbd3df63162aafa1886e389a5a6b4ff1f94c2906e31538501d3be36267fbee12f6a SHA512 1c37b81b1dcb1223293b30ddc7096e074d01e2dd978b543fbda7ae11ecc29c1c461d12e4b22288bb382a188e9e679bf1ad3e281e77428374b7c605c8902c1b17 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
DIST cryptsetup-2.0.3.tar.xz 10125548 BLAKE2B 871df4c248151394f5abc907209b6df636049e5a1ff72161af091d36963ef68adee14e5e1867d779c9419e489aa9bea7562608b239a8fe361b769f0cc14daaf0 SHA512 f5ac54aa9614b234f2d1e84758a98914d283b669f4ab5cbe0ed7cdf25ce77f2d1abdf1e5b5010d803971f0e29120954110ee4fcc538137b04fbdc13b7804385e DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d

59
sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/cryptsetup-2.0.3.ebuild → sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild vendored
View File

@ -1,26 +1,24 @@
# Copyright 1999-2018 Gentoo Foundation # Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=6 EAPI=7
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit autotools linux-info libtool
inherit autotools python-single-r1 linux-info libtool ltprune versionator
DESCRIPTION="Tool to setup encrypted devices with dm-crypt" DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P/_/-}.tar.xz" SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
LICENSE="GPL-2+" LICENSE="GPL-2+"
SLOT="0/12" # libcryptsetup.so version SLOT="0/12" # libcryptsetup.so version
[[ ${PV} != *_rc* ]] && \ [[ ${PV} != *_rc* ]] && \
KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
CRYPTO_BACKENDS="+gcrypt kernel nettle openssl" CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
# we don't support nss since it doesn't allow cryptsetup to be built statically # we don't support nss since it doesn't allow cryptsetup to be built statically
# and it's missing ripemd160 support so it can't provide full backward compatibility # and it's missing ripemd160 support so it can't provide full backward compatibility
IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs udev urandom" IUSE="${CRYPTO_BACKENDS} +argon2 libressl luks1_default nls pwquality reencrypt static static-libs +udev urandom"
REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
python? ( ${PYTHON_REQUIRED_USE} ) libressl? ( openssl )
static? ( !gcrypt )" #496612 static? ( !gcrypt )" #496612
LIB_DEPEND=" LIB_DEPEND="
@ -33,23 +31,35 @@ LIB_DEPEND="
nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
openssl? ( openssl? (
!libressl? ( dev-libs/openssl:0=[static-libs(+)] ) !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl:=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] )
) )
pwquality? ( dev-libs/libpwquality[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] )
sys-fs/lvm2[static-libs(+)] sys-fs/lvm2[static-libs(+)]
udev? ( virtual/libudev[static-libs(+)] )" udev? ( virtual/libudev[static-libs(-)] )"
# We have to always depend on ${LIB_DEPEND} rather than put behind # We have to always depend on ${LIB_DEPEND} rather than put behind
# !static? () because we provide a shared library which links against # !static? () because we provide a shared library which links against
# these other packages. #414665 # these other packages. #414665
RDEPEND="static-libs? ( ${LIB_DEPEND} ) RDEPEND="static-libs? ( ${LIB_DEPEND} )
${LIB_DEPEND//\[static-libs\(+\)\]} ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
virtual/pkgconfig
static? ( ${LIB_DEPEND} )" static? ( ${LIB_DEPEND} )"
BDEPEND="
virtual/pkgconfig
"
S="${WORKDIR}/${P/_/-}" S="${WORKDIR}/${P/_/-}"
PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
pkg_pretend() {
if ! use luks1_default ; then
ewarn "WARNING! WARNING! WARNING!"
ewarn "You have chosen LUKS2 as your default format."
ewarn "This can break LUKS1 backwards compatibility."
ewarn "Enable \"luks1_default\" USE flag if you need backwards compatibility."
fi
}
pkg_setup() { pkg_setup() {
local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
@ -72,22 +82,17 @@ src_configure() {
ewarn "userspace crypto libraries." ewarn "userspace crypto libraries."
fi fi
use python && python_setup
# We disable autotool python integration so we can use eclasses
# for proper integration with multiple python versions.
local myeconfargs=( local myeconfargs=(
--disable-internal-argon2 --disable-internal-argon2
--enable-shared --enable-shared
--sbindir=/sbin --sbindir=/sbin
# for later use # for later use
# --with-default-luks-format=LUKS2 --with-default-luks-format=LUKS$(usex luks1_default 1 2)
--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d" --with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
$(use_enable argon2 libargon2) $(use_enable argon2 libargon2)
$(use_enable nls) $(use_enable nls)
$(use_enable pwquality) $(use_enable pwquality)
$(use_enable python)
$(use_enable reencrypt cryptsetup-reencrypt) $(use_enable reencrypt cryptsetup-reencrypt)
$(use_enable static static-cryptsetup) $(use_enable static static-cryptsetup)
$(use_enable static-libs static) $(use_enable static-libs static)
@ -115,11 +120,13 @@ src_install() {
default default
if use static ; then if use static ; then
mv "${ED%}"/sbin/cryptsetup{.static,} || die mv "${ED}"/sbin/cryptsetup{.static,} || die
mv "${ED%}"/sbin/veritysetup{.static,} || die mv "${ED}"/sbin/veritysetup{.static,} || die
use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; } if use reencrypt ; then
mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
fi
fi fi
prune_libtool_files --modules find "${ED}" -type f -name "*.la" -delete || die
dodoc docs/v*ReleaseNotes dodoc docs/v*ReleaseNotes

113
sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/cryptsetup-1.7.5.ebuild → sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/cryptsetup-2.3.3.ebuild vendored
View File

@ -1,51 +1,64 @@
# Copyright 1999-2018 Gentoo Foundation # Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=5 EAPI=7
DISTUTILS_OPTIONAL=1 inherit autotools linux-info libtool
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit autotools distutils-r1 linux-info libtool eutils versionator
DESCRIPTION="Tool to setup encrypted devices with dm-crypt" DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz" SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
LICENSE="GPL-2+" LICENSE="GPL-2+"
SLOT="0" SLOT="0/12" # libcryptsetup.so version
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" [[ ${PV} != *_rc* ]] && \
CRYPTO_BACKENDS="+gcrypt kernel nettle openssl" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
# we don't support nss since it doesn't allow cryptsetup to be built statically # we don't support nss since it doesn't allow cryptsetup to be built statically
# and it's missing ripemd160 support so it can't provide full backward compatibility # and it's missing ripemd160 support so it can't provide full backward compatibility
IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static static-libs udev urandom" IUSE="${CRYPTO_BACKENDS} +argon2 libressl luks1_default nls pwquality reencrypt static static-libs +udev urandom"
REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
python? ( ${PYTHON_REQUIRED_USE} ) libressl? ( openssl )
static? ( !gcrypt )" #496612 static? ( !gcrypt )" #496612
LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)] LIB_DEPEND="
dev-libs/json-c:=[static-libs(+)]
dev-libs/libgpg-error[static-libs(+)]
dev-libs/popt[static-libs(+)] dev-libs/popt[static-libs(+)]
sys-apps/util-linux[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)]
argon2? ( app-crypt/argon2:=[static-libs(+)] )
gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
openssl? ( openssl? (
!libressl? ( dev-libs/openssl:0=[static-libs(+)] ) !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl:=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] )
) )
pwquality? ( dev-libs/libpwquality[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] )
sys-fs/lvm2[static-libs(+)] sys-fs/lvm2[static-libs(+)]
udev? ( virtual/libudev[static-libs(+)] )" udev? ( virtual/libudev[static-libs(-)] )"
# We have to always depend on ${LIB_DEPEND} rather than put behind # We have to always depend on ${LIB_DEPEND} rather than put behind
# !static? () because we provide a shared library which links against # !static? () because we provide a shared library which links against
# these other packages. #414665 # these other packages. #414665
RDEPEND="static-libs? ( ${LIB_DEPEND} ) RDEPEND="static-libs? ( ${LIB_DEPEND} )
${LIB_DEPEND//\[static-libs\(+\)\]} ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
virtual/pkgconfig
static? ( ${LIB_DEPEND} )" static? ( ${LIB_DEPEND} )"
BDEPEND="
virtual/pkgconfig
"
#PATCHES=( ) S="${WORKDIR}/${P/_/-}"
PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
pkg_pretend() {
if ! use luks1_default ; then
ewarn "WARNING! WARNING! WARNING!"
ewarn "You have chosen LUKS2 as your default format."
ewarn "This can break LUKS1 backwards compatibility."
ewarn "Enable \"luks1_default\" USE flag if you need backwards compatibility."
fi
}
pkg_setup() { pkg_setup() {
local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
@ -58,14 +71,8 @@ pkg_setup() {
src_prepare() { src_prepare() {
sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
#epatch "${PATCHES[@]}" default
epatch_user && eautoreconf eautoreconf
if use python ; then
cd python
cp "${FILESDIR}"/setup-1.7.0.py setup.py || die
distutils-r1_src_prepare
fi
} }
src_configure() { src_configure() {
@ -75,27 +82,24 @@ src_configure() {
ewarn "userspace crypto libraries." ewarn "userspace crypto libraries."
fi fi
# We disable autotool python integration so we can use eclasses local myeconfargs=(
# for proper integration with multiple python versions. --disable-internal-argon2
econf \ --enable-shared
--sbindir=/sbin \ --sbindir=/sbin
--enable-shared \ # for later use
--disable-python \ --with-default-luks-format=LUKS$(usex luks1_default 1 2)
$(use_enable static static-cryptsetup) \ --with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
$(use_enable static-libs static) \
$(use_enable nls) \
$(use_enable pwquality) \
$(use_enable reencrypt cryptsetup-reencrypt) \
$(use_enable udev) \
$(use_enable !urandom dev-random) \
--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
$(use_enable argon2 libargon2)
use python && cd python && distutils-r1_src_configure $(use_enable nls)
} $(use_enable pwquality)
$(use_enable reencrypt cryptsetup-reencrypt)
src_compile() { $(use_enable static static-cryptsetup)
default $(use_enable static-libs static)
use python && cd python && distutils-r1_src_compile $(use_enable udev)
$(use_enable !urandom dev-random)
)
econf "${myeconfargs[@]}"
} }
src_test() { src_test() {
@ -103,24 +107,29 @@ src_test() {
ewarn "No /dev/mapper/control found -- skipping tests" ewarn "No /dev/mapper/control found -- skipping tests"
return 0 return 0
fi fi
local p local p
for p in /dev/mapper /dev/loop* ; do for p in /dev/mapper /dev/loop* ; do
addwrite ${p} addwrite ${p}
done done
default default
} }
src_install() { src_install() {
default default
if use static ; then if use static ; then
mv "${ED}"/sbin/cryptsetup{.static,} || die mv "${ED}"/sbin/cryptsetup{.static,} || die
mv "${ED}"/sbin/veritysetup{.static,} || die mv "${ED}"/sbin/veritysetup{.static,} || die
use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; } if use reencrypt ; then
mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
fi
fi fi
prune_libtool_files --modules find "${ED}" -type f -name "*.la" -delete || die
dodoc docs/v*ReleaseNotes
newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
use python && cd python && distutils-r1_src_install
} }

50
sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/cryptsetup-2.0.2.ebuild → sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild vendored
View File

@ -1,26 +1,24 @@
# Copyright 1999-2018 Gentoo Foundation # Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=6 EAPI=7
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit autotools linux-info libtool
inherit autotools python-single-r1 linux-info libtool ltprune versionator
DESCRIPTION="Tool to setup encrypted devices with dm-crypt" DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P/_/-}.tar.xz" SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
LICENSE="GPL-2+" LICENSE="GPL-2+"
SLOT="0/12" # libcryptsetup.so version SLOT="0/12" # libcryptsetup.so version
[[ ${PV} != *_rc* ]] && \ [[ ${PV} != *_rc* ]] && \
KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
CRYPTO_BACKENDS="+gcrypt kernel nettle openssl" CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
# we don't support nss since it doesn't allow cryptsetup to be built statically # we don't support nss since it doesn't allow cryptsetup to be built statically
# and it's missing ripemd160 support so it can't provide full backward compatibility # and it's missing ripemd160 support so it can't provide full backward compatibility
IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs udev urandom" IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static static-libs +udev urandom"
REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
python? ( ${PYTHON_REQUIRED_USE} ) libressl? ( openssl )
static? ( !gcrypt )" #496612 static? ( !gcrypt )" #496612
LIB_DEPEND=" LIB_DEPEND="
@ -33,23 +31,26 @@ LIB_DEPEND="
nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
openssl? ( openssl? (
!libressl? ( dev-libs/openssl:0=[static-libs(+)] ) !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl:=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] )
) )
pwquality? ( dev-libs/libpwquality[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] )
sys-fs/lvm2[static-libs(+)] sys-fs/lvm2[static-libs(+)]
udev? ( virtual/libudev[static-libs(+)] )" udev? ( virtual/libudev[static-libs(-)] )"
# We have to always depend on ${LIB_DEPEND} rather than put behind # We have to always depend on ${LIB_DEPEND} rather than put behind
# !static? () because we provide a shared library which links against # !static? () because we provide a shared library which links against
# these other packages. #414665 # these other packages. #414665
RDEPEND="static-libs? ( ${LIB_DEPEND} ) RDEPEND="static-libs? ( ${LIB_DEPEND} )
${LIB_DEPEND//\[static-libs\(+\)\]} ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
virtual/pkgconfig
static? ( ${LIB_DEPEND} )" static? ( ${LIB_DEPEND} )"
BDEPEND="
virtual/pkgconfig
"
S="${WORKDIR}/${P/_/-}" S="${WORKDIR}/${P/_/-}"
PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
pkg_setup() { pkg_setup() {
local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
@ -72,20 +73,17 @@ src_configure() {
ewarn "userspace crypto libraries." ewarn "userspace crypto libraries."
fi fi
use python && python_setup
# We disable autotool python integration so we can use eclasses
# for proper integration with multiple python versions.
local myeconfargs=( local myeconfargs=(
--disable-internal-argon2 --disable-internal-argon2
--enable-shared --enable-shared
--sbindir=/sbin --sbindir=/sbin
--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d" # for later use
--with-default-luks-format=LUKS2
--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
$(use_enable argon2 libargon2) $(use_enable argon2 libargon2)
$(use_enable nls) $(use_enable nls)
$(use_enable pwquality) $(use_enable pwquality)
$(use_enable python)
$(use_enable reencrypt cryptsetup-reencrypt) $(use_enable reencrypt cryptsetup-reencrypt)
$(use_enable static static-cryptsetup) $(use_enable static static-cryptsetup)
$(use_enable static-libs static) $(use_enable static-libs static)
@ -113,11 +111,13 @@ src_install() {
default default
if use static ; then if use static ; then
mv "${ED%}"/sbin/cryptsetup{.static,} || die mv "${ED}"/sbin/cryptsetup{.static,} || die
mv "${ED%}"/sbin/veritysetup{.static,} || die mv "${ED}"/sbin/veritysetup{.static,} || die
use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; } if use reencrypt ; then
mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
fi
fi fi
prune_libtool_files --modules find "${ED}" -type f -name "*.la" -delete || die
dodoc docs/v*ReleaseNotes dodoc docs/v*ReleaseNotes

18
sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/files/cryptsetup-2.0.4-fix-static-pwquality-build.patch vendored Normal file
View File

@ -0,0 +1,18 @@
--- a/src/Makemodule.am 2018-07-31 14:32:46.000000000 +0200
+++ b/src/Makemodule.am 2018-08-12 17:13:26.000000000 +0200
@@ -64,6 +64,7 @@
$(veritysetup_LDADD) \
@CRYPTO_STATIC_LIBS@ \
@DEVMAPPER_STATIC_LIBS@ \
+ @PWQUALITY_STATIC_LIBS@ \
@UUID_LIBS@
endif
endif
@@ -93,6 +94,7 @@
$(integritysetup_LDADD) \
@CRYPTO_STATIC_LIBS@ \
@DEVMAPPER_STATIC_LIBS@ \
+ @PWQUALITY_STATIC_LIBS@ \
@UUID_LIBS@
endif
endif

21
sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/files/setup-1.7.0.py vendored
View File

@ -1,21 +0,0 @@
import os
from distutils.core import setup, Extension
top_srcdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
def get_ver():
with open(os.path.join(top_srcdir, 'configure')) as f:
for line in f:
if line.startswith('PACKAGE_VERSION='):
return line.split('=')[1].replace("'", '').strip()
module = Extension('pycryptsetup',
include_dirs=[os.path.join(top_srcdir, 'lib')],
extra_compile_args=['-include', os.path.join(top_srcdir, 'config.h')],
library_dirs=[os.path.join(top_srcdir, 'lib', '.libs')],
libraries=['cryptsetup'],
sources=['pycryptsetup.c'])
setup(name='pycryptsetup',
version=get_ver(),
ext_modules=[module])

1
sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/metadata.xml vendored
View File

@ -9,6 +9,7 @@
<flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag> <flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag>
<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag> <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
<flag name="kernel">Use kernel crypto backend (mainly for embedded systems)</flag> <flag name="kernel">Use kernel crypto backend (mainly for embedded systems)</flag>
<flag name="luks1_default">Default to LUKS1 on disk encryption format rather than new LUKS2</flag>
<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag> <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> crypto backend</flag> <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> crypto backend</flag>
<flag name="pwquality">Use <pkg>dev-libs/libpwquality</pkg> for password quality checking</flag> <flag name="pwquality">Use <pkg>dev-libs/libpwquality</pkg> for password quality checking</flag>