1 |
commit: 242f614cf4c430d448300241d796dcbf3b9d6e46 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 3 08:43:14 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 3 08:48:54 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242f614c |
7 |
|
8 |
sys-fs/cryptsetup: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
sys-fs/cryptsetup/Manifest | 1 - |
13 |
sys-fs/cryptsetup/cryptsetup-1.7.3.ebuild | 126 --------------------- |
14 |
.../files/cryptsetup-1.7.3-libressl.patch | 12 -- |
15 |
3 files changed, 139 deletions(-) |
16 |
|
17 |
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest |
18 |
index a6ee8fb1d96..9b6d098427b 100644 |
19 |
--- a/sys-fs/cryptsetup/Manifest |
20 |
+++ b/sys-fs/cryptsetup/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST cryptsetup-1.7.2.tar.xz 1222688 SHA256 dbb35dbf5f0c1749168c86c913fe98e872247bfc8425314b494c2423e7e43342 SHA512 ff761bd0c5e9a7941fd27d55839804f2ce96145a45a9689d234954fc43c6172c913c59c83b37ef6cc5459ccecff63212c369077fdea70c14326372076eae7f86 WHIRLPOOL b78d91b449ea7ba325f05dc00b2005e8f6def91703cd982900682bc965eec0992a0cc21c4f44335c03dda885d4505bcf26d1bf58f991c9f60096927bcf582963 |
23 |
-DIST cryptsetup-1.7.3.tar.xz 1228432 SHA256 af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02 SHA512 616bac2ce272b8e9d1de6b71ba23f6260dfdb17e3969ff4950c3221fc9fa1b9a0a1081327d2806868045395a407452a8c8bcf4ce0faaf2bd2d51a7c9f844a767 WHIRLPOOL 82a70877abbe674cca9f97585cd54535a60191a019028907a7a7187964260f754020dc1351de48480944cb3701cb8d83a543d8ffd7c2594342d1e244d4026e3d |
24 |
DIST cryptsetup-1.7.4.tar.xz 1232068 SHA256 7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016 SHA512 c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71 WHIRLPOOL f00d0e529a5d34460733e8110584266b42011055d81d94b0ae8d47a1f11f1639c4b658a55415241e72c431c615d896a94ae444a518a0b56f971b888a5ab7cc09 |
25 |
DIST cryptsetup-1.7.5.tar.xz 1232696 SHA256 2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 WHIRLPOOL cd2fe15a08f3202c89055e334a3c56fcb60a19bda8135c7d833f384e9beb7fcd6f31fbbd4ac29572f46199f05bd6055b89b3d6733828354d9c985b3e55da4e14 |
26 |
|
27 |
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.3.ebuild |
28 |
deleted file mode 100644 |
29 |
index 9182d5a5ffa..00000000000 |
30 |
--- a/sys-fs/cryptsetup/cryptsetup-1.7.3.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,126 +0,0 @@ |
33 |
-# Copyright 1999-2016 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=5 |
37 |
- |
38 |
-DISTUTILS_OPTIONAL=1 |
39 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
40 |
- |
41 |
-inherit autotools distutils-r1 linux-info libtool eutils 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" |
49 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
50 |
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl" |
51 |
-# we don't support nss since it doesn't allow cryptsetup to be built statically |
52 |
-# and it's missing ripemd160 support so it can't provide full backward compatibility |
53 |
-IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static static-libs udev urandom" |
54 |
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) |
55 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
56 |
- static? ( !gcrypt )" #496612 |
57 |
- |
58 |
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)] |
59 |
- dev-libs/popt[static-libs(+)] |
60 |
- sys-apps/util-linux[static-libs(+)] |
61 |
- gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) |
62 |
- nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) |
63 |
- openssl? ( |
64 |
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
65 |
- libressl? ( dev-libs/libressl:=[static-libs(+)] ) |
66 |
- ) |
67 |
- pwquality? ( dev-libs/libpwquality[static-libs(+)] ) |
68 |
- sys-fs/lvm2[static-libs(+)] |
69 |
- udev? ( virtual/libudev[static-libs(+)] )" |
70 |
-# We have to always depend on ${LIB_DEPEND} rather than put behind |
71 |
-# !static? () because we provide a shared library which links against |
72 |
-# these other packages. #414665 |
73 |
-RDEPEND="static-libs? ( ${LIB_DEPEND} ) |
74 |
- ${LIB_DEPEND//\[static-libs\(+\)\]} |
75 |
- python? ( ${PYTHON_DEPS} )" |
76 |
-DEPEND="${RDEPEND} |
77 |
- virtual/pkgconfig |
78 |
- static? ( ${LIB_DEPEND} )" |
79 |
- |
80 |
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) |
81 |
- |
82 |
-pkg_setup() { |
83 |
- local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" |
84 |
- local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" |
85 |
- local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n" |
86 |
- local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" |
87 |
- local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" |
88 |
- check_extra_config |
89 |
-} |
90 |
- |
91 |
-src_prepare() { |
92 |
- sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die |
93 |
- epatch "${PATCHES[@]}" |
94 |
- epatch_user && eautoreconf |
95 |
- |
96 |
- if use python ; then |
97 |
- cd python |
98 |
- cp "${FILESDIR}"/setup-1.7.0.py setup.py || die |
99 |
- distutils-r1_src_prepare |
100 |
- fi |
101 |
-} |
102 |
- |
103 |
-src_configure() { |
104 |
- if use kernel ; then |
105 |
- ewarn "Note that kernel backend is very slow for this type of operation" |
106 |
- ewarn "and is provided mainly for embedded systems wanting to avoid" |
107 |
- ewarn "userspace crypto libraries." |
108 |
- fi |
109 |
- |
110 |
- # We disable autotool python integration so we can use eclasses |
111 |
- # for proper integration with multiple python versions. |
112 |
- econf \ |
113 |
- --sbindir=/sbin \ |
114 |
- --enable-shared \ |
115 |
- --disable-python \ |
116 |
- $(use_enable static static-cryptsetup) \ |
117 |
- $(use_enable static-libs static) \ |
118 |
- $(use_enable nls) \ |
119 |
- $(use_enable pwquality) \ |
120 |
- $(use_enable reencrypt cryptsetup-reencrypt) \ |
121 |
- $(use_enable udev) \ |
122 |
- $(use_enable !urandom dev-random) \ |
123 |
- --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) |
124 |
- |
125 |
- use python && cd python && distutils-r1_src_configure |
126 |
-} |
127 |
- |
128 |
-src_compile() { |
129 |
- default |
130 |
- use python && cd python && distutils-r1_src_compile |
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 |
- local p |
139 |
- for p in /dev/mapper /dev/loop* ; do |
140 |
- addwrite ${p} |
141 |
- done |
142 |
- default |
143 |
-} |
144 |
- |
145 |
-src_install() { |
146 |
- default |
147 |
- if use static ; then |
148 |
- mv "${ED}"/sbin/cryptsetup{.static,} || die |
149 |
- mv "${ED}"/sbin/veritysetup{.static,} || die |
150 |
- use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; } |
151 |
- fi |
152 |
- prune_libtool_files --modules |
153 |
- |
154 |
- newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt |
155 |
- newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt |
156 |
- |
157 |
- use python && cd python && distutils-r1_src_install |
158 |
-} |
159 |
|
160 |
diff --git a/sys-fs/cryptsetup/files/cryptsetup-1.7.3-libressl.patch b/sys-fs/cryptsetup/files/cryptsetup-1.7.3-libressl.patch |
161 |
deleted file mode 100644 |
162 |
index a7a708f427a..00000000000 |
163 |
--- a/sys-fs/cryptsetup/files/cryptsetup-1.7.3-libressl.patch |
164 |
+++ /dev/null |
165 |
@@ -1,12 +0,0 @@ |
166 |
-diff -Naur cryptsetup-1.7.3.orig/lib/crypto_backend/crypto_openssl.c cryptsetup-1.7.3/lib/crypto_backend/crypto_openssl.c |
167 |
---- cryptsetup-1.7.3.orig/lib/crypto_backend/crypto_openssl.c 2016-10-28 01:58:10.000000000 -0700 |
168 |
-+++ cryptsetup-1.7.3/lib/crypto_backend/crypto_openssl.c 2016-11-02 13:38:46.094483756 -0700 |
169 |
-@@ -73,7 +73,7 @@ |
170 |
- /* |
171 |
- * Compatible wrappers for OpenSSL < 1.1.0 |
172 |
- */ |
173 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
174 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
175 |
- static EVP_MD_CTX *EVP_MD_CTX_new(void) |
176 |
- { |
177 |
- EVP_MD_CTX *md = malloc(sizeof(*md)); |