From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 27 Aug 2018 17:10:24 +0000 (+0200)
Subject: - update to 1.2.5 (note: rmtcalls are now disabled in default build)
X-Git-Tag: auto/th/rpcbind-1.2.5-1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Frpcbind.git;a=commitdiff_plain;h=3c37f6c8f3ca79e481ea67239d19679a651ab185

- update to 1.2.5 (note: rmtcalls are now disabled in default build)
---

diff --git a/rpcbind-systemd.patch b/rpcbind-systemd.patch
index c38ca9c..a749973 100644
--- a/rpcbind-systemd.patch
+++ b/rpcbind-systemd.patch
@@ -1,17 +1,16 @@
---- rpcbind-0.2.4/systemd/rpcbind.service.in.orig	2016-11-28 21:47:28.000000000 +0100
-+++ rpcbind-0.2.4/systemd/rpcbind.service.in	2018-04-11 19:41:46.466605338 +0200
-@@ -6,12 +6,13 @@
- # Make sure we use the IP addresses listed for
+--- rpcbind-1.2.5/systemd/rpcbind.service.in.orig	2018-08-26 11:29:00.657170237 +0200
++++ rpcbind-1.2.5/systemd/rpcbind.service.in	2018-08-26 21:41:05.066750909 +0200
+@@ -8,11 +8,13 @@
  # rpcbind.socket, no matter how this unit is started.
- Wants=rpcbind.socket
--After=rpcbind.socket
-+After=rpcbind.socket syslog.target network.target
+ Requires=rpcbind.socket
+ Wants=rpcbind.target
++After=syslog.target network.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]
  WantedBy=multi-user.target
diff --git a/rpcbind.spec b/rpcbind.spec
index 544fe5a..730aceb 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -1,12 +1,16 @@
+#
+# Conditional build:
+%bcond_with	rmtcalls	# Remote Calls
+
 Summary:	Universal addresses to RPC program number mapper
 Summary(pl.UTF-8):	Demon odwzorowujący adresy uniwersalne na numery programów RPC
 Name:		rpcbind
-Version:	0.2.4
+Version:	1.2.5
 Release:	1
 License:	BSD
 Group:		Daemons
 Source0:	http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
-# Source0-md5:	cf10cd41ed8228fc54c316191c1f07fe
+# Source0-md5:	ed46f09b9c0fa2d49015f6431bc5ea7b
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-libwrap.patch
@@ -65,8 +69,10 @@ wywołania RPC na serwerze na tej maszynie.
 %{__autoconf}
 %{__automake}
 %configure \
-	--bindir=/sbin \
+	--sbindir=/sbin \
+	--bindir=%{_sbindir} \
 	--enable-libwrap \
+	%{?with_rmtcalls:--enable-rmtcalls} \
 	--enable-warmstarts \
 	--with-statedir=/var/lib/rpcbind \
 	--with-rpcuser=rpc \
@@ -80,8 +86,6 @@ install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},/etc/{sysconfig,rc.d/init.d},/var/l
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__mv} $RPM_BUILD_ROOT/sbin/rpcinfo $RPM_BUILD_ROOT%{_sbindir}
-
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcbind
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rpcbind