[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[Robin H. Johnson]

commit:     e06c613c8c92d16972f0861769ad2acbab33124e
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jan 19 17:21:17 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 21:08:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e06c613c

net-fs/nfs-utils: remove unsed patch

(cherry picked from commit 5c5cbd85b48a42e262095ade628feb521ef6b0fa)
Fixes: https://github.com/gentoo/gentoo/pull/3542
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 .../nfs-utils/files/nfs-utils-1.3.0-gcc-4.9.patch  | 62 ----------------------
 1 file changed, 62 deletions(-)

diff --git a/net-fs/nfs-utils/files/nfs-utils-1.3.0-gcc-4.9.patch b/net-fs/nfs-utils/files/nfs-utils-1.3.0-gcc-4.9.patch
deleted file mode 100644
index e2d98b5..00000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.3.0-gcc-4.9.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 25e83c2270b2d2966c992885faed0b79be09f474 Mon Sep 17 00:00:00 2001
-From: Jeff Layton <jlayton@poochiereds.net>
-Date: Thu, 1 May 2014 11:15:16 -0400
-Subject: [PATCH [nfs-utils]] mountd: fix segfault in add_name with newer gcc
- compilers
-
-I hit a segfault in add_name with a mountd built with gcc-4.9.0. Some
-NULL pointer checks got reordered such that a pointer was dereferenced
-before checking to see whether it was NULL. The problem was due to
-nfs-utils relying on undefined behavior, which tricked gcc into assuming
-that the pointer would never be NULL.
-
-At first I assumed that this was a compiler bug, but Jakub Jelinek and
-Jeff Law pointed out:
-
-"If old is NULL, then:
-
-	strncpy(new, old, cp-old);
-
-is undefined behavior (even when cp == old == NULL in that case),
-therefore gcc assumes that old is never NULL, as otherwise it would be
-invalid.
-
-Just guard
-	strncpy(new, old, cp-old);
-	new[cp-old] = 0;
-with if (old) { ... }."
-
-This patch does that. If old is NULL though, then we still need to
-ensure that new is NULL terminated, lest the subsequent strcats walk off
-the end of it.
-
-Cc: Jeff Law <law@redhat.com>
-Cc: Jakub Jelinek <jakub@redhat.com>
-Signed-off-by: Jeff Layton <jlayton@poochiereds.net>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- support/export/client.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/support/export/client.c b/support/export/client.c
-index dbf47b9..f85e11c 100644
---- a/support/export/client.c
-+++ b/support/export/client.c
-@@ -482,8 +482,12 @@ add_name(char *old, const char *add)
- 		else
- 			cp = cp + strlen(cp);
- 	}
--	strncpy(new, old, cp-old);
--	new[cp-old] = 0;
-+	if (old) {
-+		strncpy(new, old, cp-old);
-+		new[cp-old] = 0;
-+	} else {
-+		new[0] = 0;
-+	}
- 	if (cp != old && !*cp)
- 		strcat(new, ",");
- 	strcat(new, add);
--- 
-2.0.0
-

[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[Thomas Deutschmann]

commit:     0e750ae279e78bbd9d48dac8119a2fd18262d04d
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 27 17:16:35 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 20:17:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e750ae2

net-fs/nfs-utils: remove unused files

 net-fs/nfs-utils/files/nfsd.service-r1              | 15 ---------------
 net-fs/nfs-utils/files/proc-fs-nfsd.mount           |  8 --------
 net-fs/nfs-utils/files/rpc-gssd.service             | 12 ------------
 net-fs/nfs-utils/files/rpc-idmapd.service           | 11 -----------
 net-fs/nfs-utils/files/rpc-mountd.service-r1        | 10 ----------
 net-fs/nfs-utils/files/rpc-statd.service-r2         | 12 ------------
 net-fs/nfs-utils/files/rpc-svcgssd.service          | 13 -------------
 net-fs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount |  7 -------
 8 files changed, 88 deletions(-)

diff --git a/net-fs/nfs-utils/files/nfsd.service-r1 b/net-fs/nfs-utils/files/nfsd.service-r1
deleted file mode 100644
index e15cf98f9be..00000000000
--- a/net-fs/nfs-utils/files/nfsd.service-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=NFS server
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/rpc.nfsd 8
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-fs/nfs-utils/files/proc-fs-nfsd.mount b/net-fs/nfs-utils/files/proc-fs-nfsd.mount
deleted file mode 100644
index 26b58b9682d..00000000000
--- a/net-fs/nfs-utils/files/proc-fs-nfsd.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=NFS Configuration File System
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/proc/fs/nfsd
-Type=nfsd

diff --git a/net-fs/nfs-utils/files/rpc-gssd.service b/net-fs/nfs-utils/files/rpc-gssd.service
deleted file mode 100644
index 4c96deef440..00000000000
--- a/net-fs/nfs-utils/files/rpc-gssd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=RPC GSS-API Client Daemon
-Documentation=man:rpc.gssd(8)
-After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-Before=remote-fs-pre.target
-
-[Service]
-ExecStart=/usr/sbin/rpc.gssd -f
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-fs/nfs-utils/files/rpc-idmapd.service b/net-fs/nfs-utils/files/rpc-idmapd.service
deleted file mode 100644
index 4a63b91ca73..00000000000
--- a/net-fs/nfs-utils/files/rpc-idmapd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=NFS v4 ID-Name Mapping Daemon
-Documentation=man:rpc.idmapd(8) man:idmapd.conf(5)
-After=var-lib-nfs-rpc_pipefs.mount nfsd.service
-Requires=var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-ExecStart=/usr/sbin/rpc.idmapd -f
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-fs/nfs-utils/files/rpc-mountd.service-r1 b/net-fs/nfs-utils/files/rpc-mountd.service-r1
deleted file mode 100644
index d5f5b24af39..00000000000
--- a/net-fs/nfs-utils/files/rpc-mountd.service-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-After=rpcbind.service nfsd.service
-Requires=rpcbind.service nfsd.service
-
-[Service]
-ExecStart=/usr/sbin/rpc.mountd -F
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-fs/nfs-utils/files/rpc-statd.service-r2 b/net-fs/nfs-utils/files/rpc-statd.service-r2
deleted file mode 100644
index 3633ebded5d..00000000000
--- a/net-fs/nfs-utils/files/rpc-statd.service-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
-Wants=remote-fs-pre.target
-
-[Service]
-ExecStart=/sbin/rpc.statd -F
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-fs/nfs-utils/files/rpc-svcgssd.service b/net-fs/nfs-utils/files/rpc-svcgssd.service
deleted file mode 100644
index 121c61a49b3..00000000000
--- a/net-fs/nfs-utils/files/rpc-svcgssd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RPC GSS-API Server Daemon
-Documentation=man:rpc.svcgssd(8)
-After=rpcbind.service
-Requires=rpcbind.service
-Before=nfs-server.target
-PartOf=nfs-server.target
-
-[Service]
-ExecStart=/usr/sbin/rpc.svcgssd -f
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-fs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount b/net-fs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount
deleted file mode 100644
index c4166582225..00000000000
--- a/net-fs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=RPC Pipe File System
-
-[Mount]
-What=rpc_pipefs
-Where=/var/lib/nfs/rpc_pipefs
-Type=rpc_pipefs

[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[Mike Gilbert]

commit:     dcbc3b44c131b7b9e2c6f43243f3ca74309942fa
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 16:45:13 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 16:45:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbc3b44

net-fs/nfs-utils: replace svcgssd patch with upstream version

Closes: https://bugs.gentoo.org/643848
Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45

 ...s-utils-2.3.1-svcgssd_undefined_reference.patch | 37 +++++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
index 2134cedaea4..77c902f2727 100644
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
@@ -1,13 +1,40 @@
-https://bugs.gentoo.org/641912
+From 1451d7585bf1c622658ccc04abac7e79ffe40263 Mon Sep 17 00:00:00 2001
+From: Justin Mitchell <jumitche@redhat.com>
+Date: Mon, 8 Jan 2018 09:14:11 -0500
+Subject: [PATCH] svcgssd: Update svcgssd so that it builds
 
---- nfs-utils-2.3.1/utils/gssd/svcgssd.c
-+++ nfs-utils-2.3.1/utils/gssd/svcgssd.c
-@@ -101,7 +101,7 @@
+Since a15bd948 the --enable-svcgss option no longer builds
+as svcgssd references functions which were changed at that time.
+Fix those, and other function changes since then.
+
+Signed-off-by: Justin Mitchell <jumitche@redhat.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ utils/gssd/svcgssd.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c
+index 3514ae1..23f0c0b 100644
+--- a/utils/gssd/svcgssd.c
++++ b/utils/gssd/svcgssd.c
+@@ -63,6 +63,8 @@
+ #include "err_util.h"
+ #include "conffile.h"
+ 
++struct state_paths etab;
++
+ void
+ sig_die(int signal)
+ {
+@@ -101,7 +103,7 @@ main(int argc, char *argv[])
  	char *principal = NULL;
  	char *s;
  
 -	conf_init(NFS_CONFFILE); 
-+	conf_init_file(NFS_CONFFILE); 
++	conf_init_file(NFS_CONFFILE);
  
  	s = conf_get_str("svcgssd", "principal");
  	if (!s)
+-- 
+1.8.3.1
+

[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[Matt Turner]

commit:     71ce315b0913d1562f8c7cfb0e018d3f9e39b60e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 06:07:43 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 07:08:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ce315b

net-fs/nfs-utils: Handle quoted export directories

exports(5) says

       Blank lines are ignored.  A pound sign ("#") introduces a comment
       to the end of the line. Entries may be continued across newlines
       using a backslash. If an export name contains spaces it  should
       be quoted using double quotes. You can also specify spaces or
       other unusual character in the export name using a backslash
       followed by the character code as three octal digits.

Thus, allow an optional single double-quote character before the /.

Closes: https://bugs.gentoo.org/675648
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-fs/nfs-utils/files/nfs.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index bf599021c9a..59120629be3 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -84,7 +84,7 @@ start() {
 	# Exportfs likes to hang if networking isn't working.
 	# If that's the case, then try to kill it so the
 	# bootup process can continue.
-	if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then
+	if grep -qs '^[[:space:]]*"\?/' /etc/exports /etc/exports.d/*.exports ; then
 		ebegin "Exporting NFS directories"
 		${exportfs} -r &
 		waitfor_exportfs $!

[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[Matt Turner]

commit:     998148dd775a5c629266fcd1c93837ac8ee3541d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 05:50:16 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 07:08:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998148dd

net-fs/nfs-utils: Don't unexport directories on restart

Originally added in 2007 (see commit a0fefa89daef "Remove some bashisms
and support baselayout-2 restart option." in the historical repo), = vs
!= looks like an obvious typo. But, with RC_CMD, we don't need the extra
restarting variable.

Closes: https://bugs.gentoo.org/675644
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-fs/nfs-utils/files/nfs.initd | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 4b572fc2e5e..bf599021c9a 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -4,10 +4,6 @@
 
 extra_started_commands="reload"
 
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-restarting=no
-
 # The binary locations
 exportfs=/usr/sbin/exportfs
   mountd=/usr/sbin/rpc.mountd
@@ -131,7 +127,7 @@ stop() {
 	# then "exportfs -r" will reread the xtab, and all the current
 	# clients will be able to resume NFS activity, *without* needing
 	# to umount/(re)mount the filesystem.
-	if [ "${restarting}" = no -o "${RC_CMD}" = "restart" ] ; then
+	if [ "${RC_CMD}" != "restart" ] ; then
 		ebegin "Unexporting NFS directories"
 		# Exportfs likes to hang if networking isn't working.
 		# If that's the case, then try to kill it so the
@@ -155,8 +151,6 @@ reload() {
 }
 
 restart() {
-	# See long comment in stop() regarding "restarting" and exportfs -ua
-	restarting=yes
 	svc_stop
 	svc_start
 }

[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[Aaron Bauman]

commit:     8a49d5b3f8f5eb966da5e889db1363d41dfbbc64
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Nov  3 09:36:35 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov  8 02:42:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a49d5b3

net-fs/nfs-utils: remove unused files

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13533
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 net-fs/nfs-utils/files/nfs-utils.conf |  3 ---
 net-fs/nfs-utils/files/nfsmount.confd |  7 ------
 net-fs/nfs-utils/files/nfsmount.initd | 47 -----------------------------------
 3 files changed, 57 deletions(-)

diff --git a/net-fs/nfs-utils/files/nfs-utils.conf b/net-fs/nfs-utils/files/nfs-utils.conf
deleted file mode 100644
index b9b586c2ac0..00000000000
--- a/net-fs/nfs-utils/files/nfs-utils.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-d /var/lib/nfs/rpc_pipefs
-d /var/lib/nfs/v4recovery
-d /var/lib/nfs/v4root

diff --git a/net-fs/nfs-utils/files/nfsmount.confd b/net-fs/nfs-utils/files/nfsmount.confd
deleted file mode 100644
index 418353668f9..00000000000
--- a/net-fs/nfs-utils/files/nfsmount.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# You will need to set the dependencies in the nfsmount script to match
-# the network configuration tools you are using. This should be done in
-# this file by following the examples below, and not by changing the
-# service script itself.  See /etc/conf.d/netmount for more examples.
-#
-# This is a safe default.
-rc_after="net"

diff --git a/net-fs/nfs-utils/files/nfsmount.initd b/net-fs/nfs-utils/files/nfsmount.initd
deleted file mode 100644
index 12c7d786a0f..00000000000
--- a/net-fs/nfs-utils/files/nfsmount.initd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-depend() {
-	local myneed=""
-	if [ -e /etc/fstab ] ; then
-		myneed="${myneed} $(
-			awk '!/^[[:space:]]*#/ && ($3 == "nfs" || $3 == "nfs4") {
-					if ($3 == "nfs4")
-						idmapd = "rpc.idmapd"
-					if ($4 ~ /sec=(krb|spkm)/)
-						gssd = "rpc.gssd"
-				}
-				END { print idmapd " " gssd }
-				' /etc/fstab
-			)"
-	fi
-	config /etc/fstab
-	need portmap rpc.statd ${myneed}
-	use ypbind dns rpc.idmapd rpc.gssd
-}
-
-start() {
-	if [ -x /usr/sbin/sm-notify ] ; then
-		ebegin "Starting NFS sm-notify"
-		/usr/sbin/sm-notify ${OPTS_SMNOTIFY}
-		eend $?
-	fi
-
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then
-		modprobe -q nfs
-	fi
-
-	ebegin "Mounting NFS filesystems"
-	mount -a -t nfs,nfs4
-	eend $?
-}
-
-stop() {
-	ebegin "Unmounting NFS filesystems"
-	umount -a -t nfs,nfs4
-	eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[Mike Frysinger]

commit:     97e3aec5c63139c691c99a7d5fc1600fd8814e66
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 05:21:37 2020 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 05:21:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e3aec5

net-fs/nfs-utils: add metadata to cross-compile patch

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 .../nfs-utils/files/nfs-utils-1.2.8-cross-build.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch
index 7317115a0e1..366a85badfe 100644
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch
@@ -3,6 +3,25 @@ for us atm, so hack away :(
 
 (recent autotools will always add $(CFLAGS)/etc... to the compile)
 
+posted upstream:
+https://marc.info/?l=linux-nfs&m=136416341629788&w=2
+Date: Sun, 24 Mar 2013 22:21:08 +0000
+Message-ID: 1364163668-15490-1-git-send-email-vapier@gentoo.org
+
+From 269ae1346d9ccc97304205066d20e7e7b638f30e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 24 Mar 2013 18:14:48 -0400
+Subject: [PATCH nfs-utils] locktes/rpcgen: tweak how we override compiler settings
+
+Newer autotools will use both CFLAGS and <target>_CFLAGS when compiling
+the <target>.  Adding the build settings to the target-specific flags no
+longer works as a way to compile build-time tools.
+
+Instead, clobber the global flags.  This triggers an automake warning,
+but the end result actually works (unlike the existing code).
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
 --- a/tools/locktest/Makefile.am
 +++ b/tools/locktest/Makefile.am
 @@ -1,12 +1,11 @@

[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[David Seifert]

commit:     000db63dd35281b4ed072915ba4528677b9dea39
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 15:49:13 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 15:49:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000db63d

net-fs/nfs-utils: Rebase patches

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...utils-2.4.2-Ensure-consistent-struct-stat.patch | 38 +++++++++++-----------
 .../files/nfs-utils-2.5.2-no-werror.patch          |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch
index e64e2c6da38..8541a985ffa 100644
--- a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch
@@ -24,9 +24,9 @@ diff --git a/support/junction/junction.c b/support/junction/junction.c
 index ab6caa6..41cce26 100644
 --- a/support/junction/junction.c
 +++ b/support/junction/junction.c
-@@ -23,6 +23,10 @@
-  *	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-  */
+@@ -27,6 +27,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
@@ -39,9 +39,9 @@ diff --git a/support/misc/file.c b/support/misc/file.c
 index e7c3819..06f6bb2 100644
 --- a/support/misc/file.c
 +++ b/support/misc/file.c
-@@ -18,6 +18,10 @@
-  * along with nfs-utils.  If not, see <http://www.gnu.org/licenses/>.
-  */
+@@ -22,6 +22,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
@@ -54,9 +54,9 @@ diff --git a/support/misc/mountpoint.c b/support/misc/mountpoint.c
 index c6217f2..14d6731 100644
 --- a/support/misc/mountpoint.c
 +++ b/support/misc/mountpoint.c
-@@ -3,6 +3,10 @@
-  * check if a given path is a mountpoint 
-  */
+@@ -7,6 +7,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
@@ -69,24 +69,24 @@ diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c
 index 9dc4cf1..7c4cf37 100644
 --- a/support/nfs/cacheio.c
 +++ b/support/nfs/cacheio.c
-@@ -15,6 +15,10 @@
-  *
-  */
+@@ -19,6 +19,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
 +#endif
 +
  #include <nfslib.h>
+ #include <inttypes.h>
  #include <stdio.h>
- #include <stdio_ext.h>
 diff --git a/utils/mount/fstab.c b/utils/mount/fstab.c
 index eedbdda..8b0aaf1 100644
 --- a/utils/mount/fstab.c
 +++ b/utils/mount/fstab.c
-@@ -7,6 +7,10 @@
-  * - Moved code to nfs-utils/support/nfs from util-linux/mount.
-  */
+@@ -11,6 +11,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
@@ -99,9 +99,9 @@ diff --git a/utils/nfsdcld/legacy.c b/utils/nfsdcld/legacy.c
 index 07f477a..3c6bea6 100644
 --- a/utils/nfsdcld/legacy.c
 +++ b/utils/nfsdcld/legacy.c
-@@ -15,6 +15,10 @@
-  * Boston, MA 02110-1301, USA.
-  */
+@@ -19,6 +19,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch
index 396532a919a..a7226db2492 100644
--- a/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch
@@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
 index 50847d8a..6bc18e93 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -620,47 +620,15 @@ AC_SUBST(CPPFLAGS_FOR_BUILD)
+@@ -631,47 +631,15 @@ AC_SUBST(CPPFLAGS_FOR_BUILD)
  AC_SUBST(LDFLAGS_FOR_BUILD)
  
  my_am_cflags="\

[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[Sam James]

commit:     6a73c6935a2c72580082653baf8c096e08bc7e9c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 02:17:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 02:17:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a73c693

net-fs/nfs-utils: add link to upstream patch submission

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/nfs-utils-2.6.2-clang-more-function-prototypes.patch          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch
index aecb29d3a7cf..51bfb30f1e64 100644
--- a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch
@@ -1,3 +1,5 @@
+https://patchwork.kernel.org/project/linux-nfs/patch/20220916214300.2820117-1-sam@gentoo.org/
+
 From daf6aa9b659078aebd202fffff59bd9a0ab685ce Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Fri, 16 Sep 2022 22:35:23 +0100

[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/

[Mike Gilbert]

commit:     803ade1a8a177ff47d4a8e5d5c60ca45e98ba5f5
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 19:44:33 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 19:44:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=803ade1a

net-fs/nfs-utils: update copyright year in nfs.initd

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-fs/nfs-utils/files/nfs.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index bc548f027c07..7c1de560d1da 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -1,5 +1,5 @@
 #!/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"