From 0a5cbbdec004ec312b54af5c4b97fea6feea800d Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Tue, 31 Oct 2017 14:00:07 -0400 Subject: [PATCH] Updated to latest upstream release: nfs-utils-2-2-1 Signed-off-by: Steve Dickson --- .gitignore | 6 +-- nfs-utils-2.1.1-nfs-config.patch | 75 +++++++++++++++-------------- nfs-utils.spec | 82 ++++++++++++++++++++++---------- sources | 2 +- 4 files changed, 97 insertions(+), 68 deletions(-) diff --git a/.gitignore b/.gitignore index 817fe1d..6cfba05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ x86_64 Makefile -nfs-utils-1.3.4/ -/nfs-utils-1.3.4.tar.xz -/nfs-utils-2.1.1.tar.xz -nfs-utils-2.1.1/ +/nfs-utils-2.2.1.tar.xz +nfs-utils-2.2.1/ diff --git a/nfs-utils-2.1.1-nfs-config.patch b/nfs-utils-2.1.1-nfs-config.patch index 28e9672..2eb0fb1 100644 --- a/nfs-utils-2.1.1-nfs-config.patch +++ b/nfs-utils-2.1.1-nfs-config.patch @@ -1,7 +1,7 @@ -diff -up nfs-utils-2.1.1/configure.ac.orig nfs-utils-2.1.1/configure.ac ---- nfs-utils-2.1.1/configure.ac.orig 2017-01-12 10:21:39.000000000 -0500 -+++ nfs-utils-2.1.1/configure.ac 2017-04-26 12:22:25.320882445 -0400 -@@ -518,6 +518,11 @@ AC_SUBST([AM_CFLAGS], ["$my_am_cflags"]) +diff -up nfs-utils-2.2.1/configure.ac.orig nfs-utils-2.2.1/configure.ac +--- nfs-utils-2.2.1/configure.ac.orig 2017-10-25 15:32:19.000000000 -0400 ++++ nfs-utils-2.2.1/configure.ac 2017-10-25 15:52:43.287511759 -0400 +@@ -552,6 +552,11 @@ AC_SUBST([AM_CFLAGS], ["$my_am_cflags"]) # Make sure that $ACLOCAL_FLAGS are used during a rebuild AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) @@ -13,7 +13,7 @@ diff -up nfs-utils-2.1.1/configure.ac.orig nfs-utils-2.1.1/configure.ac # make _sysconfdir available for substituion in config files # 2 "evals" needed late to expand variable names. AC_SUBST([_sysconfdir]) -@@ -525,6 +530,7 @@ AC_CONFIG_COMMANDS_PRE([eval eval _sysco +@@ -559,6 +564,7 @@ AC_CONFIG_COMMANDS_PRE([eval eval _sysco AC_CONFIG_FILES([ Makefile @@ -21,9 +21,9 @@ diff -up nfs-utils-2.1.1/configure.ac.orig nfs-utils-2.1.1/configure.ac systemd/rpc-gssd.service linux-nfs/Makefile support/Makefile -diff -up nfs-utils-2.1.1/systemd/Makefile.am.orig nfs-utils-2.1.1/systemd/Makefile.am ---- nfs-utils-2.1.1/systemd/Makefile.am.orig 2017-04-26 12:21:44.759035047 -0400 -+++ nfs-utils-2.1.1/systemd/Makefile.am 2017-04-26 12:22:25.321882441 -0400 +diff -up nfs-utils-2.2.1/systemd/Makefile.am.orig nfs-utils-2.2.1/systemd/Makefile.am +--- nfs-utils-2.2.1/systemd/Makefile.am.orig 2017-10-25 15:32:19.000000000 -0400 ++++ nfs-utils-2.2.1/systemd/Makefile.am 2017-10-25 15:52:43.287511759 -0400 @@ -6,6 +6,7 @@ unit_files = \ nfs-client.target \ rpc_pipefs.target \ @@ -32,9 +32,9 @@ diff -up nfs-utils-2.1.1/systemd/Makefile.am.orig nfs-utils-2.1.1/systemd/Makefi nfs-mountd.service \ nfs-server.service \ nfs-utils.service \ -diff -up nfs-utils-2.1.1/systemd/nfs-blkmap.service.orig nfs-utils-2.1.1/systemd/nfs-blkmap.service ---- nfs-utils-2.1.1/systemd/nfs-blkmap.service.orig 2017-04-26 12:21:44.759035047 -0400 -+++ nfs-utils-2.1.1/systemd/nfs-blkmap.service 2017-04-26 12:22:25.321882441 -0400 +diff -up nfs-utils-2.2.1/systemd/nfs-blkmap.service.orig nfs-utils-2.2.1/systemd/nfs-blkmap.service +--- nfs-utils-2.2.1/systemd/nfs-blkmap.service.orig 2017-10-25 15:32:19.000000000 -0400 ++++ nfs-utils-2.2.1/systemd/nfs-blkmap.service 2017-10-25 15:52:43.288511762 -0400 @@ -10,7 +10,8 @@ PartOf=nfs-utils.service [Service] Type=forking @@ -45,9 +45,9 @@ diff -up nfs-utils-2.1.1/systemd/nfs-blkmap.service.orig nfs-utils-2.1.1/systemd [Install] WantedBy=nfs-client.target -diff -up nfs-utils-2.1.1/systemd/nfs-config.service.in.orig nfs-utils-2.1.1/systemd/nfs-config.service.in ---- nfs-utils-2.1.1/systemd/nfs-config.service.in.orig 2017-04-26 12:22:25.322882438 -0400 -+++ nfs-utils-2.1.1/systemd/nfs-config.service.in 2017-04-26 12:22:25.322882438 -0400 +diff -up nfs-utils-2.2.1/systemd/nfs-config.service.in.orig nfs-utils-2.2.1/systemd/nfs-config.service.in +--- nfs-utils-2.2.1/systemd/nfs-config.service.in.orig 2017-10-25 15:52:43.288511762 -0400 ++++ nfs-utils-2.2.1/systemd/nfs-config.service.in 2017-10-25 15:52:43.288511762 -0400 @@ -0,0 +1,13 @@ +[Unit] +Description=Preprocess NFS configuration @@ -62,9 +62,9 @@ diff -up nfs-utils-2.1.1/systemd/nfs-config.service.in.orig nfs-utils-2.1.1/syst +# ensures this happens. +RemainAfterExit=no +ExecStart=@_libexecdir@/nfs-utils/nfs-utils_env.sh -diff -up nfs-utils-2.1.1/systemd/nfs-idmapd.service.orig nfs-utils-2.1.1/systemd/nfs-idmapd.service ---- nfs-utils-2.1.1/systemd/nfs-idmapd.service.orig 2017-04-26 12:21:44.759035047 -0400 -+++ nfs-utils-2.1.1/systemd/nfs-idmapd.service 2017-04-26 12:22:25.322882438 -0400 +diff -up nfs-utils-2.2.1/systemd/nfs-idmapd.service.orig nfs-utils-2.2.1/systemd/nfs-idmapd.service +--- nfs-utils-2.2.1/systemd/nfs-idmapd.service.orig 2017-10-25 15:32:19.000000000 -0400 ++++ nfs-utils-2.2.1/systemd/nfs-idmapd.service 2017-10-25 15:52:43.288511762 -0400 @@ -6,6 +6,10 @@ After=rpc_pipefs.target local-fs.target BindsTo=nfs-server.service @@ -77,9 +77,9 @@ diff -up nfs-utils-2.1.1/systemd/nfs-idmapd.service.orig nfs-utils-2.1.1/systemd Type=forking -ExecStart=/usr/sbin/rpc.idmapd +ExecStart=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS -diff -up nfs-utils-2.1.1/systemd/nfs-mountd.service.orig nfs-utils-2.1.1/systemd/nfs-mountd.service ---- nfs-utils-2.1.1/systemd/nfs-mountd.service.orig 2017-04-26 12:21:44.765035024 -0400 -+++ nfs-utils-2.1.1/systemd/nfs-mountd.service 2017-04-26 12:22:25.323882434 -0400 +diff -up nfs-utils-2.2.1/systemd/nfs-mountd.service.orig nfs-utils-2.2.1/systemd/nfs-mountd.service +--- nfs-utils-2.2.1/systemd/nfs-mountd.service.orig 2017-10-25 15:32:19.000000000 -0400 ++++ nfs-utils-2.2.1/systemd/nfs-mountd.service 2017-10-25 15:52:43.289511766 -0400 @@ -8,6 +8,10 @@ After=network-online.target local-fs.tar After=rpcbind.socket BindsTo=nfs-server.service @@ -92,9 +92,9 @@ diff -up nfs-utils-2.1.1/systemd/nfs-mountd.service.orig nfs-utils-2.1.1/systemd Type=forking -ExecStart=/usr/sbin/rpc.mountd +ExecStart=/usr/sbin/rpc.mountd $RPCMOUNTDARGS -diff -up nfs-utils-2.1.1/systemd/nfs-server.service.orig nfs-utils-2.1.1/systemd/nfs-server.service ---- nfs-utils-2.1.1/systemd/nfs-server.service.orig 2017-04-26 12:21:44.765035024 -0400 -+++ nfs-utils-2.1.1/systemd/nfs-server.service 2017-04-26 12:22:25.323882434 -0400 +diff -up nfs-utils-2.2.1/systemd/nfs-server.service.orig nfs-utils-2.2.1/systemd/nfs-server.service +--- nfs-utils-2.2.1/systemd/nfs-server.service.orig 2017-10-25 15:32:19.000000000 -0400 ++++ nfs-utils-2.2.1/systemd/nfs-server.service 2017-10-25 15:52:43.289511766 -0400 @@ -16,11 +16,16 @@ Before= rpc-statd-notify.service Wants=auth-rpcgss-module.service After=rpc-gssd.service gssproxy.service rpc-svcgssd.service @@ -113,9 +113,9 @@ diff -up nfs-utils-2.1.1/systemd/nfs-server.service.orig nfs-utils-2.1.1/systemd ExecStop=/usr/sbin/rpc.nfsd 0 ExecStopPost=/usr/sbin/exportfs -au ExecStopPost=/usr/sbin/exportfs -f -diff -up nfs-utils-2.1.1/systemd/README.orig nfs-utils-2.1.1/systemd/README ---- nfs-utils-2.1.1/systemd/README.orig 2017-01-12 10:21:39.000000000 -0500 -+++ nfs-utils-2.1.1/systemd/README 2017-04-26 12:22:25.324882430 -0400 +diff -up nfs-utils-2.2.1/systemd/README.orig nfs-utils-2.2.1/systemd/README +--- nfs-utils-2.2.1/systemd/README.orig 2017-10-25 15:32:19.000000000 -0400 ++++ nfs-utils-2.2.1/systemd/README 2017-10-25 15:52:43.289511766 -0400 @@ -19,8 +19,8 @@ by a suitable 'preset' setting: can work (if no type is given, ".service" is assumed). @@ -152,9 +152,9 @@ diff -up nfs-utils-2.1.1/systemd/README.orig nfs-utils-2.1.1/systemd/README rpc.gssd and rpc.svcgssd are assumed to be needed if /etc/krb5.keytab is present. -diff -up nfs-utils-2.1.1/systemd/rpc-gssd.service.in.orig nfs-utils-2.1.1/systemd/rpc-gssd.service.in ---- nfs-utils-2.1.1/systemd/rpc-gssd.service.in.orig 2017-04-26 12:21:44.760035043 -0400 -+++ nfs-utils-2.1.1/systemd/rpc-gssd.service.in 2017-04-26 12:22:25.324882430 -0400 +diff -up nfs-utils-2.2.1/systemd/rpc-gssd.service.in.orig nfs-utils-2.2.1/systemd/rpc-gssd.service.in +--- nfs-utils-2.2.1/systemd/rpc-gssd.service.in.orig 2017-10-25 15:32:19.000000000 -0400 ++++ nfs-utils-2.2.1/systemd/rpc-gssd.service.in 2017-10-25 15:52:43.290511769 -0400 @@ -9,6 +9,11 @@ ConditionPathExists=@_sysconfdir@/krb5.k PartOf=nfs-utils.service @@ -168,10 +168,10 @@ diff -up nfs-utils-2.1.1/systemd/rpc-gssd.service.in.orig nfs-utils-2.1.1/system Type=forking -ExecStart=/usr/sbin/rpc.gssd +ExecStart=/usr/sbin/rpc.gssd $RPCGSSDARGS -diff -up nfs-utils-2.1.1/systemd/rpc-statd-notify.service.orig nfs-utils-2.1.1/systemd/rpc-statd-notify.service ---- nfs-utils-2.1.1/systemd/rpc-statd-notify.service.orig 2017-04-26 12:21:44.765035024 -0400 -+++ nfs-utils-2.1.1/systemd/rpc-statd-notify.service 2017-04-26 12:22:25.325882426 -0400 -@@ -10,6 +10,10 @@ After=nfs-server.service +diff -up nfs-utils-2.2.1/systemd/rpc-statd-notify.service.orig nfs-utils-2.2.1/systemd/rpc-statd-notify.service +--- nfs-utils-2.2.1/systemd/rpc-statd-notify.service.orig 2017-10-25 15:52:43.290511769 -0400 ++++ nfs-utils-2.2.1/systemd/rpc-statd-notify.service 2017-10-25 15:56:28.102284921 -0400 +@@ -10,7 +10,11 @@ After=nfs-server.service PartOf=nfs-utils.service @@ -179,13 +179,14 @@ diff -up nfs-utils-2.1.1/systemd/rpc-statd-notify.service.orig nfs-utils-2.1.1/s +After=nfs-config.service + [Service] -+EnvironmentFile=-/run/sysconfig/nfs-utils Type=forking -ExecStart=-/usr/sbin/sm-notify ++EnvironmentFile=-/run/sysconfig/nfs-utils +ExecStart=-/usr/sbin/sm-notify $SMNOTIFYARGS -diff -up nfs-utils-2.1.1/systemd/rpc-statd.service.orig nfs-utils-2.1.1/systemd/rpc-statd.service ---- nfs-utils-2.1.1/systemd/rpc-statd.service.orig 2017-04-26 12:21:44.765035024 -0400 -+++ nfs-utils-2.1.1/systemd/rpc-statd.service 2017-04-26 12:22:25.325882426 -0400 + RemainAfterExit=yes +diff -up nfs-utils-2.2.1/systemd/rpc-statd.service.orig nfs-utils-2.2.1/systemd/rpc-statd.service +--- nfs-utils-2.2.1/systemd/rpc-statd.service.orig 2017-10-25 15:32:19.000000000 -0400 ++++ nfs-utils-2.2.1/systemd/rpc-statd.service 2017-10-25 15:52:43.291511772 -0400 @@ -8,8 +8,12 @@ After=network-online.target nss-lookup.t PartOf=nfs-utils.service diff --git a/nfs-utils.spec b/nfs-utils.spec index 1adaf93..8d16257 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -1,8 +1,8 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Name: nfs-utils URL: http://linux-nfs.org/ -Version: 2.1.1 -Release: 8.rc6%{?dist} +Version: 2.2.1 +Release: 0%{?dist} Epoch: 1 # group all 32bit related archs @@ -15,15 +15,11 @@ Source3: nfs-utils_env.sh Source4: lockd.conf Source5: 24-nfs-server.conf -Patch001: nfs-utils-2.1.2-rc6.patch - Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch -Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch -Patch103: nfs-utils-1.2.5-idmap-errmsg.patch -Patch104: nfs-utils-2.1.1-nfs-config.patch +Patch102: nfs-utils-1.2.5-idmap-errmsg.patch +Patch103: nfs-utils-2.1.1-nfs-config.patch -Group: System Environment/Daemons Provides: exportfs = %{epoch}:%{version}-%{release} Provides: nfsstat = %{epoch}:%{version}-%{release} Provides: showmount = %{epoch}:%{version}-%{release} @@ -44,12 +40,11 @@ License: MIT and GPLv2 and GPLv2+ and BSD Requires: rpcbind, sed, gawk, sh-utils, fileutils, textutils, grep Requires: kmod, keyutils, quota BuildRequires: libevent-devel libcap-devel -BuildRequires: libnfsidmap-devel libtirpc-devel libblkid-devel +BuildRequires: libtirpc-devel libblkid-devel BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 BuildRequires: automake, libtool, gcc, device-mapper-devel BuildRequires: krb5-devel, tcp_wrappers-devel, libmount-devel BuildRequires: sqlite-devel -BuildRequires: python3-devel Requires(pre): shadow-utils >= 4.0.3-25 Requires(pre): util-linux Requires: libnfsidmap libevent @@ -59,6 +54,29 @@ Requires(preun): systemd-units Requires(postun): systemd-units Requires: gssproxy => 0.7.0-3 +%package -n libnfsidmap +Summary: NFSv4 User and Group ID Mapping Library +Provides: libnfsidmap%{?_isa} = %{epoch}:%{version}-%{release} +License: BSD +BuildRequires: pkgconfig, openldap-devel +BuildRequires: automake, libtool +Requires(postun): /sbin/ldconfig +Requires(pre): /sbin/ldconfig +Requires: openldap + +%description -n libnfsidmap +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: pkgconfig + +%description -n libnfsidmap-devel +This package includes header files and libraries necessary for +developing programs which use the libnfsidmap library. + + %description The nfs-utils package provides a daemon for the kernel NFS server and related tools, which provides a much higher level of performance than the @@ -72,15 +90,7 @@ clients which are mounted on that host. This package also contains the mount.nfs and umount.nfs program. %prep -%setup -q - -%patch001 -p1 - -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 +%autosetup -p1 # Remove .orig files find . -name "*.orig" | xargs rm -f @@ -110,16 +120,17 @@ CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE -D_FILE_OFFSET_BITS=64`" --enable-ipv6 \ --with-statdpath=%{_statdpath} \ --enable-libmount-mount \ - --with-systemd + --with-systemd \ + --with-pluginpath=%{_libdir}/libnfsidmap -make %{?_smp_mflags} all +%make_build all %install %define _pkgdir %{_prefix}/lib/systemd rm -rf $RPM_BUILD_ROOT/* -mkdir -p $RPM_BUILD_ROOT%/sbin +mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/nfs-utils/ mkdir -p $RPM_BUILD_ROOT%{_pkgdir}/system @@ -129,10 +140,13 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy -make DESTDIR=$RPM_BUILD_ROOT install + +%make_install + install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT%{_sbindir} install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT%{_sysconfdir} install -m 644 nfs.conf $RPM_BUILD_ROOT%{_sysconfdir} +install -m 644 support/nfsidmap/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir} install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nfs @@ -142,6 +156,9 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_libexecdir}/nfs-utils/nfs-utils_env install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy +rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la} +rm -rf $RPM_BUILD_ROOT%{_libdir}/libnfsidmap/*.{a,la} + # # For backwards compatablity # @@ -161,8 +178,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/statd/sm.bak mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/v4recovery mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/exports.d -%clean -rm -rf $RPM_BUILD_ROOT/* %pre # move files so the running service will have this applied as well @@ -242,7 +257,6 @@ fi /bin/systemctl try-restart gssproxy %files -%defattr(-,root,root,-) %config(noreplace) /etc/sysconfig/nfs %config(noreplace) /etc/nfsmount.conf %dir %{_sysconfdir}/exports.d @@ -288,7 +302,23 @@ fi /sbin/umount.nfs /sbin/umount.nfs4 +%files -n libnfsidmap +%doc support/nfsidmap/AUTHORS support/nfsidmap/README support/nfsidmap/COPYING +%config(noreplace) %{_sysconfdir}/idmapd.conf +%{_libdir}/libnfsidmap.so.* +%{_libdir}/libnfsidmap/*.so +%{_mandir}/man3/nfs4_uid_to_name.* +%{_mandir}/man5/idmapd.conf.* + +%files -n libnfsidmap-devel +%{_libdir}/pkgconfig/libnfsidmap.pc +%{_includedir}/nfsidmap.h +%{_libdir}/libnfsidmap.so + %changelog +* Mon Oct 30 2017 Steve Dickson 2.2.1-0 +- Updated to latest upstream release: nfs-utils-2-2-1 + * Mon Oct 16 2017 Steve Dickson 2.1.1-8.rc6 - Own the /usr/libexec/nfs-utils dir (bz 1484300) diff --git a/sources b/sources index c1d024c..e42db5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-utils-2.1.1.tar.xz) = 8798bd4e844dae63f1568534a6625e2c9c9bfa01b268fa223b57959cf62e11478556382e08db3abbc8c9652eeb84a6c5f4887d2006f2a66c8a5eb9fd3f0dde45 +SHA512 (nfs-utils-2.2.1.tar.xz) = 50898a5d71ad9369d177dd1f004d3ddc150b201b1af65f6c91dbe2505fad3ebecc7033eb14dc2f3b71704bdece645f6f2d62107c8b421c5fa98831898e36c30f