Accepting request 223970 from home:kukuk:branches:network

- Fix ownership of /var/lib/rpcbind, else rpcbind cannot write
  warmstart files

- Don't print error message about missing files in warmstart code
  if we do a coldstart [bnc#865807]
  (0025-rpcinfo-warmstat_no-warning-about-missing-file.patch)

OBS-URL: https://build.opensuse.org/request/show/223970
OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=36

0025-rpcinfo-warmstat_no-warning-about-missing-file.patch

@@ -0,0 +1,16 @@
+--- src/warmstart.c
++++ src/warmstart.c	2014/02/26 14:18:39
+@@ -106,9 +106,10 @@
+ 		fprintf(stderr, "rpcbind: using '%s' startup file\n", filename);
+ 
+ 	if ((fp = fopen(filename, "r")) == NULL) {
+-		rpcbind_log_error(
+-			"Cannot open '%s' file for reading, errno %d (%s)", 
+-			filename, errno, strerror(errno));
++                if (errno != ENOENT)
++			rpcbind_log_error(
++			   "Cannot open '%s' file for reading, errno %d (%s)", 
++			   filename, errno, strerror(errno));
+ 		goto error;
+ 	}
+ 

rpcbind.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Feb 26 16:10:49 CET 2014 - kukuk@suse.de
+
+- Fix ownership of /var/lib/rpcbind, else rpcbind cannot write
+  warmstart files
+
+-------------------------------------------------------------------
+Wed Feb 26 15:27:45 CET 2014 - kukuk@suse.de
+
+- Don't print error message about missing files in warmstart code
+  if we do a coldstart [bnc#865807]
+  (0025-rpcinfo-warmstat_no-warning-about-missing-file.patch)
+
 -------------------------------------------------------------------
 Fri Feb 14 15:10:19 CET 2014 - kukuk@suse.de
 

rpcbind.spec

@@ -59,6 +59,7 @@ Patch20:        0021-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch
 Patch21:        0022-rpcinfo-remove-obsolete-function-clnt_com_create.patch
 Patch22:        0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch
 Patch23:        0024-rpcinfo-remove-obsolete-function-get_inet_address.patch
+Patch24:        0025-rpcinfo-warmstat_no-warning-about-missing-file.patch
 
 %define statefile /var/lib/portmap.state
 BuildRequires:  pkgconfig(systemd)
@@ -106,6 +107,7 @@ cp %{SOURCE4} .
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p0
 
 %build
 autoreconf -fiv
@@ -164,7 +166,7 @@ exit 0
 /sbin/rpcinfo
 %{_sbindir}/rcrpcbind
 %{_mandir}/*/*
-%{_localstatedir}/lib/rpcbind
+%attr(-,rpc,root) %{_localstatedir}/lib/rpcbind
 /var/adm/fillup-templates/sysconfig.rpcbind
 %{_datadir}/omc/svcinfo.d/rpcbind.xml
 %{_unitdir}/%{name}.service