nfsutils: version bump 1.3.0 -> 1.3.3

Cleanup and simplify rules while at it.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 75 insertions, 28 deletions

diff --git a/patches/nfs-utils-1.3.0/0001-start-statd-use-correct-PATH-and-unit-name.patch b/patches/nfs-utils-1.3.0/0001-start-statd-use-correct-PATH-and-unit-name.patch
deleted file mode 100644
index 1ce8a071c..000000000
--- a/patches/nfs-utils-1.3.0/0001-start-statd-use-correct-PATH-and-unit-name.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 9 Apr 2014 14:37:28 +0200
-Subject: [PATCH] start-statd: use correct PATH and unit name
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- utils/statd/start-statd | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/utils/statd/start-statd b/utils/statd/start-statd
-index cde3583..233a386 100644
---- a/utils/statd/start-statd
-+++ b/utils/statd/start-statd
-@@ -4,8 +4,8 @@
- # /var/run/rpc.statd.pid).
- # It should run statd with whatever flags are apropriate for this
- # site.
--PATH=/sbin:/usr/sbin
--if systemctl start statd.service
-+PATH=/sbin:/usr/sbin:/bin:/usr/bin
-+if systemctl start rpc-statd.service
- then :
- else
-     exec rpc.statd --no-notify
diff --git a/patches/nfs-utils-1.3.0/series b/patches/nfs-utils-1.3.0/series
deleted file mode 100644
index 947661a26..000000000
--- a/patches/nfs-utils-1.3.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-start-statd-use-correct-PATH-and-unit-name.patch
-# 8af0056951f555f77c54813c4e8a4bd6  - git-ptx-patches magic
diff --git a/patches/nfs-utils-1.3.3/0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch b/patches/nfs-utils-1.3.3/0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
new file mode 100644
index 000000000..28fbcc087
--- /dev/null
+++ b/patches/nfs-utils-1.3.3/0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
@@ -0,0 +1,45 @@
+From: Steve Dickson <steved@redhat.com>
+Date: Mon, 9 Nov 2015 11:28:30 -0500
+Subject: [PATCH] systemd: Decouple the starting and stopping of
+ rpcbind/nfs-server
+
+Commit b98f2af15 introduced a regression that cause the
+starting and stop of rpcbind and the nfs-server to
+be depended on each other
+
+The starting of the NFS server should start rpcbind
+but bring rpcbind down should not bring the NFS
+server down.
+
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ systemd/nfs-server.service | 2 +-
+ systemd/rpc-statd.service  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service
+index 12b02f26f9ce..317e5d689767 100644
+--- a/systemd/nfs-server.service
++++ b/systemd/nfs-server.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=NFS server and services
+ DefaultDependencies=no
+-Requires= network.target proc-fs-nfsd.mount rpcbind.service
++Requires= network.target proc-fs-nfsd.mount rpcbind.target
+ Requires= nfs-mountd.service
+ Wants=rpc-statd.service nfs-idmapd.service
+ Wants=rpc-statd-notify.service
+diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service
+index 14604d783ddf..f16ea425dc77 100644
+--- a/systemd/rpc-statd.service
++++ b/systemd/rpc-statd.service
+@@ -3,7 +3,7 @@ Description=NFS status monitor for NFSv2/3 locking.
+ DefaultDependencies=no
+ Conflicts=umount.target
+ Requires=nss-lookup.target rpcbind.target
+-After=network.target nss-lookup.target rpcbind.target
++After=network.target nss-lookup.target rpcbind.service
+ 
+ PartOf=nfs-utils.service
+ 
diff --git a/patches/nfs-utils-1.3.3/0002-rpcgen-don-t-link-to-libtirpc.patch b/patches/nfs-utils-1.3.3/0002-rpcgen-don-t-link-to-libtirpc.patch
new file mode 100644
index 000000000..efc8ef80a
--- /dev/null
+++ b/patches/nfs-utils-1.3.3/0002-rpcgen-don-t-link-to-libtirpc.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 11 Jan 2016 15:48:00 +0100
+Subject: [PATCH] rpcgen: don't link to libtirpc
+
+It's not necessay and causes problems when cross-compiling:
+rpcgen is a host-tool and configure only checks for a target libtirpc.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ tools/rpcgen/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
+index 8a9ec89cea76..51a2bfa006f6 100644
+--- a/tools/rpcgen/Makefile.am
++++ b/tools/rpcgen/Makefile.am
+@@ -12,7 +12,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
+ rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
+ rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
+ rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+-rpcgen_LDADD=$(LIBTIRPC)
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
diff --git a/patches/nfs-utils-1.3.3/autogen.sh b/patches/nfs-utils-1.3.3/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/nfs-utils-1.3.3/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/nfs-utils-1.3.3/series b/patches/nfs-utils-1.3.3/series
new file mode 100644
index 000000000..1b88a647d
--- /dev/null
+++ b/patches/nfs-utils-1.3.3/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
+0002-rpcgen-don-t-link-to-libtirpc.patch
+# 5b8eb83230f35a110507daeddd563ff0  - git-ptx-patches magic