Accepting request 646692 from home:tsaupe:branches:openSUSE:Factory:rpcbind

update to version 1.2.5

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

0001-systemd-unit-files.patch

@@ -1,14 +1,25 @@
-Add EnvironmentFile=-/etc/sysconfig/rpcbind to rpcbind.service
+From 9c5efb3a0973d57b79e4fc7a96debe0e6ce2d000 Mon Sep 17 00:00:00 2001
+From: Thomas Blume <thomas.blume@suse.com>
+Date: Thu, 25 Oct 2018 11:14:32 +0200
+Subject: [PATCH] systemd unit files
 
-Index: rpcbind-0.2.4/systemd/rpcbind.service.in
+Add EnvironmentFile=-/etc/sysconfig/rpcbind to rpcbind.service
-===================================================================
+---
---- rpcbind-0.2.4.orig/systemd/rpcbind.service.in
+ systemd/rpcbind.service.in | 1 +
-+++ rpcbind-0.2.4/systemd/rpcbind.service.in
+ 1 file changed, 1 insertion(+)
-@@ -11,6 +11,7 @@ After=rpcbind.socket
+
+diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
+index 7b1c74b..a05872d 100644
+--- a/systemd/rpcbind.service.in
++++ b/systemd/rpcbind.service.in
+@@ -12,6 +12,7 @@ Wants=rpcbind.target
  [Service]
  Type=notify
  # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
 +EnvironmentFile=-/etc/sysconfig/rpcbind
- ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f
+ ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
  
  [Install]
+-- 
+2.16.4
+

_service

@@ -0,0 +1,5 @@
+<services>
+<service name="download_files" mode="localonly">
+    <param name="enforceupstream">yes</param>
+  </service>
+</services>

rpcbind-0.2.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66
-size 122781

rpcbind-1.2.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ce360683963b35c19c43f0ee2c7f18aa5b81ef41c3fdbd15ffcb00b8bffda7a
+size 123502

rpcbind.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Oct 26 06:04:23 UTC 2018 - Thomas.Blume@suse.com
+
+- update to current upstream version 1.2.5 (bsc#1113002)
+  * move procinfo from /sbin to /bin and create a symlink in /sbin
+  * remove obsolete svc-freeargs.patch (included in the sources now)
+
 -------------------------------------------------------------------
 Mon Jun  4 19:42:29 UTC 2018 - tchvatal@suse.com
 

rpcbind.spec

@@ -21,7 +21,7 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           rpcbind
-Version:        0.2.4
+Version:        1.2.5
 Release:        0
 Summary:        Transport independent RPC portmapper
 # Git-Web:      http://git.linux-nfs.org/?p=steved/rpcbind.git;a=summary
@@ -33,7 +33,6 @@ Source2:        sysconfig.rpcbind
 Source4:        pmap_set.c
 Patch1:         0001-systemd-unit-files.patch
 Patch31:        0031-rpcbind-manpage.patch
-Patch32:        svc-freeargs.patch
 BuildRequires:  libtirpc-devel >= 1.0.1
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -61,14 +60,14 @@ regards to portmap.
 cp %{SOURCE4} .
 %patch1 -p1
 %patch31 -p1
-%patch32 -p1
 
 %build
 autoreconf -fiv
 export  CFLAGS="%{optflags} -fpie"
 export LDFLAGS="-pie -Wl,-z,relro,-z,now"
 %configure \
-	    --bindir=/sbin \
+	    --bindir=/bin \
+	    --sbindir=/sbin \
 	    --enable-libwrap \
 	    --enable-warmstarts \
 	    --disable-debug \
@@ -87,8 +86,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/
 #
 install -m 755 pmap_set %{buildroot}/sbin/pmap_set2
 # create symlink for rcrpcbind
-mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}/%{_sbindir}
-ln -s service %{buildroot}%{_sbindir}/rc%{name}
+ln -s service %{buildroot}/%{_sbindir}/rc%{name}
+ln -s /bin/rpcinfo %{buildroot}/sbin/rpcinfo
 
 %pre
 %service_add_pre %{name}.service %{name}.socket
@@ -112,6 +112,7 @@ exit 0
 %doc AUTHORS README
 /sbin/pmap_set2
 /sbin/%{name}
+/bin/rpcinfo
 /sbin/rpcinfo
 %{_sbindir}/rc%{name}
 %{_mandir}/*/*

svc-freeargs.patch

@@ -1,26 +0,0 @@
-Index: rpcbind-0.2.3/src/rpcb_svc.c
-===================================================================
---- rpcbind-0.2.3.orig/src/rpcb_svc.c
-+++ rpcbind-0.2.3/src/rpcb_svc.c
-@@ -166,7 +166,7 @@ rpcb_service_3(struct svc_req *rqstp, SV
- 		svcerr_decode(transp);
- 		if (debugging)
- 			(void) xlog(LOG_DEBUG, "rpcbind: could not decode");
--		return;
-+		goto done;
- 	}
- 
- 	if (rqstp->rq_proc == RPCBPROC_SET
-Index: rpcbind-0.2.3/src/rpcb_svc_4.c
-===================================================================
---- rpcbind-0.2.3.orig/src/rpcb_svc_4.c
-+++ rpcbind-0.2.3/src/rpcb_svc_4.c
-@@ -220,7 +220,7 @@ rpcb_service_4(struct svc_req *rqstp, SV
- 		svcerr_decode(transp);
- 		if (debugging)
- 			(void) xlog(LOG_DEBUG, "rpcbind: could not decode\n");
--		return;
-+		goto done;
- 	}
- 
- 	if (rqstp->rq_proc == RPCBPROC_SET