Accepting request 709353 from home:tsaupe:branches:network:rpcbind-bsc1134659

change lockingdir to /run (bsc#1134659)

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

0001-change-lockingdir-to-run.patch

@@ -0,0 +1,25 @@
+From 4d32e143124fa47466bbc91f54067674f212c3e3 Mon Sep 17 00:00:00 2001
+From: Thomas Blume <thomas.blume@suse.com>
+Date: Wed, 12 Jun 2019 10:09:01 +0200
+Subject: [PATCH] change lockingdir to /run
+
+---
+ src/rpcbind.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rpcbind.c b/src/rpcbind.c
+index cc848b1..65054ff 100644
+--- a/src/rpcbind.c
++++ b/src/rpcbind.c
+@@ -106,7 +106,7 @@ char *nss_modules = "files";
+ /* who to suid to if -s is given */
+ #define RUN_AS  "daemon"
+ 
+-#define RPCBINDDLOCK "/var/run/rpcbind.lock"
++#define RPCBINDDLOCK "/run/rpcbind.lock"
+ 
+ int runasdaemon = 0;
+ int insecure = 0;
+-- 
+2.16.4
+

rpcbind.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jun 12 08:11:40 UTC 2019 - Thomas Blume <Thomas.Blume@suse.com>
+
+- change rpcbind locking path from /var/run/rpcbind.lock to 
+  /run/rpcbind.lock (bsc#1134659)
+  add 0001-change-lockingdir-to-run.patch
+- change the order of socket/service in the %postun scriptlet to
+  avoid an error from rpcbind.socket when rpcbind is running 
+  during package update
+
 -------------------------------------------------------------------
 Wed Dec 12 07:41:26 UTC 2018 - Thomas.Blume@suse.com
 

rpcbind.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rpcbind
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -32,6 +32,7 @@ Source:         https://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{
 Source2:        sysconfig.rpcbind
 Source4:        pmap_set.c
 Patch1:         0001-systemd-unit-files.patch
+Patch2:         0001-change-lockingdir-to-run.patch
 Patch31:        0031-rpcbind-manpage.patch
 BuildRequires:  libtirpc-devel >= 1.0.1
 BuildRequires:  libtool
@@ -59,6 +60,7 @@ regards to portmap.
 %setup -q
 cp %{SOURCE4} .
 %patch1 -p1
+%patch2 -p1
 %patch31 -p1
 
 %build
@@ -102,10 +104,10 @@ exit 0
 
 %post
 %{fillup_only -n rpcbind}
-%service_add_post %{name}.service %{name}.socket
+%service_add_post %{name}.socket %{name}.service
 
 %postun
-%service_del_postun %{name}.service %{name}.socket
+%service_del_postun %{name}.socket %{name}.service
 
 %files
 %license COPYING