nfs-utils-2.3.3-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11860 ec354946-7b23-47d6-9f5a-488ba84defc7

n/nfs-utils/nfs-utils-vl.spec

@@ -1,8 +1,10 @@
+%define _unpackaged_files_terminate_build 1
+
 Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
 Summary(ja): カーネル NFS サーバ用 NFS ユーティリティと関連プログラム
 Name: nfs-utils
-Version: 1.3.3
-Release: 1%{?_dist_release}
+Version: 2.3.3
+Release: 2%{?_dist_release}
 
 %define enablegss 1
 
@@ -11,10 +13,12 @@ Release: 1%{?_dist_release}
 
 License: MIT and GPLv2 and GPLv2+ and BSD
 Group: System Environment/Daemons
-URL: http://sourceforge.net/projects/nfs
+URL: https://sourceforge.net/projects/nfs/
+
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source0: %{name}-%{version}.tar.bz2
-Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
+Source0: %{name}-%{version}.tar.xz
 
 Source10: nfs.init
 Source11: nfslock.init
@@ -28,7 +32,6 @@ Source23: nfs.sysconfig
 
 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
 
 Provides: exportfs    = %{version}-%{release}
@@ -97,13 +100,36 @@ NFS サーバに関する情報を得ることができます。
 
 本パッケージにはまた mount.nfs と umount.nfs プログラムも収録されています。
 
+%package -n libnfsidmap
+Summary: NFSv4 User and Group ID Mapping Library
+Provides: libnfsidmap%{?_isa} = %{version}-%{release}
+Group: System Environment/Libraries
+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
+Group: Development/Libraries
+Requires: libnfsidmap%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
+
+%description -n libnfsidmap-devel
+This package includes header files and libraries necessary for
+developing programs which use the libnfsidmap library.
+
 
 %prep
 %setup -q
 
 %patch100 -p1
 %patch101 -p1
-%patch102 -p1
 %patch103 -p1
 
 
@@ -131,9 +157,7 @@ CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE -D_FILE_OFFSET_BITS=64`"
     --enable-ipv6 \
     --with-statdpath=/var/lib/nfs/statd \
     --enable-libmount-mount \
-%if !%{enablegss}
-    --disable-gss
-%endif
+	--with-pluginpath=%{_libdir}/libnfsidmap
 
 make %{?_smp_mflags} all
 
@@ -149,6 +173,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
 make DESTDIR=$RPM_BUILD_ROOT 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 755 %{SOURCE10} $RPM_BUILD_ROOT%{_initdir}/nfs
 install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_initdir}/nfslock
 install -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_initdir}/rpcidmapd
@@ -173,6 +199,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/exports.d
 # temporarily remove nfs.5 man page until util-linux gets upgraded...
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/nfs.5*
 
+rm -f %{buildroot}%{_libdir}/*.{a,la}
+rm -f %{buildroot}%{_libdir}/libnfsidmap/*.{a,la}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -273,6 +302,10 @@ if [ "$1" -ge 1 ]; then
     fi
 fi
 
+%post -n libnfsidmap -p /sbin/ldconfig
+
+%postun -n libnfsidmap -p /sbin/ldconfig
+
 %triggerpostun -- nfs-server
 /sbin/chkconfig --add nfs
 
@@ -295,6 +328,7 @@ fi
 %config(noreplace) %{_sysconfdir}/nfsmount.conf
 %config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf
 %config(noreplace) %{_sysconfdir}/modprobe.d/lockd.conf
+%config(noreplace) %{_sysconfdir}/nfs.conf
 %dir %{_sysconfdir}/exports.d
 %dir /var/lib/nfs/v4recovery
 %dir /var/lib/nfs/rpc_pipefs
@@ -302,7 +336,6 @@ fi
 %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd
 %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm
 %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm.bak
-%config(noreplace) /var/lib/nfs/xtab
 %config(noreplace) /var/lib/nfs/etab
 %config(noreplace) /var/lib/nfs/rmtab
 %config(noreplace) %attr(644,rpcuser,rpcuser) /var/lib/nfs/statd/state
@@ -325,6 +358,7 @@ fi
 %{_sbindir}/nfsiostat
 %{_sbindir}/nfsidmap
 %{_sbindir}/blkmapd
+%{_sbindir}/nfsconf
 %{_mandir}/*/*
 %config %{_initdir}/nfslock
 
@@ -333,8 +367,31 @@ 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
+%{_includedir}/nfsidmap_plugin.h
+%{_libdir}/libnfsidmap.so
+
 
 %changelog
+* Mon Nov 05 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.3-2
+- fixed "Provides:".
+
+* Sun Nov 04 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.3-1
+- new upstream release.
+- built with libevent-2.1.8.
+- dropped Patch102 (fixed in upstream).
+- updated Patch103.
+
 * Mon Nov 23 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.3-1
 - new upstream release
 - remove Patch1,2
@@ -513,7 +570,7 @@ fi
 - Added -o nordirplus mount option to disable READDIRPLUS (bz 240357)
 - Disabled the FSCache patch, for now... 
 
-* Wed May 10 2007 Steve Dickson <steved@redhat.com> 1.0.12-5
+* Thu May 10 2007 Steve Dickson <steved@redhat.com> 1.0.12-5
 - Fix mount.nfs4 to display correct error message (bz 227212)
 - Updated mountd and showmount reverse lookup flags (bz 220772)
 - Eliminate timeout on nfsd shutdowns (bz 222001)
@@ -556,7 +613,7 @@ fi
 * Wed Dec 13 2006 Steve Dickson <steved@redhat.com> 1.0.10-5
 - Stopped v4 umounts from ping rpc.mountd (bz 215553)
 
-* Wed Nov 28 2006 Steve Dickson <steved@redhat.com> 1.0.10-4
+* Tue Nov 28 2006 Steve Dickson <steved@redhat.com> 1.0.10-4
 - Doing a connect on UDP sockets causes the linux network
   stack to reject UDP patches from multi-home server with
   nic on the same subnet. (bz 212471)
@@ -687,7 +744,7 @@ fi
 - Updated libevent from 1.0b to 1.1a
 - Added libgssapi-0.4 and librpcsecgss-0.6 libs from CITI
 
-* Tue Sep  8 2005 Steve Dickson <SteveD@RedHat.com> 1.0.7-16
+* Thu Sep  8 2005 Steve Dickson <SteveD@RedHat.com> 1.0.7-16
 - Reworked the nfslock init script so if lockd is running
   it will be killed which is what the HA community needs. (bz 162446)
 - Stopped rpcidmapd.init from doing extra echoing when
@@ -718,7 +775,7 @@ fi
 * Wed Apr 13 2005 Steve Dickson <SteveD@RedHat.com> 1.0.7-6
 - Fixed misformated output from nfslock script (bz 154648)
 
-* Mon Mar 29 2005 Steve Dickson <SteveD@RedHat.com> 1.0.7-4
+* Tue Mar 29 2005 Steve Dickson <SteveD@RedHat.com> 1.0.7-4
 - Fixed a compile error on x86_64 machines in the gss code.
 - Updated the statd-notify-hostname.patch to eliminate 
   a segmentation fault in rpc.statd when an network 
@@ -813,7 +870,7 @@ fi
   by default, there only needs to be away of 
   turning them off.
 
-* Thu May 10 2004 <SteveD@RedHat.com>
+* Mon May 10 2004 <SteveD@RedHat.com>
 - Rebuilt
 
 * Thu Apr 15 2004 <SteveD@RedHat.com>
@@ -888,7 +945,7 @@ fi
 - Upgrated to 1.0.6
 - Commented out the acl path for fedora
 
-* Thu Aug  27 2003 Steve Dickson <SteveD@RedHat.com>
+* Wed Aug  27 2003 Steve Dickson <SteveD@RedHat.com>
 - Added the setting of lockd ports via sysclt interface
 - Removed queue setting code since its no longer needed
 
@@ -898,7 +955,7 @@ fi
 * Wed Jul 23 2003 Steve Dickson <SteveD@RedHat.com>
 - Commented out the acl patch (for now)
 
-* Wed Jul 21 2003 Steve Dickson <SteveD@RedHat.com>
+* Mon Jul 21 2003 Steve Dickson <SteveD@RedHat.com>
 - Upgrated to 1.0.5
 
 * Wed Jun 18 2003 Steve Dickson <SteveD@RedHat.com>
@@ -987,7 +1044,7 @@ the mountd man page.
 - don't use rquotad from here now; quota package contains a version that 
   works with 2.4 (#33738)
 
-* Tue Mar 12 2001 Bob Matthews <bmatthews@redhat.com>
+* Mon Mar 12 2001 Bob Matthews <bmatthews@redhat.com>
 - Statd logs at LOG_DAEMON rather than LOG_LOCAL5
 - s/nfs/\$0/ where appropriate in init scripts
 
@@ -1013,7 +1070,7 @@ the mountd man page.
 - Fix incorrect file specifications in statd manpage.
 - Require gawk 'cause it's used in nfslock init script.
 
-* Thu Dec 13 2000 Bob Matthews <bmatthews@redhat.com>
+* Wed Dec 13 2000 Bob Matthews <bmatthews@redhat.com>
 - Require sed because it's used in nfs init script
 
 * Tue Dec 12 2000 Bob Matthews <bmatthews@redhat.com>