diff --git a/rpcbind-0.2.4-systemd-service.patch b/rpcbind-0.2.4-systemd-service.patch deleted file mode 100644 index 0350020..0000000 --- a/rpcbind-0.2.4-systemd-service.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up rpcbind-0.2.4/systemd/rpcbind.service.in.orig rpcbind-0.2.4/systemd/rpcbind.service.in ---- rpcbind-0.2.4/systemd/rpcbind.service.in.orig 2017-12-16 15:46:12.896270101 -0500 -+++ rpcbind-0.2.4/systemd/rpcbind.service.in 2017-12-16 15:46:43.672027210 -0500 -@@ -7,7 +7,8 @@ RequiresMountsFor=@statedir@ - # Make sure we use the IP addresses listed for - # rpcbind.socket, no matter how this unit is started. - Requires=rpcbind.socket --Wants=rpcbind.target -+Wants=rpcbind.target systemd-tmpfiles-setup.service -+After=systemd-tmpfiles-setup.service - - [Service] - Type=notify diff --git a/rpcbind-1.2.6-systemd-service.patch b/rpcbind-1.2.6-systemd-service.patch new file mode 100644 index 0000000..e22b2ba --- /dev/null +++ b/rpcbind-1.2.6-systemd-service.patch @@ -0,0 +1,20 @@ +diff -up rpcbind-1.2.6/systemd/rpcbind.service.in.orig rpcbind-1.2.6/systemd/rpcbind.service.in +--- rpcbind-1.2.6/systemd/rpcbind.service.in.orig 2021-06-23 14:09:47.696252854 -0400 ++++ rpcbind-1.2.6/systemd/rpcbind.service.in 2021-06-23 14:10:25.279413508 -0400 +@@ -7,13 +7,14 @@ RequiresMountsFor=@statedir@ + # Make sure we use the IP addresses listed for + # rpcbind.socket, no matter how this unit is started. + Requires=rpcbind.socket +-Wants=rpcbind.target ++Wants=rpcbind.target systemd-tmpfiles-setup.service ++After=systemd-tmpfiles-setup.service + + [Service] + Type=notify + # distro can provide a drop-in adding EnvironmentFile=-/??? if needed. + EnvironmentFile=/etc/sysconfig/rpcbind +-ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f ++ExecStart=@_sbindir@/rpcbind $RPCBIND_ARGS -w -f + + [Install] + WantedBy=multi-user.target diff --git a/rpcbind.spec b/rpcbind.spec index 17b71d4..185264b 100644 --- a/rpcbind.spec +++ b/rpcbind.spec @@ -4,7 +4,7 @@ Name: rpcbind Version: 1.2.6 -Release: 0%{?dist} +Release: 1%{?dist} Summary: Universal Addresses to RPC Program Number Mapper License: BSD URL: http://nfsv4.bullopensource.org @@ -25,7 +25,7 @@ Requires(postun): systemd coreutils Patch100: rpcbind-0.2.3-systemd-envfile.patch Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch Patch102: rpcbind-0.2.4-runstatdir.patch -Patch103: rpcbind-0.2.4-systemd-service.patch +Patch103: rpcbind-1.2.6-systemd-service.patch Patch104: rpcbind-0.2.4-systemd-rundir.patch Provides: portmap = %{version}-%{release} @@ -118,6 +118,9 @@ fi %attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir} %changelog +* Wed Jun 23 2021 Steve Dickson - 1.2.6-1 +- Use sysconfig variable in service file (bz 1972094) + * Tue Jun 22 2021 Steve Dickson - 1.2.6-0 - Rebased to latest upstream release: rpcbind-1-2-6 (bz 1959128)