[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-12-27 Thread Sam James
commit: cf7e681c1a49951ffab38072745e8515d545f4f6
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:59:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:59:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf7e681c

sys-fs/cryptsetup: drop 2.4.3-r2

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/Manifest   |   1 -
 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild | 139 ---
 sys-fs/cryptsetup/metadata.xml   |   1 -
 3 files changed, 141 deletions(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 8cbaeb900891..12d3d7733690 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,2 +1 @@
-DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B 
f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f
 SHA512 
2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e
 DIST cryptsetup-2.6.1.tar.xz 11402380 BLAKE2B 
efd7a64d89d863876de68ff3e89d8c94ad5eca6a8d2236c52c234fbe51e9d9ee303a0c7fe7dac7df10e0062003b9c0aeddc8dc342582106c157ab2d1e742155e
 SHA512 
0cbddbf33cbac2b834ed7e2dd47a9fc787131031a1c729f373f5c974600a838097e9cc0555f13719fc79c384a2a34b404f94ba4cc2f35f0bb1d70aef2233fd18

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
deleted file mode 100644
index ff673fe9aa9c..
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info tmpfiles
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup;
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
-# and it's missing ripemd160 support so it can't provide full backward 
compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 fips nls pwquality reencrypt ssh static 
static-libs test +udev urandom"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt !ssh !udev !fips )
-   fips? ( !kernel !nettle )
-" # 496612, 832711, 843863
-
-LIB_DEPEND="
-   dev-libs/json-c:=[static-libs(+)]
-   dev-libs/popt[static-libs(+)]
-   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
-   argon2? ( app-crypt/argon2:=[static-libs(+)] )
-   gcrypt? (
-   dev-libs/libgcrypt:0=[static-libs(+)]
-   dev-libs/libgpg-error[static-libs(+)]
-   )
-   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
-   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-   ssh? ( net-libs/libssh[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
-   udev? ( virtual/libudev:= )"
-# vim-core needed for xxd in tests
-DEPEND="${RDEPEND}
-   static? ( ${LIB_DEPEND} )
-   test? ( app-editors/vim-core )"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-pkg_setup() {
-   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
-   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
-   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
-   check_extra_config
-}
-
-src_prepare() {
-   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-   default
-}
-
-src_configure() {
-   if use kernel ; then
-   ewarn "Note that kernel backend is very slow for this type of 
operation"
-   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
-   ewarn "userspace crypto libraries."
-   fi
-
-   local myeconfargs=(
-   --disable-internal-argon2
-   --enable-shared
-   --sbindir="${EPREFIX}"/sbin
-   # for later use
-   --with-default-luks-format=LUKS2
-   --with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-06-13 Thread Sam James
commit: a5cb655bb4c7b68f3e631405f15863bb84619ec1
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 14 02:54:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 14 02:54:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5cb655b

sys-fs/cryptsetup: update HOMEPAGE

It's unusual to link to the README in HOMEPAGE and it's already on the
main repo page anyway.

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild | 4 ++--
 sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index 2ec9830e1339..ff673fe9aa9c 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit linux-info tmpfiles
 
 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;
 SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2+"

diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
index 5a6fdc660b4a..07d4351b691c 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit linux-info tmpfiles
 
 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;
 SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
 S="${WORKDIR}"/${P/_/-}
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-04-29 Thread Arthur Zamarin
commit: 90512068080d69700eb2d867263f4c4e6ef70fc9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 29 11:44:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 29 11:44:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90512068

sys-fs/cryptsetup: Stabilize 2.6.1 hppa, #904925

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
index db8e770c9c0b..5a6fdc660b4a 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 fi
 
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-04-23 Thread Sam James
commit: 0d3d407294199ef9c17c7839717b5f3f200dc474
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 22:23:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 22:23:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3d4072

sys-fs/cryptsetup: Stabilize 2.6.1 arm, #904925

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
index a0b43b339648..db8e770c9c0b 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 fi
 
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-04-23 Thread Sam James
commit: ee6455018bca7ca620e4bf6bef234cac771ec49b
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 21:07:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 21:07:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee645501

sys-fs/cryptsetup: Stabilize 2.6.1 ppc, #904925

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
index 8a1de94b9787..a0b43b339648 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 fi
 
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-04-23 Thread Sam James
commit: 64928df090fe86a4e59dc999d4ef0be55aaa8106
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:53:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:53:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64928df0

sys-fs/cryptsetup: Stabilize 2.6.1 sparc, #904925

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
index 33cb493d14b4..8a1de94b9787 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 sparc x86"
 fi
 
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-04-23 Thread Sam James
commit: 60b86dbb3df4b96d9d27d18deb2b7a86028721e9
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:43:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:43:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b86dbb

sys-fs/cryptsetup: Stabilize 2.6.1 ppc64, #904925

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
index dd2b6b674a65..33cb493d14b4 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-04-23 Thread Sam James
commit: 26f95e56e25b0aac19614f33b87e5672c7deebca
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:21:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:21:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f95e56

sys-fs/cryptsetup: Stabilize 2.6.1 x86, #904925

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
index 05ec85fd822d..dd2b6b674a65 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-04-23 Thread Sam James
commit: e50423cbba801afbb5963509921490f4bad79cb2
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:05:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:05:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50423cb

sys-fs/cryptsetup: Stabilize 2.6.1 amd64, #904925

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
index 1d1ebe1d47bc..05ec85fd822d 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-04-23 Thread Sam James
commit: 6e1ac7db480af78ea04a8b6f5e34d6bc42c83dd6
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:00:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:00:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1ac7db

sys-fs/cryptsetup: Stabilize 2.6.1 arm64, #904925

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
index 140ba82518df..1d1ebe1d47bc 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2023-03-22 Thread Sam James
commit: 6e674d3aea95ede19978bde81dcd1ca6b538fca7
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 23 05:57:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 23 05:58:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e674d3a

sys-fs/cryptsetup: add 2.6.1

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild | 148 ++
 2 files changed, 149 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 05710fd70925..8cbaeb900891 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1 +1,2 @@
 DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B 
f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f
 SHA512 
2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e
+DIST cryptsetup-2.6.1.tar.xz 11402380 BLAKE2B 
efd7a64d89d863876de68ff3e89d8c94ad5eca6a8d2236c52c234fbe51e9d9ee303a0c7fe7dac7df10e0062003b9c0aeddc8dc342582106c157ab2d1e742155e
 SHA512 
0cbddbf33cbac2b834ed7e2dd47a9fc787131031a1c729f373f5c974600a838097e9cc0555f13719fc79c384a2a34b404f94ba4cc2f35f0bb1d70aef2233fd18

diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
new file mode 100644
index ..140ba82518df
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info tmpfiles
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+S="${WORKDIR}"/${P/_/-}
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+# 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
+IUSE="${CRYPTO_BACKENDS} +argon2 fips nls pwquality ssh static static-libs 
test +udev urandom"
+RESTRICT="!test? ( test )"
+# bug #496612, bug #832711, bug #843863
+REQUIRED_USE="
+   ^^ ( ${CRYPTO_BACKENDS//+/} )
+   static? ( !gcrypt !ssh !udev !fips )
+   fips? ( !kernel !nettle )
+"
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? (
+   dev-libs/libgcrypt:0=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   ssh? ( net-libs/libssh[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]
+"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. bug #414665
+RDEPEND="
+   static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
+   udev? ( virtual/libudev:= )
+"
+DEPEND="
+   ${RDEPEND}
+   static? ( ${LIB_DEPEND} )
+"
+# vim-core needed for xxd in tests
+BDEPEND="
+   virtual/pkgconfig
+   test? ( app-editors/vim-core )
+"
+
+pkg_setup() {
+   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+}
+
+src_prepare() {
+   default
+
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+}
+
+src_configure() {
+   local myeconfargs=(
+   --disable-internal-argon2
+   --disable-asciidoc
+   --enable-shared
+   --sbindir="${EPREFIX}"/sbin
+   # 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)
+   $(use_enable argon2 libargon2)
+   $(use_enable nls)
+   $(use_enable pwquality)
+   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/files/

2022-10-31 Thread Mike Gilbert
commit: e60a8d35dfa988cb1147c32e2b147a1d75fd0564
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Oct 31 17:14:04 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Oct 31 17:16:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e60a8d35

sys-fs/cryptsetup: order dmcrypt after dev-settle

This is still racy, but should increase the probability of success.

Bug: https://bugs.gentoo.org/820773
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc 
b/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc
index 3b3c57da1c00..ea9a5ca4807b 100644
--- a/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc
+++ b/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc
@@ -5,6 +5,7 @@
 depend() {
use modules
before checkfs fsck
+   after dev-settle
 
if grep -qs ^swap= "${conf_file}" ; then
before swap



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/, sys-fs/cryptsetup/files/

2022-10-28 Thread Sam James
commit: 53d136993ca49ab1b44ddce96648ce5f1202c15b
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:06:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:09:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d13699

sys-fs/cryptsetup: drop 2.4.3

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild   | 136 ---
 sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd | 112 -
 sys-fs/cryptsetup/files/2.4.0-dmcrypt.rc| 350 
 3 files changed, 598 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
deleted file mode 100644
index 79282c022d79..
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info tmpfiles
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-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
-# and it's missing ripemd160 support so it can't provide full backward 
compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs test +udev urandom"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt !ssh !udev )" # 496612, 832711
-
-LIB_DEPEND="
-   dev-libs/json-c:=[static-libs(+)]
-   dev-libs/popt[static-libs(+)]
-   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
-   argon2? ( app-crypt/argon2:=[static-libs(+)] )
-   gcrypt? (
-   dev-libs/libgcrypt:0=[static-libs(+)]
-   dev-libs/libgpg-error[static-libs(+)]
-   )
-   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
-   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-   ssh? ( net-libs/libssh[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
-   udev? ( virtual/libudev:= )"
-# vim-core needed for xxd in tests
-DEPEND="${RDEPEND}
-   static? ( ${LIB_DEPEND} )
-   test? ( app-editors/vim-core )"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-pkg_setup() {
-   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
-   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
-   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
-   check_extra_config
-}
-
-src_prepare() {
-   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-   default
-}
-
-src_configure() {
-   if use kernel ; then
-   ewarn "Note that kernel backend is very slow for this type of 
operation"
-   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
-   ewarn "userspace crypto libraries."
-   fi
-
-   local myeconfargs=(
-   --disable-internal-argon2
-   --enable-shared
-   --sbindir=/sbin
-   # 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)
-   $(use_enable argon2 libargon2)
-   $(use_enable nls)
-   $(use_enable pwquality)
-   $(use_enable reencrypt cryptsetup-reencrypt)
-   $(use_enable !static external-tokens)
-   $(use_enable static static-cryptsetup)
-   $(use_enable static-libs static)
-   $(use_enable udev)
-   $(use_enable !urandom dev-random)
-   $(use_enable ssh ssh-token)
-   $(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
-   )
-   econf "${myeconfargs[@]}"
-}
-
-src_test() {
-   if [[ ! -e /dev/mapper/control ]] ; then
-   ewarn "No /dev/mapper/control found -- skipping tests"
-   return 0
-   fi
-
-   local p
-   for p in 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-10-27 Thread Sam James
commit: a8b9370fd513c35005df5a871de2a3589ae706b6
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 27 23:46:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 27 23:46:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8b9370f

sys-fs/cryptsetup: Stabilize 2.4.3-r2 x86, #85

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index a867b3a9d311..2ec9830e1339 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-10-25 Thread Sam James
commit: fa9a3ae464fbac6957e9315890b910d3181636aa
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 25 11:11:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 25 11:11:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa9a3ae4

sys-fs/cryptsetup: Stabilize 2.4.3-r2 amd64, #85

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index 6c2a8edabdc2..a867b3a9d311 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-10-22 Thread Arthur Zamarin
commit: 8884dfe7fe7e286ee1eca21577f1d009d4244a04
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Oct 22 14:59:33 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Oct 22 14:59:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8884dfe7

sys-fs/cryptsetup: Stabilize 2.4.3-r2 hppa, #85

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index 3657f1982a1c..6c2a8edabdc2 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-10-21 Thread Agostino Sarubbo
commit: 3ba2ac7994cef387f59cb0e000fbe36e6c5c2d68
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct 21 06:48:20 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct 21 06:48:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba2ac79

sys-fs/cryptsetup: Stabilize 2.4.3-r2 sparc, #85

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index 98bece87bcb8..3657f1982a1c 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-10-21 Thread Agostino Sarubbo
commit: 8e1aadf1a325bad892cc86a04bed68e4f98f85f8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct 21 06:47:31 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct 21 06:47:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e1aadf1

sys-fs/cryptsetup: Stabilize 2.4.3-r2 ppc, #85

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index a09ca6e3971f..98bece87bcb8 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-10-20 Thread Sam James
commit: b4e45ae5163ba9f836d028268a6e9ed1cfa43726
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 20 21:15:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 20 21:15:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e45ae5

sys-fs/cryptsetup: Stabilize 2.4.3-r2 ppc64, #85

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index c456dea861de..a09ca6e3971f 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-10-20 Thread Arthur Zamarin
commit: ffbc02a51f7eba46ecf032f5d0a6f507faaae342
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Oct 20 19:05:50 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Oct 20 19:05:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbc02a5

sys-fs/cryptsetup: Stabilize 2.4.3-r2 arm, #85

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index 5227f2a51034..c456dea861de 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-10-20 Thread Arthur Zamarin
commit: bb932c4975a690ddab9c5a4b37708cf096c68d99
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Oct 20 18:51:20 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Oct 20 18:51:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb932c49

sys-fs/cryptsetup: Stabilize 2.4.3-r2 arm64, #85

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index 48ef57af21a5..5227f2a51034 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/, sys-fs/cryptsetup/files/

2022-10-20 Thread Mike Gilbert
commit: 7b11c3a8a55ffb81ec3194545639513011c7ec54
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Oct 20 17:59:25 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Oct 20 17:59:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b11c3a8

sys-fs/cryptsetup: replace egrep in init script

Closes: https://bugs.gentoo.org/877699
Signed-off-by: Mike Gilbert  gentoo.org>

 .../{cryptsetup-2.4.3-r1.ebuild => cryptsetup-2.4.3-r2.ebuild}| 0
 sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc  | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
similarity index 100%
rename from sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild

diff --git a/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc 
b/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc
index 0903ac5eabd0..3b3c57da1c00 100644
--- a/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc
+++ b/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc
@@ -109,7 +109,7 @@ dm_crypt_execute() {
#   ${target} is active:
# Newer versions report:
#   ${target} is active[ and is in use.]
-   if cryptsetup ${header_opt} status ${target} | egrep -q ' is active' ; 
then
+   if cryptsetup ${header_opt} status ${target} | grep -E -q ' is active' 
; then
einfo "dm-crypt mapping ${target} is already configured"
return
fi
@@ -329,7 +329,7 @@ stop() {
 
# Break down all mappings
print_header=true
-   egrep "^(target|swap)=" ${conf_file} | \
+   grep -E "^(target|swap)=" ${conf_file} | \
while read line ; do
${print_header} && einfo "Removing dm-crypt mappings"
print_header=false



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-10-14 Thread Sam James
commit: 76a207b5c5b0bef75e0b80505b5208a866556d2b
Author: kochera  google  com>
AuthorDate: Fri Oct 14 08:54:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 15 03:08:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76a207b5

sys-fs/cryptsetup: Add cpe_uri for cryptsetup package.

Signed-off-by: Michael Kochera  google.com>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 5f7443faf40f..5e848865257a 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -18,6 +18,7 @@
Use /dev/urandom instead of /dev/random
 
 
+   cpe:/a:cryptsetup_project:cryptsetup
cryptsetup/cryptsetup
 
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-05-18 Thread Sam James
commit: f5278f717ee1c5bdc88ea609c33504451779b96a
Author: YiyangWu  gmail  com>
AuthorDate: Wed May 18 09:20:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 19 01:58:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5278f71

sys-fs/cryptsetup: specify sbin dir inside EPREFIX

Closes: https://bugs.gentoo.org/845330
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yiyang Wu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25547
Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
index a0f8af607ccd..48ef57af21a5 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
@@ -77,7 +77,7 @@ src_configure() {
local myeconfargs=(
--disable-internal-argon2
--enable-shared
-   --sbindir=/sbin
+   --sbindir="${EPREFIX}"/sbin
# for later use
--with-default-luks-format=LUKS2
--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-05-12 Thread Mike Gilbert
commit: 9b104e867391c14db1758ad0e97ada81868c8d64
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu May 12 17:57:13 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu May 12 17:58:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b104e86

sys-fs/cryptsetup: disallow fips for kernel and nettle backends

Closes: https://bugs.gentoo.org/843863
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
index 339d9d761672..a0f8af607ccd 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
@@ -19,7 +19,9 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 IUSE="${CRYPTO_BACKENDS} +argon2 fips nls pwquality reencrypt ssh static 
static-libs test +udev urandom"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt !ssh !udev !fips )" # 496612, 832711
+   static? ( !gcrypt !ssh !udev !fips )
+   fips? ( !kernel !nettle )
+" # 496612, 832711, 843863
 
 LIB_DEPEND="
dev-libs/json-c:=[static-libs(+)]



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-05-08 Thread WANG Xuerui
commit: 6a5b957c8c94a9bbc26f815cc9125e574caa2208
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun May  8 15:53:59 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun May  8 15:54:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5b957c

sys-fs/cryptsetup: keyword 2.4.3-r1 for ~loong

Tests passed on real hardware.

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
index f2ac3491ef69..339d9d761672 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-03-21 Thread Sam James
commit: 5ec57a0b4c6249bafb46fb7041430cc9b53e2372
Author: Mathieu Tortuyaux  microsoft  com>
AuthorDate: Thu Mar 10 14:27:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 21 23:44:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec57a0b

sys-fs/cryptsetup: add fips useflag

Closes: https://bugs.gentoo.org/834920
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mathieu Tortuyaux  microsoft.com>
Closes: https://github.com/gentoo/gentoo/pull/24479
Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild | 5 +++--
 sys-fs/cryptsetup/metadata.xml   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
index 8287adbcacaf..f2ac3491ef69 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
@@ -16,10 +16,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc 
~ppc64 ~riscv ~s390 ~
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # 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
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs test +udev urandom"
+IUSE="${CRYPTO_BACKENDS} +argon2 fips nls pwquality reencrypt ssh static 
static-libs test +udev urandom"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt !ssh !udev )" # 496612, 832711
+   static? ( !gcrypt !ssh !udev !fips )" # 496612, 832711
 
 LIB_DEPEND="
dev-libs/json-c:=[static-libs(+)]
@@ -91,6 +91,7 @@ src_configure() {
$(use_enable !urandom dev-random)
$(use_enable ssh ssh-token)
$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
+   $(use_enable fips)
)
econf "${myeconfargs[@]}"
 }

diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 7ecc557fd2b4..5f7443faf40f 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -7,6 +7,7 @@
 
 
Enable password hashing algorithm from 
app-crypt/argon2
+   Enable FIPS mode restrictions
Use dev-libs/libgcrypt crypto 
backend
Use kernel crypto backend (mainly for embedded 
systems)
Use dev-libs/nettle crypto backend



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/files/, sys-fs/cryptsetup/

2022-02-07 Thread Mike Gilbert
commit: 46c5119fa073c4062f2950ae3b378821528bae5f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Feb  7 20:09:41 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Feb  7 20:27:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c5119f

sys-fs/cryptsetup: drop 2.3.6-r2, 2.3.7, 2.4.1-r1, 2.4.2-r1

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/cryptsetup/Manifest |   4 -
 sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild   | 127 
 sys-fs/cryptsetup/cryptsetup-2.3.7.ebuild  | 127 
 sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild   | 141 -
 sys-fs/cryptsetup/cryptsetup-2.4.2-r1.ebuild   | 133 
 sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd| 111 ---
 sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc   | 339 -
 ...yptsetup-2.0.4-fix-static-pwquality-build.patch |  18 --
 .../files/cryptsetup-2.4.1-external-tokens.patch   |  34 ---
 ...yptsetup-2.4.1-fix-static-pwquality-build.patch | 225 --
 10 files changed, 1259 deletions(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 106cf0b15950..05710fd70925 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,5 +1 @@
-DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
-DIST cryptsetup-2.3.7.tar.xz 11203500 BLAKE2B 
34f39e8f17c0fb44a186345d58e3ff1632fc4bd0e570bb1935181d2dfd43bc34c300f96eb70efbddb85168e6c16886b6675db2c86482b7ff7dba64c168b5920c
 SHA512 
d209225c6f195f54c513904b71637bdadd47f3efc6227c61c15434a1467ddb76fe14123683a3d5e943ffa203ef33611f51b7c67bc1aed67d019a6aa552ea15ab
-DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 
6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada
 SHA512 
17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7
-DIST cryptsetup-2.4.2.tar.xz 11173984 BLAKE2B 
33a26ac2f38750171c74cdd827317cd4bba193a6b60cc7250dc52a5117c0feb1d2fca6b52b5ae7926725d77dc6c1ab9d13e85a1c59606e80003294b90578781d
 SHA512 
9464f180f24dffa4566450041fc88c372baa3334c62724487ccee230c16e87572439dc604766d94144cc1fc13802a4322b378185eca0cc848892821653566848
 DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B 
f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f
 SHA512 
2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
deleted file mode 100644
index 205ef838d9bd..
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-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
-# and it's missing ripemd160 support so it can't provide full backward 
compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt !udev )" #496612
-
-LIB_DEPEND="
-   dev-libs/json-c:=[static-libs(+)]
-   dev-libs/libgpg-error[static-libs(+)]
-   dev-libs/popt[static-libs(+)]
-   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
-   argon2? ( app-crypt/argon2:=[static-libs(+)] )
-   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
-   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
-   udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
-   static? ( ${LIB_DEPEND} )"
-BDEPEND="
-   virtual/pkgconfig
-"
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-02-07 Thread Mike Gilbert
commit: 8ba9ed3ff5f358bbae9500325a84357ff50cb291
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Feb  7 20:06:33 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Feb  7 20:06:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba9ed3f

sys-fs/cryptsetup: set REQUIRED_USE="static? ( !ssh )"

Closes: https://bugs.gentoo.org/832711
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild | 2 +-
 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
index 3337dfaa89a0..8287adbcacaf 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
@@ -19,7 +19,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs test +udev urandom"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt !udev )" #496612
+   static? ( !gcrypt !ssh !udev )" # 496612, 832711
 
 LIB_DEPEND="
dev-libs/json-c:=[static-libs(+)]

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
index f1679bbf84ec..79282c022d79 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -19,7 +19,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs test +udev urandom"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt !udev )" #496612
+   static? ( !gcrypt !ssh !udev )" # 496612, 832711
 
 LIB_DEPEND="
dev-libs/json-c:=[static-libs(+)]



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-01-27 Thread Sam James
commit: a52d40608da62f67ca8b7df086cf2bce05fabff4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 27 19:03:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 27 19:03:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52d4060

sys-fs/cryptsetup: Stabilize 2.4.3 hppa, #831982

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
index 480e7e811ce5..f1679bbf84ec 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-01-26 Thread Sam James
commit: 3f44a119753b02f21420c1c429ab217f1c8f1fd8
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 26 19:32:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 26 19:32:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f44a119

sys-fs/cryptsetup: Stabilize 2.4.3 ppc64, #831982

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
index 12343f2fa219..480e7e811ce5 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-01-26 Thread Arthur Zamarin
commit: f2c52342d946ac52c3bf3ed1d84e84684f64c35e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jan 26 19:27:00 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jan 26 19:27:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c52342

sys-fs/cryptsetup: Stabilize 2.4.3 sparc, #831982

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
index d3a73896274f..12343f2fa219 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-01-25 Thread Sam James
commit: f58bafd9ff1f89b1aedcde58bfa2af28fa5ce83b
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 25 22:16:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 22:16:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f58bafd9

sys-fs/cryptsetup: Stabilize 2.4.3 arm64, #831982

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
index 56011aeb45a3..d3a73896274f 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-01-25 Thread Sam James
commit: 4b66a964d031d3520d671409c6d145cf0ee3b75e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 25 15:45:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 15:45:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b66a964

sys-fs/cryptsetup: Stabilize 2.4.3 ppc, #831982

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
index 8bc2a6dbbc51..56011aeb45a3 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-01-24 Thread Sam James
commit: 2327a28797160098f279982844d4f2f699d158e1
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 25 03:57:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 03:57:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2327a287

sys-fs/cryptsetup: Stabilize 2.4.3 arm, #831982

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
index fa0b3700c21b..8bc2a6dbbc51 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-01-24 Thread Sam James
commit: ad7f837bd2f9192667f52146a03dd8f73042f91c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 24 19:30:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 24 19:30:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7f837b

sys-fs/cryptsetup: Stabilize 2.4.3 x86, #831982

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
index bcaafc0292c5..d0aa02c967be 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-01-24 Thread Sam James
commit: 4a20b3bc7092a4c07452d977e7cc2caf88e4b2f7
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 24 19:31:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 24 19:31:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a20b3bc

sys-fs/cryptsetup: Stabilize 2.4.3 amd64, #831982

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
index d0aa02c967be..fa0b3700c21b 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/, sys-fs/cryptsetup/files/

2022-01-24 Thread Mike Gilbert
commit: afaf583892dd618378dd559159777c49bb4b1b88
Author: Martin Kjær Jørgensen  gotu  dk>
AuthorDate: Sat Jan 22 09:46:01 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jan 24 17:02:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afaf5838

sys-fs/cryptsetup: add support for using detached LUKS headers

Closes: https://bugs.gentoo.org/831806
Closes: https://github.com/gentoo/gentoo/pull/23908
Signed-off-by: Martin Kjær Jørgensen  gotu.dk>
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild | 136 ++
 sys-fs/cryptsetup/files/2.4.3-dmcrypt.confd  | 120 +
 sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc | 367 +++
 3 files changed, 623 insertions(+)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
new file mode 100644
index ..3337dfaa89a0
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info tmpfiles
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs test +udev urandom"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   static? ( !gcrypt !udev )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? (
+   dev-libs/libgcrypt:0=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   ssh? ( net-libs/libssh[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
+   udev? ( virtual/libudev:= )"
+# vim-core needed for xxd in tests
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )
+   test? ( app-editors/vim-core )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+pkg_setup() {
+   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+}
+
+src_prepare() {
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+   default
+}
+
+src_configure() {
+   if use kernel ; then
+   ewarn "Note that kernel backend is very slow for this type of 
operation"
+   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
+   ewarn "userspace crypto libraries."
+   fi
+
+   local myeconfargs=(
+   --disable-internal-argon2
+   --enable-shared
+   --sbindir=/sbin
+   # 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)
+   $(use_enable argon2 libargon2)
+   $(use_enable nls)
+   $(use_enable pwquality)
+   $(use_enable reencrypt cryptsetup-reencrypt)
+   $(use_enable !static external-tokens)
+   $(use_enable static static-cryptsetup)
+   $(use_enable static-libs static)
+   $(use_enable udev)
+   $(use_enable !urandom dev-random)
+   $(use_enable ssh ssh-token)
+   $(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_test() {
+   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-01-14 Thread Sam James
commit: 16ff43bbd3fa6ac5f4998b1eabaecbeb0661f465
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 14 15:07:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 14 15:07:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ff43bb

sys-fs/cryptsetup: add 2.4.3

Bug: https://bugs.gentoo.org/831157
Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild | 136 ++
 2 files changed, 137 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index dc51fc6cca29..106cf0b15950 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -2,3 +2,4 @@ DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12
 DIST cryptsetup-2.3.7.tar.xz 11203500 BLAKE2B 
34f39e8f17c0fb44a186345d58e3ff1632fc4bd0e570bb1935181d2dfd43bc34c300f96eb70efbddb85168e6c16886b6675db2c86482b7ff7dba64c168b5920c
 SHA512 
d209225c6f195f54c513904b71637bdadd47f3efc6227c61c15434a1467ddb76fe14123683a3d5e943ffa203ef33611f51b7c67bc1aed67d019a6aa552ea15ab
 DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 
6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada
 SHA512 
17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7
 DIST cryptsetup-2.4.2.tar.xz 11173984 BLAKE2B 
33a26ac2f38750171c74cdd827317cd4bba193a6b60cc7250dc52a5117c0feb1d2fca6b52b5ae7926725d77dc6c1ab9d13e85a1c59606e80003294b90578781d
 SHA512 
9464f180f24dffa4566450041fc88c372baa3334c62724487ccee230c16e87572439dc604766d94144cc1fc13802a4322b378185eca0cc848892821653566848
+DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B 
f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f
 SHA512 
2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
new file mode 100644
index ..bcaafc0292c5
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info tmpfiles
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs test +udev urandom"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   static? ( !gcrypt !udev )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? (
+   dev-libs/libgcrypt:0=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   ssh? ( net-libs/libssh[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
+   udev? ( virtual/libudev:= )"
+# vim-core needed for xxd in tests
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )
+   test? ( app-editors/vim-core )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+pkg_setup() {
+   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+}
+
+src_prepare() {
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2022-01-14 Thread Sam James
commit: e12bc0d444254ce100b1a422664ae2f7d3612745
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 14 15:07:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 14 15:07:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12bc0d4

sys-fs/cryptsetup: add 2.3.7

Bug: https://bugs.gentoo.org/831157
Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.3.7.ebuild | 127 ++
 2 files changed, 128 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 782c5894222e..dc51fc6cca29 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,4 @@
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
+DIST cryptsetup-2.3.7.tar.xz 11203500 BLAKE2B 
34f39e8f17c0fb44a186345d58e3ff1632fc4bd0e570bb1935181d2dfd43bc34c300f96eb70efbddb85168e6c16886b6675db2c86482b7ff7dba64c168b5920c
 SHA512 
d209225c6f195f54c513904b71637bdadd47f3efc6227c61c15434a1467ddb76fe14123683a3d5e943ffa203ef33611f51b7c67bc1aed67d019a6aa552ea15ab
 DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 
6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada
 SHA512 
17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7
 DIST cryptsetup-2.4.2.tar.xz 11173984 BLAKE2B 
33a26ac2f38750171c74cdd827317cd4bba193a6b60cc7250dc52a5117c0feb1d2fca6b52b5ae7926725d77dc6c1ab9d13e85a1c59606e80003294b90578781d
 SHA512 
9464f180f24dffa4566450041fc88c372baa3334c62724487ccee230c16e87572439dc604766d94144cc1fc13802a4322b378185eca0cc848892821653566848

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.7.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.7.ebuild
new file mode 100644
index ..f6ad133f9546
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.7.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info tmpfiles
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   static? ( !gcrypt !udev )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
+   udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+}
+
+src_prepare() {
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+   default
+   eautoreconf
+}
+
+src_configure() {
+   if use kernel ; then
+   ewarn "Note that kernel backend is very slow for this type of 
operation"
+   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-11-20 Thread Mike Gilbert
commit: 8d3ec54594d2cdc796074cde6605359d8625d0b5
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Nov 20 23:45:32 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Nov 20 23:46:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d3ec545

sys-fs/cryptsetup: drop external tokens patch

Closes: https://bugs.gentoo.org/824618
Signed-off-by: Mike Gilbert  gentoo.org>

 .../{cryptsetup-2.4.2.ebuild => cryptsetup-2.4.2-r1.ebuild}   | 4 
 1 file changed, 4 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.2-r1.ebuild
similarity index 98%
rename from sys-fs/cryptsetup/cryptsetup-2.4.2.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.4.2-r1.ebuild
index cd60372120e6..9bfa24d56c8d 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.2-r1.ebuild
@@ -48,10 +48,6 @@ BDEPEND="
 
 S="${WORKDIR}/${P/_/-}"
 
-PATCHES=(
-   "${FILESDIR}"/cryptsetup-2.4.1-external-tokens.patch
-)
-
 pkg_setup() {
local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for 
cryptsetup)\n"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-11-18 Thread Lars Wendler
commit: 6e4c27eaa300c1766b52f408c11bcdf03b928679
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Nov 18 19:02:16 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Nov 18 19:02:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4c27ea

sys-fs/cryptsetup: Bump to version 2.4.2

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.4.2.ebuild | 137 ++
 2 files changed, 138 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index dfe672e7f32e..782c5894222e 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,2 +1,3 @@
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
 DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 
6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada
 SHA512 
17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7
+DIST cryptsetup-2.4.2.tar.xz 11173984 BLAKE2B 
33a26ac2f38750171c74cdd827317cd4bba193a6b60cc7250dc52a5117c0feb1d2fca6b52b5ae7926725d77dc6c1ab9d13e85a1c59606e80003294b90578781d
 SHA512 
9464f180f24dffa4566450041fc88c372baa3334c62724487ccee230c16e87572439dc604766d94144cc1fc13802a4322b378185eca0cc848892821653566848

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.2.ebuild
new file mode 100644
index ..cd60372120e6
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info tmpfiles
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   static? ( !gcrypt !udev )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? (
+   dev-libs/libgcrypt:0=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   ssh? ( net-libs/libssh[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
+   udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+   "${FILESDIR}"/cryptsetup-2.4.1-external-tokens.patch
+)
+
+pkg_setup() {
+   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+}
+
+src_prepare() {
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+   default
+}
+
+src_configure() {
+   if use kernel ; then
+   ewarn "Note that kernel backend is very slow for this type of 
operation"
+   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
+   ewarn "userspace crypto libraries."
+   fi
+
+   local myeconfargs=(
+   --disable-internal-argon2
+   --enable-shared
+   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/, sys-fs/cryptsetup/files/

2021-10-06 Thread Mike Gilbert
commit: 49b17379090d805437364c5ed3f3fb20f096d4b3
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Oct  6 15:25:39 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Oct  6 15:25:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b17379

sys-fs/cryptsetup: apply upstream fix for USE=static

Closes: https://bugs.gentoo.org/816285
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild   |   6 +-
 ...yptsetup-2.4.1-fix-static-pwquality-build.patch | 225 +
 2 files changed, 230 insertions(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
index cd60372120e..928f589b960 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info tmpfiles
+inherit autotools linux-info tmpfiles
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
@@ -50,6 +50,9 @@ S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
"${FILESDIR}"/cryptsetup-2.4.1-external-tokens.patch
+
+   # Remove autotools/eautoreconf when this patch is dropped.
+   "${FILESDIR}"/cryptsetup-2.4.1-fix-static-pwquality-build.patch
 )
 
 pkg_setup() {
@@ -64,6 +67,7 @@ pkg_setup() {
 src_prepare() {
sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
default
+   eautoreconf
 }
 
 src_configure() {

diff --git 
a/sys-fs/cryptsetup/files/cryptsetup-2.4.1-fix-static-pwquality-build.patch 
b/sys-fs/cryptsetup/files/cryptsetup-2.4.1-fix-static-pwquality-build.patch
new file mode 100644
index 000..f39e88507ff
--- /dev/null
+++ b/sys-fs/cryptsetup/files/cryptsetup-2.4.1-fix-static-pwquality-build.patch
@@ -0,0 +1,225 @@
+From 26cc1644b489578c76ec6f576614ca885c00a35d Mon Sep 17 00:00:00 2001
+From: Milan Broz 
+Date: Wed, 6 Oct 2021 12:27:25 +0200
+Subject: [PATCH 1/2] Do not link integritysetup and veritysetup with
+ pwquality.
+
+These tools do not read passphrases, no need to link to these libraries.
+
+Just move the helper code that introduced this dependence as a side-effect.
+
+Fixes: #677
+---
+ src/Makemodule.am|  6 -
+ src/utils_password.c | 56 
+ src/utils_tools.c| 56 
+ 3 files changed, 56 insertions(+), 62 deletions(-)
+
+diff --git a/src/Makemodule.am b/src/Makemodule.am
+index a6dc50cf..f2b896bf 100644
+--- a/src/Makemodule.am
 b/src/Makemodule.am
+@@ -52,7 +52,6 @@ veritysetup_SOURCES =\
+   src/utils_arg_names.h   \
+   src/utils_arg_macros.h  \
+   src/utils_tools.c   \
+-  src/utils_password.c\
+   src/veritysetup.c   \
+   src/veritysetup_args.h  \
+   src/veritysetup_arg_list.h  \
+@@ -61,8 +60,6 @@ veritysetup_SOURCES =\
+ veritysetup_LDADD = $(LDADD)  \
+   libcryptsetup.la\
+   @POPT_LIBS@ \
+-  @PWQUALITY_LIBS@\
+-  @PASSWDQC_LIBS@ \
+   @BLKID_LIBS@
+ 
+ sbin_PROGRAMS += veritysetup
+@@ -91,7 +88,6 @@ integritysetup_SOURCES = \
+   src/utils_arg_names.h   \
+   src/utils_arg_macros.h  \
+   src/utils_tools.c   \
+-  src/utils_password.c\
+   src/utils_blockdev.c\
+   src/integritysetup.c\
+   src/integritysetup_args.h \
+@@ -101,8 +97,6 @@ integritysetup_SOURCES =\
+ integritysetup_LDADD = $(LDADD)   \
+   libcryptsetup.la\
+   @POPT_LIBS@ \
+-  @PWQUALITY_LIBS@\
+-  @PASSWDQC_LIBS@ \
+   @UUID_LIBS@ \
+   @BLKID_LIBS@
+ 
+diff --git a/src/utils_password.c b/src/utils_password.c
+index 58f3a7b3..65618b9c 100644
+--- a/src/utils_password.c
 b/src/utils_password.c
+@@ -318,59 +318,3 @@ void tools_passphrase_msg(int r)
+   else if (r == -ENOENT)
+   log_err(_("No usable keyslot is available."));
+ }
+-
+-int tools_read_mk(const char *file, char **key, int keysize)
+-{
+-  int fd = -1, r = -EINVAL;
+-
+-  if (keysize <= 0 || !key)
+-  return -EINVAL;
+-
+-  *key = crypt_safe_alloc(keysize);
+-  if (!*key)
+-  return -ENOMEM;
+-
+-  fd = open(file, O_RDONLY);
+-  if (fd == -1) {
+-  log_err(_("Cannot read keyfile %s."), file);
+-  goto out;
+-  }
+-
+-  if (read_buffer(fd, *key, keysize) != keysize) {
+-  log_err(_("Cannot read %d bytes from keyfile %s."), keysize, 
file);
+-  goto out;
+-  }
+-  r = 0;
+-out:
+-  if (fd != -1)
+-  close(fd);
+-
+-  if (r) {
+-  crypt_safe_free(*key);
+-  *key = NULL;
+-  }
+-
+-  return r;
+-}
+-
+-int tools_write_mk(const char *file, const char *key, int keysize)
+-{
+-  

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-10-03 Thread David Seifert
commit: 558cc99d1ee8c933170db96956e63a1c8e588950
Author: David Seifert  gentoo  org>
AuthorDate: Sun Oct  3 11:28:01 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Oct  3 11:28:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=558cc99d

sys-fs/cryptsetup: drop 2.4.0-r1

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/cryptsetup/Manifest   |   1 -
 sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild | 133 ---
 2 files changed, 134 deletions(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index fdf916e6343..dfe672e7f32 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,2 @@
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
-DIST cryptsetup-2.4.0.tar.xz 11162168 BLAKE2B 
a2074d1607ff3c136818b14ea3939fde3a528430b50ebd4d483d1e164ede6a62432c27e0d7d8b29b89ad6bce69dae30fc6bdf5ce458b3c6faa5178f6218519e6
 SHA512 
9c868b1dee7145f91092160cf977d3ada57a14634b5312d54477e111250975b6f077a92c417373bb7de07244b01ab19553bcce5030ee456ca2c38030e3067186
 DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 
6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada
 SHA512 
17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
deleted file mode 100644
index 09141d7320f..000
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-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
-# and it's missing ripemd160 support so it can't provide full backward 
compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt !udev )" #496612
-
-LIB_DEPEND="
-   dev-libs/json-c:=[static-libs(+)]
-   dev-libs/libgpg-error[static-libs(+)]
-   dev-libs/popt[static-libs(+)]
-   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
-   argon2? ( app-crypt/argon2:=[static-libs(+)] )
-   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
-   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-   ssh? ( net-libs/libssh[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
-   udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
-   static? ( ${LIB_DEPEND} )"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_setup() {
-   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
-   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
-   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
-   check_extra_config
-}
-
-src_prepare() {
-   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-   default
-   eautoreconf
-}
-
-src_configure() {
-   if use kernel ; then
-   ewarn "Note that kernel backend is very slow for this type of 
operation"
-   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
-   ewarn "userspace crypto libraries."
-   fi
-
-   local myeconfargs=(
-   --disable-internal-argon2
-   --enable-shared
-   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-09-17 Thread Mike Gilbert
commit: 51b057f1aacabdb1fcfaf0f09b7ee8c6733a2689
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Sep 17 16:42:24 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Sep 17 16:42:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b057f1

sys-fs/cryptsetup: move libgpg-error behind USE=gcrypt

Closes: https://bugs.gentoo.org/782541
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
index c503aa0807b..cd60372120e 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
@@ -22,11 +22,13 @@ REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
 
 LIB_DEPEND="
dev-libs/json-c:=[static-libs(+)]
-   dev-libs/libgpg-error[static-libs(+)]
dev-libs/popt[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(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   )
nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
openssl? ( dev-libs/openssl:0=[static-libs(+)] )
pwquality? ( dev-libs/libpwquality[static-libs(+)] )



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-09-17 Thread Mike Gilbert
commit: 62749b5a354d9db4f35cde93eea67cd912739e7d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Sep 17 16:31:17 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Sep 17 16:33:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62749b5a

sys-fs/cryptsetup: stop applying 
cryptsetup-2.0.4-fix-static-pwquality-build.patch

According to upstream, this should not be needed in recent versions.

https://gitlab.com/cryptsetup/cryptsetup/-/issues/405#note_105306216

Bug: https://bugs.gentoo.org/663450
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
index 214b5c462e3..c503aa0807b 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info tmpfiles
+inherit linux-info tmpfiles
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
@@ -47,7 +47,6 @@ BDEPEND="
 S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
-   "${FILESDIR}"/cryptsetup-2.0.4-fix-static-pwquality-build.patch
"${FILESDIR}"/cryptsetup-2.4.1-external-tokens.patch
 )
 
@@ -63,7 +62,6 @@ pkg_setup() {
 src_prepare() {
sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
default
-   eautoreconf
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/, sys-fs/cryptsetup/files/

2021-09-17 Thread Mike Gilbert
commit: cb18b96260b1940f67c4f1e3a99136215c0684ee
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Sep 17 16:21:10 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Sep 17 16:23:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb18b962

sys-fs/cryptsetup: fix link error with USE=static

Closes: https://bugs.gentoo.org/813441
Signed-off-by: Mike Gilbert  gentoo.org>

 ...tup-2.4.1.ebuild => cryptsetup-2.4.1-r1.ebuild} |  6 +++-
 .../files/cryptsetup-2.4.1-external-tokens.patch   | 34 ++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
similarity index 95%
rename from sys-fs/cryptsetup/cryptsetup-2.4.1.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
index 09141d7320f..214b5c462e3 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
@@ -46,7 +46,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P/_/-}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+PATCHES=(
+   "${FILESDIR}"/cryptsetup-2.0.4-fix-static-pwquality-build.patch
+   "${FILESDIR}"/cryptsetup-2.4.1-external-tokens.patch
+)
 
 pkg_setup() {
local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
@@ -82,6 +85,7 @@ src_configure() {
$(use_enable nls)
$(use_enable pwquality)
$(use_enable reencrypt cryptsetup-reencrypt)
+   $(use_enable !static external-tokens)
$(use_enable static static-cryptsetup)
$(use_enable static-libs static)
$(use_enable udev)

diff --git a/sys-fs/cryptsetup/files/cryptsetup-2.4.1-external-tokens.patch 
b/sys-fs/cryptsetup/files/cryptsetup-2.4.1-external-tokens.patch
new file mode 100644
index 000..1777a02652c
--- /dev/null
+++ b/sys-fs/cryptsetup/files/cryptsetup-2.4.1-external-tokens.patch
@@ -0,0 +1,34 @@
+From a1b577c085cc9ef6b95c4556ec8815070828ee6c Mon Sep 17 00:00:00 2001
+From: Hector Martin 
+Date: Fri, 17 Sep 2021 05:44:18 +
+Subject: [PATCH] Do not attempt to unload external tokens if
+ USE_EXTERNAL_TOKENS is disabled.
+
+This allows building a static binary as long as --disable-external-tokens is 
used
+---
+ lib/luks2/luks2_token.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/luks2/luks2_token.c b/lib/luks2/luks2_token.c
+index d34cebf5..88d84418 100644
+--- a/lib/luks2/luks2_token.c
 b/lib/luks2/luks2_token.c
+@@ -245,6 +245,7 @@ int crypt_token_register(const crypt_token_handler 
*handler)
+ 
+ void crypt_token_unload_external_all(struct crypt_device *cd)
+ {
++#if USE_EXTERNAL_TOKENS
+   int i;
+ 
+   for (i = LUKS2_TOKENS_MAX - 1; i >= 0; i--) {
+@@ -258,6 +259,7 @@ void crypt_token_unload_external_all(struct crypt_device 
*cd)
+   if (dlclose(CONST_CAST(void *)token_handlers[i].u.v2.dlhandle))
+   log_dbg(cd, "%s", dlerror());
+   }
++#endif
+ }
+ 
+ static const void
+-- 
+GitLab
+



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-09-17 Thread Lars Wendler
commit: b92b1ef6f12e3f5d8fd5d99a108bd520819c969b
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Sep 17 10:17:30 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Sep 17 10:24:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b92b1ef6

sys-fs/cryptsetup: Bump to version 2.4.1

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.4.1.ebuild | 133 ++
 2 files changed, 134 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index e71ad1a733d..fdf916e6343 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,2 +1,3 @@
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
 DIST cryptsetup-2.4.0.tar.xz 11162168 BLAKE2B 
a2074d1607ff3c136818b14ea3939fde3a528430b50ebd4d483d1e164ede6a62432c27e0d7d8b29b89ad6bce69dae30fc6bdf5ce458b3c6faa5178f6218519e6
 SHA512 
9c868b1dee7145f91092160cf977d3ada57a14634b5312d54477e111250975b6f077a92c417373bb7de07244b01ab19553bcce5030ee456ca2c38030e3067186
+DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 
6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada
 SHA512 
17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.1.ebuild
new file mode 100644
index 000..09141d7320f
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info tmpfiles
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   static? ( !gcrypt !udev )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   ssh? ( net-libs/libssh[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
+   udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+}
+
+src_prepare() {
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+   default
+   eautoreconf
+}
+
+src_configure() {
+   if use kernel ; then
+   ewarn "Note that kernel backend is very slow for this type of 
operation"
+   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
+   ewarn "userspace crypto libraries."
+   fi
+
+   local myeconfargs=(
+   --disable-internal-argon2
+   --enable-shared
+   --sbindir=/sbin

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-09-07 Thread Mike Gilbert
commit: b128813dd6945ed3fdf3e2016d724128dfb8cad7
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Sep  5 00:43:17 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Sep  7 17:36:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b128813d

sys-fs/cryptsetup: drop udev static libs

Signed-off-by: Mike Gilbert  gentoo.org>

 .../{cryptsetup-2.3.6-r1.ebuild => cryptsetup-2.3.6-r2.ebuild}| 8 
 .../{cryptsetup-2.4.0.ebuild => cryptsetup-2.4.0-r1.ebuild}   | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
similarity index 96%
rename from sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
index 3c4bf01a993..205ef838d9b 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
@@ -18,7 +18,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility
 IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt )" #496612
+   static? ( !gcrypt !udev )" #496612
 
 LIB_DEPEND="
dev-libs/json-c:=[static-libs(+)]
@@ -30,13 +30,13 @@ LIB_DEPEND="
nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
openssl? ( dev-libs/openssl:0=[static-libs(+)] )
pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]
-   udev? ( virtual/libudev[static-libs(-)] )"
+   sys-fs/lvm2[static-libs(+)]"
 # We have to always depend on ${LIB_DEPEND} rather than put behind
 # !static? () because we provide a shared library which links against
 # these other packages. #414665
 RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
+   udev? ( virtual/libudev:= )"
 DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
 BDEPEND="

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
similarity index 96%
rename from sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
index 918f7598446..09141d7320f 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
@@ -18,7 +18,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility
 IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs +udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt )" #496612
+   static? ( !gcrypt !udev )" #496612
 
 LIB_DEPEND="
dev-libs/json-c:=[static-libs(+)]
@@ -31,13 +31,13 @@ LIB_DEPEND="
openssl? ( dev-libs/openssl:0=[static-libs(+)] )
pwquality? ( dev-libs/libpwquality[static-libs(+)] )
ssh? ( net-libs/libssh[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]
-   udev? ( virtual/libudev[static-libs(-)] )"
+   sys-fs/lvm2[static-libs(+)]"
 # We have to always depend on ${LIB_DEPEND} rather than put behind
 # !static? () because we provide a shared library which links against
 # these other packages. #414665
 RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
+   udev? ( virtual/libudev:= )"
 DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/files/, sys-fs/cryptsetup/

2021-08-19 Thread Lars Wendler
commit: 77c740c826fc56aaec0f352aab41ee187e63312e
Author: Karel Kočí  email  cz>
AuthorDate: Sat Aug 14 07:19:40 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Aug 19 08:53:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77c740c8

sys-fs/cryptsetup: wait for source to appear

Devices that are primarily hotplug are commonly initialized little bit
later when init is already started. This can be either because they
require module or because they are just slow to initialize or because
they are just last in the line. No matter the reason the expectation
that source is always immediately available to open does not apply.

Real live example is all time plugged in SD card on some embedded
devices serving as extension storage. It is removable and thus it is
highly desirable to encrypt it but it is initialized asynchronously thus
it is not available immediately after boot.

This adds new argument `wait`. It is in default set to 5 seconds. It can
be set to zero for devices that are not expected to be present during
the boot process (although such usage seems to me like a hack). Any
other device should be present and thus wait is skipped or it benefits
from wait.

Signed-off-by: Karel Kočí  email.cz>
Closes: https://github.com/gentoo/gentoo/pull/21987
Signed-off-by: Lars Wendler  gentoo.org>

 ...-r1.ebuild => cryptsetup-2.4.0_rc1-r100.ebuild} |   4 +-
 sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd| 112 +++
 sys-fs/cryptsetup/files/2.4.0-dmcrypt.rc   | 350 +
 3 files changed, 464 insertions(+), 2 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r100.ebuild
similarity index 97%
rename from sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r100.ebuild
index 3e204ddad19..918f7598446 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r100.ebuild
@@ -124,8 +124,8 @@ src_install() {
 
dodoc docs/v*ReleaseNotes
 
-   newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-   newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+   newconfd "${FILESDIR}"/2.4.0-dmcrypt.confd dmcrypt
+   newinitd "${FILESDIR}"/2.4.0-dmcrypt.rc dmcrypt
 }
 
 pkg_postinst() {

diff --git a/sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd 
b/sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd
new file mode 100644
index 000..96c523e0f95
--- /dev/null
+++ b/sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd
@@ -0,0 +1,112 @@
+# /etc/conf.d/dmcrypt
+
+# For people who run dmcrypt on top of some other layer (like raid),
+# use rc_need to specify that requirement.  See the runscript(8) man
+# page for more information.
+
+#
+# Instructions
+#
+
+# Note regarding the syntax of this file.  This file is *almost* bash,
+# but each line is evaluated separately.  Separate swaps/targets can be
+# specified.  The init-script which reads this file assumes that a
+# swap= or target= line starts a new section, similar to lilo or grub
+# configuration.
+
+# Note when using gpg keys and /usr on a separate partition, you will
+# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly
+# and ensure that gpg has been compiled statically.
+# See http://bugs.gentoo.org/90482 for more information.
+
+# Note that the init-script which reads this file detects whether your
+# partition is LUKS or not. No mkfs is run unless you specify a makefs
+# option.
+
+# Global options:
+#
+
+# How long to wait for each timeout (in seconds).
+dmcrypt_key_timeout=1
+
+# Max number of checks to perform (see dmcrypt_key_timeout).
+#dmcrypt_max_timeout=300
+
+# Number of password retries.
+dmcrypt_retries=5
+
+# Arguments:
+#---
+# target=  == Mapping name for partition.
+# swap=== Mapping name for swap partition.
+# source='' == Real device for partition.
+#Note: You can (and should) specify a tag 
like UUID
+#for blkid (see -t option).  This is safer 
than using
+#the full path to the device.
+# key='[:]'  == Fullpath from / or from inside 
removable media.
+# remdev='' == Device that will be assigned to 
removable media.
+# gpg_options=''   == Default are --quiet --decrypt
+# options=''   == cryptsetup, for LUKS you can only use 
--readonly
+# loop_file='' == Loopback file.
+#Note: If you omit $source, then a free 
loopback will
+#be looked up automatically.
+# pre_mount='cmds'   == commands to execute before mounting 
partition.
+# post_mount='cmds'  == commands to execute after mounting 
partition.
+# wait=5   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-08-19 Thread Lars Wendler
commit: e2b26e2d4794c4390230a16998dc23ef15e0b916
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Aug 19 08:53:13 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Aug 19 08:53:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b26e2d

sys-fs/cryptsetup: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest   |   1 -
 sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild | 127 ---
 2 files changed, 128 deletions(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 1afda367537..e71ad1a733d 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,2 @@
-DIST cryptsetup-2.3.4.tar.xz 4004 BLAKE2B 
680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19
 SHA512 
db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
 DIST cryptsetup-2.4.0.tar.xz 11162168 BLAKE2B 
a2074d1607ff3c136818b14ea3939fde3a528430b50ebd4d483d1e164ede6a62432c27e0d7d8b29b89ad6bce69dae30fc6bdf5ce458b3c6faa5178f6218519e6
 SHA512 
9c868b1dee7145f91092160cf977d3ada57a14634b5312d54477e111250975b6f077a92c417373bb7de07244b01ab19553bcce5030ee456ca2c38030e3067186

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild
deleted file mode 100644
index 3c4bf01a993..000
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-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
-# and it's missing ripemd160 support so it can't provide full backward 
compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-   dev-libs/json-c:=[static-libs(+)]
-   dev-libs/libgpg-error[static-libs(+)]
-   dev-libs/popt[static-libs(+)]
-   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
-   argon2? ( app-crypt/argon2:=[static-libs(+)] )
-   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
-   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]
-   udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
-DEPEND="${RDEPEND}
-   static? ( ${LIB_DEPEND} )"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_setup() {
-   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
-   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
-   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
-   check_extra_config
-}
-
-src_prepare() {
-   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-   default
-   eautoreconf
-}
-
-src_configure() {
-   if use kernel ; then
-   ewarn "Note that kernel backend is very slow for this type of 
operation"
-   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
-   ewarn "userspace crypto libraries."
-   fi
-
-   local myeconfargs=(
-   --disable-internal-argon2
-   --enable-shared
-   --sbindir=/sbin
-   # for later use
-   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-08-19 Thread Lars Wendler
commit: cd8bf8406b715f0e366892fa93d62ba3d6a8d304
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Aug 19 08:52:42 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Aug 19 08:53:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd8bf840

sys-fs/cryptsetup: Bump to version 2.4.0. Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest  | 2 +-
 .../{cryptsetup-2.4.0_rc1-r100.ebuild => cryptsetup-2.4.0.ebuild}   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 4d666f908f9..1afda367537 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,3 @@
 DIST cryptsetup-2.3.4.tar.xz 4004 BLAKE2B 
680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19
 SHA512 
db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
-DIST cryptsetup-2.4.0-rc1.tar.xz 11148144 BLAKE2B 
e3ae27231b0a4e634be35b1c767aa74e50d09b14339ad82678df1058eeda7b3280f8aaf0e0ccbf039fe632564974f778dac524311767ab7e3c6a419afbd3cb2b
 SHA512 
73f07e7963624111d916f9791617af52bdf614be04da8462603aa17e0b10f28f681eca2bc991c74c9c3804a4ffc9714f7d075242631f5b77a86462bc57bade93
+DIST cryptsetup-2.4.0.tar.xz 11162168 BLAKE2B 
a2074d1607ff3c136818b14ea3939fde3a528430b50ebd4d483d1e164ede6a62432c27e0d7d8b29b89ad6bce69dae30fc6bdf5ce458b3c6faa5178f6218519e6
 SHA512 
9c868b1dee7145f91092160cf977d3ada57a14634b5312d54477e111250975b6f077a92c417373bb7de07244b01ab19553bcce5030ee456ca2c38030e3067186

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r100.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild
similarity index 100%
rename from sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r100.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-31 Thread Sam James
commit: 32ecc44a3eafa00f99c83cabb547f1a45b30cc36
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 31 03:19:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 31 22:13:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32ecc44a

sys-fs/cryptsetup: [QA] call tmpfiles_process in pkg_postinst

This is needed to actually apply the tmpfiles configuration
we've installed in the ebuild. See tmpfiles.eclass documentation.

Revbump because the new tmpfiles inherit adds a new dependency
(virtual/tmpfiles).

Signed-off-by: Sam James  gentoo.org>

 .../{cryptsetup-2.3.4-r1.ebuild => cryptsetup-2.3.4-r2.ebuild}  | 6 +-
 .../{cryptsetup-2.3.6.ebuild => cryptsetup-2.3.6-r1.ebuild} | 6 +-
 .../{cryptsetup-2.4.0_rc1.ebuild => cryptsetup-2.4.0_rc1-r1.ebuild} | 6 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild
similarity index 97%
rename from sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild
index e96df12d24b..3c4bf01a993 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info
+inherit autotools linux-info tmpfiles
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
@@ -121,3 +121,7 @@ src_install() {
newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
 }
+
+pkg_postinst() {
+   tmpfiles_process cryptsetup.conf
+}

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
similarity index 97%
rename from sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
index e96df12d24b..3c4bf01a993 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info
+inherit autotools linux-info tmpfiles
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
@@ -121,3 +121,7 @@ src_install() {
newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
 }
+
+pkg_postinst() {
+   tmpfiles_process cryptsetup.conf
+}

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild
similarity index 97%
rename from sys-fs/cryptsetup/cryptsetup-2.4.0_rc1.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild
index bf7a491c4a5..3e204ddad19 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info
+inherit autotools linux-info tmpfiles
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
@@ -127,3 +127,7 @@ src_install() {
newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
 }
+
+pkg_postinst() {
+   tmpfiles_process cryptsetup.conf
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-30 Thread Lars Wendler
commit: 42cace1182189ca30610078f7742ddc3e860687e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jul 30 18:20:17 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul 30 18:20:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42cace11

sys-fs/cryptsetup: Fixed IUSE order

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.0_rc1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1.ebuild
index 6a8851cfee4..bf7a491c4a5 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc 
~ppc64 ~riscv ~s390 ~
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # 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
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom ssh"
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static 
static-libs +udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
static? ( !gcrypt )" #496612
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-30 Thread Lars Wendler
commit: 5a6a66f5ba4d613dc26db1ddd617a3c1bcd5f48d
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jul 30 08:42:57 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul 30 08:42:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a6a66f5

sys-fs/cryptsetup: Bump to version 2.4.0_rc1. Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest  | 2 +-
 .../{cryptsetup-2.4.0_rc0.ebuild => cryptsetup-2.4.0_rc1.ebuild}| 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index b0e55eb6283..4d666f908f9 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,3 @@
 DIST cryptsetup-2.3.4.tar.xz 4004 BLAKE2B 
680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19
 SHA512 
db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
-DIST cryptsetup-2.4.0-rc0.tar.xz 11145080 BLAKE2B 
e6425a54d14d93b712df42e7b9460e23afb8bcb74bbe164522a2399a26d3eb668bfcc6387e5934056cdf46fcf0c136601dc1617dcb96ded6d4251a8335442e27
 SHA512 
ed80cc7a1763cf0e788bd72eee979640d6133b98a7b294a3fa09c608273eef172c2d56d80802433143d01063a0c142e68ea06465392b273fc2615b8f90273b25
+DIST cryptsetup-2.4.0-rc1.tar.xz 11148144 BLAKE2B 
e3ae27231b0a4e634be35b1c767aa74e50d09b14339ad82678df1058eeda7b3280f8aaf0e0ccbf039fe632564974f778dac524311767ab7e3c6a419afbd3cb2b
 SHA512 
73f07e7963624111d916f9791617af52bdf614be04da8462603aa17e0b10f28f681eca2bc991c74c9c3804a4ffc9714f7d075242631f5b77a86462bc57bade93

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1.ebuild
similarity index 100%
rename from sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.4.0_rc1.ebuild



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-12 Thread Sam James
commit: 2356e66cbf39704c3b92764de8eb360f9d5cba0f
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 13 04:01:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 13 04:01:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2356e66c

sys-fs/cryptsetup: Stabilize 2.3.6 arm64, #800434

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index 9d0266bbbda..e96df12d24b 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-06 Thread Sergei Trofimovich
commit: fb2459a61ba8502960a16ad593d79c1734fad6c2
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Jul  6 19:00:14 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul  6 21:30:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb2459a6

sys-fs/cryptsetup: stable 2.3.6 for hppa, bug #800434

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index 0246d992978..9d0266bbbda 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-06 Thread Sam James
commit: bea46cc549c5bf7e27a09eacea70bc40feb3d50e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  6 18:01:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  6 18:01:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea46cc5

sys-fs/cryptsetup: Stabilize 2.3.6 sparc, #800434

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index 39bebf1e839..0246d992978 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-05 Thread Sam James
commit: 82e491bd52accf6070d3027e02949c9cbbfba951
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  6 04:13:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  6 04:13:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e491bd

sys-fs/cryptsetup: Stabilize 2.3.6 arm, #800434

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index 33639dede7e..39bebf1e839 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-05 Thread Agostino Sarubbo
commit: c5112db2107aa07562da29586f88d90c53a5c9d7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jul  5 06:59:41 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jul  5 06:59:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5112db2

sys-fs/cryptsetup: x86 stable wrt bug #800434

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index 7b5b46a4f7c..33639dede7e 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-05 Thread Agostino Sarubbo
commit: c05698ab3a1f953a58079814502813ed6ced7569
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jul  5 06:58:40 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jul  5 06:58:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05698ab

sys-fs/cryptsetup: ppc64 stable wrt bug #800434

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index a7866973e90..7b5b46a4f7c 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-05 Thread Agostino Sarubbo
commit: bd7001eaee5f3d7723b6b0aa8dfa5807a57dabfb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jul  5 06:58:01 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jul  5 06:58:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7001ea

sys-fs/cryptsetup: ppc stable wrt bug #800434

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index da1b12b9528..a7866973e90 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-04 Thread Sam James
commit: 9ad0ab6495a531d917a4edbd2ee6a985f064ba87
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul  4 22:17:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  4 22:17:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad0ab64

sys-fs/cryptsetup: Stabilize 2.3.6 amd64, #800434

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index 72a0baf8cb9..da1b12b9528 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-04 Thread Robin H. Johnson
commit: 77fd4b1458819795789b6c3d7ea120c5a067c3fd
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jul  4 19:16:25 2021 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Jul  4 19:41:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fd4b14

sys-fs/cryptsetup: update 2.4.0_rc2 for integrity & ssh tokens

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild | 8 +++-
 sys-fs/cryptsetup/metadata.xml| 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild
index 72a0baf8cb9..6a8851cfee4 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc 
~ppc64 ~riscv ~s390 ~
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # 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
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom ssh"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
static? ( !gcrypt )" #496612
 
@@ -30,6 +30,7 @@ LIB_DEPEND="
nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
openssl? ( dev-libs/openssl:0=[static-libs(+)] )
pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   ssh? ( net-libs/libssh[static-libs(+)] )
sys-fs/lvm2[static-libs(+)]
udev? ( virtual/libudev[static-libs(-)] )"
 # We have to always depend on ${LIB_DEPEND} rather than put behind
@@ -85,6 +86,7 @@ src_configure() {
$(use_enable static-libs static)
$(use_enable udev)
$(use_enable !urandom dev-random)
+   $(use_enable ssh ssh-token)
$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
)
econf "${myeconfargs[@]}"
@@ -110,6 +112,10 @@ src_install() {
if use static ; then
mv "${ED}"/sbin/cryptsetup{.static,} || die
mv "${ED}"/sbin/veritysetup{.static,} || die
+   mv "${ED}"/sbin/integritysetup{.static,} || die
+   if use ssh ; then
+   mv "${ED}"/sbin/cryptsetup-ssh{.static,} || die
+   fi
if use reencrypt ; then
mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
fi

diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 878e56b200b..d2968cbd565 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -12,8 +12,9 @@
Use dev-libs/nettle crypto backend
Use dev-libs/openssl crypto 
backend
Use dev-libs/libpwquality for 
password quality checking
-   Use /dev/urandom instead of /dev/random
Build cryptsetup-reencrypt
+   Build cryptsetup-ssh for experimental support of token 
via SSH-server
+   Use /dev/urandom instead of /dev/random
 
 
cryptsetup/cryptsetup



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-04 Thread Robin H. Johnson
commit: 934eb26b55ec8f4bb7130fd3b0c5084d50339dd6
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jul  3 22:41:17 2021 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Jul  4 19:39:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=934eb26b

sys-fs/cryptsetup: update upstream location

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-fs/cryptsetup/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 33e359aeaf2..878e56b200b 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -16,6 +16,6 @@
Build cryptsetup-reencrypt
 
 
-   cryptsetup
+   cryptsetup/cryptsetup
 
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-07-04 Thread Lars Wendler
commit: e19b0cd40a113eaff4f4af5f074d954c22c8d9d7
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jul  4 11:01:34 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jul  4 11:01:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19b0cd4

sys-fs/cryptsetup: Bump to version 2.4.0_rc0

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild | 123 ++
 2 files changed, 124 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 988bc46cc7b..b0e55eb6283 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,2 +1,3 @@
 DIST cryptsetup-2.3.4.tar.xz 4004 BLAKE2B 
680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19
 SHA512 
db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
+DIST cryptsetup-2.4.0-rc0.tar.xz 11145080 BLAKE2B 
e6425a54d14d93b712df42e7b9460e23afb8bcb74bbe164522a2399a26d3eb668bfcc6387e5934056cdf46fcf0c136601dc1617dcb96ded6d4251a8335442e27
 SHA512 
ed80cc7a1763cf0e788bd72eee979640d6133b98a7b294a3fa09c608273eef172c2d56d80802433143d01063a0c142e68ea06465392b273fc2615b8f90273b25

diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild
new file mode 100644
index 000..72a0baf8cb9
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]
+   udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+}
+
+src_prepare() {
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+   default
+   eautoreconf
+}
+
+src_configure() {
+   if use kernel ; then
+   ewarn "Note that kernel backend is very slow for this type of 
operation"
+   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
+   ewarn "userspace crypto libraries."
+   fi
+
+   local myeconfargs=(
+   --disable-internal-argon2
+   --enable-shared
+   --sbindir=/sbin
+   # for later 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-06-14 Thread David Seifert
commit: 029a55ba38685e0c56131c5ab1c401e990f2
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jun 14 09:19:27 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jun 14 09:19:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=029a

sys-fs/cryptsetup: drop 2.3.5-r1

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/cryptsetup/Manifest   |   1 -
 sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild | 123 ---
 2 files changed, 124 deletions(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 90695cd1163..988bc46cc7b 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,2 @@
 DIST cryptsetup-2.3.4.tar.xz 4004 BLAKE2B 
680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19
 SHA512 
db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
-DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B 
fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae
 SHA512 
60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
deleted file mode 100644
index 72a0baf8cb9..000
--- a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-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
-# and it's missing ripemd160 support so it can't provide full backward 
compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-   dev-libs/json-c:=[static-libs(+)]
-   dev-libs/libgpg-error[static-libs(+)]
-   dev-libs/popt[static-libs(+)]
-   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
-   argon2? ( app-crypt/argon2:=[static-libs(+)] )
-   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
-   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]
-   udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
-DEPEND="${RDEPEND}
-   static? ( ${LIB_DEPEND} )"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_setup() {
-   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
-   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
-   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
-   check_extra_config
-}
-
-src_prepare() {
-   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-   default
-   eautoreconf
-}
-
-src_configure() {
-   if use kernel ; then
-   ewarn "Note that kernel backend is very slow for this type of 
operation"
-   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
-   ewarn "userspace crypto libraries."
-   fi
-
-   local myeconfargs=(
-   --disable-internal-argon2
-   --enable-shared
-   --sbindir=/sbin
-   # for later use
-   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-05-28 Thread Lars Wendler
commit: e4af58b3d32c8125b74d3011e071ec7820066f2a
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May 28 18:39:26 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May 28 18:39:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4af58b3

sys-fs/cryptsetup: Bump to version 2.3.6

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild | 123 ++
 2 files changed, 124 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 150becf2677..90695cd1163 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,2 +1,3 @@
 DIST cryptsetup-2.3.4.tar.xz 4004 BLAKE2B 
680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19
 SHA512 
db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B 
fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae
 SHA512 
60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf
+DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 
23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2
 SHA512 
5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
new file mode 100644
index 000..72a0baf8cb9
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]
+   udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+}
+
+src_prepare() {
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+   default
+   eautoreconf
+}
+
+src_configure() {
+   if use kernel ; then
+   ewarn "Note that kernel backend is very slow for this type of 
operation"
+   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
+   ewarn "userspace crypto libraries."
+   fi
+
+   local myeconfargs=(
+   --disable-internal-argon2
+   --enable-shared
+   --sbindir=/sbin
+   # for later use
+   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-05-13 Thread David Seifert
commit: a80d53920a2f15829d20e6fa9795666fe9dc2387
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 13:54:34 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu May 13 13:54:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a80d5392

sys-fs/cryptsetup: drop unused libtool inherit

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild | 2 +-
 sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
index 641a9c76c68..e96df12d24b 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info libtool
+inherit autotools linux-info
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
index 30f4962b68e..72a0baf8cb9 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info libtool
+inherit autotools linux-info
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-04-29 Thread Mikle Kolyada
commit: 73de8fdef3d85f1db4f751a95b2b033a022f821a
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Apr 29 18:21:26 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Apr 29 18:28:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73de8fde

sys-fs/cryptsetup: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild | 8 ++--
 sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild | 8 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
index 506cc07dfd9..641a9c76c68 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
@@ -16,9 +16,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 
~riscv ~s390 sparc x
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # 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
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static 
static-libs +udev urandom"
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   libressl? ( openssl )
static? ( !gcrypt )" #496612
 
 LIB_DEPEND="
@@ -29,10 +28,7 @@ LIB_DEPEND="
argon2? ( app-crypt/argon2:=[static-libs(+)] )
gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? (
-   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-   libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-   )
+   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
pwquality? ( dev-libs/libpwquality[static-libs(+)] )
sys-fs/lvm2[static-libs(+)]
udev? ( virtual/libudev[static-libs(-)] )"

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
index c752e6c2722..30f4962b68e 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
@@ -16,9 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc 
~ppc64 ~riscv ~s390 ~
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # 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
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static 
static-libs +udev urandom"
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   libressl? ( openssl )
static? ( !gcrypt )" #496612
 
 LIB_DEPEND="
@@ -29,10 +28,7 @@ LIB_DEPEND="
argon2? ( app-crypt/argon2:=[static-libs(+)] )
gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? (
-   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-   libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-   )
+   openssl? ( dev-libs/openssl:0=[static-libs(+)] )
pwquality? ( dev-libs/libpwquality[static-libs(+)] )
sys-fs/lvm2[static-libs(+)]
udev? ( virtual/libudev[static-libs(-)] )"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-04-28 Thread Lars Wendler
commit: d6b4747fd6f5917f28a1756a24f9760f49813fbb
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Apr 28 08:19:58 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Apr 28 08:21:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6b4747f

sys-fs/cryptsetup: Revbump to fix default pw-hashing with USE="-argon2"

Thanks-to: Hector Martin  marcan.st>
Closes: https://bugs.gentoo.org/786372
Signed-off-by: Lars Wendler  gentoo.org>

 .../cryptsetup/{cryptsetup-2.3.4.ebuild => cryptsetup-2.3.4-r1.ebuild}   | 1 +
 .../cryptsetup/{cryptsetup-2.3.5.ebuild => cryptsetup-2.3.5-r1.ebuild}   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
similarity index 98%
rename from sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
index 5c0a691593f..506cc07dfd9 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
@@ -89,6 +89,7 @@ src_configure() {
$(use_enable static-libs static)
$(use_enable udev)
$(use_enable !urandom dev-random)
+   $(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
)
econf "${myeconfargs[@]}"
 }

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.5.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
similarity index 98%
rename from sys-fs/cryptsetup/cryptsetup-2.3.5.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
index af8bdea1118..c752e6c2722 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
@@ -89,6 +89,7 @@ src_configure() {
$(use_enable static-libs static)
$(use_enable udev)
$(use_enable !urandom dev-random)
+   $(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
)
econf "${myeconfargs[@]}"
 }



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-03-11 Thread Lars Wendler
commit: f8111af7056fdcef0cb6477844e33bfd759ba257
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 11 18:03:27 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 11 18:03:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8111af7

sys-fs/cryptsetup: Removed unused USE flag description

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index e044cae4089..33e359aeaf2 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -9,7 +9,6 @@
Enable password hashing algorithm from 
app-crypt/argon2
Use dev-libs/libgcrypt crypto 
backend
Use kernel crypto backend (mainly for embedded 
systems)
-   Default to LUKS1 on disk encryption format 
rather than new LUKS2
Use dev-libs/nettle crypto backend
Use dev-libs/openssl crypto 
backend
Use dev-libs/libpwquality for 
password quality checking



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-03-11 Thread Lars Wendler
commit: 48b2860386d7a85684385d809e4608ea4da8e0b7
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 11 17:32:35 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 11 17:33:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b28603

sys-fs/cryptsetup: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest|   2 -
 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 135 --
 sys-fs/cryptsetup/cryptsetup-2.3.3.ebuild | 135 --
 3 files changed, 272 deletions(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 7d9f379c37d..150becf2677 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,4 +1,2 @@
-DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B 
b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1
 SHA512 
c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f
-DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 
54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a
 SHA512 
d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
 DIST cryptsetup-2.3.4.tar.xz 4004 BLAKE2B 
680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19
 SHA512 
db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B 
fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae
 SHA512 
60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
deleted file mode 100644
index c9775999f93..000
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info libtool
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-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
-# and it's missing ripemd160 support so it can't provide full backward 
compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl luks1_default nls pwquality 
reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   libressl? ( openssl )
-   static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-   dev-libs/json-c:=[static-libs(+)]
-   dev-libs/libgpg-error[static-libs(+)]
-   dev-libs/popt[static-libs(+)]
-   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
-   argon2? ( app-crypt/argon2:=[static-libs(+)] )
-   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? (
-   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-   libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-   )
-   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]
-   udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
-DEPEND="${RDEPEND}
-   static? ( ${LIB_DEPEND} )"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-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() {
-   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 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-03-11 Thread Lars Wendler
commit: fdf721c51158f585aa779073c7614d705f653faf
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 11 17:32:00 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 11 17:33:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf721c5

sys-fs/cryptsetup: Bump to version 2.3.5

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.3.5.ebuild | 126 ++
 2 files changed, 127 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 212251c1571..7d9f379c37d 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,4 @@
 DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B 
b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1
 SHA512 
c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f
 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 
54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a
 SHA512 
d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
 DIST cryptsetup-2.3.4.tar.xz 4004 BLAKE2B 
680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19
 SHA512 
db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
+DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B 
fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae
 SHA512 
60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.5.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.5.ebuild
new file mode 100644
index 000..af8bdea1118
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info libtool
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static 
static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   libressl? ( openssl )
+   static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? (
+   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+   libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+   )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]
+   udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+}
+
+src_prepare() {
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+   default
+   eautoreconf
+}
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-02-16 Thread Sam James
commit: 68aa6882a5524e0eaf19ec6855c4e5a12104606c
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 16 12:29:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 16 12:29:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68aa6882

sys-fs/cryptsetup: Stabilize 2.3.4 ppc, #769602

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index b69eb5f8c85..42ae3e6e939 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc 
x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-02-15 Thread Sam James
commit: 400bb28a0c0220fb11e4552cf03e135fe2f1941b
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 15 08:39:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 15 08:39:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400bb28a

sys-fs/cryptsetup: Stabilize 2.3.4 arm, #769602

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index be0adf86c79..b69eb5f8c85 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 
sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-02-14 Thread Sam James
commit: b4af9f4e24108a8dbebba12279663685e03c7394
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 14 14:52:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 14 14:52:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4af9f4e

sys-fs/cryptsetup: Stabilize 2.3.4 arm64, #769602

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index 994ecb298f9..be0adf86c79 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 
sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-02-12 Thread Sam James
commit: c5579d934bf615e0701c2c312e3a28c5f29bd344
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 12 09:55:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 12 09:55:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5579d93

sys-fs/cryptsetup: Stabilize 2.3.4 x86, #769602

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index c8f596ce8a6..994ecb298f9 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 
sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-02-10 Thread Sergei Trofimovich
commit: 1efd14cce9eb922c98a8ccf5d82f759602b97cb0
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Feb 10 15:39:43 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Feb 10 16:29:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efd14cc

sys-fs/cryptsetup: stable 2.3.4 for hppa, bug #769602

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index 9f15e0f1182..c8f596ce8a6 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 
sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-02-09 Thread Sam James
commit: 5b759d54523f1117e9c99642164138ec6f15b142
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  9 22:51:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  9 22:51:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b759d54

sys-fs/cryptsetup: Stabilize 2.3.4 amd64, #769602

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index 7366e22e12e..9f15e0f1182 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 
sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-02-08 Thread Sam James
commit: 31cf23840f82c0dc1fde17be9b8e5bd0bf92c627
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  9 06:16:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  9 06:16:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31cf2384

sys-fs/cryptsetup: Stabilize 2.3.4 sparc, #769602

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index 2a2e5db91fa..7366e22e12e 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-02-08 Thread Sam James
commit: 80db5cf2b74d76dc5621afddea4d4999eb5b1be5
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  9 06:15:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  9 06:15:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80db5cf2

sys-fs/cryptsetup: Stabilize 2.3.4 s390, #769602

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index 931770b9f6e..2a2e5db91fa 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2021-02-08 Thread Sam James
commit: da5ab9e2aa58ed2ecda25224fed96ec91c412693
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  9 06:15:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  9 06:15:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5ab9e2

sys-fs/cryptsetup: Stabilize 2.3.4 ppc64, #769602

Signed-off-by: Sam James  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index 78f20a6fafb..931770b9f6e 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-09-04 Thread Lars Wendler
commit: 71a083553c0de1ed63b803598f259a12738758f9
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Sep  4 09:05:07 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Sep  4 09:05:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a08355

sys-fs/cryptsetup: Bump to version 2.3.4

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild | 126 ++
 2 files changed, 127 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index bc14ac43704..212251c1571 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,2 +1,3 @@
 DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B 
b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1
 SHA512 
c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f
 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 
54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a
 SHA512 
d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
+DIST cryptsetup-2.3.4.tar.xz 4004 BLAKE2B 
680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19
 SHA512 
db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
new file mode 100644
index 000..78f20a6fafb
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info libtool
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static 
static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   libressl? ( openssl )
+   static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? (
+   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+   libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+   )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]
+   udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+}
+
+src_prepare() {
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+   default
+   eautoreconf
+}
+
+src_configure() {
+   if use kernel ; then
+   ewarn "Note that kernel backend is very slow for this type of 
operation"
+   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
+   ewarn "userspace crypto libraries."
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/, sys-fs/cryptsetup/files/

2020-05-29 Thread Lars Wendler
commit: 677ced54ce991f13362b177069b0a53cda19b0d6
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May 29 08:51:04 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May 29 08:51:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677ced54

sys-fs/cryptsetup: Removed old

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest   |   2 -
 sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild | 126 -
 sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild| 135 ---
 sys-fs/cryptsetup/files/setup-1.7.0.py   |  21 -
 4 files changed, 284 deletions(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 07e55781c5d..bc14ac43704 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,4 +1,2 @@
-DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 
1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456
 SHA512 
d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
-DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B 
d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68
 SHA512 
d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851
 DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B 
b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1
 SHA512 
c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f
 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 
54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a
 SHA512 
d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c

diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
deleted file mode 100644
index 309bb43a6de..000
--- a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit autotools distutils-r1 linux-info libtool ltprune eutils versionator
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(get_version_component_range
 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
-# 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
-IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static 
static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   python? ( ${PYTHON_REQUIRED_USE} )
-   static? ( !gcrypt )" #496612
-
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
-   dev-libs/popt[static-libs(+)]
-   sys-apps/util-linux[static-libs(+)]
-   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? (
-   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-   libressl? ( dev-libs/libressl:=[static-libs(+)] )
-   )
-   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]
-   udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   ${LIB_DEPEND//\[static-libs\([+-]\)\]}
-   python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   static? ( ${LIB_DEPEND} )"
-
-#PATCHES=( )
-
-pkg_setup() {
-   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_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set 
(required for cryptsetup)\n"
-   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
-   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
-   check_extra_config
-}
-
-src_prepare() {
-   sed -i '/^LOOPDEV=/s:$: || exit 0:' 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-29 Thread Lars Wendler
commit: 8ba4e2ca4f1e360d6bf8f630064161db8b41993c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May 29 08:46:43 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May 29 08:51:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba4e2ca

sys-fs/cryptsetup: Bump to version 2.3.3

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.3.3.ebuild | 135 ++
 2 files changed, 136 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 26ee1beefbc..07e55781c5d 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,4 @@
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 
1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456
 SHA512 
d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
 DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B 
d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68
 SHA512 
d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851
 DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B 
b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1
 SHA512 
c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f
+DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 
54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a
 SHA512 
d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.3.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.3.ebuild
new file mode 100644
index 000..e9301bd4133
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info libtool
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl luks1_default nls pwquality 
reencrypt static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   libressl? ( openssl )
+   static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? (
+   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+   libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+   )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]
+   udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+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() {
+   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 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-20 Thread Mart Raudsepp
commit: 4eccf264e5de74e0fc6e511fd02795c67a15c185
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Sun May 17 18:19:00 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed May 20 15:52:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eccf264

sys-fs/cryptsetup: arm64 stable (bug #723234)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index fefacf7ae7f..c9775999f93 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc 
x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-18 Thread Sergei Trofimovich
commit: 58c23ff943970c1017f9d7a8d9b659d4338d5f36
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon May 18 15:34:58 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon May 18 16:46:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58c23ff9

sys-fs/cryptsetup: stable 2.3.2 for hppa, bug #723234

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index 69964317069..fefacf7ae7f 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 
sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-18 Thread Agostino Sarubbo
commit: 46a4d8d8e560bde7d02faf9432a90286d96c3a28
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May 18 12:37:25 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May 18 12:37:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a4d8d8

sys-fs/cryptsetup: s390 stable wrt bug #723234

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index f50cd9be436..69964317069 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-17 Thread Sergei Trofimovich
commit: a0df6b76e92490b4f25f2a196ffb870cd2722a25
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 17 10:02:27 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 17 10:02:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0df6b76

sys-fs/cryptsetup: stable 2.3.2 for ppc64, bug #723234

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index 5537fd45ff9..f50cd9be436 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-17 Thread Sergei Trofimovich
commit: ce8193c855ff16826b23a4705e19fa7e13b59d27
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 17 09:45:36 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 17 09:45:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8193c8

sys-fs/cryptsetup: stable 2.3.2 for ppc, bug #723234

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index 32556e27062..5537fd45ff9 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-15 Thread Sergei Trofimovich
commit: d241e2cda1a69d20c066af4b172a56d17a9389f0
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri May 15 19:11:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri May 15 20:30:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d241e2cd

sys-fs/cryptsetup: stable 2.3.2 for sparc, bug #723234

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index 9a8386d18a9..32556e27062 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-15 Thread Lars Wendler
commit: 288864129581d58012a5b9e64a01ba04960ce388
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May 15 12:08:02 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May 15 16:58:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28886412

sys-fs/cryptsetup: Removed old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest   |   3 -
 sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild | 135 ---
 sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild| 135 ---
 sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild| 135 ---
 4 files changed, 408 deletions(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 029b886f6c5..26ee1beefbc 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,6 +1,3 @@
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 
1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456
 SHA512 
d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
-DIST cryptsetup-2.2.1.tar.xz 10803072 BLAKE2B 
00ee2eff11e3054a40a4d9036c1786422288ff4c61ff497cb7039721dde80ca337cab067faa4f70721de3aded465f612e9328a6b533ff7c9b67d1069fe435bed
 SHA512 
e4b45b24ad63cc4c22cb816f04cf4af71431e15134a8208af1a24e64ded54c07aba6c43521c063f03429304e0610b6cce849332564d69a46934fb7bae8e99718
 DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B 
d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68
 SHA512 
d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851
-DIST cryptsetup-2.3.0.tar.xz 11035660 BLAKE2B 
0fff903cdb07d91183bbd35afb660aad42d31188a80d0ef6294c40082b39fdcde25da4fe1bf679ebe308133fc63051876ce813a2ef3a557f63b574d6f6f49d8c
 SHA512 
d4af8edb7a50603028c6c6999ae7a1851d2232ee11d4a501270afb424f0a7dc82893a6a5d30d3a3188634aa80ec1a79f22a91b539910df10d07f8d9ae532cb08
-DIST cryptsetup-2.3.1.tar.xz 11041592 BLAKE2B 
acf3bb17503575b5d7edb58d0ab13989a2bc70ec96583dfc057b8258fd98a39a088411a9e0175d51d816b9164e5ec193710f1ada92427b1e6c6a53c5b8a6b9ea
 SHA512 
e6ee77d72eda0b990db894d794a686f22043161b17b5f5c8cd54a64c5751f884a241c76b03bbccd52f74440c609036d50ed8503584bc3a0a011e4854a60dd4bf
 DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B 
b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1
 SHA512 
c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f

diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild
deleted file mode 100644
index e48c4ff99e6..000
--- a/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info libtool
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
-# 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
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality 
reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-   libressl? ( openssl )
-   static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-   dev-libs/json-c:=[static-libs(+)]
-   dev-libs/libgpg-error[static-libs(+)]
-   dev-libs/popt[static-libs(+)]
-   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
-   argon2? ( app-crypt/argon2:=[static-libs(+)] )
-   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-   openssl? (
-   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-   libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-   )
-   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-   sys-fs/lvm2[static-libs(+)]
-   udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-15 Thread Mikle Kolyada
commit: 5a6664344b992901ce6fc25541e4c0dd507e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri May 15 13:45:39 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri May 15 13:45:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a666434

sys-fs/cryptsetup: arm stable wrt bug #723234

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index e9301bd4133..3470a225374 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-15 Thread Mikle Kolyada
commit: 3fd19ba01d934820d39b9cf16727d51b782c5e84
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri May 15 13:46:39 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri May 15 13:46:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd19ba0

sys-fs/cryptsetup: x86 stable wrt bug #723234

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Mikle Kolyada  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index 24930bec305..9a8386d18a9 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-15 Thread Mikle Kolyada
commit: b4020291e5bd8ae83f18b0bb203e9b9f81202b51
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri May 15 13:46:11 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri May 15 13:46:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4020291

sys-fs/cryptsetup: amd64 stable wrt bug #723234

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index 3470a225374..24930bec305 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-05-01 Thread Thomas Deutschmann
commit: 0e4ee9f08476aaf1f947d963a31bf2deca10aead
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri May  1 13:12:31 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri May  1 13:22:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4ee9f0

sys-fs/cryptsetup: bump to v2.3.2

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild | 135 ++
 2 files changed, 136 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index cae99ab9f39..029b886f6c5 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,3 +3,4 @@ DIST cryptsetup-2.2.1.tar.xz 10803072 BLAKE2B 
00ee2eff11e3054a40a4d9036c17864222
 DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B 
d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68
 SHA512 
d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851
 DIST cryptsetup-2.3.0.tar.xz 11035660 BLAKE2B 
0fff903cdb07d91183bbd35afb660aad42d31188a80d0ef6294c40082b39fdcde25da4fe1bf679ebe308133fc63051876ce813a2ef3a557f63b574d6f6f49d8c
 SHA512 
d4af8edb7a50603028c6c6999ae7a1851d2232ee11d4a501270afb424f0a7dc82893a6a5d30d3a3188634aa80ec1a79f22a91b539910df10d07f8d9ae532cb08
 DIST cryptsetup-2.3.1.tar.xz 11041592 BLAKE2B 
acf3bb17503575b5d7edb58d0ab13989a2bc70ec96583dfc057b8258fd98a39a088411a9e0175d51d816b9164e5ec193710f1ada92427b1e6c6a53c5b8a6b9ea
 SHA512 
e6ee77d72eda0b990db894d794a686f22043161b17b5f5c8cd54a64c5751f884a241c76b03bbccd52f74440c609036d50ed8503584bc3a0a011e4854a60dd4bf
+DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B 
b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1
 SHA512 
c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
new file mode 100644
index 000..e9301bd4133
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info libtool
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+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
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl luks1_default nls pwquality 
reencrypt static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   libressl? ( openssl )
+   static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? (
+   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+   libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+   )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]
+   udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+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() {
+   local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+   local 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-04-09 Thread Göktürk Yüksek
commit: 07b35394d1ea49ca5d0cb645acc8a4ceefe15745
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Thu Apr  9 04:23:08 2020 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Thu Apr  9 17:37:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b35394

sys-fs/cryptsetup: keyword 2.3.1 for ~riscv

Bug: https://bugs.gentoo.org/716480
Package-Manager: Portage-2.3.69, Repoman-2.3.14
Signed-off-by: Göktürk Yüksek  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
index d911035b085..e9301bd4133 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+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
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-04-08 Thread Mart Raudsepp
commit: b18bd56b83099e7c9455857495874798f68dc4ef
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Tue Apr  7 23:34:05 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Apr  8 06:09:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18bd56b

sys-fs/cryptsetup: arm64 stable (bug #708480)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
index d7fa209589a..e48c4ff99e6 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # 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



[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2020-03-13 Thread Lars Wendler
commit: e7e75c69a9602811808ef716df45ce9752c15fd0
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 13 13:09:31 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 13 17:44:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e75c69

sys-fs/cryptsetup: Bump to version 2.3.1

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/cryptsetup/Manifest|   1 +
 sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild | 135 ++
 2 files changed, 136 insertions(+)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 2b4a6a70359..cae99ab9f39 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -2,3 +2,4 @@ DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 
1bd62b186564e0b902480d66f623074f8d2
 DIST cryptsetup-2.2.1.tar.xz 10803072 BLAKE2B 
00ee2eff11e3054a40a4d9036c1786422288ff4c61ff497cb7039721dde80ca337cab067faa4f70721de3aded465f612e9328a6b533ff7c9b67d1069fe435bed
 SHA512 
e4b45b24ad63cc4c22cb816f04cf4af71431e15134a8208af1a24e64ded54c07aba6c43521c063f03429304e0610b6cce849332564d69a46934fb7bae8e99718
 DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B 
d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68
 SHA512 
d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851
 DIST cryptsetup-2.3.0.tar.xz 11035660 BLAKE2B 
0fff903cdb07d91183bbd35afb660aad42d31188a80d0ef6294c40082b39fdcde25da4fe1bf679ebe308133fc63051876ce813a2ef3a557f63b574d6f6f49d8c
 SHA512 
d4af8edb7a50603028c6c6999ae7a1851d2232ee11d4a501270afb424f0a7dc82893a6a5d30d3a3188634aa80ec1a79f22a91b539910df10d07f8d9ae532cb08
+DIST cryptsetup-2.3.1.tar.xz 11041592 BLAKE2B 
acf3bb17503575b5d7edb58d0ab13989a2bc70ec96583dfc057b8258fd98a39a088411a9e0175d51d816b9164e5ec193710f1ada92427b1e6c6a53c5b8a6b9ea
 SHA512 
e6ee77d72eda0b990db894d794a686f22043161b17b5f5c8cd54a64c5751f884a241c76b03bbccd52f74440c609036d50ed8503584bc3a0a011e4854a60dd4bf

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
new file mode 100644
index 000..cf95b7a30b0
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info libtool
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 
1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+# 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
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl luks1_default nls pwquality 
reencrypt static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   libressl? ( openssl )
+   static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+   dev-libs/json-c:=[static-libs(+)]
+   dev-libs/libgpg-error[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   >=sys-apps/util-linux-2.31-r1[static-libs(+)]
+   argon2? ( app-crypt/argon2:=[static-libs(+)] )
+   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? (
+   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+   libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+   )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]
+   udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+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() {
+   local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+   local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis 

  1   2   3   >