diff --git a/0028-rpcbind-after-var-run.patch b/0028-rpcbind-after-var-run.patch new file mode 100644 index 0000000..773d16d --- /dev/null +++ b/0028-rpcbind-after-var-run.patch @@ -0,0 +1,20 @@ +rpcbind service wants /var/run mounted before started + +References: bnc#881518 +Signed-off-by: Werner Fink + +--- + systemd/rpcbind.service.in | 2 ++ + 1 file changed, 2 insertions(+) + +--- rpcbind-0.2.1_rc4/systemd/rpcbind.service.in ++++ rpcbind-0.2.1_rc4/systemd/rpcbind.service.in 2014-06-05 12:45:47.267340658 +0000 +@@ -3,6 +3,8 @@ Description=RPC Bind + Documentation=man:rpcbind(8) + DefaultDependencies=no + Requires=rpcbind.socket ++Wants=var-run.mount ++After=var-run.mount + + [Service] + Type=notify 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 765a7c3..4b1b68f 100644 --- a/rpcbind.changes +++ b/rpcbind.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 + +- Add patch 0028-rpcbind-after-var-run.patch as rpcbind service + wants /var/run mounted before started (bnc#881518) + ------------------------------------------------------------------- Wed May 21 13:56:14 UTC 2014 - werner@suse.de diff --git a/rpcbind.spec b/rpcbind.spec index bab9bb1..ba7b1c2 100644 --- a/rpcbind.spec +++ b/rpcbind.spec @@ -32,6 +32,7 @@ BuildRequires: libtirpc-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: tcpd-devel +BuildRequires: pkgconfig(libsystemd-daemon) PreReq: %fillup_prereq Requires(pre): /usr/sbin/useradd @@ -63,9 +64,10 @@ Patch23: 0024-rpcinfo-remove-obsolete-function-get_inet_address.patch 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 -BuildRequires: pkgconfig(libsystemd-daemon) %{?systemd_requires} Provides: portmap @@ -106,6 +108,8 @@ cp %{SOURCE4} . %patch24 -p0 %patch25 -p1 %patch26 -p1 +%patch27 -p1 +%patch28 -p1 %build autoreconf -fiv