- 0004-nfsidmap-honour-with-pluginpath-for-instalation.patch
Allow plugins to be installed properly - nfs-utils.spec Package shared library correctly OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=198
This commit is contained in:
Neil Brown
Git OBS Bridge
parent
5aba4a2d55
commit
22747e3040
39
0004-nfsidmap-honour-with-pluginpath-for-instalation.patch
Normal file
39
0004-nfsidmap-honour-with-pluginpath-for-instalation.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From b535ba0513fd53bb3ae63d13b55b4784e056e225 Mon Sep 17 00:00:00 2001
|
||||
From: NeilBrown <neilb@suse.com>
|
||||
Date: Tue, 4 Dec 2018 11:00:10 +1100
|
||||
Subject: [PATCH] nfsidmap: honour --with-pluginpath for instalation.
|
||||
|
||||
The path set with --with-pluginpath is not currently
|
||||
used when installing plugins. It should be.
|
||||
|
||||
Signed-off-by: NeilBrown <neilb@suse.com>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
support/nfsidmap/Makefile.am | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4163f6a518f5..4bf5aea4442f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -450,6 +450,7 @@ if test -n "$path_plugins" ; then
|
||||
[Define this to change the plugins path])
|
||||
fi
|
||||
AM_CONDITIONAL(PATH_PLUGINS, test -n "$path_plugins")
|
||||
+AC_SUBST(PATH_PLUGINS, "$path_plugins")
|
||||
|
||||
AC_SUBST(AM_CPPFLAGS, "$AM_CPPFLAGS")
|
||||
AC_DEFINE([HAVE_NFS4_SET_DEBUG], 1,
|
||||
diff --git a/support/nfsidmap/Makefile.am b/support/nfsidmap/Makefile.am
|
||||
index 8b5dfe4e784a..cdbeb4c1a9ac 100644
|
||||
--- a/support/nfsidmap/Makefile.am
|
||||
+++ b/support/nfsidmap/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
-pkgplugindir=$(libdir)/libnfsidmap
|
||||
+pkgplugindir=$(PATH_PLUGINS)
|
||||
|
||||
if ENABLE_LDAP
|
||||
UMICH_LDAP_LIB = umich_ldap.la
|
||||
--
|
||||
2.14.0.rc0.dirty
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 4 00:03:00 UTC 2018 - Neil Brown <nfbrown@suse.com>
|
||||
|
||||
- 0004-nfsidmap-honour-with-pluginpath-for-instalation.patch
|
||||
Allow plugins to be installed properly
|
||||
- nfs-utils.spec
|
||||
Package shared library correctly
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 3 02:49:13 UTC 2018 - Neil Brown <nfbrown@suse.com>
|
||||
|
||||
|
||||
@ -50,6 +50,7 @@ Patch0: nfs-utils-1.0.7-bind-syntax.patch
|
||||
Patch1: 0001-nfs.conf-allow-empty-assignments.patch
|
||||
Patch2: 0002-Let-systemd-know-when-rpc.statd-is-needed.patch
|
||||
Patch3: 0003-systemd-run-statd-notify-even-when-nfs-client-isn-t-.patch
|
||||
Patch4: 0004-nfsidmap-honour-with-pluginpath-for-instalation.patch
|
||||
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: fedfs-utils-devel
|
||||
@ -79,8 +80,8 @@ quota over NFS support, install the quota package.
|
||||
Summary: Support Utilities for NFS
|
||||
Group: Productivity/Networking/NFS
|
||||
Requires: keyutils
|
||||
Requires: libnfsidmap1
|
||||
Requires: netcfg
|
||||
Requires: nfsidmap
|
||||
Requires: rpcbind
|
||||
Requires(post): %fillup_prereq
|
||||
Requires(pre): permissions
|
||||
@ -111,20 +112,21 @@ tune the number of server threads via the sysconfig variable
|
||||
USE_KERNEL_NFSD_NUMBER. For quota over NFS support, install the quota
|
||||
package.
|
||||
|
||||
%package -n nfsidmap
|
||||
%package -n libnfsidmap1
|
||||
Summary: NFSv4 ID Mapping Library
|
||||
Group: Productivity/Networking/NFS
|
||||
Version: 1.0
|
||||
Release: 0
|
||||
Obsoletes: nfsidmap
|
||||
|
||||
%package -n nfsidmap-devel
|
||||
Summary: NFSv4 ID Mapping Library development libraries
|
||||
Group: Development/Libraries/C and C++
|
||||
Version: 1.0
|
||||
Release: 0
|
||||
Requires: nfsidmap = %{version}
|
||||
Requires: libnfsidmap1 = %{version}
|
||||
|
||||
%description -n nfsidmap
|
||||
%description -n libnfsidmap1
|
||||
In NFSv4, identities of users are conveyed by names rather than user ID
|
||||
and group ID. Both the NFS server and client code in the kernel need to
|
||||
translate these to numeric IDs.
|
||||
@ -150,6 +152,7 @@ This package contains additional NFS documentation.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
cp %{SOURCE6} .
|
||||
|
||||
@ -167,7 +170,7 @@ export LDFLAGS="-pie"
|
||||
--enable-mount \
|
||||
--enable-libmount-mount \
|
||||
--disable-static \
|
||||
--with-pluginpath=%{_libdir}/libnfsidmap \
|
||||
--with-pluginpath=%{_libdir}/libnfsidmap-1.0.0 \
|
||||
--enable-mountconfig
|
||||
make %{?_smp_mflags}
|
||||
cd nfs
|
||||
@ -375,16 +378,16 @@ fi
|
||||
%config(noreplace) %{_localstatedir}/lib/nfs/rmtab
|
||||
%config %attr(0644,root,root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server
|
||||
|
||||
%files -n nfsidmap
|
||||
%doc support/nfsidmap/README
|
||||
%{_libdir}/libnfsidmap/
|
||||
%files -n libnfsidmap1
|
||||
%{_libdir}/libnfsidmap-1.0.0/
|
||||
%{_libdir}/libnfsidmap.so.1*
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%files -n nfsidmap-devel
|
||||
%{_libdir}/libnfsidmap.so
|
||||
%{_includedir}/*.h
|
||||
%{_libdir}/pkgconfig/libnfsidmap.pc
|
||||
%{_mandir}/man3/*
|
||||
%doc support/nfsidmap/README
|
||||
|
||||
%files -n nfs-doc
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user