Accepting request 224667 from network

- fix typo in useradd call's user home dir (forwarded request 224663 from coolo)

OBS-URL: https://build.opensuse.org/request/show/224667
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpcbind?expand=0&rev=38

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,26 @@
+-------------------------------------------------------------------
+Tue Mar  4 17:55:01 UTC 2014 - coolo@suse.com
+
+- fix typo in useradd call's user home dir
+
+-------------------------------------------------------------------
+Tue Mar  4 06:39:39 UTC 2014 - coolo@suse.com
+
+- prereq useradd - called from %pre
+
+-------------------------------------------------------------------
+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

@@ -33,6 +33,7 @@ BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  tcpd-devel
 PreReq:         %fillup_prereq
+Requires(pre):  /usr/sbin/useradd
 
 # The next three are from upstream, applied directly on top of rc4.
 Patch0:         0001-Fix-building-one-systems-w-out-nss.h.patch
@@ -59,6 +60,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)
@@ -72,13 +74,6 @@ on various transports supported by the TI-RPC. This includes TCP and
 UDP over IPv6. Moreover, rpcbind provides additional functions in
 regards to portmap.
 
-
-
-Authors:
---------
-    Gilles Quillard <gilles.quillard@bull.net>
-    Vincent ROQUETA <vincent.roqueta@ext.bull.net>
-
 %prep
 %setup -q
 cp %{SOURCE4} .
@@ -106,6 +101,7 @@ cp %{SOURCE4} .
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p0
 
 %build
 autoreconf -fiv
@@ -143,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT
 %service_add_pre %{name}.service %{name}.socket
 
 # Add "rpc" user
-getent passwd rpc >/dev/null || useradd -r -g nogroup -d /var/lib/emptry -s /sbin/nologin -c "user for rpcbind" rpc
+getent passwd rpc >/dev/null || /usr/sbin/useradd -r -g nogroup -d /var/lib/empty -s /sbin/nologin -c "user for rpcbind" rpc
 exit 0
 
 %preun
@@ -164,7 +160,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