From a8f9c46276101fbad8757ea59e7b87253c525b53 Mon Sep 17 00:00:00 2001
From: Wiktor Ciurej <wiktor.ciurej@gmail.com>
Date: Sun, 16 Oct 2022 20:28:14 +0200
Subject: [PATCH 1/2] New package: cryptodev-dkms-1.12

---
 srcpkgs/cryptodev-dkms/files/dkms.conf |  7 ++++++
 srcpkgs/cryptodev-dkms/template        | 32 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 srcpkgs/cryptodev-dkms/files/dkms.conf
 create mode 100644 srcpkgs/cryptodev-dkms/template

diff --git a/srcpkgs/cryptodev-dkms/files/dkms.conf b/srcpkgs/cryptodev-dkms/files/dkms.conf
new file mode 100644
index 00000000000000..e4c7ead1278610
--- /dev/null
+++ b/srcpkgs/cryptodev-dkms/files/dkms.conf
@@ -0,0 +1,7 @@
+PACKAGE_NAME="cryptodev-linux"
+PACKAGE_VERSION="@@VERSION@@"
+BUILT_MODULE_NAME[0]="cryptodev"
+DEST_MODULE_LOCATION[0]="/kernel/misc"
+MAKE[0]="make KERNEL_DIR=/lib/modules/${kernelver}/build"
+CLEAN="make clean"
+AUTOINSTALL="yes"
diff --git a/srcpkgs/cryptodev-dkms/template b/srcpkgs/cryptodev-dkms/template
new file mode 100644
index 00000000000000..17a6503c2ff60f
--- /dev/null
+++ b/srcpkgs/cryptodev-dkms/template
@@ -0,0 +1,32 @@
+# Template file for 'cryptodev-dkms'
+pkgname=cryptodev-dkms
+version=1.12
+revision=1
+archs="i686 x86_64*"
+wrksrc="cryptodev-linux-cryptodev-linux-${version}"
+short_desc="Kernel module for accessing Linux kernel crypto drivers from userspace"
+maintainer="Wiktor Ciurej <wiktor.ciurej@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/cryptodev-linux/cryptodev-linux"
+distfiles="https://github.com/cryptodev-linux/cryptodev-linux/archive/refs/tags/cryptodev-linux-${version}.tar.gz"
+checksum=f51c2254749233b1b1d7ec9445158bd709f124f88e1c650fe2faac83c3a81938
+
+dkms_modules="cryptodev ${version}"
+depends="dkms"
+
+do_build() {
+	cp -f ${FILESDIR}/dkms.conf dkms.conf
+	make dkms.conf
+}
+
+do_install() {
+	vmkdir usr/src/cryptodev-${version}
+	vcopy "*" usr/src/cryptodev-${version}
+	vmkdir usr/include/crypto
+	install -m644 crypto/cryptodev.h ${DESTDIR}/usr/include/crypto/cryptodev.h
+
+	vdoc AUTHORS
+	vdoc INSTALL
+	vdoc NEWS
+	vdoc README
+}

From b3397085fd137a030a4a45d64e8b5a4e31238939 Mon Sep 17 00:00:00 2001
From: Wiktor Ciurej <wiktor.ciurej@gmail.com>
Date: Sat, 29 Oct 2022 19:04:20 +0200
Subject: [PATCH 2/2] cryptodev: Split into dkms and headers subpackages.

---
 srcpkgs/cryptodev-dkms                        |  1 +
 srcpkgs/cryptodev-headers                     |  1 +
 .../files/dkms.conf                           |  2 +-
 .../{cryptodev-dkms => cryptodev}/template    | 36 ++++++++++++++-----
 4 files changed, 30 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/cryptodev-dkms
 create mode 120000 srcpkgs/cryptodev-headers
 rename srcpkgs/{cryptodev-dkms => cryptodev}/files/dkms.conf (82%)
 rename srcpkgs/{cryptodev-dkms => cryptodev}/template (56%)

diff --git a/srcpkgs/cryptodev-dkms b/srcpkgs/cryptodev-dkms
new file mode 120000
index 00000000000000..fa898543b36377
--- /dev/null
+++ b/srcpkgs/cryptodev-dkms
@@ -0,0 +1 @@
+cryptodev
\ No newline at end of file
diff --git a/srcpkgs/cryptodev-headers b/srcpkgs/cryptodev-headers
new file mode 120000
index 00000000000000..fa898543b36377
--- /dev/null
+++ b/srcpkgs/cryptodev-headers
@@ -0,0 +1 @@
+cryptodev
\ No newline at end of file
diff --git a/srcpkgs/cryptodev-dkms/files/dkms.conf b/srcpkgs/cryptodev/files/dkms.conf
similarity index 82%
rename from srcpkgs/cryptodev-dkms/files/dkms.conf
rename to srcpkgs/cryptodev/files/dkms.conf
index e4c7ead1278610..f7b7fe5b86358b 100644
--- a/srcpkgs/cryptodev-dkms/files/dkms.conf
+++ b/srcpkgs/cryptodev/files/dkms.conf
@@ -1,7 +1,7 @@
 PACKAGE_NAME="cryptodev-linux"
 PACKAGE_VERSION="@@VERSION@@"
 BUILT_MODULE_NAME[0]="cryptodev"
-DEST_MODULE_LOCATION[0]="/kernel/misc"
+DEST_MODULE_LOCATION[0]="/kernel/crypto"
 MAKE[0]="make KERNEL_DIR=/lib/modules/${kernelver}/build"
 CLEAN="make clean"
 AUTOINSTALL="yes"
diff --git a/srcpkgs/cryptodev-dkms/template b/srcpkgs/cryptodev/template
similarity index 56%
rename from srcpkgs/cryptodev-dkms/template
rename to srcpkgs/cryptodev/template
index 17a6503c2ff60f..a080b1bce36e33 100644
--- a/srcpkgs/cryptodev-dkms/template
+++ b/srcpkgs/cryptodev/template
@@ -2,31 +2,49 @@
 pkgname=cryptodev-dkms
 version=1.12
 revision=1
-archs="i686 x86_64*"
 wrksrc="cryptodev-linux-cryptodev-linux-${version}"
-short_desc="Kernel module for accessing Linux kernel crypto drivers from userspace"
+checkdepends="openssl-devel"
+short_desc="Interface for kernel crypto drivers."
 maintainer="Wiktor Ciurej <wiktor.ciurej@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/cryptodev-linux/cryptodev-linux"
 distfiles="https://github.com/cryptodev-linux/cryptodev-linux/archive/refs/tags/cryptodev-linux-${version}.tar.gz"
 checksum=f51c2254749233b1b1d7ec9445158bd709f124f88e1c650fe2faac83c3a81938
+subpackages="cryptodev-dkms cryptodev-headers"
 
-dkms_modules="cryptodev ${version}"
-depends="dkms"
-
-do_build() {
+pre_install() {
 	cp -f ${FILESDIR}/dkms.conf dkms.conf
-	make dkms.conf
 }
 
 do_install() {
 	vmkdir usr/src/cryptodev-${version}
 	vcopy "*" usr/src/cryptodev-${version}
-	vmkdir usr/include/crypto
-	install -m644 crypto/cryptodev.h ${DESTDIR}/usr/include/crypto/cryptodev.h
 
 	vdoc AUTHORS
 	vdoc INSTALL
 	vdoc NEWS
 	vdoc README
 }
+
+cryptodev-dkms_package() {
+	short_desc="${_desc} - DKMS kernel module"
+	depends="dkms"
+	dkms_modules="cryptodev ${version}"
+
+	pkg_install() {
+		vmove usr/src
+	}
+}
+
+cryptodev-headers_package() {
+	short_desc="${_desc} - headers"
+
+	pkg_install() {
+		vmkdir usr/include/crypto/
+		vinstall crypto/cryptodev.h 0644 usr/include/crypto/
+	}
+}
+
+do_check() {
+	make check
+}