sys-fs/cryptsetup: Fixed build with USE="static".

Closes: https://bugs.gentoo.org/641226
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
index eee71164cf068bb2a51fef5f79b9541f6845f992..66f994df07b97c4897062529e574ad1e38745ad7 100644 (file)
--- a/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
@@ -27,7 +27,7 @@ LIB_DEPEND="
        dev-libs/json-c[static-libs(+)]
        dev-libs/libgpg-error[static-libs(+)]
        dev-libs/popt[static-libs(+)]
-       sys-apps/util-linux[static-libs(+)]
+       >=sys-apps/util-linux-2.31-r1[static-libs(+)]
        argon2? ( app-crypt/argon2[static-libs(+)] )
        gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
        nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
@@ -50,7 +50,9 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P/_/-}"
 
-#PATCHES=( )
+PATCHES=(
+       "${FILESDIR}/${P}-pwquality_static.patch" #641226
+)
 
 pkg_setup() {
        local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"

diff --git a/sys-fs/cryptsetup/files/cryptsetup-2.0.0-pwquality_static.patch b/sys-fs/cryptsetup/files/cryptsetup-2.0.0-pwquality_static.patch
new file mode 100644 (file)
index 0000000..56a2d45
--- /dev/null
+++ b/sys-fs/cryptsetup/files/cryptsetup-2.0.0-pwquality_static.patch
@@ -0,0 +1,27 @@
+From 7c9312607c5b0923447175480d696b34f47f0e03 Mon Sep 17 00:00:00 2001
+From: Milan Broz <gmazyland@gmail.com>
+Date: Sun, 17 Dec 2017 15:20:49 +0100
+Subject: [PATCH] Fix cryptsetup-reencrypt static build if pwquality is enabled.
+
+In static build we need to link also to pwquality.
+
+Fixes Issue#357.
+---
+ src/Makemodule.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makemodule.am b/src/Makemodule.am
+index 55a388d..b6889eb 100644
+--- a/src/Makemodule.am
++++ b/src/Makemodule.am
+@@ -112,6 +112,7 @@ cryptsetup_reencrypt_static_LDFLAGS = $(AM_LDFLAGS) -all-static
+ cryptsetup_reencrypt_static_LDADD =   \
+       $(cryptsetup_reencrypt_LDADD)   \
+       @CRYPTO_STATIC_LIBS@            \
++      @PWQUALITY_STATIC_LIBS@         \
+       @DEVMAPPER_STATIC_LIBS@
+ endif
+ endif
+--
+libgit2 0.26.0
+