From 4c77ed802a39da68741e80ccfd2da3556d0c7962 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:37:49 +0100 Subject: [PATCH] x86_64: fixed plugin path by passing --with-pluginpath [release 2.4.1-2mamba;Sun Jul 28 2019] --- nfs-utils-2.4.1-arm-int64.patch | 46 +++++++++++++++++++++++++++++++++ nfs-utils-2.4.1-arm-llx.patch | 11 ++++++++ nfs-utils.spec | 28 +++++++++++++++++--- 3 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 nfs-utils-2.4.1-arm-int64.patch create mode 100644 nfs-utils-2.4.1-arm-llx.patch diff --git a/nfs-utils-2.4.1-arm-int64.patch b/nfs-utils-2.4.1-arm-int64.patch new file mode 100644 index 0000000..a13885c --- /dev/null +++ b/nfs-utils-2.4.1-arm-int64.patch @@ -0,0 +1,46 @@ +diff -Nru nfs-utils-2.4.1.orig/utils/nfsdcld/cld-internal.h nfs-utils-2.4.1/utils/nfsdcld/cld-internal.h +--- nfs-utils-2.4.1.orig/utils/nfsdcld/cld-internal.h 2019-06-10 16:34:37.000000000 +0200 ++++ nfs-utils-2.4.1/utils/nfsdcld/cld-internal.h 2019-07-26 23:56:27.198358900 +0200 +@@ -24,8 +24,8 @@ + struct cld_msg cl_msg; + }; + +-uint64_t current_epoch; +-uint64_t recovery_epoch; ++long unsigned int current_epoch; ++long unsigned int recovery_epoch; + int first_time; + int num_cltrack_records; + int num_legacy_records; +diff -Nru nfs-utils-2.4.1.orig/utils/nfsdcld/sqlite.c nfs-utils-2.4.1/utils/nfsdcld/sqlite.c +--- nfs-utils-2.4.1.orig/utils/nfsdcld/sqlite.c 2019-06-10 16:34:37.000000000 +0200 ++++ nfs-utils-2.4.1/utils/nfsdcld/sqlite.c 2019-07-26 23:57:54.812911667 +0200 +@@ -435,7 +435,7 @@ + goto out; + } + +- tcur = (uint64_t)sqlite3_column_int64(stmt, 0); ++ tcur = sqlite3_column_int64(stmt, 0); + trec = (uint64_t)sqlite3_column_int64(stmt, 1); + + current_epoch = tcur; +@@ -854,8 +854,8 @@ + { + int ret, ret2; + char *err; +- uint64_t tcur = current_epoch; +- uint64_t trec = recovery_epoch; ++ unsigned long int tcur = current_epoch; ++ unsigned long int trec = recovery_epoch; + + /* begin transaction */ + ret = sqlite3_exec(dbh, "BEGIN EXCLUSIVE TRANSACTION;", NULL, NULL, +@@ -875,7 +875,7 @@ + + ret = snprintf(buf, sizeof(buf), "UPDATE grace " + "SET current = %" PRId64 ", recovery = %" PRId64 ";", +- (int64_t)tcur, (int64_t)trec); ++ (long int)tcur, (long int)trec); + if (ret < 0) { + xlog(L_ERROR, "sprintf failed!"); + goto rollback; diff --git a/nfs-utils-2.4.1-arm-llx.patch b/nfs-utils-2.4.1-arm-llx.patch new file mode 100644 index 0000000..2368276 --- /dev/null +++ b/nfs-utils-2.4.1-arm-llx.patch @@ -0,0 +1,11 @@ +--- nfs-utils-2.4.1/utils/nfsdcld/sqlite.c.orig 2019-07-28 13:45:16.880331195 +0200 ++++ nfs-utils-2.4.1/utils/nfsdcld/sqlite.c 2019-07-28 13:48:29.268276675 +0200 +@@ -68,6 +68,8 @@ + #include "conffile.h" + #include "legacy.h" + ++#define PRIx64 "lx" ++#define PRId64 "ld" + #define CLD_SQLITE_LATEST_SCHEMA_VERSION 3 + #define CLTRACK_DEFAULT_STORAGEDIR NFS_STATEDIR "/nfsdcltrack" + diff --git a/nfs-utils.spec b/nfs-utils.spec index d7598b9..818cb63 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -8,8 +8,8 @@ %define with_mount 1 Name: nfs-utils -Version: 2.3.3 -Release: 1mamba +Version: 2.4.1 +Release: 2mamba Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Group: Network/File Systems Vendor: openmamba @@ -23,6 +23,8 @@ Source2: nfs-utils_env.sh Source7: nfs-utils-idmapd.conf Patch0: %{name}-1.2.5-arm-PAGE_SIZE.patch Patch1: nfs-utils-1.3.3-rundir.patch +Patch2: nfs-utils-2.4.1-arm-int64.patch +Patch3: nfs-utils-2.4.1-arm-llx.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -86,6 +88,11 @@ This package contains the files needed for development with this library. %prep %setup -q #% patch1 -p1 +%ifarch arm +%patch2 -p1 +%patch3 -p1 +%endif + sed -i "s|/run/sysconfig|/run|" systemd/* %build @@ -100,6 +107,7 @@ sed -i "s|/run/sysconfig|/run|" systemd/* --enable-ipv6 \ --with-statedir=/var/lib/nfs \ %endif + --with-pluginpath=%{_libdir}/libnfsidmap \ %if %{with_mount} --enable-mount \ --enable-libmount-mount \ @@ -155,6 +163,8 @@ install -D -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/nfs install -D -m0755 %{SOURCE2} %{buildroot}%{_prefix}/libexec/nfs-utils/nfs-utils_env.sh +install -D -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/idmapd.conf + %pre if [ $1 -ge 1 ]; then chkconfig nfs off 2>/dev/null || true @@ -208,7 +218,7 @@ fi %attr(4755,root,root) /sbin/umount.nfs4 %endif /sbin/nfsdcltrack -/sbin/osd_login +/sbin/nfsdcld %{_sbindir}/blkmapd %{_sbindir}/mountstats %{_sbindir}/nfsconf @@ -256,6 +266,7 @@ fi %{_mandir}/man8/mount.nfs.8* %{_mandir}/man8/mountstats.8* %{_mandir}/man8/nfsdcltrack.8* +%{_mandir}/man8/nfsdcld.8* %{_mandir}/man8/nfsidmap.8* %{_mandir}/man8/nfsiostat.8* %{_mandir}/man8/nfsstat.8* @@ -274,6 +285,7 @@ fi %files -n nfs-server %defattr(-,root,root) +%config %{_sysconfdir}/idmapd.conf %config(noreplace) %{_sysconfdir}/exports %{_sbindir}/exportfs %{_sbindir}/rpc.mountd @@ -301,6 +313,7 @@ fi %files -n libnfsidmap %defattr(-,root,root) %{_libdir}/libnfsidmap.so.* +%dir %{_libdir}/libnfsidmap %{_libdir}/libnfsidmap/nsswitch.la %{_libdir}/libnfsidmap/nsswitch.so %{_libdir}/libnfsidmap/static.la @@ -318,6 +331,15 @@ fi %changelog +* Sun Jul 28 2019 Silvan Calarco 2.4.1-2mamba +- x86_64: fixed plugin path by passing --with-pluginpath + +* Wed Jul 24 2019 Silvan Calarco 2.4.1-1mamba +- update to 2.4.1 + +* Sun May 26 2019 Automatic Build System 2.3.4-1mamba +- automatic version update by autodist + * Tue Apr 23 2019 Automatic Build System 2.3.3-1mamba - automatic version update by autodist