Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/
Date: Sun, 28 Oct 2018 22:42:11
Message-Id: 1540766521.b91279dd68f1b47519072978017b202c5293f4df.polynomial-c@gentoo
1 commit: b91279dd68f1b47519072978017b202c5293f4df
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 28 22:41:39 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 28 22:42:01 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91279dd
7
8 sys-fs/cryptsetup: Removed old.
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 sys-fs/cryptsetup/Manifest | 1 -
14 sys-fs/cryptsetup/cryptsetup-2.0.3-r1.ebuild | 128 ---------------------------
15 sys-fs/cryptsetup/cryptsetup-2.0.4.ebuild | 128 ---------------------------
16 3 files changed, 257 deletions(-)
17
18 diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
19 index 710859edb15..aa021fe7bc7 100644
20 --- a/sys-fs/cryptsetup/Manifest
21 +++ b/sys-fs/cryptsetup/Manifest
22 @@ -1,4 +1,3 @@
23 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
24 -DIST cryptsetup-2.0.3.tar.xz 10125548 BLAKE2B 871df4c248151394f5abc907209b6df636049e5a1ff72161af091d36963ef68adee14e5e1867d779c9419e489aa9bea7562608b239a8fe361b769f0cc14daaf0 SHA512 f5ac54aa9614b234f2d1e84758a98914d283b669f4ab5cbe0ed7cdf25ce77f2d1abdf1e5b5010d803971f0e29120954110ee4fcc538137b04fbdc13b7804385e
25 DIST cryptsetup-2.0.4.tar.xz 10444544 BLAKE2B 95c18eefe99c27d05e347440d77e4ff53dcc110822dc706e2284e3203da9069acbd8afedb8d596a0f832bdadea0597b75af58a22af712818a3e0aae2824e51b7 SHA512 74d442c7c7837da719a14aefa8bf0b5dffbb050acd6fbd140c50d43470c828f79fdcf7cd6acf1c149a4e1129a100059df6216b7d8ca04eb0b070cb8d4ca33e61
26 DIST cryptsetup-2.0.5.tar.xz 10476304 BLAKE2B cf1e335fce48a7bf835b2008dfc0a96ef35d344e2c9f6a0a5a2ff45644f9015311e99b8f9e05b0b23cad69d74f91dd1b7cdd766560fb6504e7453d6e46bea186 SHA512 bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae
27
28 diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.3-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.3-r1.ebuild
29 deleted file mode 100644
30 index 90930f1120c..00000000000
31 --- a/sys-fs/cryptsetup/cryptsetup-2.0.3-r1.ebuild
32 +++ /dev/null
33 @@ -1,128 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
40 -
41 -inherit autotools python-single-r1 linux-info libtool ltprune versionator
42 -
43 -DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
44 -HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
45 -SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P/_/-}.tar.xz"
46 -
47 -LICENSE="GPL-2+"
48 -SLOT="0/12" # libcryptsetup.so version
49 -[[ ${PV} != *_rc* ]] && \
50 -KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
51 -CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
52 -# we don't support nss since it doesn't allow cryptsetup to be built statically
53 -# and it's missing ripemd160 support so it can't provide full backward compatibility
54 -IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs +udev urandom"
55 -REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
56 - python? ( ${PYTHON_REQUIRED_USE} )
57 - static? ( !gcrypt )" #496612
58 -
59 -LIB_DEPEND="
60 - dev-libs/json-c:=[static-libs(+)]
61 - dev-libs/libgpg-error[static-libs(+)]
62 - dev-libs/popt[static-libs(+)]
63 - >=sys-apps/util-linux-2.31-r1[static-libs(+)]
64 - argon2? ( app-crypt/argon2:=[static-libs(+)] )
65 - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
66 - nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
67 - openssl? (
68 - !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
69 - libressl? ( dev-libs/libressl:=[static-libs(+)] )
70 - )
71 - pwquality? ( dev-libs/libpwquality[static-libs(+)] )
72 - sys-fs/lvm2[static-libs(+)]
73 - udev? ( virtual/libudev[static-libs(+)] )"
74 -# We have to always depend on ${LIB_DEPEND} rather than put behind
75 -# !static? () because we provide a shared library which links against
76 -# these other packages. #414665
77 -RDEPEND="static-libs? ( ${LIB_DEPEND} )
78 - ${LIB_DEPEND//\[static-libs\(+\)\]}
79 - python? ( ${PYTHON_DEPS} )"
80 -DEPEND="${RDEPEND}
81 - virtual/pkgconfig
82 - static? ( ${LIB_DEPEND} )"
83 -
84 -S="${WORKDIR}/${P/_/-}"
85 -
86 -pkg_setup() {
87 - local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
88 - local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
89 - local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
90 - local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
91 - local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
92 - check_extra_config
93 -}
94 -
95 -src_prepare() {
96 - sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
97 - default
98 - eautoreconf
99 -}
100 -
101 -src_configure() {
102 - if use kernel ; then
103 - ewarn "Note that kernel backend is very slow for this type of operation"
104 - ewarn "and is provided mainly for embedded systems wanting to avoid"
105 - ewarn "userspace crypto libraries."
106 - fi
107 -
108 - use python && python_setup
109 -
110 - # We disable autotool python integration so we can use eclasses
111 - # for proper integration with multiple python versions.
112 - local myeconfargs=(
113 - --disable-internal-argon2
114 - --enable-shared
115 - --sbindir=/sbin
116 - # for later use
117 - # --with-default-luks-format=LUKS2
118 - --with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
119 - --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
120 - $(use_enable argon2 libargon2)
121 - $(use_enable nls)
122 - $(use_enable pwquality)
123 - $(use_enable python)
124 - $(use_enable reencrypt cryptsetup-reencrypt)
125 - $(use_enable static static-cryptsetup)
126 - $(use_enable static-libs static)
127 - $(use_enable udev)
128 - $(use_enable !urandom dev-random)
129 - )
130 - econf "${myeconfargs[@]}"
131 -}
132 -
133 -src_test() {
134 - if [[ ! -e /dev/mapper/control ]] ; then
135 - ewarn "No /dev/mapper/control found -- skipping tests"
136 - return 0
137 - fi
138 -
139 - local p
140 - for p in /dev/mapper /dev/loop* ; do
141 - addwrite ${p}
142 - done
143 -
144 - default
145 -}
146 -
147 -src_install() {
148 - default
149 -
150 - if use static ; then
151 - mv "${ED%}"/sbin/cryptsetup{.static,} || die
152 - mv "${ED%}"/sbin/veritysetup{.static,} || die
153 - use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
154 - fi
155 - prune_libtool_files --modules
156 -
157 - dodoc docs/v*ReleaseNotes
158 -
159 - newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
160 - newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
161 -}
162
163 diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.4.ebuild
164 deleted file mode 100644
165 index a0458bbe4f6..00000000000
166 --- a/sys-fs/cryptsetup/cryptsetup-2.0.4.ebuild
167 +++ /dev/null
168 @@ -1,128 +0,0 @@
169 -# Copyright 1999-2018 Gentoo Foundation
170 -# Distributed under the terms of the GNU General Public License v2
171 -
172 -EAPI=6
173 -
174 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
175 -
176 -inherit autotools python-single-r1 linux-info libtool eapi7-ver
177 -
178 -DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
179 -HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
180 -SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
181 -
182 -LICENSE="GPL-2+"
183 -SLOT="0/12" # libcryptsetup.so version
184 -[[ ${PV} != *_rc* ]] && \
185 -KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
186 -CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
187 -# we don't support nss since it doesn't allow cryptsetup to be built statically
188 -# and it's missing ripemd160 support so it can't provide full backward compatibility
189 -IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs +udev urandom"
190 -REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
191 - python? ( ${PYTHON_REQUIRED_USE} )
192 - static? ( !gcrypt )" #496612
193 -
194 -LIB_DEPEND="
195 - dev-libs/json-c:=[static-libs(+)]
196 - dev-libs/libgpg-error[static-libs(+)]
197 - dev-libs/popt[static-libs(+)]
198 - >=sys-apps/util-linux-2.31-r1[static-libs(+)]
199 - argon2? ( app-crypt/argon2:=[static-libs(+)] )
200 - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
201 - nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
202 - openssl? (
203 - !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
204 - libressl? ( dev-libs/libressl:=[static-libs(+)] )
205 - )
206 - pwquality? ( dev-libs/libpwquality[static-libs(+)] )
207 - sys-fs/lvm2[static-libs(+)]
208 - udev? ( virtual/libudev[static-libs(+)] )"
209 -# We have to always depend on ${LIB_DEPEND} rather than put behind
210 -# !static? () because we provide a shared library which links against
211 -# these other packages. #414665
212 -RDEPEND="static-libs? ( ${LIB_DEPEND} )
213 - ${LIB_DEPEND//\[static-libs\(+\)\]}
214 - python? ( ${PYTHON_DEPS} )"
215 -DEPEND="${RDEPEND}
216 - virtual/pkgconfig
217 - static? ( ${LIB_DEPEND} )"
218 -
219 -S="${WORKDIR}/${P/_/-}"
220 -
221 -pkg_setup() {
222 - local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
223 - local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
224 - local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
225 - local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
226 - local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
227 - check_extra_config
228 -}
229 -
230 -src_prepare() {
231 - sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
232 - default
233 - eautoreconf
234 -}
235 -
236 -src_configure() {
237 - if use kernel ; then
238 - ewarn "Note that kernel backend is very slow for this type of operation"
239 - ewarn "and is provided mainly for embedded systems wanting to avoid"
240 - ewarn "userspace crypto libraries."
241 - fi
242 -
243 - use python && python_setup
244 -
245 - # We disable autotool python integration so we can use eclasses
246 - # for proper integration with multiple python versions.
247 - local myeconfargs=(
248 - --disable-internal-argon2
249 - --enable-shared
250 - --sbindir=/sbin
251 - # for later use
252 - # --with-default-luks-format=LUKS2
253 - --with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
254 - --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
255 - $(use_enable argon2 libargon2)
256 - $(use_enable nls)
257 - $(use_enable pwquality)
258 - $(use_enable python)
259 - $(use_enable reencrypt cryptsetup-reencrypt)
260 - $(use_enable static static-cryptsetup)
261 - $(use_enable static-libs static)
262 - $(use_enable udev)
263 - $(use_enable !urandom dev-random)
264 - )
265 - econf "${myeconfargs[@]}"
266 -}
267 -
268 -src_test() {
269 - if [[ ! -e /dev/mapper/control ]] ; then
270 - ewarn "No /dev/mapper/control found -- skipping tests"
271 - return 0
272 - fi
273 -
274 - local p
275 - for p in /dev/mapper /dev/loop* ; do
276 - addwrite ${p}
277 - done
278 -
279 - default
280 -}
281 -
282 -src_install() {
283 - default
284 -
285 - if use static ; then
286 - mv "${ED%}"/sbin/cryptsetup{.static,} || die
287 - mv "${ED%}"/sbin/veritysetup{.static,} || die
288 - use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
289 - fi
290 - find "${ED}" -name "*.la" -delete || die
291 -
292 - dodoc docs/v*ReleaseNotes
293 -
294 - newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
295 - newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
296 -}