X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=nfs-utils.spec;h=f97cad14a3a78f6c4bbc6ea54d50580fcd002c2b;hb=747453cc8d5bf4cd037379ec6a67328c5cd5ee62;hp=9be1586a723ff35942a7e539088dd4488560de4f;hpb=cf0e60b21fce46958adf598bb71f1e1e9bef52db;p=packages%2Fnfs-utils.git diff --git a/nfs-utils.spec b/nfs-utils.spec index 9be1586..f97cad1 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -2,18 +2,22 @@ # - should unmount /proc/fs/nfsd and /var/lib/nfs/rpc_pipefs at package # uninstall (or in service nfs stop) # +# Conditional build: +%bcond_with krb5 # build with MIT Kerberos (+libgssglue) instead of Heimdal +%bcond_without tirpc # use librpcsecgss instead of libtirpc +# Summary: Kernel NFS server Summary(pl.UTF-8): Działający na poziomie jądra serwer NFS Summary(pt_BR.UTF-8): Os utilitários para o cliente e servidor NFS do Linux Summary(ru.UTF-8): Утилиты для NFS и демоны поддержки для NFS-сервера ядра Summary(uk.UTF-8): Утиліти для NFS та демони підтримки для NFS-сервера ядра Name: nfs-utils -Version: 1.1.5 -Release: 1 +Version: 1.2.2 +Release: 2.3 License: GPL v2 Group: Networking/Daemons Source0: http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2 -# Source0-md5: 2848072a5e53840b9bc520fbb6782b57 +# Source0-md5: dad92f64db3266c7757f71bb53ee8f35 #Source1: ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz Source1: nfs.doc.tar.gz # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da @@ -28,38 +32,50 @@ Source9: nfslock.sysconfig Source10: nfsfs.sysconfig Patch0: %{name}-install.patch Patch1: %{name}-statdpath.patch -Patch2: %{name}-keytab-path.patch -Patch3: %{name}-subsys.patch -Patch4: %{name}-git-cel.patch +Patch2: %{name}-subsys.patch +Patch3: %{name}-union-mount.patch +Patch4: %{name}-kerberos-ac.patch +Patch5: %{name}-no_libgssapi.patch +Patch6: %{name}-pkgconfig_ac.patch +Patch7: %{name}-heimdal_functions.patch +Patch100: %{name}-git.patch URL: http://nfs.sourceforge.net/ BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: cpp -BuildRequires: e2fsprogs-devel >= 1.41 -BuildRequires: krb5-devel >= 1.6 +BuildRequires: libblkid-devel +BuildRequires: libcap-devel BuildRequires: libevent-devel >= 1.2 -BuildRequires: libgssglue-devel >= 0.1 BuildRequires: libnfsidmap-devel >= 0.21-3 -BuildRequires: librpcsecgss-devel >= 0.16 -BuildRequires: libtirpc-devel >= 1:0.1.10-4 BuildRequires: libtool BuildRequires: libwrap-devel BuildRequires: pkgconfig -BuildRequires: sed >= 4.0 +%if %{with tirpc} +BuildRequires: libtirpc-devel >= 1:0.1.10-4 +%else +BuildRequires: librpcsecgss-devel >= 0.16 +%endif +%if %{with krb5} +BuildRequires: krb5-devel >= 1.6 +BuildRequires: libgssglue-devel >= 0.1 +%else +BuildRequires: heimdal-devel >= 1.0 +%endif # lucid context fields mismatch with current version of spkm3.h BuildConflicts: gss_mech_spkm3-devel Requires(post): fileutils Requires(post): sed >= 4.0 Requires(post,preun): /sbin/chkconfig Requires: %{name}-common = %{version}-%{release} -Requires: portmap >= 4.0 Requires: rc-scripts >= 0.4.1.5 +Requires: rpcbind >= 0.1.7 Requires: setup >= 2.4.6-7 Provides: nfsdaemon Obsoletes: knfsd Obsoletes: nfs-server Obsoletes: nfsdaemon Conflicts: kernel < 2.2.5 +Conflicts: krb5-common < 1.7 ExcludeArch: armv4l BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -101,6 +117,7 @@ Provides: nfsclient Obsoletes: knfsd-clients Obsoletes: nfs-server-clients Obsoletes: nfsclient +Conflicts: krb5-common < 1.7 %description clients The nfs-server-clients package contains the showmount program. @@ -121,11 +138,11 @@ Summary: Programs for NFS file locking Summary(pl.UTF-8): Programy do obsługi blokowania plików poprzez NFS (lock) Group: Networking Requires(post,preun): /sbin/chkconfig -Requires: portmap >= 4.0 Requires: rc-scripts +Requires: rpcbind >= 0.1.7 Provides: group(rpcstatd) -Provides: user(rpcstatd) Provides: nfslockd +Provides: user(rpcstatd) Obsoletes: knfsd-lock Obsoletes: nfslockd @@ -152,14 +169,17 @@ Wspólne programy do obsługi NFS. %prep %setup -q -a1 +%patch100 -p1 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 - -# conflict with GNU stdio extension -sed -i -e 's/dprintf/dbgprintf/' support/include/ha-callout.h utils/statd/*.[ch] +%if %{without krb5} +%patch5 -p1 +%patch6 -p1 +%patch7 -p0 +%endif %build %{__libtoolize} @@ -172,13 +192,13 @@ sed -i -e 's/dprintf/dbgprintf/' support/include/ha-callout.h utils/statd/*.[ch] --enable-nfsv4 \ --enable-gss \ --enable-mount \ - --enable-tirpc \ + --%{?with_tirpc:en}%{!?with_tirpc:dis}able-tirpc \ --enable-ipv6 \ --with-statedir=/var/lib/nfs \ --with-statduser=rpcstatd \ --with-start-statd=%{_sbindir}/start-statd \ --with-tcp-wrappers \ - --with-krb5=%{_prefix} + --with-krb5-config=%{_bindir}/krb5-config %{__make} all @@ -318,9 +338,11 @@ fi %attr(755,root,root) %{_sbindir}/exportfs %attr(755,root,root) %{_sbindir}/rpc.mountd %attr(755,root,root) %{_sbindir}/rpc.nfsd +%attr(755,root,root) %{_sbindir}/rpc.svcgssd %attr(755,root,root) %{_sbindir}/nfsstat %attr(754,root,root) /etc/rc.d/init.d/nfs +%attr(754,root,root) /etc/rc.d/init.d/svcgssd %attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/exports %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsd @@ -336,10 +358,9 @@ fi %{_mandir}/man8/nfsstat.8* %{_mandir}/man8/rpc.mountd.8* %{_mandir}/man8/rpc.nfsd.8* +%{_mandir}/man8/rpc.svcgssd.8* %{_mandir}/man8/rpcdebug.8* -%attr(754,root,root) /etc/rc.d/init.d/svcgssd -%attr(755,root,root) %{_sbindir}/rpc.svcgssd -%{_mandir}/man8/*svcgss* +%{_mandir}/man8/svcgssd.8* %files lock %defattr(644,root,root,755) @@ -352,32 +373,41 @@ fi %attr(755,root,root) %{_sbindir}/start-statd %attr(754,root,root) /etc/rc.d/init.d/nfslock %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfslock -%{_mandir}/man8/*statd.8* -%{_mandir}/man8/*sm-notify.8* +%{_mandir}/man8/rpc.sm-notify.8* +%{_mandir}/man8/rpc.statd.8* +%{_mandir}/man8/sm-notify.8* +%{_mandir}/man8/statd.8* %files clients %defattr(644,root,root,755) %attr(754,root,root) /etc/rc.d/init.d/nfsfs %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsfs -%attr(755,root,root) %{_sbindir}/showmount -%{_mandir}/man8/showmount.8* %attr(4755,root,root) /sbin/mount.nfs %attr(4755,root,root) /sbin/umount.nfs %attr(4755,root,root) /sbin/mount.nfs4 %attr(4755,root,root) /sbin/umount.nfs4 -%{_mandir}/man8/*mount.nfs.8* -%attr(754,root,root) /etc/rc.d/init.d/gssd +%attr(755,root,root) %{_sbindir}/mountstats +%attr(755,root,root) %{_sbindir}/nfsiostat +%attr(755,root,root) %{_sbindir}/showmount %attr(755,root,root) %{_sbindir}/rpc.gssd -%{_mandir}/man8/rpc.gssd* -%{_mandir}/man8/gssd* +%attr(754,root,root) /etc/rc.d/init.d/gssd +%{_mandir}/man8/gssd.8* +%{_mandir}/man8/mount.nfs.8* +%{_mandir}/man8/mountstats.8* +%{_mandir}/man8/nfsiostat.8* +%{_mandir}/man8/rpc.gssd.8* +%{_mandir}/man8/showmount.8* +%{_mandir}/man8/umount.nfs.8* %files common %defattr(644,root,root,755) -%attr(755,root,root) %dir %{_var}/lib/nfs -%attr(755,root,root) %dir %{_var}/lib/nfs/rpc_pipefs -%attr(755,root,root) %dir %{_var}/lib/nfs/v4recovery -%{_mandir}/man5/nfs* -%attr(754,root,root) /etc/rc.d/init.d/idmapd -%attr(755,root,root) %{_sbindir}/gss_* +%attr(755,root,root) %{_sbindir}/gss_clnt_send_err +%attr(755,root,root) %{_sbindir}/gss_destroy_creds %attr(755,root,root) %{_sbindir}/rpc.idmapd -%{_mandir}/man[58]/*idmap* +%attr(754,root,root) /etc/rc.d/init.d/idmapd +%dir %{_var}/lib/nfs +%dir %{_var}/lib/nfs/rpc_pipefs +%dir %{_var}/lib/nfs/v4recovery +%{_mandir}/man5/nfs.5* +%{_mandir}/man8/idmapd.8* +%{_mandir}/man8/rpc.idmapd.8*