From c67132264d90c270dbfe79fd5bbd4dd7ca5d89ab Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Sep 2021 10:11:58 +0200 Subject: [PATCH] acpi_call-dkms: update to 1.2.2, drop upstreamed patches --- .../patches/dkms_conf_from_outside.patch | 69 ------------------- .../patches/null_pointer_exception.patch | 30 -------- srcpkgs/acpi_call-dkms/template | 6 +- 3 files changed, 3 insertions(+), 102 deletions(-) delete mode 100644 srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch delete mode 100644 srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch diff --git a/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch b/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch deleted file mode 100644 index 5463fd7f8c..0000000000 --- a/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 4b14040db865034eb4aa215efd212307a9c60167 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89rico=20Nogueira?= -Date: Sun, 18 Jul 2021 18:16:13 -0300 -Subject: [PATCH] Allow dkms.conf to be used outside of the repository - -Add a Makefile target that turns the dkms.conf.in template into a -dkms.conf file that has all the necessary informantion to be installed -directly on a system. - -All the dkms-* targets need to depend on the dkms.conf file, now. ---- - .gitignore | 1 + - Makefile | 11 +++++++---- - dkms.conf => dkms.conf.in | 2 +- - 3 files changed, 9 insertions(+), 5 deletions(-) - rename dkms.conf => dkms.conf.in (84%) - -diff --git a/.gitignore b/.gitignore -index a73e5d1..9f39b24 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -9,3 +9,4 @@ MANIFEST - Module.symvers - debian/tmp/* - modules.order -+dkms.conf -diff --git a/Makefile b/Makefile -index 269b43f..0094f7e 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,16 +17,19 @@ load: - -/sbin/rmmod acpi_call - /sbin/insmod acpi_call.ko - --dkms-add: -+dkms.conf: dkms.conf.in -+ sed "s/@@VERSION@@/$(VERSION)/" $^ > $@ -+ -+dkms-add: dkms.conf - /usr/sbin/dkms add $(CURDIR) - --dkms-build: -+dkms-build: dkms.conf - /usr/sbin/dkms build acpi_call/$(VERSION) - --dkms-install: -+dkms-install: dkms.conf - /usr/sbin/dkms install acpi_call/$(VERSION) - --dkms-remove: -+dkms-remove: dkms.conf - /usr/sbin/dkms remove acpi_call/$(VERSION) --all - - modprobe-install: -diff --git a/dkms.conf b/dkms.conf.in -similarity index 84% -rename from dkms.conf -rename to dkms.conf.in -index 780fb50..b927370 100644 ---- a/dkms.conf -+++ b/dkms.conf.in -@@ -1,5 +1,5 @@ - PACKAGE_NAME="acpi_call" --PACKAGE_VERSION="$(cat VERSION)" -+PACKAGE_VERSION="@@VERSION@@" - MAKE="KDIR=/lib/modules/${kernelver}/build make" - CLEAN="make clean" - BUILT_MODULE_NAME[0]="acpi_call" - diff --git a/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch deleted file mode 100644 index 786e639c03..0000000000 --- a/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 48011f82726c263f49a2b9ca3d9f674bdb4cfd22 Mon Sep 17 00:00:00 2001 -From: Alexander Wetzel -Date: Thu, 8 Jul 2021 16:37:43 +0200 -Subject: [PATCH] Fix for 5.13+ kernels - -Upstream commit d4455faccd6c ('proc: mandate ->proc_lseek -in "struct proc_ops"') made seek support for proc mandatory. - -Not providing it will cause a null pointer exception for kernels ->=5.13.0 - -Signed-off-by: Alexander Wetzel ---- - acpi_call.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/acpi_call.c b/acpi_call.c -index ebdda25..9fd9886 100644 ---- a/acpi_call.c -+++ b/acpi_call.c -@@ -369,6 +369,9 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff, - static struct proc_ops proc_acpi_operations = { - .proc_read = acpi_proc_read, - .proc_write = acpi_proc_write, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) -+ .proc_lseek = default_llseek, -+#endif - }; - #else - static struct file_operations proc_acpi_operations = { diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template index ae5b9d6564..a2a4250b2e 100644 --- a/srcpkgs/acpi_call-dkms/template +++ b/srcpkgs/acpi_call-dkms/template @@ -1,6 +1,6 @@ # Template file for 'acpi_call-dkms' pkgname=acpi_call-dkms -version=1.2.1 +version=1.2.2 revision=1 archs="i686 x86_64*" wrksrc=acpi_call-${version} @@ -8,8 +8,8 @@ short_desc="Kernel module allowing calls to ACPI methods through /proc/acpi/call maintainer="Daniel A. Maierhofer " license="GPL-3.0-or-later" homepage="https://github.com/nix-community/acpi_call" -distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=aa84ac8a209e18ee6de5fa809abd3474fdca67cda3c3256f0650c4fce78d4a0f +distfiles="https://github.com/nix-community/acpi_call/archive/refs/tags/v${version}.tar.gz" +checksum=d83919fc5e93b2605b262aae4c19a35bcc365b3cbade912d09fd366e8a5cca01 dkms_modules="acpi_call ${version}" depends="dkms"