diff --git a/nfs-utils-2.6.1-overflow.patch b/nfs-utils-2.6.1-overflow.patch deleted file mode 100644 index 1f90bb484d88d56ad342aba4f7c9ba3f797e5ac0..0000000000000000000000000000000000000000 --- a/nfs-utils-2.6.1-overflow.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 7f8463fe702174bd613df9d308cc899af25ae02e -Author: Steve Dickson -Date: Wed Feb 23 15:19:51 2022 -0500 - - systemd: Fix format-overflow warning - - rpc-pipefs-generator.c:35:23: error: '%s' directive output between 0 and 2147483653 bytes may exceed minimum required size of 4095 [-Werror=format-overflow=] - 35 | sprintf(path, "%s/%s", dirname, pipefs_unit); - | ^ - - Signed-off-by: Steve Dickson - -diff --git a/systemd/rpc-pipefs-generator.c b/systemd/rpc-pipefs-generator.c -index c24db56..7b2bb4f 100644 ---- a/systemd/rpc-pipefs-generator.c -+++ b/systemd/rpc-pipefs-generator.c -@@ -28,11 +28,12 @@ static int generate_mount_unit(const char *pipefs_path, const char *pipefs_unit, - { - char *path; - FILE *f; -+ size_t size = (strlen(dirname) + 1 + strlen(pipefs_unit)); - -- path = malloc(strlen(dirname) + 1 + strlen(pipefs_unit)); -+ path = malloc(size); - if (!path) - return 1; -- sprintf(path, "%s/%s", dirname, pipefs_unit); -+ snprintf(path, size, "%s/%s", dirname, pipefs_unit); - f = fopen(path, "w"); - if (!f) - { diff --git a/nfs-utils-2.6.1.tar.xz b/nfs-utils-2.6.1.tar.xz deleted file mode 100644 index baafb1d867577fa1c9d7536bec21bb372edd8960..0000000000000000000000000000000000000000 Binary files a/nfs-utils-2.6.1.tar.xz and /dev/null differ diff --git a/nfs-utils-2.6.2.tar.xz b/nfs-utils-2.6.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..722838ee24e02a8433ee171b163d1d1b840b7419 Binary files /dev/null and b/nfs-utils-2.6.2.tar.xz differ diff --git a/nfs-utils.spec b/nfs-utils.spec index 6db5f433e3192123000bdfa334c00f6f44d04ae7..be55f93822e01224d6e4cef474c152f168801f35 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Name: nfs-utils URL: http://linux-nfs.org/ -Version: 2.6.1 +Version: 2.6.2 Release: %{anolis_release}%{?dist} Epoch: 1 @@ -15,8 +15,6 @@ Source5: nfsconvert.sh Source6: nfs-convert.service Source7: 10-nfsv4.conf -Patch001: nfs-utils-2.6.1-overflow.patch - Patch101: nfs-utils-2.3.1-systemd-gssproxy-restart.patch Patch102: nfs-utils-2.3.3-nfsconf-usegssproxy.patch Patch103: nfs-utils-2.4.2-systemd-svcgssd.patch @@ -59,6 +57,14 @@ Requires: rpcbind, sed, gawk, grep Requires: kmod, keyutils, quota %{?systemd_requires} +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %package -n nfs-utils-coreos Summary: Minimal NFS utilities for supporting clients Provides: nfsstat = %{epoch}:%{version}-%{release} @@ -101,7 +107,7 @@ The nfsv4-client-utils packages provided NFSv4 client support %package -n libnfsidmap Summary: NFSv4 User and Group ID Mapping Library -Provides: libnfsidmap%{?_isa} = %{epoch}:%{version}-%{release} +Provides: libnfsidmap = %{epoch}:%{version}-%{release} License: BSD BuildRequires: pkgconfig, openldap-devel BuildRequires: automake, libtool @@ -112,7 +118,7 @@ Library that handles mapping between names and ids for NFSv4. %package -n libnfsidmap-devel Summary: Development files for the libnfsidmap library -Requires: libnfsidmap%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libnfsidmap = %{epoch}:%{version}-%{release} Requires: pkgconfig %description -n libnfsidmap-devel @@ -315,13 +321,15 @@ fi %config(noreplace) %{_sysconfdir}/modprobe.d/lockd.conf %config(noreplace) %{_sysconfdir}/nfs.conf %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/gssproxy/24-nfs-server.conf -%doc linux-nfs/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README -%doc linux-nfs/THANKS linux-nfs/TODO +%attr(0600,root,root) %config(noreplace) /usr/lib/modprobe.d/50-nfs.conf + +%doc linux-nfs/KNOWNBUGS /sbin/rpc.statd /sbin/nfsdcltrack %{_sbindir}/exportfs %{_sbindir}/nfsstat %{_sbindir}/rpcdebug +%{_sbindir}/rpcctl %{_sbindir}/rpc.mountd %{_sbindir}/rpc.nfsd %{_sbindir}/showmount @@ -335,20 +343,24 @@ fi %{_sbindir}/blkmapd %{_sbindir}/nfsconf %{_sbindir}/nfsref -%{_sbindir}/nfsconvert %{_sbindir}/nfsdcld %{_sbindir}/nfsdclddb %{_sbindir}/nfsdclnts +%{_libexecdir}/nfsrahead +%{_udevrulesdir}/99-nfs.rules %{_mandir}/*/* %{_pkgdir}/*/* %attr(4755,root,root) /sbin/mount.nfs -%attr(755,root,root) %{_libexecdir}/nfs-utils/nfsconvert.sh /sbin/mount.nfs4 /sbin/umount.nfs /sbin/umount.nfs4 +%files doc +%doc linux-nfs/ChangeLog linux-nfs/NEW linux-nfs/README +%doc linux-nfs/THANKS linux-nfs/TODO + %files -n libnfsidmap %doc support/nfsidmap/AUTHORS support/nfsidmap/README support/nfsidmap/COPYING %config(noreplace) %{_sysconfdir}/idmapd.conf @@ -447,5 +459,8 @@ fi %{_mandir}/*/nfsiostat.8.gz %changelog +* Fri Sep 23 2022 mgb01105731 - 2.6.2-1 +- update to 2.6.2 + * Wed Mar 09 2022 Chunmei Xu 2.6.1-1 - init from usptream 2.6.1