1 |
commit: 9476f32feb9b4aa803d4b47c4fb927000203e1f6 |
2 |
Author: Sven Wegener <swegener <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 1 18:46:27 2021 +0000 |
4 |
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 1 18:46:27 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9476f32f |
7 |
|
8 |
sys-kernel/cryptodev: Cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.17, Repoman-3.0.2 |
11 |
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org> |
12 |
|
13 |
sys-kernel/cryptodev/Manifest | 1 - |
14 |
sys-kernel/cryptodev/cryptodev-1.9-r1.ebuild | 56 ---------------------- |
15 |
.../cryptodev-1.9-fix-build-with-4.14-629958.patch | 44 ----------------- |
16 |
.../files/ioctl.c-Fix-build-with-linux-4.17.patch | 39 --------------- |
17 |
4 files changed, 140 deletions(-) |
18 |
|
19 |
diff --git a/sys-kernel/cryptodev/Manifest b/sys-kernel/cryptodev/Manifest |
20 |
index 5fa4d78fc0b..37705199474 100644 |
21 |
--- a/sys-kernel/cryptodev/Manifest |
22 |
+++ b/sys-kernel/cryptodev/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
DIST cryptodev-linux-1.11.tar.gz 56876 BLAKE2B 97cf09c515c586372b2c5bd450e445afd5f80ed8ab39002545dc550c63480469a5318214f467444618e4e1783b9ab999b550cfb16d8ded6de26671a0727d06c2 SHA512 f7b76e9a154945514e2238cd7106cb50cea8120febc79228d6a8ba2dfaf98d5f0756d970df76fd63bda4755d7e0d78331aea394c3c5c18794b7ef1a8738fddba |
25 |
DIST cryptodev-linux-1.12.tar.gz 56922 BLAKE2B ec3d6585cbc15027468c0d009dfad1437286e71f90247b6b07067e1355483d9a3184cb0134ab4cfb406168b1b506fb08d4a0ab6476b71305267769a33e5ed2de SHA512 75f4f20ee7474375fd515cfd4f247f9a61739ac766525cd8fe007adfa44129d90077568d59409f577202a4d8883539b0d533dd5e060a1065b61106f68ea5e4b3 |
26 |
-DIST cryptodev-linux-1.9.tar.gz 54409 BLAKE2B 48427235409c792001f420c8a66ab4320457a1cf22c1bf47c8d0a40ef82491ffe64a27b7f2e7ed92f3b8b426fc8425bd15b2bf9c875bb222de8b738022adf99f SHA512 8aff822e834d7d77f2b954b3f6de22d7de9659dac27b8a185b7ca060ff4b17bd38e287bb5c19043a53f5015a3f000d31be961695152bad0fb9f55785b2753d29 |
27 |
|
28 |
diff --git a/sys-kernel/cryptodev/cryptodev-1.9-r1.ebuild b/sys-kernel/cryptodev/cryptodev-1.9-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 6041c66cd1d..00000000000 |
31 |
--- a/sys-kernel/cryptodev/cryptodev-1.9-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,56 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
-inherit linux-info linux-mod |
39 |
- |
40 |
-DESCRIPTION="device that allows access to Linux kernel cryptographic drivers" |
41 |
-HOMEPAGE="http://cryptodev-linux.org/index.html" |
42 |
-SRC_URI="http://nwl.cc/pub/cryptodev-linux/${PN}-linux-${PV}.tar.gz" |
43 |
-KEYWORDS="~amd64 ~arm ~x86" |
44 |
- |
45 |
-LICENSE="GPL-2+" |
46 |
-SLOT="0" |
47 |
-IUSE="examples" |
48 |
- |
49 |
-DEPEND="virtual/linux-sources" |
50 |
- |
51 |
-#test requires that the module is already loaded |
52 |
-RESTRICT="test" |
53 |
- |
54 |
-S=${WORKDIR}/${PN}-linux-${PV} |
55 |
- |
56 |
-MODULE_NAMES="cryptodev(extra:${S})" |
57 |
-BUILD_PARAMS="KERNEL_DIR=\"\${KV_OUT_DIR}\"" |
58 |
- |
59 |
-PATCHES=( |
60 |
- "${FILESDIR}"/cryptodev-1.9-fix-build-with-4.14-629958.patch |
61 |
- "${FILESDIR}"/ioctl.c-Fix-build-with-linux-4.17.patch |
62 |
-) |
63 |
- |
64 |
-pkg_pretend() { |
65 |
- if use kernel_linux ; then |
66 |
- CONFIG_CHECK="~CRYPTO ~CRYPTO_BLKCIPHER ~CRYPTO_AEAD" |
67 |
- check_extra_config |
68 |
- fi |
69 |
-} |
70 |
- |
71 |
-pkg_setup() { |
72 |
- if use kernel_linux ; then |
73 |
- linux-mod_pkg_setup |
74 |
- else |
75 |
- die "cryptodev ebuild only support linux" |
76 |
- fi |
77 |
- BUILD_TARGETS="build" |
78 |
- export KERNEL_DIR |
79 |
-} |
80 |
- |
81 |
-src_install() { |
82 |
- linux-mod_src_install |
83 |
- if use examples ; then |
84 |
- docinto examples |
85 |
- dodoc example/* |
86 |
- fi |
87 |
- insinto /usr/include/crypto |
88 |
- doins crypto/cryptodev.h |
89 |
-} |
90 |
|
91 |
diff --git a/sys-kernel/cryptodev/files/cryptodev-1.9-fix-build-with-4.14-629958.patch b/sys-kernel/cryptodev/files/cryptodev-1.9-fix-build-with-4.14-629958.patch |
92 |
deleted file mode 100644 |
93 |
index 8a78d5ec876..00000000000 |
94 |
--- a/sys-kernel/cryptodev/files/cryptodev-1.9-fix-build-with-4.14-629958.patch |
95 |
+++ /dev/null |
96 |
@@ -1,44 +0,0 @@ |
97 |
-From f0d69774afb27ffc62bf353465fba145e70cb85a Mon Sep 17 00:00:00 2001 |
98 |
-From: Ricardo Ribalda Delgado <ricardo.ribalda@×××××.com> |
99 |
-Date: Mon, 4 Sep 2017 11:05:08 +0200 |
100 |
-Subject: [PATCH] ioctl.c: Fix build with linux 4.13 |
101 |
- |
102 |
-git/ioctl.c:1127:3: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] |
103 |
- {0, }, |
104 |
- ^ |
105 |
-note: (near initialization for 'verbosity_ctl_dir[1]') |
106 |
-git/ioctl.c:1136:3: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] |
107 |
- {0, }, |
108 |
- ^ |
109 |
- |
110 |
-Linux kernel has added -Werror=designated-init around 4.11 (c834f0e8a8b) |
111 |
-triggering build errors with gcc 5 and 6 (but not with gcc 4) |
112 |
- |
113 |
-Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@×××××.com> |
114 |
-Signed-off-by: Cristian Stoica <cristian.stoica@×××.com> |
115 |
---- |
116 |
- ioctl.c | 4 ++-- |
117 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
118 |
- |
119 |
-diff --git a/ioctl.c b/ioctl.c |
120 |
-index 0385203..8d4a162 100644 |
121 |
---- a/ioctl.c |
122 |
-+++ b/ioctl.c |
123 |
-@@ -1124,7 +1124,7 @@ static struct ctl_table verbosity_ctl_dir[] = { |
124 |
- .mode = 0644, |
125 |
- .proc_handler = proc_dointvec, |
126 |
- }, |
127 |
-- {0, }, |
128 |
-+ {}, |
129 |
- }; |
130 |
- |
131 |
- static struct ctl_table verbosity_ctl_root[] = { |
132 |
-@@ -1133,7 +1133,7 @@ static struct ctl_table verbosity_ctl_root[] = { |
133 |
- .mode = 0555, |
134 |
- .child = verbosity_ctl_dir, |
135 |
- }, |
136 |
-- {0, }, |
137 |
-+ {}, |
138 |
- }; |
139 |
- static struct ctl_table_header *verbosity_sysctl_header; |
140 |
- static int __init init_cryptodev(void) |
141 |
|
142 |
diff --git a/sys-kernel/cryptodev/files/ioctl.c-Fix-build-with-linux-4.17.patch b/sys-kernel/cryptodev/files/ioctl.c-Fix-build-with-linux-4.17.patch |
143 |
deleted file mode 100644 |
144 |
index 3eb81e4d9d7..00000000000 |
145 |
--- a/sys-kernel/cryptodev/files/ioctl.c-Fix-build-with-linux-4.17.patch |
146 |
+++ /dev/null |
147 |
@@ -1,39 +0,0 @@ |
148 |
-From f60aa08c63fc02780554a0a12180a478ca27d49f Mon Sep 17 00:00:00 2001 |
149 |
-From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@×××.com> |
150 |
-Date: Wed, 23 May 2018 18:43:39 +0300 |
151 |
-Subject: [PATCH] ioctl.c: Fix build with linux 4.17 |
152 |
-MIME-Version: 1.0 |
153 |
-Content-Type: text/plain; charset=UTF-8 |
154 |
-Content-Transfer-Encoding: 8bit |
155 |
- |
156 |
-Since kernel 4.17-rc1, sys_* syscalls can no longer be called directly: |
157 |
-819671ff849b ("syscalls: define and explain goal to not call syscalls in the kernel") |
158 |
- |
159 |
-Since cryptodev uses sys_close() - and this has been removed in commit: |
160 |
-2ca2a09d6215 ("fs: add ksys_close() wrapper; remove in-kernel calls to sys_close()") |
161 |
-cryptodev has to be updated to use the ksys_close() wrapper. |
162 |
- |
163 |
-Signed-off-by: Horia Geantă <horia.geanta@×××.com> |
164 |
---- |
165 |
- ioctl.c | 4 ++++ |
166 |
- 1 file changed, 4 insertions(+) |
167 |
- |
168 |
-diff --git a/ioctl.c b/ioctl.c |
169 |
-index d831b0c..2571034 100644 |
170 |
---- a/ioctl.c |
171 |
-+++ b/ioctl.c |
172 |
-@@ -828,7 +828,11 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_) |
173 |
- fd = clonefd(filp); |
174 |
- ret = put_user(fd, p); |
175 |
- if (unlikely(ret)) { |
176 |
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) |
177 |
- sys_close(fd); |
178 |
-+#else |
179 |
-+ ksys_close(fd); |
180 |
-+#endif |
181 |
- return ret; |
182 |
- } |
183 |
- return ret; |
184 |
--- |
185 |
-2.16.4 |
186 |
- |