nfs-utils: Update to 2.6.2

* Provides libnfsidmap packages from now
* Drop systemd files because the package contains
  their own

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm
index 07ac64ce143bab0f401addaf6e265ad6d6f36dbc..f703bf53abfd5c1afe6a4c0b26fcdad27b7adf54 100644 (file)
--- a/nfs-utils/nfs-utils.nm
+++ b/nfs-utils/nfs-utils.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = nfs-utils
-version    = 1.3.3
+version    = 2.6.2
 release    = 1
 
 groups     = Networking/Tools
@@ -36,13 +36,14 @@ build
                libcap-devel
                libevent-devel
                libgssglue-devel >= 0.3
+               libkeyutils-devel
                libmount-devel
-               libnfsidmap-devel
                libtirpc-devel
                libtool
+               rpcsvc-proto
                shadow-utils
                sqlite-devel
-               systemd-units
+               systemd-devel
        end
 
        configure_options += \
@@ -50,9 +51,16 @@ build
                --enable-libmount-mount \
                --enable-mountconfig \
                --enable-ipv6 \
-               --with-statdpath=/var/lib/nfs/statd
+               --enable-gss \
+               --with-statedir=/var/lib/nfs \
+               --with-statdpath=/var/lib/nfs/statd \
+               --with-start-statd=/usr/bin/start-statd \
+               --with-systemd
 
        prepare_cmds
+               # Install utils into correct place.
+               sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
+
                sh autogen.sh
 
                %{create_user}
@@ -96,7 +104,6 @@ packages
                end
 
                requires
-                       libnfsidmap >= 0.25
                        quota
                        rpcbind
                        util-linux
@@ -126,6 +133,14 @@ packages
                end
        end
 
+       package libnfsidmap
+               template LIBS
+       end
+
+       package libnfsidmap-devel
+               template DEVEL
+       end
+
        package %{name}-debuginfo
                template DEBUGINFO
        end

diff --git a/nfs-utils/systemd/nfs-blkmap.service b/nfs-utils/systemd/nfs-blkmap.service
deleted file mode 100644 (file)
index 6b5127b..0000000
--- a/nfs-utils/systemd/nfs-blkmap.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=pNFS block layout mapping daemon
-Wants=var-lib-nfs-rpc_pipefs.mount
-Requires=var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStart=/usr/sbin/blkmapd
-
-[Install]
-WantedBy=multi-user.target

diff --git a/nfs-utils/systemd/nfs-idmap.service b/nfs-utils/systemd/nfs-idmap.service
deleted file mode 100644 (file)
index e0c1803..0000000
--- a/nfs-utils/systemd/nfs-idmap.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFSv4 ID-name mapping daemon
-BindTo=nfs-server.service
-After=nfs-server.service
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStart=/usr/sbin/rpc.idmapd
-
-[Install]
-WantedBy=nfs.target

diff --git a/nfs-utils/systemd/nfs-lock.service b/nfs-utils/systemd/nfs-lock.service
deleted file mode 100644 (file)
index fa991e5..0000000
--- a/nfs-utils/systemd/nfs-lock.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=NFS file locking service.
-Requires=rpcbind.service network.target
-After=network.target named.service rpcbind.service
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStartPre=/usr/lib/nfs-utils/scripts/nfs-lock.preconfig
-ExecStart=/sbin/rpc.statd
-
-[Install]
-WantedBy=multi-user.target

diff --git a/nfs-utils/systemd/nfs-mountd.service b/nfs-utils/systemd/nfs-mountd.service
deleted file mode 100644 (file)
index 32e1638..0000000
--- a/nfs-utils/systemd/nfs-mountd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-BindTo=nfs-server.service
-After=nfs-server.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/rpc.mountd
-StandardError=syslog+console
-
-[Install]
-WantedBy=nfs.target

diff --git a/nfs-utils/systemd/nfs-rquotad.service b/nfs-utils/systemd/nfs-rquotad.service
deleted file mode 100644 (file)
index ab1d207..0000000
--- a/nfs-utils/systemd/nfs-rquotad.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFS Remote Quota Server
-BindTo=nfs-server.service
-After=nfs-server.service
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStart=-/usr/sbin/rpc.rquotad
-
-[Install]
-WantedBy=nfs.target

diff --git a/nfs-utils/systemd/nfs-secure-server.service b/nfs-utils/systemd/nfs-secure-server.service
deleted file mode 100644 (file)
index b88bab5..0000000
--- a/nfs-utils/systemd/nfs-secure-server.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Secure NFS Server
-Requires=var-lib-nfs-rpc_pipefs.mount nfs-server.service
-After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-server.service 
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStart=/usr/sbin/rpc.svcgssd
-
-[Install]
-WantedBy=multi-user.target
-

diff --git a/nfs-utils/systemd/nfs-secure.service b/nfs-utils/systemd/nfs-secure.service
deleted file mode 100644 (file)
index 2a7dfb6..0000000
--- a/nfs-utils/systemd/nfs-secure.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Secure NFS
-Requires=var-lib-nfs-rpc_pipefs.mount
-After=syslog.target var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStart=/usr/sbin/rpc.gssd
-
-[Install]
-WantedBy=multi-user.target

diff --git a/nfs-utils/systemd/nfs-server.service b/nfs-utils/systemd/nfs-server.service
deleted file mode 100644 (file)
index 79d114e..0000000
--- a/nfs-utils/systemd/nfs-server.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=NFS Server
-Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service
-Requires=nfs-idmap.service nfs-mountd.service nfs-rquotad.service
-After=network.target named.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-StandardError=syslog+console
-ExecStartPre=/usr/sbin/exportfs -r
-ExecStart=/usr/sbin/rpc.nfsd
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -f
-
-[Install]
-WantedBy=multi-user.target
-

diff --git a/nfs-utils/systemd/nfs.target b/nfs-utils/systemd/nfs.target
deleted file mode 100644 (file)
index 6c3262a..0000000
--- a/nfs-utils/systemd/nfs.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Network File System Server
-Requires=var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount rpcbind.service
-After=network.target named.service 
-
-[Install]
-WantedBy=multi-user.target

diff --git a/nfs-utils/systemd/proc-fs-nfsd.mount b/nfs-utils/systemd/proc-fs-nfsd.mount
deleted file mode 100644 (file)
index e5ee6fb..0000000
--- a/nfs-utils/systemd/proc-fs-nfsd.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPC Pipe File System 
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/proc/fs/nfsd
-Type=nfsd

diff --git a/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount b/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount
deleted file mode 100644 (file)
index d27e1a2..0000000
--- a/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPC Pipe File System 
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/var/lib/nfs/rpc_pipefs
-Type=rpc_pipefs