diff options
Diffstat (limited to 'sys-kernel/cryptodev')
| -rw-r--r-- | sys-kernel/cryptodev/Manifest | 9 | ||||
| -rw-r--r-- | sys-kernel/cryptodev/cryptodev-1.7.ebuild | 54 | ||||
| -rw-r--r-- | sys-kernel/cryptodev/cryptodev-1.9.ebuild | 6 | ||||
| -rw-r--r-- | sys-kernel/cryptodev/cryptodev-9999.ebuild | 3 | ||||
| -rw-r--r-- | sys-kernel/cryptodev/files/ioctl.c-Fix-build-with-linux-4.17.patch | 39 | ||||
| -rw-r--r-- | sys-kernel/cryptodev/metadata.xml | 6 |
6 files changed, 54 insertions, 63 deletions
diff --git a/sys-kernel/cryptodev/Manifest b/sys-kernel/cryptodev/Manifest index 165fbb6e32cd..86357c27c352 100644 --- a/sys-kernel/cryptodev/Manifest +++ b/sys-kernel/cryptodev/Manifest @@ -1,7 +1,6 @@ AUX cryptodev-1.9-fix-build-with-4.14-629958.patch 1481 BLAKE2B d79780ae1c89f4a32c9e6cd75d3acfa2e0ccf1a00baa2f86d52cf42d4fb0a50c50848e1bdcc667b4defd3cef530ef36e9522700fc4f457d9e909ca545312a9b6 SHA512 3afc89f9099a68688d2e1fc5558444e841971ff42268f93b01bec5173360c8c0e234ff08641422c74dff67d8928d268d3604a897150e8e2b718ff8a374f8a48e -DIST cryptodev-linux-1.7.tar.gz 52827 BLAKE2B b64b317dfae942c0323acec6cf14b4bf7c6313b60b95d925f0c1c02b1d0b55d17ee8924d5fba1a4f18c5c9b3fd24d437103159986c03dc6c6251ee05d19f17dd SHA512 b0073bc547782973587654cb14205ec624059ef46f88ed2b36236d37203f9231ffb8124489b1b2fea735eb7f89bd1011f0d1546eae7b6f562e26ec7a72a59b6c +AUX ioctl.c-Fix-build-with-linux-4.17.patch 1210 BLAKE2B 90f0aa56a2dc0a926e1537d22fe2e34744d884beb4616082d88e5d4029033e6d52a3b04b1a522604e07801bb8415f61e55fd8e2b066905f859f3ae1c42a2872a SHA512 008e96390eec46be7d412af8baa3d73a8d7d61c4e8595b32665f7e16ac71f364a826bbdab770839d33080d60ab61441e4e95db06b8a89dab70e9c56fe86e49da DIST cryptodev-linux-1.9.tar.gz 54409 BLAKE2B 48427235409c792001f420c8a66ab4320457a1cf22c1bf47c8d0a40ef82491ffe64a27b7f2e7ed92f3b8b426fc8425bd15b2bf9c875bb222de8b738022adf99f SHA512 8aff822e834d7d77f2b954b3f6de22d7de9659dac27b8a185b7ca060ff4b17bd38e287bb5c19043a53f5015a3f000d31be961695152bad0fb9f55785b2753d29 -EBUILD cryptodev-1.7.ebuild 1137 BLAKE2B 5089baf94476297c84e5a1ab0c0aff7bb801e1327428dc03eb5912ed13e7f472d4275d31b3e78457a0a2ee32e12220bce91f84e2e3829ee22e529a78824a19d2 SHA512 8ff5d43309c5603a8c5c3c6ba9ca7f6c93f7dbc4c436392a941794cf0a30397e73df768878380903637f43ed23f7db0ba8a506b61f65886f2eb017c5c32d4c0f -EBUILD cryptodev-1.9.ebuild 1103 BLAKE2B cc59b4e0fb50af0f75450a785b0de280710debfc64500f092f232d62c45fe8a45886a20d35ee43fba67af455c512e00dfb6321b8e2b83d4c9a4b44e54b86c949 SHA512 4d42f1894211d2d978f197bd6d37583e426f90be177c88d8bebe8f138606fd15deddd5a582d60a82c56d790ca67bdab7c541fa37262188dcad4df20b8bc90e98 -EBUILD cryptodev-9999.ebuild 1189 BLAKE2B 9bdd5027cafdca9dfd95eba4454ea43707bb9d00e7e6d690b2084f8947d0294c1e1a7e770804a31927bd2f8d415c4d0d740a5e0a0ea9ec44f5da4548a3508997 SHA512 afb8b8f4bd773f1a6b3f64d09f22f7586b0607bacced011b9d2451fd314a7f7bfb3a6e1024cb8d05b0fd44c73e673568763e3a11a17b1294032a31cbf6c37be8 -MISC metadata.xml 167 BLAKE2B ee34aa7c86910531f97e3ba5ec71670012761b3523ddf4e0e1fccb2134b6ddaabdc9329c3b45d697b4f745a707dd513f6b71a8cd32fb840a6b0b5af774ac0015 SHA512 bb251ebe24a6b0c9ff8ee0298e1aa3653443fc97bf44ff71ff56b88b82c36696a5db75c19cb345a1852e6a455874c603efff97b15799d7e8a224124a312df8b8 +EBUILD cryptodev-1.9.ebuild 1208 BLAKE2B 9264fef763bfdd2d3a62fbf188ca352f899f5aebd1c3f8dbf7b182bdbc52cc111dcb7741d9df7dcfa541c6e2c84b776c547f563be328424a42b303a9d936cd2e SHA512 cc0391ef55e6b9a9746dbb6ed6fa2112e1657aba2256579b0a1b074e17db20b44ba5d5cd9a15466a447d7219d57c5cd4f1477a0edfca967ddf79cc3dbd44cd45 +EBUILD cryptodev-9999.ebuild 1234 BLAKE2B 5eeefb6f9d03a03b5eae2cc4e1fbfe68964a6cf9ea2292cb93c63109c674f6af3e66d7c9a8aa3bcfa5dc43510908908f9d3d9212e38195abd7b022de8db2bf70 SHA512 6e25d83365a040f04bd6ed72e0c09dc1555716b216ec1686b0a91551836584cce94366f090247eede43a87d9ba914fb71de954b61276bd51d25ef46a65aaf656 +MISC metadata.xml 247 BLAKE2B 7d02d43b3c72e93cf47c0e3e1461126322143c11c20f6d2ddc450540e9b7e298603366305dd0aa69e3cd724ff8289bbe8ad7f71356620597101e5757bbec37b0 SHA512 4cb53ef3f9c97ccfb06730609875c880abe563278461b2f16420e354dd83531adcabcdee9814c999fe93ae880d788e3946b9f09374b1724eefe80a7de92e72f6 diff --git a/sys-kernel/cryptodev/cryptodev-1.7.ebuild b/sys-kernel/cryptodev/cryptodev-1.7.ebuild deleted file mode 100644 index 7a99d764ec4e..000000000000 --- a/sys-kernel/cryptodev/cryptodev-1.7.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit linux-info linux-mod - -DESCRIPTION="device that allows access to Linux kernel cryptographic drivers" -HOMEPAGE="http://cryptodev-linux.org/index.html" -SRC_URI="http://nwl.cc/pub/cryptodev-linux/${PN}-linux-${PV}.tar.gz" -KEYWORDS="~amd64 ~arm ~x86" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="examples" - -DEPEND="virtual/linux-sources" -RDEPEND="" -#test do not compile -RESTRICT="test" -S=${WORKDIR}/${PN}-linux-${PV} - -MODULE_NAMES="cryptodev(extra:${S})" - -pkg_pretend() { - if use kernel_linux ; then - CONFIG_CHECK="~CRYPTO ~CRYPTO_BLKCIPHER ~CRYPTO_AEAD" - check_extra_config - fi -} - -pkg_setup() { - if use kernel_linux ; then - linux-mod_pkg_setup - else - die "cryptodev ebuild only support linux" - fi - BUILD_TARGETS="build" - export KERNEL_DIR -} - -src_prepare() { - # get_unused_fd was removed in 3.19 - sed -i 's,get_unused_fd(),get_unused_fd_flags(0),' ioctl.c || die -} - -src_install() { - linux-mod_src_install - if use examples ; then - docinto examples - dodoc example/* - fi - insinto /usr/include/crypto - doins crypto/cryptodev.h -} diff --git a/sys-kernel/cryptodev/cryptodev-1.9.ebuild b/sys-kernel/cryptodev/cryptodev-1.9.ebuild index e4e62d997e60..7ac492ca811d 100644 --- a/sys-kernel/cryptodev/cryptodev-1.9.ebuild +++ b/sys-kernel/cryptodev/cryptodev-1.9.ebuild @@ -21,8 +21,12 @@ RESTRICT="test" S=${WORKDIR}/${PN}-linux-${PV} MODULE_NAMES="cryptodev(extra:${S})" +BUILD_PARAMS="KERNEL_DIR=\"\${KV_OUT_DIR}\"" -PATCHES="${FILESDIR}/cryptodev-1.9-fix-build-with-4.14-629958.patch" +PATCHES=( + "${FILESDIR}"/cryptodev-1.9-fix-build-with-4.14-629958.patch + "${FILESDIR}"/ioctl.c-Fix-build-with-linux-4.17.patch +) pkg_pretend() { if use kernel_linux ; then diff --git a/sys-kernel/cryptodev/cryptodev-9999.ebuild b/sys-kernel/cryptodev/cryptodev-9999.ebuild index 195433b58015..97182739422a 100644 --- a/sys-kernel/cryptodev/cryptodev-9999.ebuild +++ b/sys-kernel/cryptodev/cryptodev-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,6 +27,7 @@ DEPEND="virtual/linux-sources" RESTRICT="test" MODULE_NAMES="cryptodev(extra:${S})" +BUILD_PARAMS="KERNEL_DIR=\"\${KV_OUT_DIR}\"" pkg_pretend() { if use kernel_linux ; then 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 new file mode 100644 index 000000000000..3eb81e4d9d73 --- /dev/null +++ b/sys-kernel/cryptodev/files/ioctl.c-Fix-build-with-linux-4.17.patch @@ -0,0 +1,39 @@ +From f60aa08c63fc02780554a0a12180a478ca27d49f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com> +Date: Wed, 23 May 2018 18:43:39 +0300 +Subject: [PATCH] ioctl.c: Fix build with linux 4.17 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since kernel 4.17-rc1, sys_* syscalls can no longer be called directly: +819671ff849b ("syscalls: define and explain goal to not call syscalls in the kernel") + +Since cryptodev uses sys_close() - and this has been removed in commit: +2ca2a09d6215 ("fs: add ksys_close() wrapper; remove in-kernel calls to sys_close()") +cryptodev has to be updated to use the ksys_close() wrapper. + +Signed-off-by: Horia Geantă <horia.geanta@nxp.com> +--- + ioctl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ioctl.c b/ioctl.c +index d831b0c..2571034 100644 +--- a/ioctl.c ++++ b/ioctl.c +@@ -828,7 +828,11 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_) + fd = clonefd(filp); + ret = put_user(fd, p); + if (unlikely(ret)) { ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) + sys_close(fd); ++#else ++ ksys_close(fd); ++#endif + return ret; + } + return ret; +-- +2.16.4 + diff --git a/sys-kernel/cryptodev/metadata.xml b/sys-kernel/cryptodev/metadata.xml index 684b678e70f5..c7bb627138ce 100644 --- a/sys-kernel/cryptodev/metadata.xml +++ b/sys-kernel/cryptodev/metadata.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>swegener@gentoo.org</email> + <name>Sven Wegener</name> + </maintainer> </pkgmetadata> - |