commit 41c5b63828d9f3cd8b55d2e1a541af073bf7a408
Author: Jakub Bogusz <[email protected]>
Date: Fri Nov 29 17:39:01 2019 +0100
- updated to 2.4.2
- updated x32 patch
- added types patch (don't assume building only on LP64 machines)
nfs-utils-types.patch | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++
nfs-utils-x32.patch | 16 +++++----
nfs-utils.spec | 11 ++++--
3 files changed, 111 insertions(+), 10 deletions(-)
---
diff --git a/nfs-utils.spec b/nfs-utils.spec
index d1bc7c1..1edf900 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -10,12 +10,12 @@ 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: 2.4.1
+Version: 2.4.2
Release: 1
License: GPL v2
Group: Networking/Daemons
Source0:
https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 161efe469ec1b06f1c750bd87f8ba6dd
+# Source0-md5: d427c6b3014e9a04e8498f0598b1c1b9
#Source1: ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
Source1: nfs.doc.tar.gz
# Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -49,6 +49,7 @@ Patch3: %{name}-union-mount.patch
Patch4: %{name}-heimdal.patch
Patch5: %{name}-x32.patch
Patch6: libnfsidmap-pluginpath.patch
+Patch7: %{name}-types.patch
URL: http://linux-nfs.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
@@ -229,6 +230,7 @@ Statyczna biblioteka libnfsidmap.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
%{__libtoolize}
@@ -327,8 +329,9 @@ install %{SOURCE106}
$RPM_BUILD_ROOT%{systemdunitdir}/idmapd.service
install %{SOURCE107} $RPM_BUILD_ROOT%{systemdunitdir}/nfslock.service
# TODO: upstream installs nfs-mountd.service
install %{SOURCE108} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-mountd.service
-# TODO: upstream installs auth-rpcgss-module.service / nfs-svcgssd.service
+# TODO: upstream installs auth-rpcgss-module.service / rpc-svcgssd.service
install %{SOURCE109} $RPM_BUILD_ROOT%{systemdunitdir}/svcgssd.service
+# TODO: upstream installs also nfs-utils.service and nfs-client.target
meta-services
install %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.postconfig
install %{SOURCE111} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.preconfig
install %{SOURCE112} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfslock.preconfig
@@ -479,6 +482,7 @@ fi
%attr(755,root,root) /sbin/nfsdcltrack
%attr(755,root,root) /sbin/rpcdebug
%attr(755,root,root) /sbin/fsck.nfs
+%attr(755,root,root) %{_sbindir}/clddb-tool
%attr(755,root,root) %{_sbindir}/exportfs
%attr(755,root,root) %{_sbindir}/rpc.mountd
%attr(755,root,root) %{_sbindir}/rpc.nfsd
@@ -500,6 +504,7 @@ fi
%{_mandir}/man5/nfs.conf.5*
%{_mandir}/man7/nfsd.7*
%{_mandir}/man7/nfs.systemd.7*
+%{_mandir}/man8/clddb-tool.8*
%{_mandir}/man8/exportfs.8*
%{_mandir}/man8/mountd.8*
%{_mandir}/man8/nfsd.8*
diff --git a/nfs-utils-types.patch b/nfs-utils-types.patch
new file mode 100644
index 0000000..3be2667
--- /dev/null
+++ b/nfs-utils-types.patch
@@ -0,0 +1,94 @@
+--- nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c.orig 2019-11-29
16:50:34.858389742 +0100
++++ nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c 2019-11-29 16:50:38.298371106
+0100
+@@ -378,7 +378,7 @@
+ bsize = cld_message_size(cmsg);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize)
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+
+ /* reopen pipe, just to be sure */
+@@ -409,7 +409,7 @@
+ xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+@@ -459,7 +459,7 @@
+ xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+@@ -498,7 +498,7 @@
+ cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+@@ -548,7 +548,7 @@
+ cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+@@ -607,7 +607,7 @@
+ xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+@@ -667,7 +667,7 @@
+ xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+--- nfs-utils-2.4.2/utils/nfsdcld/sqlite.c.orig 2019-11-13
18:09:41.000000000 +0100
++++ nfs-utils-2.4.2/utils/nfsdcld/sqlite.c 2019-11-29 16:52:19.827821073
+0100
+@@ -512,7 +512,7 @@
+ current_epoch = tcur;
+ recovery_epoch = trec;
+ ret = 0;
+- xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
++ xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64,
+ __func__, current_epoch, recovery_epoch);
+ out:
+ sqlite3_finalize(stmt);
+@@ -1223,7 +1223,7 @@
+
+ current_epoch = tcur;
+ recovery_epoch = trec;
+- xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
++ xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64,
+ __func__, current_epoch, recovery_epoch);
+
+ out:
+@@ -1282,7 +1282,7 @@
+ }
+
+ recovery_epoch = 0;
+- xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
++ xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64,
+ __func__, current_epoch, recovery_epoch);
+
+ out:
diff --git a/nfs-utils-x32.patch b/nfs-utils-x32.patch
index 365dffc..789a5a7 100644
--- a/nfs-utils-x32.patch
+++ b/nfs-utils-x32.patch
@@ -1,15 +1,17 @@
---- nfs-utils-1.3.2/aclocal/kerberos5.m4.orig 2015-05-06 23:41:11.208089930
+0200
-+++ nfs-utils-1.3.2/aclocal/kerberos5.m4 2015-05-06 23:41:53.404811795
+0200
-@@ -39,6 +39,8 @@
+--- nfs-utils-2.4.2/aclocal/kerberos5.m4.orig 2019-11-29 16:24:46.626777231
+0100
++++ nfs-utils-2.4.2/aclocal/kerberos5.m4 2019-11-29 16:27:53.019100791
+0100
+@@ -39,8 +39,8 @@
if test -f $dir/include/gssapi/gssapi_krb5.h -a \
\( -f $dir/lib/libgssapi_krb5.a -o \
- -f $dir/lib64/libgssapi_krb5.a -o \
+ -f $dir/lib/libgssapi_krb5.so -o \
+- -f $dir/lib32/libgssapi_krb5.a -o \
+- -f $dir/lib32/libgssapi_krb5.so -o \
+ -f $dir/libx32/libgssapi_krb5.a -o \
+ -f $dir/libx32/libgssapi_krb5.so -o \
- -f $dir/lib64/libgssapi_krb5.so -o \
- -f $dir/lib/libgssapi_krb5.so \) ; then
+ -f $dir/lib64/libgssapi_krb5.a -o \
+ -f $dir/lib64/libgssapi_krb5.so \) ; then
AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos
libraries])
-@@ -60,6 +62,8 @@
+@@ -53,6 +53,8 @@
-f $dir/include/heimdal/heim_err.h \) -a \
\( -f $dir/lib/libroken.a -o \
-f $dir/lib64/libroken.a -o \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nfs-utils.git/commitdiff/41c5b63828d9f3cd8b55d2e1a541af073bf7a408
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
