1 |
commit: 5f539dede2b6b3087d7b89bfc8fdfa7e1fc38de8 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 4 05:41:34 2015 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 4 05:41:34 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f539ded |
7 |
|
8 |
sys-fs/cryptsetup: Removed old. |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-fs/cryptsetup/Manifest | 2 - |
14 |
sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild | 122 --------------------- |
15 |
sys-fs/cryptsetup/cryptsetup-1.6.7.ebuild | 103 ----------------- |
16 |
.../files/cryptsetup-1.6.1-openssl-static.patch | 13 --- |
17 |
4 files changed, 240 deletions(-) |
18 |
|
19 |
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest |
20 |
index bdb509e..8521e7d 100644 |
21 |
--- a/sys-fs/cryptsetup/Manifest |
22 |
+++ b/sys-fs/cryptsetup/Manifest |
23 |
@@ -1,5 +1,3 @@ |
24 |
-DIST cryptsetup-1.6.2.tar.bz2 1189584 SHA256 15723f0198303d4bcb99d480b7a773918e2d319f0348457988c063bdd03e109a SHA512 59fb835ef8bcd6d0c704a021055032639840ef4bb7be6ade8ff91d347ae74d8e6cba4583d8ced7a4a8c6f09ebc16c4eff3549c13c4327d92fd9234db58e18c10 WHIRLPOOL 3ab24572ea42dfdd0d5176dfa4621520cd0bccda53c3a01676d400a7a841ab9643c979c4942daa774658602bd8cdf659376cbc94c553e2097c5eb3c51a7edb31 |
25 |
DIST cryptsetup-1.6.5.tar.xz 1136892 SHA256 267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a SHA512 c77ac590d28954e7bd430d1069b820a288c4668857a7ced7f81546ea39676f2b536abbcda06f20440e31c205b7ada68bcfa5aab220b102a2b62198a788d9b65e WHIRLPOOL 74a597abbdcc1225bb811597e53737eab2348a328f3ba30e7eb519a0621b06e6c898e320db8e24a16decfd4706b6a2e68b06894dde91124e4c089e952dbff9c1 |
26 |
-DIST cryptsetup-1.6.7.tar.xz 1188876 SHA256 c23c24c8d662032da8650c1c84985221be8bbedf4737c1540bba7e4517dfe820 SHA512 d6cecd2f3f5d468d4337d4e8407c8c3315e8972c0fc72cd1f93fb67f02a632b56ad293f08f6682f24c9ad0b5ad5967be751e5679413109692ade5823aafd1d19 WHIRLPOOL 95611938ddbf3520f1a2a2891e3103f6bf1699a210f7902bd65d1e61357ed44c9b6f344f567d1d5f1b88adb40154831e34014f3e22ec141f9101b707295007a0 |
27 |
DIST cryptsetup-1.6.8.tar.xz 1221232 SHA256 45a6ccd3c65b7d904e58e1cb3656a7e997190b6a05b5ff7c6887e4a41c5f19bc SHA512 db189a98da6329f4d4c2ae92dbdc08ccffdf6ae41c964186ebf48a612bf0aa9731653ef6b7549b5feee0043edfa171874c3609418499902e6339b48481c621d7 WHIRLPOOL 8873d14fc2a54d97ed7d065ad4a0c63b057d9085c2cfd99c0b97aba78d49566bd7c9b47e56033992ac1f3892369bebf2165aaccc6ca3f933c0c33c2e6ef8c1e4 |
28 |
DIST cryptsetup-1.7.0.tar.xz 1224616 SHA256 075524a7cc0db36d12119fa79116750accb1c6c8825d5faa2534b74b8ce3d148 SHA512 3c1732c8f1c18f0497c84c81777f54c398eea9300cd82a18691bf323d303687f4dfdd76010fb86114414f78193630cae4de5b665ce417dbf307f7fef4fa1bef6 WHIRLPOOL 4706317a6f2fe24e5c56df934ee3b0fb64cca2544885ce11ad567369ede1215e8a624b3f4c1e445aa4b59dbf9f644aed461ec422f627f37af4569f74b9f2a1ab |
29 |
|
30 |
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild |
31 |
deleted file mode 100644 |
32 |
index 7cb25db..0000000 |
33 |
--- a/sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,122 +0,0 @@ |
36 |
-# Copyright 1999-2015 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
-# $Id$ |
39 |
- |
40 |
-EAPI=5 |
41 |
-PYTHON_COMPAT=( python2_7 ) |
42 |
- |
43 |
-inherit autotools python-single-r1 linux-info libtool eutils |
44 |
- |
45 |
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt" |
46 |
-HOMEPAGE="https://code.google.com/p/cryptsetup/" |
47 |
-SRC_URI="https://cryptsetup.googlecode.com/files/${P}.tar.bz2" |
48 |
- |
49 |
-LICENSE="GPL-2+" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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} nls 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? ( dev-libs/openssl[static-libs(+)] ) |
66 |
- sys-fs/lvm2[static-libs(+)] |
67 |
- udev? ( virtual/libudev[static-libs(+)] )" |
68 |
-# We have to always depend on ${LIB_DEPEND} rather than put behind |
69 |
-# !static? () because we provide a shared library which links against |
70 |
-# these other packages. #414665 |
71 |
-RDEPEND="static-libs? ( ${LIB_DEPEND} ) |
72 |
- ${LIB_DEPEND//\[static-libs\(+\)\]} |
73 |
- python? ( ${PYTHON_DEPS} )" |
74 |
-DEPEND="${RDEPEND} |
75 |
- virtual/pkgconfig |
76 |
- static? ( ${LIB_DEPEND} )" |
77 |
- |
78 |
-pkg_setup() { |
79 |
- local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC" |
80 |
- local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" |
81 |
- local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" |
82 |
- local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" |
83 |
- check_extra_config |
84 |
- |
85 |
- use python && python-single-r1_pkg_setup |
86 |
-} |
87 |
- |
88 |
-src_prepare() { |
89 |
- sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die |
90 |
- epatch "${FILESDIR}"/${PN}-1.6.1-openssl-static.patch |
91 |
- eautoreconf |
92 |
-} |
93 |
- |
94 |
-src_configure() { |
95 |
- if use kernel ; then |
96 |
- ewarn "Note that kernel backend is very slow for this type of operation" |
97 |
- ewarn "and is provided mainly for embedded systems wanting to avoid" |
98 |
- ewarn "userspace crypto libraries." |
99 |
- fi |
100 |
- |
101 |
- econf \ |
102 |
- --sbindir=/sbin \ |
103 |
- --enable-shared \ |
104 |
- $(use_enable static static-cryptsetup) \ |
105 |
- $(use_enable static-libs static) \ |
106 |
- $(use_enable nls) \ |
107 |
- $(use_enable python) \ |
108 |
- $(use_enable reencrypt cryptsetup-reencrypt) \ |
109 |
- $(use_enable udev) \ |
110 |
- $(use_enable !urandom dev-random) \ |
111 |
- --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/}; do use ${x} && echo ${x} ; done) |
112 |
-} |
113 |
- |
114 |
-src_test() { |
115 |
- if [[ ! -e /dev/mapper/control ]] ; then |
116 |
- ewarn "No /dev/mapper/control found -- skipping tests" |
117 |
- return 0 |
118 |
- fi |
119 |
- local p |
120 |
- for p in /dev/mapper /dev/loop* ; do |
121 |
- addwrite ${p} |
122 |
- done |
123 |
- default |
124 |
-} |
125 |
- |
126 |
-src_install() { |
127 |
- default |
128 |
- if use static ; then |
129 |
- mv "${ED}"/sbin/cryptsetup{.static,} || die |
130 |
- mv "${ED}"/sbin/veritysetup{.static,} || die |
131 |
- use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; } |
132 |
- fi |
133 |
- prune_libtool_files --modules |
134 |
- |
135 |
- newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt |
136 |
- newinitd "${FILESDIR}"/1.5.1-dmcrypt.rc dmcrypt |
137 |
-} |
138 |
- |
139 |
-pkg_postinst() { |
140 |
- if [[ -z ${REPLACING_VERSIONS} ]] ; then |
141 |
- elog "Please see the example for configuring a LUKS mountpoint" |
142 |
- elog "in /etc/conf.d/dmcrypt" |
143 |
- elog |
144 |
- elog "If you are using baselayout-2 then please do:" |
145 |
- elog "rc-update add dmcrypt boot" |
146 |
- elog "This version introduces a command line arguement 'key_timeout'." |
147 |
- elog "If you want the search for the removable key device to timeout" |
148 |
- elog "after 10 seconds add the following to your bootloader config:" |
149 |
- elog "key_timeout=10" |
150 |
- elog "A timeout of 0 will mean it will wait indefinitely." |
151 |
- elog |
152 |
- elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use" |
153 |
- elog "a compatibility mode when using cryptsetup-1.1.x. This can be" |
154 |
- elog "done by specifying the cipher (-c), key size (-s) and hash (-h)." |
155 |
- elog "For more info, see https://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup" |
156 |
- fi |
157 |
-} |
158 |
|
159 |
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.7.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.7.ebuild |
160 |
deleted file mode 100644 |
161 |
index 83cb5fd..0000000 |
162 |
--- a/sys-fs/cryptsetup/cryptsetup-1.6.7.ebuild |
163 |
+++ /dev/null |
164 |
@@ -1,103 +0,0 @@ |
165 |
-# Copyright 1999-2015 Gentoo Foundation |
166 |
-# Distributed under the terms of the GNU General Public License v2 |
167 |
-# $Id$ |
168 |
- |
169 |
-EAPI=5 |
170 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
171 |
- |
172 |
-inherit autotools python-single-r1 linux-info libtool eutils versionator |
173 |
- |
174 |
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt" |
175 |
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" |
176 |
-SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz" |
177 |
- |
178 |
-LICENSE="GPL-2+" |
179 |
-SLOT="0" |
180 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
181 |
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl" |
182 |
-# we don't support nss since it doesn't allow cryptsetup to be built statically |
183 |
-# and it's missing ripemd160 support so it can't provide full backward compatibility |
184 |
-IUSE="${CRYPTO_BACKENDS} nls pwquality python reencrypt static static-libs udev urandom" |
185 |
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) |
186 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
187 |
- static? ( !gcrypt )" #496612 |
188 |
- |
189 |
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)] |
190 |
- dev-libs/popt[static-libs(+)] |
191 |
- sys-apps/util-linux[static-libs(+)] |
192 |
- gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) |
193 |
- nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) |
194 |
- openssl? ( dev-libs/openssl[static-libs(+)] ) |
195 |
- pwquality? ( dev-libs/libpwquality[static-libs(+)] ) |
196 |
- sys-fs/lvm2[static-libs(+)] |
197 |
- udev? ( virtual/libudev[static-libs(+)] )" |
198 |
-# We have to always depend on ${LIB_DEPEND} rather than put behind |
199 |
-# !static? () because we provide a shared library which links against |
200 |
-# these other packages. #414665 |
201 |
-RDEPEND="static-libs? ( ${LIB_DEPEND} ) |
202 |
- ${LIB_DEPEND//\[static-libs\(+\)\]} |
203 |
- python? ( ${PYTHON_DEPS} )" |
204 |
-DEPEND="${RDEPEND} |
205 |
- virtual/pkgconfig |
206 |
- static? ( ${LIB_DEPEND} )" |
207 |
- |
208 |
-pkg_setup() { |
209 |
- local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC" |
210 |
- local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" |
211 |
- local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" |
212 |
- local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" |
213 |
- check_extra_config |
214 |
- |
215 |
- use python && python-single-r1_pkg_setup |
216 |
-} |
217 |
- |
218 |
-src_prepare() { |
219 |
- sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die |
220 |
- epatch_user && eautoreconf |
221 |
-} |
222 |
- |
223 |
-src_configure() { |
224 |
- if use kernel ; then |
225 |
- ewarn "Note that kernel backend is very slow for this type of operation" |
226 |
- ewarn "and is provided mainly for embedded systems wanting to avoid" |
227 |
- ewarn "userspace crypto libraries." |
228 |
- fi |
229 |
- |
230 |
- econf \ |
231 |
- --sbindir=/sbin \ |
232 |
- --enable-shared \ |
233 |
- $(use_enable static static-cryptsetup) \ |
234 |
- $(use_enable static-libs static) \ |
235 |
- $(use_enable nls) \ |
236 |
- $(use_enable pwquality) \ |
237 |
- $(use_enable python) \ |
238 |
- $(use_enable reencrypt cryptsetup-reencrypt) \ |
239 |
- $(use_enable udev) \ |
240 |
- $(use_enable !urandom dev-random) \ |
241 |
- --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) |
242 |
-} |
243 |
- |
244 |
-src_test() { |
245 |
- if [[ ! -e /dev/mapper/control ]] ; then |
246 |
- ewarn "No /dev/mapper/control found -- skipping tests" |
247 |
- return 0 |
248 |
- fi |
249 |
- local p |
250 |
- for p in /dev/mapper /dev/loop* ; do |
251 |
- addwrite ${p} |
252 |
- done |
253 |
- default |
254 |
-} |
255 |
- |
256 |
-src_install() { |
257 |
- default |
258 |
- if use static ; then |
259 |
- mv "${ED}"/sbin/cryptsetup{.static,} || die |
260 |
- mv "${ED}"/sbin/veritysetup{.static,} || die |
261 |
- use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; } |
262 |
- fi |
263 |
- prune_libtool_files --modules |
264 |
- |
265 |
- newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt |
266 |
- newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt |
267 |
-} |
268 |
|
269 |
diff --git a/sys-fs/cryptsetup/files/cryptsetup-1.6.1-openssl-static.patch b/sys-fs/cryptsetup/files/cryptsetup-1.6.1-openssl-static.patch |
270 |
deleted file mode 100644 |
271 |
index e479a30..0000000 |
272 |
--- a/sys-fs/cryptsetup/files/cryptsetup-1.6.1-openssl-static.patch |
273 |
+++ /dev/null |
274 |
@@ -1,13 +0,0 @@ |
275 |
---- a/configure.ac 2013-03-24 05:02:02.000000000 -0400 |
276 |
-+++ b/configure.ac 2013-08-06 15:57:57.844461481 -0400 |
277 |
-@@ -149,8 +149,8 @@ |
278 |
- if test x$enable_static_cryptsetup = xyes; then |
279 |
- saved_PKG_CONFIG=$PKG_CONFIG |
280 |
- PKG_CONFIG="$PKG_CONFIG --static" |
281 |
-- PKG_CHECK_MODULES([OPENSSL], [openssl]) |
282 |
-- CRYPTO_STATIC_LIBS=$OPENSSL_LIBS |
283 |
-+ PKG_CHECK_MODULES([OPENSSL_STATIC], [openssl]) |
284 |
-+ CRYPTO_STATIC_LIBS=$OPENSSL_STATIC_LIBS |
285 |
- PKG_CONFIG=$saved_PKG_CONFIG |
286 |
- fi |
287 |
- NO_FIPS([]) |