From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/3] nfs-utils: Update to 2.6.2 Date: Tue, 21 Feb 2023 15:45:51 +0100 Message-ID: <20230221144552.857087-2-stefan.schantl@ipfire.org> In-Reply-To: <20230221144552.857087-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2880111478335891013==" List-Id: --===============2880111478335891013== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable * Provides libnfsidmap packages from now * Drop systemd files because the package contains their own Signed-off-by: Stefan Schantl --- nfs-utils/nfs-utils.nm | 25 +++++++++++++++---- nfs-utils/systemd/nfs-blkmap.service | 12 --------- nfs-utils/systemd/nfs-idmap.service | 12 --------- nfs-utils/systemd/nfs-lock.service | 14 ----------- nfs-utils/systemd/nfs-mountd.service | 12 --------- nfs-utils/systemd/nfs-rquotad.service | 12 --------- nfs-utils/systemd/nfs-secure-server.service | 13 ---------- nfs-utils/systemd/nfs-secure.service | 12 --------- nfs-utils/systemd/nfs-server.service | 18 ------------- nfs-utils/systemd/nfs.target | 7 ------ nfs-utils/systemd/proc-fs-nfsd.mount | 8 ------ .../systemd/var-lib-nfs-rpc_pipefs.mount | 8 ------ 12 files changed, 20 insertions(+), 133 deletions(-) delete mode 100644 nfs-utils/systemd/nfs-blkmap.service delete mode 100644 nfs-utils/systemd/nfs-idmap.service delete mode 100644 nfs-utils/systemd/nfs-lock.service delete mode 100644 nfs-utils/systemd/nfs-mountd.service delete mode 100644 nfs-utils/systemd/nfs-rquotad.service delete mode 100644 nfs-utils/systemd/nfs-secure-server.service delete mode 100644 nfs-utils/systemd/nfs-secure.service delete mode 100644 nfs-utils/systemd/nfs-server.service delete mode 100644 nfs-utils/systemd/nfs.target delete mode 100644 nfs-utils/systemd/proc-fs-nfsd.mount delete mode 100644 nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount diff --git a/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm index 07ac64ce1..f703bf53a 100644 --- a/nfs-utils/nfs-utils.nm +++ b/nfs-utils/nfs-utils.nm @@ -4,7 +4,7 @@ ############################################################################= ### =20 name =3D nfs-utils -version =3D 1.3.3 +version =3D 2.6.2 release =3D 1 =20 groups =3D Networking/Tools @@ -36,13 +36,14 @@ build libcap-devel libevent-devel libgssglue-devel >=3D 0.3 + libkeyutils-devel libmount-devel - libnfsidmap-devel libtirpc-devel libtool + rpcsvc-proto shadow-utils sqlite-devel - systemd-units + systemd-devel end =20 configure_options +=3D \ @@ -50,9 +51,16 @@ build --enable-libmount-mount \ --enable-mountconfig \ --enable-ipv6 \ - --with-statdpath=3D/var/lib/nfs/statd + --enable-gss \ + --with-statedir=3D/var/lib/nfs \ + --with-statdpath=3D/var/lib/nfs/statd \ + --with-start-statd=3D/usr/bin/start-statd \ + --with-systemd =20 prepare_cmds + # Install utils into correct place. + sed -i "s|sbindir =3D /sbin|sbindir =3D /usr/bin|g" utils/*/Makefile.am + sh autogen.sh =20 %{create_user} @@ -96,7 +104,6 @@ packages end =20 requires - libnfsidmap >=3D 0.25 quota rpcbind util-linux @@ -126,6 +133,14 @@ packages end end =20 + 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-blk= map.service deleted file mode 100644 index 6b5127ba5..000000000 --- a/nfs-utils/systemd/nfs-blkmap.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=3DpNFS block layout mapping daemon -Wants=3Dvar-lib-nfs-rpc_pipefs.mount -Requires=3Dvar-lib-nfs-rpc_pipefs.mount - -[Service] -Type=3Dforking -StandardError=3Dsyslog+console -ExecStart=3D/usr/sbin/blkmapd - -[Install] -WantedBy=3Dmulti-user.target diff --git a/nfs-utils/systemd/nfs-idmap.service b/nfs-utils/systemd/nfs-idma= p.service deleted file mode 100644 index e0c18037d..000000000 --- a/nfs-utils/systemd/nfs-idmap.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=3DNFSv4 ID-name mapping daemon -BindTo=3Dnfs-server.service -After=3Dnfs-server.service - -[Service] -Type=3Dforking -StandardError=3Dsyslog+console -ExecStart=3D/usr/sbin/rpc.idmapd - -[Install] -WantedBy=3Dnfs.target diff --git a/nfs-utils/systemd/nfs-lock.service b/nfs-utils/systemd/nfs-lock.= service deleted file mode 100644 index fa991e5c1..000000000 --- a/nfs-utils/systemd/nfs-lock.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=3DNFS file locking service. -Requires=3Drpcbind.service network.target -After=3Dnetwork.target named.service rpcbind.service -Before=3Dremote-fs-pre.target - -[Service] -Type=3Dforking -StandardError=3Dsyslog+console -ExecStartPre=3D/usr/lib/nfs-utils/scripts/nfs-lock.preconfig -ExecStart=3D/sbin/rpc.statd - -[Install] -WantedBy=3Dmulti-user.target diff --git a/nfs-utils/systemd/nfs-mountd.service b/nfs-utils/systemd/nfs-mou= ntd.service deleted file mode 100644 index 32e1638c7..000000000 --- a/nfs-utils/systemd/nfs-mountd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=3DNFS Mount Daemon -BindTo=3Dnfs-server.service -After=3Dnfs-server.service - -[Service] -Type=3Dforking -ExecStart=3D/usr/sbin/rpc.mountd -StandardError=3Dsyslog+console - -[Install] -WantedBy=3Dnfs.target diff --git a/nfs-utils/systemd/nfs-rquotad.service b/nfs-utils/systemd/nfs-rq= uotad.service deleted file mode 100644 index ab1d2078e..000000000 --- a/nfs-utils/systemd/nfs-rquotad.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=3DNFS Remote Quota Server -BindTo=3Dnfs-server.service -After=3Dnfs-server.service - -[Service] -Type=3Dforking -StandardError=3Dsyslog+console -ExecStart=3D-/usr/sbin/rpc.rquotad - -[Install] -WantedBy=3Dnfs.target diff --git a/nfs-utils/systemd/nfs-secure-server.service b/nfs-utils/systemd/= nfs-secure-server.service deleted file mode 100644 index b88bab55c..000000000 --- a/nfs-utils/systemd/nfs-secure-server.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=3DSecure NFS Server -Requires=3Dvar-lib-nfs-rpc_pipefs.mount nfs-server.service -After=3Dsyslog.target var-lib-nfs-rpc_pipefs.mount nfs-server.service=20 - -[Service] -Type=3Dforking -StandardError=3Dsyslog+console -ExecStart=3D/usr/sbin/rpc.svcgssd - -[Install] -WantedBy=3Dmulti-user.target - diff --git a/nfs-utils/systemd/nfs-secure.service b/nfs-utils/systemd/nfs-sec= ure.service deleted file mode 100644 index 2a7dfb678..000000000 --- a/nfs-utils/systemd/nfs-secure.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=3DSecure NFS -Requires=3Dvar-lib-nfs-rpc_pipefs.mount -After=3Dsyslog.target var-lib-nfs-rpc_pipefs.mount - -[Service] -Type=3Dforking -StandardError=3Dsyslog+console -ExecStart=3D/usr/sbin/rpc.gssd - -[Install] -WantedBy=3Dmulti-user.target diff --git a/nfs-utils/systemd/nfs-server.service b/nfs-utils/systemd/nfs-ser= ver.service deleted file mode 100644 index 79d114e0d..000000000 --- a/nfs-utils/systemd/nfs-server.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=3DNFS Server -Requires=3Dproc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service -Requires=3Dnfs-idmap.service nfs-mountd.service nfs-rquotad.service -After=3Dnetwork.target named.service - -[Service] -Type=3Doneshot -RemainAfterExit=3Dyes -StandardError=3Dsyslog+console -ExecStartPre=3D/usr/sbin/exportfs -r -ExecStart=3D/usr/sbin/rpc.nfsd -ExecStop=3D/usr/sbin/rpc.nfsd 0 -ExecStopPost=3D/usr/sbin/exportfs -f - -[Install] -WantedBy=3Dmulti-user.target - diff --git a/nfs-utils/systemd/nfs.target b/nfs-utils/systemd/nfs.target deleted file mode 100644 index 6c3262a76..000000000 --- a/nfs-utils/systemd/nfs.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=3DNetwork File System Server -Requires=3Dvar-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount rpcbind.service -After=3Dnetwork.target named.service=20 - -[Install] -WantedBy=3Dmulti-user.target diff --git a/nfs-utils/systemd/proc-fs-nfsd.mount b/nfs-utils/systemd/proc-fs= -nfsd.mount deleted file mode 100644 index e5ee6fbf6..000000000 --- a/nfs-utils/systemd/proc-fs-nfsd.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=3DRPC Pipe File System=20 -DefaultDependencies=3Dno - -[Mount] -What=3Dsunrpc -Where=3D/proc/fs/nfsd -Type=3Dnfsd diff --git a/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount b/nfs-utils/syste= md/var-lib-nfs-rpc_pipefs.mount deleted file mode 100644 index d27e1a26a..000000000 --- a/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=3DRPC Pipe File System=20 -DefaultDependencies=3Dno - -[Mount] -What=3Dsunrpc -Where=3D/var/lib/nfs/rpc_pipefs -Type=3Drpc_pipefs --=20 2.30.2 --===============2880111478335891013==--