new file mode 100644

@@ -0,0 +1,7 @@

+[Unit]

+Description=NFS server and client services

+

+[Service]

+Type=oneshot

+RemainAfterExit=yes

+ExecStart=/bin/true

new file mode 100644

@@ -0,0 +1,8 @@

+[Unit]

+Description=NFS client services

+Before=remote-fs-pre.target

+Wants=remote-fs-pre.target rpc-statd-notify.service

+

+[Install]

+WantedBy=multi-user.target

+WantedBy=remote-fs.target

new file mode 100644

@@ -0,0 +1,25 @@

+# Begin /etc/default/nfs-utils

+

+# Options to pass to rpc.idmapd.

+# See rpc.idmapd(8) for more details.

+IDMAPD_OPTS=""

+

+# Options to paass to rpc.mountd.

+# If you have a port-based firewall, you might want to set up

+# a fixed port here using the --port option.

+# See rpc.mountd(8) for more details.

+MOUNTD_OPTS=""

+

+# Options to pass to rpc.nfsd.

+# See rpc.nfsd(8) for more details.

+NFSD_OPTS=""

+

+# Options to pass to sm-notify.

+# See sm-notify(8) for more details.

+SM_NOTIFY_OPTS=""

+

+# Options to pass to rpc.statd.

+# See rpc.statd(8) for more details.

+STATD_OPTS=""

+

+# End /etc/default/nfs-utils

@@ -1,18 +1,24 @@

 Summary:	NFS client utils

 Name:		nfs-utils

 Version:	1.3.2

-Release:	1%{?dist}

-License:	GPLv3+

-URL:		http://www.linuxfromscratch.org/

+Release:	2%{?dist}

+License:	GPLv2+

+URL:		http://sourceforge.net/projects/nfs

 Group:		Applications/Nfs-utils-client

-Source0:	 http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2

+Source0:    http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2

 %define sha1 nfs-utils=138ad690992d4784c05024d814a2d49ee8ebf6be

+Source1:    nfs-client.service

+Source2:    nfs-client.target

+Source3:    rpc-statd.service

+Source4:    rpc-statd-notify.service

+Source5:    nfs-utils.defaults

 Vendor:		VMware, Inc.

 Distribution:	Photon

-BuildRequires: krb5

-BuildRequires: libtirpc-devel

-Requires: python2-libs

-Requires: libtirpc

+BuildRequires:  krb5

+BuildRequires:  libtirpc-devel

+Requires:   python2-libs

+Requires:   libtirpc

+Requires:   rpcbind

 %description

 The nfs-utils package contains simple nfs client service

@@ -24,12 +30,23 @@ sed -i "/daemon_init/s:\!::" utils/statd/statd.c

 %build

 ./configure --prefix=%{_prefix}          \

             --sysconfdir=%{_sysconfdir}      \

+            --enable-libmount-mount \

             --without-tcp-wrappers \

             --disable-nfsv4        \

             --disable-gss

 make

 %install

 make DESTDIR=%{buildroot} install

+install -v -m644 utils/mount/nfsmount.conf /etc/nfsmount.conf

+

+mkdir -p %{buildroot}/lib/systemd/system/

+mkdir -p %{buildroot}/etc/default

+install -m644 %{SOURCE1} %{buildroot}/lib/systemd/system/

+install -m644 %{SOURCE2} %{buildroot}/lib/systemd/system/

+install -m644 %{SOURCE3} %{buildroot}/lib/systemd/system/

+install -m644 %{SOURCE4} %{buildroot}/lib/systemd/system/

+install -m644 %{SOURCE5} %{buildroot}/etc/default/nfs-utils

+

 %files

 %defattr(-,root,root)

 %{_libdir}/*

@@ -37,6 +54,11 @@ make DESTDIR=%{buildroot} install

 /sbin/*

 %{_sbindir}/*

 %{_sharedstatedir}/*

+/etc/default/nfs-utils

+/lib/systemd/system/*

+

 %changelog

+*	Tue Dec 8 2015 Divya Thaluru <dthaluru@vmware.com> 1.3.2-2

+-	Adding systemd service files

 *	Tue Jul 14 2015 Rongrong Qiu <rqiu@vmware.com> 1.3.2-1

 -	Initial build.	First version

new file mode 100644

@@ -0,0 +1,10 @@

+[Unit]

+Description=Notify NFS peers of a restart

+Requires=network-online.target

+After=network-online.target nss-lookup.target nfs-server.service

+PartOf=nfs-client.service

+

+[Service]

+Type=forking

+EnvironmentFile=/etc/default/nfs-utils

+ExecStart=/sbin/sm-notify $SM_NOTIFY_OPTS

new file mode 100644

@@ -0,0 +1,13 @@

+[Unit]

+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

+PartOf=nfs-client.service

+

+[Service]

+Type=forking

+EnvironmentFile=/etc/default/nfs-utils

+PIDFile=/var/run/rpc.statd.pid

+ExecStart=/sbin/rpc.statd --no-notify $STATD_OPTS

new file mode 100644

@@ -0,0 +1,48 @@

+Submitted By:            Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>

+Date:                    2015-11-29

+Initial Package Version: 0.2.3

+Upstream Status:         Already in upstream git repository

+Origin:                  Upstream

+Description:             This patch fixes rpcbind to be able to build with 

+                         recent tirpc versions.

+

+From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001

+From: Steve Dickson <steved@redhat.com>

+Date: Mon, 2 Nov 2015 17:05:18 -0500

+Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly

+

+In the latest libtirpc version to access the xp_auth

+one must use the SVC_XP_AUTH macro. To be backwards

+compatible a couple ifdefs were added to use the

+macro when it exists.

+

+Signed-off-by: Steve Dickson <steved@redhat.com>

+---

+ src/rpcb_svc_com.c | 7 +++++++

+ 1 file changed, 7 insertions(+)

+

+diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c

+index 4ae93f1..22d6c84 100644

+--- a/src/rpcb_svc_com.c

+@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt)

+ 	a.rmt_localvers = fi->versnum;

+ 

+ 	xprt_set_caller(xprt, fi);

++#if defined(SVC_XP_AUTH)

++	SVC_XP_AUTH(xprt) = svc_auth_none;

++#else 

+ 	xprt->xp_auth = &svc_auth_none;

++#endif

+ 	svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);

++#if !defined(SVC_XP_AUTH)

+ 	SVCAUTH_DESTROY(xprt->xp_auth);

+ 	xprt->xp_auth = NULL;

++#endif

++

+ done:

+ 	if (buffer)

+ 		free(buffer);

+-- 

+1.8.2.1

+

new file mode 100644

@@ -0,0 +1,12 @@

+[Unit]

+Description=RPC Bind Service

+Requires=rpcbind.socket

+

+[Service]

+Type=forking

+EnvironmentFile=-/etc/sysconfig/rpcbind

+ExecStart=/usr/sbin/rpcbind $RPCBIND_OPTIONS -w

+

+[Install]

+WantedBy=multi-user.target

+Also=rpcbind.socket

new file mode 100644

@@ -0,0 +1,8 @@

+[Unit]

+Description=RPCbind Server Activation Socket

+

+[Socket]

+ListenStream=/var/run/rpcbind.sock

+

+[Install]

+WantedBy=sockets.target

new file mode 100644

@@ -0,0 +1,80 @@

+Summary:	RPC program number mapper

+Name:		rpcbind

+Version:	0.2.3

+Release:	1%{?dist}

+License:	BSD

+URL:		http://nfsv4.bullopensource.org

+Group:	    Applications/Daemons

+Source0:    http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2

+%define sha1 rpcbind=e79974a99d09b6d6fff9d86bf00225dc33723ce2

+Source1:    rpcbind.service

+Source2:    rpcbind.socket

+Source3:    rpcbind.sysconfig

+Patch0:     http://www.linuxfromscratch.org/patches/blfs/svn/rpcbind-0.2.3-tirpc_fix-1.patch

+Vendor:     VMware, Inc.

+Distribution:   Photon

+BuildRequires:	libtirpc-devel

+BuildRequires:  systemd

+Requires:       libtirpc

+Requires:       systemd

+%description

+The rpcbind program is a replacement for portmap. It is required for import or export of Network File System (NFS) shared directories. The rpcbind utility is a server that converts RPC program numbers into universal addresses

+%prep

+%setup -q

+%patch0 -p1

+%build

+sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c

+./configure --prefix=%{_prefix}      \

+            --bindir=%{_sbindir}     \

+            --enable-warmstarts \

+            --disable-debug \

+            --with-statedir=%{_localstatedir}/lib/rpcbind \

+            --with-rpcuser=rpc

+make

+%install

+make DESTDIR=%{buildroot} install

+mkdir -p %{buildroot}%{_localstatedir}/lib/rpcbind

+mkdir -p %{buildroot}%{_unitdir}

+mkdir -p %{buildroot}/etc/sysconfig

+install -m644 %{SOURCE1} %{buildroot}%{_unitdir}

+install -m644 %{SOURCE2} %{buildroot}%{_unitdir}

+install -m644 %{SOURCE3} %{buildroot}/etc/sysconfig/rpcbind

+

+%files

+%defattr(-,root,root)

+%config(noreplace) /etc/sysconfig/rpcbind

+%{_sbindir}/*

+%{_mandir}/man8/*

+%dir %{_localstatedir}/lib/rpcbind

+%{_unitdir}/*

+

+%check

+make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

+%post

+/sbin/ldconfig

+chown -v root:sys /var/lib/rpcbind

+if ! getent group rpc >/dev/null; then

+	groupadd -g 31 rpc

+fi

+if ! getent passwd rpc >/dev/null; then

+	useradd -d /var/lib/rpcbind -g rpc -s /bin/false -u 31 rpc

+fi

+systemctl enable rpcbind.socket >/dev/null 2>&1

+systemctl enable rpcbind.service >/dev/null 2>&1

+

+

+%postun

+/sbin/ldconfig

+if getent passwd rpc >/dev/null; then

+	userdel rpc

+fi

+if getent group rpc >/dev/null; then

+	groupdel rpc

+fi

+systemctl disable rpcbind.socket >/dev/null 2>&1

+systemctl disable rpcbind.service >/dev/null 2>&1

+%clean

+rm -rf %{buildroot}/*

+%changelog

+*	Tue Dec 8 2015 Divya Thaluru <dthaluru@vmware.com> 0.2.3-1

+-	Initial build.	First version

new file mode 100644

@@ -0,0 +1,4 @@

+#

+# Optional arguments passed to rpcbind. See rpcbind(8)

+RPCBIND_OPTIONS=""

+