From 589dff3a54f2c316083ec7e2691ff8d21ec1a7ac90ac6616608898aae18209ad Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 11 Jun 2014 10:41:40 +0000 Subject: [PATCH] Accepting request 236722 from home:okir:branches:network - 0029-rpcbind-sd-notify-stupid-errmsg.patch: Remove a useless error/debug message (bnc#881663) OBS-URL: https://build.opensuse.org/request/show/236722 OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=47 --- 0029-rpcbind-sd-notify-stupid-errmsg.patch | 22 ++++++++++++++++++++++ rpcbind.changes | 6 ++++++ rpcbind.spec | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 0029-rpcbind-sd-notify-stupid-errmsg.patch diff --git a/0029-rpcbind-sd-notify-stupid-errmsg.patch b/0029-rpcbind-sd-notify-stupid-errmsg.patch new file mode 100644 index 0000000..a8ca73b --- /dev/null +++ b/0029-rpcbind-sd-notify-stupid-errmsg.patch @@ -0,0 +1,22 @@ +A stupid error/debug thingie crept into the patch set which shouldn't be there. +Nuking it. See bnc#881663 + +Signed-off-by: okir@suse.de + +--- + src/rpcbind.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: rpcbind-0.2.1_rc4/src/rpcbind.c +=================================================================== +--- rpcbind-0.2.1_rc4.orig/src/rpcbind.c ++++ rpcbind-0.2.1_rc4/src/rpcbind.c +@@ -266,7 +266,7 @@ main(int argc, char *argv[]) + * used systemd socket activation or not. When started from the command + * line, this should not hurt either. + */ +- rpcbind_log_error("sd_notify returns %d\n", sd_notify(0, "READY=1")); ++ sd_notify(0, "READY=1"); + #endif + my_svc_run(); + rpcbind_log_error("svc_run returned unexpectedly"); diff --git a/rpcbind.changes b/rpcbind.changes index aa69f94..4b1b68f 100644 --- a/rpcbind.changes +++ b/rpcbind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 10 10:41:15 UTC 2014 - okir@suse.com + +- 0029-rpcbind-sd-notify-stupid-errmsg.patch: Remove a useless + error/debug message (bnc#881663) + ------------------------------------------------------------------- Thu Jun 5 12:55:45 UTC 2014 - werner@suse.de diff --git a/rpcbind.spec b/rpcbind.spec index e287848..ba7b1c2 100644 --- a/rpcbind.spec +++ b/rpcbind.spec @@ -65,6 +65,7 @@ Patch24: 0025-rpcinfo-warmstat_no-warning-about-missing-file.patch Patch25: 0026-systemd-no-default-dep Patch26: 0027-socket-before-service.patch Patch27: 0028-rpcbind-after-var-run.patch +Patch28: 0029-rpcbind-sd-notify-stupid-errmsg.patch %define statefile /var/lib/portmap.state %{?systemd_requires} @@ -108,6 +109,7 @@ cp %{SOURCE4} . %patch25 -p1 %patch26 -p1 %patch27 -p1 +%patch28 -p1 %build autoreconf -fiv