gentoo auto-resync : 16:02:2024 - 23:37:06

6 files changed, 10 insertions, 12 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 6a855bf79c7a..ee9452217289 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 76e4627c30a8..f2b849310f40 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -4,7 +4,7 @@ AUX nfs-utils-2.6.4-C99-inline.patch 573 BLAKE2B 7f05e51f94dcef942feaf15be3f8207
 AUX nfs-utils-2.6.4-includes.patch 1254 BLAKE2B b741302756690872ed218a830695abea740704e6e0850dacd17c471519337f22b268b6902849cfb83165f0dec9bd42badf2b67642564ba18c7d149d636fee55d SHA512 ec59556ac8c0626fbd37eb27e152d8994503ffc890eb95844bc705ea2241fe57a8ace109ffae4d1b2d4c36ad78994fd39f3b3bd5d7336a6cd02fddb1f3bf76e9
 AUX nfs-utils-udev-sysctl.patch 1388 BLAKE2B 843cc5f0f00e665cbd731588784193b08b45a3e16aa79d303751f8b019083404db74e78f6bc35ca8f894ff0a60ee2f374c1108f21b13be66d7049b6e46609add SHA512 2d9b6189c2e6db96a487fbae2af80623c7157ee52a51cb63afba547f05f81ab8a291c7b7001b5faf8e58cef290fd23cc2d1892f97387fc842f230d23218d06a2
 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
-AUX nfs.initd 4018 BLAKE2B 87d9111c7961db63e6a2eba1788f2bd7113e14e96a203f2f0e2a551f64dd1e19b8f4ed6a62658f48bf88007c3e115916a4d24f3cd1983df25cd09f0a21cacf79 SHA512 840f62a16b3d4cf651011f49b76033c01033b18336b2798705449ed7b15c4e6f545fb318674868d6a223781a2752bdcef4c9c3435eddf11fd0416f2037591608
+AUX nfs.initd 3907 BLAKE2B 1dc02a0d3a794cceae2348edf86c190f1ec77d10e1de4c66e7654d080d9fe1614bdd4606829d208db99a21ae819b18520697bf285ddf26a5bb8a15fcdd6fbf4f SHA512 56804513a49ed08605499c96c384415d3965331793f730cac04c6e693c87d5a0f0274a9d7ade881ed9136bbc32e961aab429527de757f7293f693ff04b91b147
 AUX nfsclient.confd 592 BLAKE2B b661b726aa50f904752ec73a201a088f403a1e0f8d11181615e794da259a03b98131fff68e27645d4371564c796bb44915d6a13db9dc5a909294c4d1613c429d SHA512 f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc6925a6ada8e95ad8321e9fc355931a804dd455aae1e4850e92
 AUX nfsclient.initd 752 BLAKE2B 8e3303be602ed97b9c6db0238b950039ec87830d733e7490f62657953e18d8050d5cd75e603d566b00db86ba910384d36e488d149112c86f1b9ed8e0901f5c16 SHA512 85078e2cd38b37a1e6fbaf0e40cf7690f403e71d9c8188d542d12fe56bfc02a49763c7bcc7742691754acc37928468c215db2795bebc29a5dfb052ba08f407bb
 AUX nfsmount.initd-1.3.1 740 BLAKE2B 2668a3c485925f5b670efd11f357c5e0d616c1e1b62863c14b86e3201d5a5d61c1c4f4257b3b19ed8a8194879c67a9ddf996608073474e154f033be719b5ea54 SHA512 a540443a0259360f2476277bc020bb08eb095debe9c8e6a620dba5da1c7850f399673cc1ab505df65aea095a7e67954a9b5b8b26bbfd94e55d62348791af643d
@@ -15,7 +15,7 @@ AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c8621
 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
 DIST nfs-utils-2.6.3.tar.bz2 978167 BLAKE2B 776b4ce6edc728e1dd2291898f429fbc76327b949008f2a477af887231feb2e27505a94978f819e4e4ed7b2b8574e6c5b8d02a9ca6e94683ec620ce99a909a06 SHA512 870dee2a95f411de6694aa8dddeef2302ef9235389a9bdca381ef719303fdd1a463a815ca67e0336a5121fa68d5b448b1952d539679e38b36f1e6b69c1e2f853
 DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab SHA512 e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533
-EBUILD nfs-utils-2.6.3-r2.ebuild 6343 BLAKE2B 115b74d78136c8570796db5beda82359bc6abb5778be465acc9aa319e0ac13e3d49c74b28d47dc819765b162051a227f1b77e427bdc40bb8930e671c121d21e4 SHA512 721b754a0e5ca8344cee80d6ea8efb197e73daf5cd2b5824fef0ebba8442b6c2bbf7082ff37866ebd8a61772ca39ae48952d758a1106eef6cf8bb9dfb9a800e0
-EBUILD nfs-utils-2.6.4-r1.ebuild 6380 BLAKE2B 6e059c702d97c1c7e600ea669c227bb537705b7729f8bc9c226d783925fed45ef29c5a58495a6c61771a28d6e67687387ad163f04cedd1a58690dd45a1622d7a SHA512 9abc26dc126f3abd9ec2dc7cf45da428dc9c24d365d3ad58987164e80b26fb82908ee439ee0780a17c1f103061da0d0042744eaa45c8d6f219558589550f5090
-EBUILD nfs-utils-2.6.4-r3.ebuild 6243 BLAKE2B d2c08b6ff57516d23090e21604c6eeab007141cd504bf299fe553208ebec5a039498d07db79ad54c1d77ae184609bf9dcfc2e6949bc47d4c53995e86453c9cfa SHA512 476fcd25a023872bdf66a3b27dc1d721b6da5562030a06ef7f4dae1342daabb92fcaade7a33131a0b64ba9ca54fc7ccc7b815c0314b5f19ffd6bc2252cf10b37
+EBUILD nfs-utils-2.6.3-r3.ebuild 6343 BLAKE2B 3a5f1cf4895d6681016f2ec21a9f8ab977bd8bfa4d15ace6c1403e694f27816ac086456e19bcf4de209c4a88dbbc252391e02112b47c5c9830aea2ef009f3c32 SHA512 47bc71277465cc5def02df11ce0fe203f3e68afda056f9df8f540d1de34946903d450bb05d8c51a2c2a96703c34d83a64dbde404c8807da2556c7458664aaf66
+EBUILD nfs-utils-2.6.4-r10.ebuild 6243 BLAKE2B d2c08b6ff57516d23090e21604c6eeab007141cd504bf299fe553208ebec5a039498d07db79ad54c1d77ae184609bf9dcfc2e6949bc47d4c53995e86453c9cfa SHA512 476fcd25a023872bdf66a3b27dc1d721b6da5562030a06ef7f4dae1342daabb92fcaade7a33131a0b64ba9ca54fc7ccc7b815c0314b5f19ffd6bc2252cf10b37
+EBUILD nfs-utils-2.6.4-r4.ebuild 6380 BLAKE2B 6e059c702d97c1c7e600ea669c227bb537705b7729f8bc9c226d783925fed45ef29c5a58495a6c61771a28d6e67687387ad163f04cedd1a58690dd45a1622d7a SHA512 9abc26dc126f3abd9ec2dc7cf45da428dc9c24d365d3ad58987164e80b26fb82908ee439ee0780a17c1f103061da0d0042744eaa45c8d6f219558589550f5090
 MISC metadata.xml 1006 BLAKE2B ffe7500e64c7943072d07095e29eca3a167bef1385ecef3492e43b2ec08a2c2221ca3454bb0773eefb04dbc89c4f97a394ee2ee1ba92e975da8ed38b6a705963 SHA512 a737c929d1488165d06777af1a14daf2478540d0574337203b1d5a8af2db2040b591ef901db89fd70dd668c8f0c3ec4e5ca1480994549d86c1c5a7ebfae9227f
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 6540c9f92075..7c1de560d1da 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -1,13 +1,13 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="reload"
 
 # The binary locations
 exportfs=/usr/sbin/exportfs
-  mountd=/usr/sbin/rpc.mountd
-    nfsd=/usr/sbin/rpc.nfsd
+mountd=/usr/sbin/rpc.mountd
+nfsd=/usr/sbin/rpc.nfsd
 smnotify=/usr/sbin/sm-notify
 
 depend() {
@@ -106,13 +106,11 @@ stop() {
 	eend $?
 	ret=$((ret + $?))
 
-	# nfsd sets its process name to [nfsd] so don't look for $nfsd
 	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --name nfsd --user root --signal 2
+	# Do not attempt to signal kernel nfsd threads directly, #924309
+	${nfsd} 0
 	eend $?
 	ret=$((ret + $?))
-	# in case things don't work out ... #228127
-	rpc.nfsd 0
 
 	# When restarting the NFS server, running "exportfs -ua" probably
 	# isn't what the user wants.  Running it causes all entries listed
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.3-r3.ebuild
index 93a79d1a257b..773a752231a3 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
index 1a00c46a24df..1a00c46a24df 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild
index ba345b4b3549..ba345b4b3549 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild