qemu-git: Switch %m to %s

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat May 27 23:40:16 2017 +0200
Changeset:	12ef40f4ef1e535875e378226a7c6b88898533db

Modified Files:
	qemu-git/distinfo
Added Files:
	qemu-git/patches/patch-qemu-nbd.c
	qemu-git/patches/patch-util_main-loop.c
	qemu-git/patches/patch-util_systemd.c

Log Message:
qemu-git: Switch %m to %s

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=12ef40f4ef1e535875e378226a7c6b88898533db

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemu-git/distinfo                       |  3 +++
 qemu-git/patches/patch-qemu-nbd.c       | 14 ++++++++++++++
 qemu-git/patches/patch-util_main-loop.c | 13 +++++++++++++
 qemu-git/patches/patch-util_systemd.c   | 15 +++++++++++++++
 4 files changed, 45 insertions(+)

diffs:
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index 35ddd5928a..d8b325b59f 100644
--- a/qemu-git/distinfo
+++ b/qemu-git/distinfo
@@ -6,3 +6,6 @@ SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88
 Size (qemu-2.8.1.tar.bz2) = 28366270 bytes
 SHA1 (patch-configure) = 2b47ff025df21276443a3a45b9ea098964c9cd43
 SHA1 (patch-disas_libvixl_Makefile.objs) = 5bc8da5c29c95d18d415fad5936e7c2bf9d48b57
+SHA1 (patch-qemu-nbd.c) = 191b4082aedd0e5b8cc03aa20bc13b415a9df5b4
+SHA1 (patch-util_main-loop.c) = 06ef4669bd63cf05b0c57ceda639b09101471e12
+SHA1 (patch-util_systemd.c) = 85cd7fbfd064c05d31c1bc64ff9485ae57615ca0
diff --git a/qemu-git/patches/patch-qemu-nbd.c b/qemu-git/patches/patch-qemu-nbd.c
new file mode 100644
index 0000000000..ed6bc9aeb8
--- /dev/null
+++ b/qemu-git/patches/patch-qemu-nbd.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- qemu-nbd.c.orig	2017-05-12 22:04:02.000000000 +0000
++++ qemu-nbd.c
+@@ -283,8 +283,7 @@ static void *nbd_client_thread(void *arg
+ 
+     fd = open(device, O_RDWR);
+     if (fd < 0) {
+-        /* Linux-only, we can use %m in printf.  */
+-        error_report("Failed to open %s: %m", device);
++        error_report("Failed to open %s: %s", device, strerror(errno));
+         goto out_socket;
+     }
+ 
diff --git a/qemu-git/patches/patch-util_main-loop.c b/qemu-git/patches/patch-util_main-loop.c
new file mode 100644
index 0000000000..741c10b416
--- /dev/null
+++ b/qemu-git/patches/patch-util_main-loop.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- util/main-loop.c.orig	2017-04-25 12:42:53.000000000 +0000
++++ util/main-loop.c
+@@ -56,7 +56,7 @@ static void sigfd_handler(void *opaque)
+         }
+ 
+         if (len != sizeof(info)) {
+-            printf("read from sigfd returned %zd: %m\n", len);
++            printf("read from sigfd returned %zd: %s\n", len, strerror(errno));
+             return;
+         }
+ 
diff --git a/qemu-git/patches/patch-util_systemd.c b/qemu-git/patches/patch-util_systemd.c
new file mode 100644
index 0000000000..3dadf67267
--- /dev/null
+++ b/qemu-git/patches/patch-util_systemd.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- util/systemd.c.orig	2017-04-25 12:42:53.000000000 +0000
++++ util/systemd.c
+@@ -60,8 +60,8 @@ unsigned int check_socket_activation(voi
+              * and we should exit.
+              */
+             error_report("Socket activation failed: "
+-                         "invalid file descriptor fd = %d: %m",
+-                         fd);
++                         "invalid file descriptor fd = %d: %s",
++                         fd, strerror(errno));
+             exit(EXIT_FAILURE);
+         }
+     }