gentoo resync : 12.07.2021

6 files changed, 46 insertions, 16 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index b5dfcb1a2b17..2af1423c030e 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index d6813286ac3c..73c2576a5a0b 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -1,4 +1,5 @@
+AUX acpi_call-1.2.1-kernel-5.13.patch 977 BLAKE2B 424730bdb4dfac67f1a8f882539685367813b781d4e5fb75c8b36eab9a558553213b5a457a82e55be2ab4e08596601f43de1845050ac60371511d2504b2f6ace SHA512 587ba8155311bacbf8a150c36857858b6399feac87aeee5f5f5075c4954b730d909fc7c8d8c2c094cc801bff669ccac9d24f362eeb103d96c53deba543e5e388
 DIST acpi_call-1.2.1.tar.gz 12340 BLAKE2B e113f8c150c8e2f4f75ca1dd81cc4399f24bedcd716c9158561e8cb9f5e63e77cade18e6543ade4ec383690bf7041a583e297948789773db8ad9b63a957e61e8 SHA512 91553cf70a6b0173a6bfec38fcfb62ecd17614c91a888933704bb57d788592ce6981b01fb7c5e4bb8efdbe7fe229860c9f2be4b549dd71b232704c8bf0b3cfee
-EBUILD acpi_call-1.2.1.ebuild 695 BLAKE2B 8df9796c1c8c2d66d2a0e02b42170477abae9fe39cacb914a026e06b52289dfa222d72780fa82679b4ac73fb7b1363f0342702a70f97ad1b5631c9f01b106c70 SHA512 d924f609372a0965218a2bbb0380403a71b0207863e5f16938495e62948cda4e10c769a9950f1b3dba8272f4923964f2e1c6072e261ddd179afc0f1ef3097071
+EBUILD acpi_call-1.2.1.ebuild 745 BLAKE2B b6bec39ac75d74897a80bc957c557846b872b580e0885340ce602cdc9469aaaf5c666076ae71686b6cb16e6080dd768527c126000400b12e0c8f30382df28ef7 SHA512 d1be7f89409827ee157907b68f419287cafa707442373bb90f1686699dd39d2a52ef673abfd59028d5f03c90a4e210266039c9ca8f8b380d75f9e6eaaac55bd9
 EBUILD acpi_call-9999.ebuild 670 BLAKE2B 02dd23b77eb28cf9425e3039c61f594a044c0dd7bd4ded1c91d70bb2a970e0b7b5adebe4c6ead52ec3fdabeae1ff5bb69c5cb980d452804e1966ed6c2d510a63 SHA512 7ee0c7e030b5494c94b4e74c85c29bb31a579db2f9a3bb67e0c5ca4edd3da5511a6aba1a8ee78ab430440a58a23ea1e3afc8e8b0f5bdaae1738c77c29aaf626f
 MISC metadata.xml 409 BLAKE2B 83af55b1f34e736097e70109b4e6f42929a25104f8d26c75ddce26d33a68669add53a47854a817ba3b5201743f02f25e5e23309efa5463752c6cc0b52f31eeaa SHA512 d1a9ecd438eaf4f7e19bb224c4d86dae71ba3bf42f9f4cdab63dbe8246228c2ed348988ed1cde0dc418c6a952264ba8be0940555c63ac270116ca2aba4988c48
diff --git a/sys-power/acpi_call/acpi_call-1.2.1.ebuild b/sys-power/acpi_call/acpi_call-1.2.1.ebuild
index 90e2e0158a01..418c4c459dee 100644
--- a/sys-power/acpi_call/acpi_call-1.2.1.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.2.1.ebuild
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="examples"
 
+PATCHES=( "${FILESDIR}/${P}-kernel-5.13.patch" )
+
 BUILD_TARGETS="default"
 CONFIG_CHECK="ACPI"
 MODULE_NAMES="acpi_call(misc:${S})"
diff --git a/sys-power/acpi_call/files/acpi_call-1.2.1-kernel-5.13.patch b/sys-power/acpi_call/files/acpi_call-1.2.1-kernel-5.13.patch
new file mode 100644
index 000000000000..786e639c03ca
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-1.2.1-kernel-5.13.patch
@@ -0,0 +1,30 @@
+From 48011f82726c263f49a2b9ca3d9f674bdb4cfd22 Mon Sep 17 00:00:00 2001
+From: Alexander Wetzel <alexander@wetzel-home.de>
+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 <alexander@wetzel-home.de>
+---
+ 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/sys-power/nut/Manifest b/sys-power/nut/Manifest
index f4982b1df8d3..588848e7cc88 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -10,5 +10,5 @@ AUX nut-2.7.4-py3.patch 1940 BLAKE2B 5bb77bca18ad40a1ba4e579098accb0135c0f4b2443
 AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1
 AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee
 DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
-EBUILD nut-2.7.4-r6.ebuild 8997 BLAKE2B 475842f820d5358242bec32a77ca3148963287ac7cb2e47d478d210a5fcdec2ab7e9988bdca0c4c02af19f6fd46f1bcda9bbd24ae1a56fc883c615b3e596783b SHA512 5f88eb033be8bf77499ac5519acd55d8189ca90b6b50d0a3319d9b458fc6065213754c494e5bbdb8448f94eac52f713c7cfe3d1bd54ec74e450dc7d38938d379
+EBUILD nut-2.7.4-r7.ebuild 8748 BLAKE2B 7ef88bc7588399130a0f72d63f0d9f38f150fa5b8675520e35f2304e1f01873094d37f6eb7c5badd698f01459dffebca68da42c5b11c752d0cebb781ba0a91e4 SHA512 d7425b3ba2b16fa77f597df10d6e91857c7409ee80b26f51e4f1db893ef7f81d3d6f9b6cf01b73d28f513312e9d55a02cacb8f6190bbc9e017f736a3928ffa9a
 MISC metadata.xml 5272 BLAKE2B cc580840e8c437fb37cd8c2132d2daf6751097374ccf11c5a7519756adc6b5d3654e3c40cfe7a66cee8ee5b016c09f65f4f425e4edbd503aed88da5f0eedc1a9 SHA512 f3133fcd673344452904f95d5898fdca3988970bf6526f50191cfa1741fb222468dc00652e968ba305a21851e6a070478627d181c26f6a1d152a215399f469ee
diff --git a/sys-power/nut/nut-2.7.4-r6.ebuild b/sys-power/nut/nut-2.7.4-r7.ebuild
index 740b94d0c143..581389d74b18 100644
--- a/sys-power/nut/nut-2.7.4-r6.ebuild
+++ b/sys-power/nut/nut-2.7.4-r7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic systemd toolchain-funcs user
+inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic systemd toolchain-funcs
 
 MY_P=${P/_/-}
 
@@ -16,6 +16,11 @@ KEYWORDS="amd64 arm ppc ppc64 x86"
 
 IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
 
+CDEPEND="
+	acct-group/nut
+	acct-user/nut
+"
+
 DEPEND="
 	dev-libs/libltdl:*
 	net-libs/libnsl
@@ -30,9 +35,12 @@ DEPEND="
 	zeroconf? ( net-dns/avahi )"
 
 BDEPEND="
+	${CDEPEND}
 	virtual/pkgconfig"
 
-RDEPEND="${DEPEND}
+RDEPEND="
+	${CDEPEND}
+	${DEPEND}
 	selinux? ( sec-policy/selinux-nut )"
 
 S="${WORKDIR}/${MY_P}"
@@ -82,17 +90,6 @@ PATCHES=(
 	"${FILESDIR}"/nut-2.7.4-py3.patch
 )
 
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/lib/nut nut,uucp
-	# As of udev-104, NUT must be in uucp and NOT in tty.
-	gpasswd -d nut tty 2>/dev/null
-	gpasswd -a nut uucp 2>/dev/null
-	# in some cases on old systems it wasn't in the nut group either!
-	gpasswd -a nut nut 2>/dev/null
-	warningmsg ewarn
-}
-
 src_prepare() {
 	default