1 |
commit: 677ced54ce991f13362b177069b0a53cda19b0d6 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 29 08:51:04 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 29 08:51:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677ced54 |
7 |
|
8 |
sys-fs/cryptsetup: Removed old |
9 |
|
10 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-fs/cryptsetup/Manifest | 2 - |
14 |
sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild | 126 ------------------------- |
15 |
sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild | 135 --------------------------- |
16 |
sys-fs/cryptsetup/files/setup-1.7.0.py | 21 ----- |
17 |
4 files changed, 284 deletions(-) |
18 |
|
19 |
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest |
20 |
index 07e55781c5d..bc14ac43704 100644 |
21 |
--- a/sys-fs/cryptsetup/Manifest |
22 |
+++ b/sys-fs/cryptsetup/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 |
25 |
-DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68 SHA512 d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851 |
26 |
DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1 SHA512 c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f |
27 |
DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c |
28 |
|
29 |
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 309bb43a6de..00000000000 |
32 |
--- a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,126 +0,0 @@ |
35 |
-# Copyright 1999-2020 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=5 |
39 |
- |
40 |
-DISTUTILS_OPTIONAL=1 |
41 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
42 |
- |
43 |
-inherit autotools distutils-r1 linux-info libtool ltprune eutils versionator |
44 |
- |
45 |
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt" |
46 |
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" |
47 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz" |
48 |
- |
49 |
-LICENSE="GPL-2+" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" |
52 |
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl" |
53 |
-# we don't support nss since it doesn't allow cryptsetup to be built statically |
54 |
-# and it's missing ripemd160 support so it can't provide full backward compatibility |
55 |
-IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static static-libs +udev urandom" |
56 |
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) |
57 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
58 |
- static? ( !gcrypt )" #496612 |
59 |
- |
60 |
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)] |
61 |
- dev-libs/popt[static-libs(+)] |
62 |
- sys-apps/util-linux[static-libs(+)] |
63 |
- gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) |
64 |
- nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) |
65 |
- openssl? ( |
66 |
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
67 |
- libressl? ( dev-libs/libressl:=[static-libs(+)] ) |
68 |
- ) |
69 |
- pwquality? ( dev-libs/libpwquality[static-libs(+)] ) |
70 |
- sys-fs/lvm2[static-libs(+)] |
71 |
- udev? ( virtual/libudev[static-libs(-)] )" |
72 |
-# We have to always depend on ${LIB_DEPEND} rather than put behind |
73 |
-# !static? () because we provide a shared library which links against |
74 |
-# these other packages. #414665 |
75 |
-RDEPEND="static-libs? ( ${LIB_DEPEND} ) |
76 |
- ${LIB_DEPEND//\[static-libs\([+-]\)\]} |
77 |
- python? ( ${PYTHON_DEPS} )" |
78 |
-DEPEND="${RDEPEND} |
79 |
- virtual/pkgconfig |
80 |
- static? ( ${LIB_DEPEND} )" |
81 |
- |
82 |
-#PATCHES=( ) |
83 |
- |
84 |
-pkg_setup() { |
85 |
- local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" |
86 |
- local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" |
87 |
- local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n" |
88 |
- local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" |
89 |
- local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" |
90 |
- check_extra_config |
91 |
-} |
92 |
- |
93 |
-src_prepare() { |
94 |
- sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die |
95 |
- #epatch "${PATCHES[@]}" |
96 |
- epatch_user && eautoreconf |
97 |
- |
98 |
- if use python ; then |
99 |
- cd python |
100 |
- cp "${FILESDIR}"/setup-1.7.0.py setup.py || die |
101 |
- distutils-r1_src_prepare |
102 |
- fi |
103 |
-} |
104 |
- |
105 |
-src_configure() { |
106 |
- if use kernel ; then |
107 |
- ewarn "Note that kernel backend is very slow for this type of operation" |
108 |
- ewarn "and is provided mainly for embedded systems wanting to avoid" |
109 |
- ewarn "userspace crypto libraries." |
110 |
- fi |
111 |
- |
112 |
- # We disable autotool python integration so we can use eclasses |
113 |
- # for proper integration with multiple python versions. |
114 |
- econf \ |
115 |
- --sbindir=/sbin \ |
116 |
- --enable-shared \ |
117 |
- --disable-python \ |
118 |
- $(use_enable static static-cryptsetup) \ |
119 |
- $(use_enable static-libs static) \ |
120 |
- $(use_enable nls) \ |
121 |
- $(use_enable pwquality) \ |
122 |
- $(use_enable reencrypt cryptsetup-reencrypt) \ |
123 |
- $(use_enable udev) \ |
124 |
- $(use_enable !urandom dev-random) \ |
125 |
- --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) |
126 |
- |
127 |
- use python && cd python && distutils-r1_src_configure |
128 |
-} |
129 |
- |
130 |
-src_compile() { |
131 |
- default |
132 |
- use python && cd python && distutils-r1_src_compile |
133 |
-} |
134 |
- |
135 |
-src_test() { |
136 |
- if [[ ! -e /dev/mapper/control ]] ; then |
137 |
- ewarn "No /dev/mapper/control found -- skipping tests" |
138 |
- return 0 |
139 |
- fi |
140 |
- local p |
141 |
- for p in /dev/mapper /dev/loop* ; do |
142 |
- addwrite ${p} |
143 |
- done |
144 |
- default |
145 |
-} |
146 |
- |
147 |
-src_install() { |
148 |
- default |
149 |
- if use static ; then |
150 |
- mv "${ED}"/sbin/cryptsetup{.static,} || die |
151 |
- mv "${ED}"/sbin/veritysetup{.static,} || die |
152 |
- use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; } |
153 |
- fi |
154 |
- prune_libtool_files --modules |
155 |
- |
156 |
- newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt |
157 |
- newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt |
158 |
- |
159 |
- use python && cd python && distutils-r1_src_install |
160 |
-} |
161 |
|
162 |
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild |
163 |
deleted file mode 100644 |
164 |
index e48c4ff99e6..00000000000 |
165 |
--- a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild |
166 |
+++ /dev/null |
167 |
@@ -1,135 +0,0 @@ |
168 |
-# Copyright 1999-2020 Gentoo Authors |
169 |
-# Distributed under the terms of the GNU General Public License v2 |
170 |
- |
171 |
-EAPI=7 |
172 |
- |
173 |
-inherit autotools linux-info libtool |
174 |
- |
175 |
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt" |
176 |
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" |
177 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz" |
178 |
- |
179 |
-LICENSE="GPL-2+" |
180 |
-SLOT="0/12" # libcryptsetup.so version |
181 |
-[[ ${PV} != *_rc* ]] && \ |
182 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" |
183 |
-CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" |
184 |
-# we don't support nss since it doesn't allow cryptsetup to be built statically |
185 |
-# and it's missing ripemd160 support so it can't provide full backward compatibility |
186 |
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom" |
187 |
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) |
188 |
- libressl? ( openssl ) |
189 |
- static? ( !gcrypt )" #496612 |
190 |
- |
191 |
-LIB_DEPEND=" |
192 |
- dev-libs/json-c:=[static-libs(+)] |
193 |
- dev-libs/libgpg-error[static-libs(+)] |
194 |
- dev-libs/popt[static-libs(+)] |
195 |
- >=sys-apps/util-linux-2.31-r1[static-libs(+)] |
196 |
- argon2? ( app-crypt/argon2:=[static-libs(+)] ) |
197 |
- gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) |
198 |
- nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) |
199 |
- openssl? ( |
200 |
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
201 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
202 |
- ) |
203 |
- pwquality? ( dev-libs/libpwquality[static-libs(+)] ) |
204 |
- sys-fs/lvm2[static-libs(+)] |
205 |
- udev? ( virtual/libudev[static-libs(-)] )" |
206 |
-# We have to always depend on ${LIB_DEPEND} rather than put behind |
207 |
-# !static? () because we provide a shared library which links against |
208 |
-# these other packages. #414665 |
209 |
-RDEPEND="static-libs? ( ${LIB_DEPEND} ) |
210 |
- ${LIB_DEPEND//\[static-libs\([+-]\)\]}" |
211 |
-DEPEND="${RDEPEND} |
212 |
- static? ( ${LIB_DEPEND} )" |
213 |
-BDEPEND=" |
214 |
- virtual/pkgconfig |
215 |
-" |
216 |
- |
217 |
-S="${WORKDIR}/${P/_/-}" |
218 |
- |
219 |
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch ) |
220 |
- |
221 |
-pkg_pretend() { |
222 |
- if ! use luks1_default ; then |
223 |
- ewarn "WARNING! WARNING! WARNING!" |
224 |
- ewarn "You have chosen LUKS2 as your default format." |
225 |
- ewarn "This can break LUKS1 backwards compatibility." |
226 |
- ewarn "Enable \"luks1_default\" USE flag if you need backwards compatibility." |
227 |
- fi |
228 |
-} |
229 |
- |
230 |
-pkg_setup() { |
231 |
- local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" |
232 |
- local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" |
233 |
- local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n" |
234 |
- local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" |
235 |
- local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" |
236 |
- check_extra_config |
237 |
-} |
238 |
- |
239 |
-src_prepare() { |
240 |
- sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die |
241 |
- default |
242 |
- eautoreconf |
243 |
-} |
244 |
- |
245 |
-src_configure() { |
246 |
- if use kernel ; then |
247 |
- ewarn "Note that kernel backend is very slow for this type of operation" |
248 |
- ewarn "and is provided mainly for embedded systems wanting to avoid" |
249 |
- ewarn "userspace crypto libraries." |
250 |
- fi |
251 |
- |
252 |
- local myeconfargs=( |
253 |
- --disable-internal-argon2 |
254 |
- --enable-shared |
255 |
- --sbindir=/sbin |
256 |
- # for later use |
257 |
- --with-default-luks-format=LUKS$(usex luks1_default 1 2) |
258 |
- --with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d" |
259 |
- --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) |
260 |
- $(use_enable argon2 libargon2) |
261 |
- $(use_enable nls) |
262 |
- $(use_enable pwquality) |
263 |
- $(use_enable reencrypt cryptsetup-reencrypt) |
264 |
- $(use_enable static static-cryptsetup) |
265 |
- $(use_enable static-libs static) |
266 |
- $(use_enable udev) |
267 |
- $(use_enable !urandom dev-random) |
268 |
- ) |
269 |
- econf "${myeconfargs[@]}" |
270 |
-} |
271 |
- |
272 |
-src_test() { |
273 |
- if [[ ! -e /dev/mapper/control ]] ; then |
274 |
- ewarn "No /dev/mapper/control found -- skipping tests" |
275 |
- return 0 |
276 |
- fi |
277 |
- |
278 |
- local p |
279 |
- for p in /dev/mapper /dev/loop* ; do |
280 |
- addwrite ${p} |
281 |
- done |
282 |
- |
283 |
- default |
284 |
-} |
285 |
- |
286 |
-src_install() { |
287 |
- default |
288 |
- |
289 |
- if use static ; then |
290 |
- mv "${ED}"/sbin/cryptsetup{.static,} || die |
291 |
- mv "${ED}"/sbin/veritysetup{.static,} || die |
292 |
- if use reencrypt ; then |
293 |
- mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die |
294 |
- fi |
295 |
- fi |
296 |
- find "${ED}" -type f -name "*.la" -delete || die |
297 |
- |
298 |
- dodoc docs/v*ReleaseNotes |
299 |
- |
300 |
- newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt |
301 |
- newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt |
302 |
-} |
303 |
|
304 |
diff --git a/sys-fs/cryptsetup/files/setup-1.7.0.py b/sys-fs/cryptsetup/files/setup-1.7.0.py |
305 |
deleted file mode 100644 |
306 |
index 0da063c0b1c..00000000000 |
307 |
--- a/sys-fs/cryptsetup/files/setup-1.7.0.py |
308 |
+++ /dev/null |
309 |
@@ -1,21 +0,0 @@ |
310 |
-import os |
311 |
-from distutils.core import setup, Extension |
312 |
- |
313 |
-top_srcdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) |
314 |
- |
315 |
-def get_ver(): |
316 |
- with open(os.path.join(top_srcdir, 'configure')) as f: |
317 |
- for line in f: |
318 |
- if line.startswith('PACKAGE_VERSION='): |
319 |
- return line.split('=')[1].replace("'", '').strip() |
320 |
- |
321 |
-module = Extension('pycryptsetup', |
322 |
- include_dirs=[os.path.join(top_srcdir, 'lib')], |
323 |
- extra_compile_args=['-include', os.path.join(top_srcdir, 'config.h')], |
324 |
- library_dirs=[os.path.join(top_srcdir, 'lib', '.libs')], |
325 |
- libraries=['cryptsetup'], |
326 |
- sources=['pycryptsetup.c']) |
327 |
- |
328 |
-setup(name='pycryptsetup', |
329 |
- version=get_ver(), |
330 |
- ext_modules=[module]) |