From 13c430316265fa1a3cc75371bad9929d0a60678cd2af9f0c51e7a889daf6b315 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 3 Mar 2014 08:59:43 +0000 Subject: [PATCH 1/3] 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 --- ...-warmstat_no-warning-about-missing-file.patch | 16 ++++++++++++++++ rpcbind.changes | 13 +++++++++++++ rpcbind.spec | 4 +++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0025-rpcinfo-warmstat_no-warning-about-missing-file.patch diff --git a/0025-rpcinfo-warmstat_no-warning-about-missing-file.patch b/0025-rpcinfo-warmstat_no-warning-about-missing-file.patch new file mode 100644 index 0000000..f7fecbb --- /dev/null +++ b/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; + } + diff --git a/rpcbind.changes b/rpcbind.changes index 9ba272f..67b077e 100644 --- a/rpcbind.changes +++ b/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 diff --git a/rpcbind.spec b/rpcbind.spec index 8a44987..48cc08b 100644 --- a/rpcbind.spec +++ b/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 From 46e2c9290dfff3ca3d2f52fc20ec2b5d5c1a5fb2ec02b5f5cef07387386a5c44 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 4 Mar 2014 08:34:23 +0000 Subject: [PATCH 2/3] Accepting request 224566 from home:coolo:branches:openSUSE:Factory - prereq useradd - called from %pre OBS-URL: https://build.opensuse.org/request/show/224566 OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=37 --- rpcbind.changes | 5 +++++ rpcbind.spec | 10 ++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rpcbind.changes b/rpcbind.changes index 67b077e..a46a881 100644 --- a/rpcbind.changes +++ b/rpcbind.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/rpcbind.spec b/rpcbind.spec index 48cc08b..cfc118c 100644 --- a/rpcbind.spec +++ b/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 @@ -73,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 - Vincent ROQUETA - %prep %setup -q cp %{SOURCE4} . @@ -145,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/emptry -s /sbin/nologin -c "user for rpcbind" rpc exit 0 %preun From 57ad97882f4878780f68ba60e94b525fa72bd8d233ef0c944a7a1a3a23dd215f Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Tue, 4 Mar 2014 18:37:47 +0000 Subject: [PATCH 3/3] Accepting request 224663 from home:coolo:branches:openSUSE:Factory - fix typo in useradd call's user home dir OBS-URL: https://build.opensuse.org/request/show/224663 OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=38 --- rpcbind.changes | 5 +++++ rpcbind.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rpcbind.changes b/rpcbind.changes index a46a881..a9b2221 100644 --- a/rpcbind.changes +++ b/rpcbind.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/rpcbind.spec b/rpcbind.spec index cfc118c..2d4476e 100644 --- a/rpcbind.spec +++ b/rpcbind.spec @@ -139,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT %service_add_pre %{name}.service %{name}.socket # Add "rpc" user -getent passwd rpc >/dev/null || /usr/sbin/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