diff options
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/Manifest.gz | bin | 22035 -> 22026 bytes | |||
| -rw-r--r-- | sys-fs/cryptsetup/Manifest | 3 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild | 6 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/files/cryptsetup-2.0.0-pwquality_static.patch | 27 |
4 files changed, 33 insertions, 3 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 12c42092fb39..d94b91226fd5 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 09bd7f3c0ce7..6ef9f824416a 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -1,11 +1,12 @@ AUX 1.6.7-dmcrypt.confd 3919 BLAKE2B 99e81cfe932dda45062966ada065da418500e58499af0f5ed18b7367cb6bc1b3fae1d4a0d4094ebf36c00292a4d4e2606026a65df66d5a96d01a0b9d5f6aa5e5 SHA512 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2f41f74fe8640163ac272d44bfbbfeb0befb1af337f88d2711f27003575758d16c5f8104db0fabc2cb9 SHA512 fdbf44f7508ca10ab89e858c206fd9dc397a11d8a553045584ab95046c309a84dd6c7ab0c0ea63c66f7d52b31ed3a1ce46d5ce2ce2588f0d6593a1c4cc1c4194 +AUX cryptsetup-2.0.0-pwquality_static.patch 760 BLAKE2B cdb48b708b936f3b34e2d3f6c200fc3ac8c1ab1ff3c80822c860effc0f597db9f4dae01adb9e516acc14570db7462acd2ca042217bdc8dd693f6bb7dee22b0fd SHA512 327f19ed8cd5a62dc7da3b3e7c58ac030869f2414f702b230014303c0bbc5e44c933f10e42083fb360b1439d673e249cd35cf04d8e096ca063257312c13048e3 AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab043b36e31d80d40772795cb5f9911b0e9a3aa41d8f1773c0e60aa6da1a530165a26384c65532117 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89 DIST cryptsetup-1.7.4.tar.xz 1232068 BLAKE2B a65295d023f611ac57abf25fe21b4b6b6f64d8cfdcc01f2e008eea8141423e9d364af42fa3b58f9f8a76f898a01b3918a2a3ff98bc62ab105fa85feb3c1d55cd SHA512 c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 DIST cryptsetup-2.0.0.tar.xz 10079936 BLAKE2B 6e5f1bb20571cf7a66f988e50b2cc88d152a2cd414a9b760ad845cafac3d0aa5b5a1fbd871117b91a78b7cbf1d8a849608221f8a35d1faf26f901518c2d00c6e SHA512 195e9c0b6429d21ec0cc7c5faddfde85cb71eee09d348fa50df6779693a2dc05fce04bada4c835150964e08b2e8af30e4194155e0f6366b24c7812f48477a249 EBUILD cryptsetup-1.7.4.ebuild 4025 BLAKE2B ba5aec9f19bc046e4269baa7d4b73f0e1e0da13253a5ee700fb62cdfaf05de0cb71b86229379d7ce3176e9075e1d063d0f9f488df97da6a8c77e098ef4754f4f SHA512 9b46af09764085af0f6de8e99629839f45b9567110dde94db040e875805ad753f111136da06ffc0a65f3ebd8fa705e0a7509961a24c08032e501967e081f8928 EBUILD cryptsetup-1.7.5.ebuild 4045 BLAKE2B 14036d9f2c6a1eb5b245ff66edd50629b517b632b11bd3303fd47e4ba7b830fec10c6eecf18b7109801e8f5e84ae0104303a9c4adbdcb5de22ce623b527ba82d SHA512 838908ef46db7d9710e9071ec21af4c0243a5b1c5220107522b0145cdb38eb1bc0fde392d276c988cf1b3e14880d4db73b1992e849d416113f01ed05dc0581fd -EBUILD cryptsetup-2.0.0-r1.ebuild 4034 BLAKE2B 0c721b44c70c5efb86a095ed0be33dbd7d08513a0e88013e897671aeab87adc92143b8c8920c366037dbb83f665e6f15414998a743e7b372d0d67570af83e7f6 SHA512 15ccf4858426497aeff2a8fb222139c5ceb4a5ea2396d558342733991cfee53747c88b99f2132ece38b83603bc361d5864728ba0d8bf6860b0ea50c788aa537a +EBUILD cryptsetup-2.0.0-r1.ebuild 4094 BLAKE2B f378ffe253c54e73164e734d1073ca61e5cbb6163c66b9b1946dc6665b62bf50cc8077b64a94b155108a565e7bbd11c2750e0d82fd4d945488ac6cd4bfb49fc9 SHA512 0732276395cd54332e39982b6157dc7cb176f9880037048b108aab1e26606e3e7d9291bbb4724186e33eba3161038853e214652a7f9123d972b607703801ced0 EBUILD cryptsetup-2.0.0.ebuild 4316 BLAKE2B fa99d5c813a225b3b2a0fcc53694641c6c61178880c652cef8d81f5a63b2145a9dceb60f0f7249b7e4d511cfb0813c7e71553d95ffd03fcdf3d1f532985679ee SHA512 182a0b657627467b0d4d6be85fe0c9ac48232e68c05a42aabee2a1c17bec28eda9bbc082645a6ed8d5a1a1217ca040b62b2d411d0a16a5f9067cdd0fcd638ce0 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41 diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild index eee71164cf06..66f994df07b9 100644 --- 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 index 000000000000..56a2d45cb42b --- /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 + |