summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2019-11-24 11:22:59 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2019-11-24 11:22:59 +0100
commitd7afbf2d2d619b1b4559b7e62b17de3c5e8f21ed (patch)
treec55b9029195f22a68f23704ab44fc9e862530f98 /extra
parent2b50318703c9344b5e9936b35ebbab916ce78a95 (diff)
downloadpackages-d7afbf2d2d619b1b4559b7e62b17de3c5e8f21ed.tar.xz
extra/nfs-utils: added nfsdcld format patching
Diffstat (limited to 'extra')
-rw-r--r--extra/nfs-utils/PKGBUILD12
-rw-r--r--extra/nfs-utils/nfs-utils-2.4.2-nfsdcld-format.patch96
2 files changed, 108 insertions, 0 deletions
diff --git a/extra/nfs-utils/PKGBUILD b/extra/nfs-utils/PKGBUILD
new file mode 100644
index 00000000..df88db2d
--- /dev/null
+++ b/extra/nfs-utils/PKGBUILD
@@ -0,0 +1,12 @@
+# sprintf format patches for nfsdcld (again)
+source+=(nfs-utils-2.4.2-nfsdcld-format.patch)
+sha256sums+=('30582fcf45c2ea279563e4bf03473f0aa00203cf903bd9e94a1c03c1acbd3cfe')
+
+eval "$(
+ declare -f prepare | \
+ sed '
+ /.*autoreconf.*/i patch -p1 < ../nfs-utils-2.3.4-nfsdcld-sqlite-PRIx.patch
+ '
+)"
+
+
diff --git a/extra/nfs-utils/nfs-utils-2.4.2-nfsdcld-format.patch b/extra/nfs-utils/nfs-utils-2.4.2-nfsdcld-format.patch
new file mode 100644
index 00000000..e1e6009f
--- /dev/null
+++ b/extra/nfs-utils/nfs-utils-2.4.2-nfsdcld-format.patch
@@ -0,0 +1,96 @@
+diff -rauN nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c nfs-utils-2.4.2-nfsdcld-format-patches/utils/nfsdcld/nfsdcld.c
+--- nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c 2019-11-13 18:09:41.000000000 +0100
++++ nfs-utils-2.4.2-nfsdcld-format-patches/utils/nfsdcld/nfsdcld.c 2019-11-24 11:06:43.790847839 +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 (%zi): %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 (%zi): %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 (%zi): %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 (%zi): %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 (%zi): %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 (%zi): %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 (%zi): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+diff -rauN nfs-utils-2.4.2/utils/nfsdcld/sqlite.c nfs-utils-2.4.2-nfsdcld-format-patches/utils/nfsdcld/sqlite.c
+--- nfs-utils-2.4.2/utils/nfsdcld/sqlite.c 2019-11-13 18:09:41.000000000 +0100
++++ nfs-utils-2.4.2-nfsdcld-format-patches/utils/nfsdcld/sqlite.c 2019-11-24 11:06:47.394192243 +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: