diff --git a/.gitignore b/.gitignore index f5d986e..0cd980a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ x86_64 Makefile -/rpcbind-1.2.6.tar.bz2 -rpcbind-1.2.6/ +rpcbind-1.2.7/ +/rpcbind-1.2.7.tar.bz2 diff --git a/rpcbind-0.2.4-runstatdir.patch b/rpcbind-0.2.4-runstatdir.patch index 462cf39..96affba 100644 --- a/rpcbind-0.2.4-runstatdir.patch +++ b/rpcbind-0.2.4-runstatdir.patch @@ -1,6 +1,6 @@ -diff -up rpcbind-1.2.6/configure.ac.orig rpcbind-1.2.6/configure.ac ---- rpcbind-1.2.6/configure.ac.orig 2022-07-12 16:23:15.409315832 -0400 -+++ rpcbind-1.2.6/configure.ac 2022-07-12 16:23:33.242399069 -0400 +diff -up rpcbind-1.2.7/configure.ac.orig rpcbind-1.2.7/configure.ac +--- rpcbind-1.2.7/configure.ac.orig 2024-07-30 10:57:07.374738667 -0400 ++++ rpcbind-1.2.7/configure.ac 2024-07-30 10:59:36.195668928 -0400 @@ -32,8 +32,8 @@ AC_ARG_ENABLE([rmtcalls], AM_CONDITIONAL(RMTCALLS, test x$enable_rmtcalls = xyes) @@ -12,10 +12,10 @@ diff -up rpcbind-1.2.6/configure.ac.orig rpcbind-1.2.6/configure.ac AC_SUBST([statedir], [$with_statedir]) AC_ARG_WITH([rpcuser], -diff -up rpcbind-1.2.6/configure.orig rpcbind-1.2.6/configure ---- rpcbind-1.2.6/configure.orig 2021-05-10 13:13:18.000000000 -0400 -+++ rpcbind-1.2.6/configure 2022-07-12 16:23:33.244399078 -0400 -@@ -1391,7 +1391,7 @@ Optional Features: +diff -up rpcbind-1.2.7/configure.orig rpcbind-1.2.7/configure +--- rpcbind-1.2.7/configure.orig 2024-07-25 16:49:00.000000000 -0400 ++++ rpcbind-1.2.7/configure 2024-07-30 11:01:42.660459442 -0400 +@@ -1429,7 +1429,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) @@ -24,18 +24,18 @@ diff -up rpcbind-1.2.6/configure.orig rpcbind-1.2.6/configure --with-rpcuser=ARG use ARG for RPC [default=root] -@@ -3901,7 +3901,7 @@ fi - if test "${with_statedir+set}" = set; then : +@@ -4440,7 +4440,7 @@ if test ${with_statedir+y} + then : withval=$with_statedir; - else + else $as_nop - with_statedir=/var/run/rpcbind + with_statedir=/run/rpcbind fi statedir=$with_statedir -diff -up rpcbind-1.2.6/man/rpcbind-fr.8.orig rpcbind-1.2.6/man/rpcbind-fr.8 ---- rpcbind-1.2.6/man/rpcbind-fr.8.orig 2021-05-10 13:10:19.000000000 -0400 -+++ rpcbind-1.2.6/man/rpcbind-fr.8 2022-07-12 16:23:33.244399078 -0400 +diff -up rpcbind-1.2.7/man/rpcbind-fr.8.orig rpcbind-1.2.7/man/rpcbind-fr.8 +--- rpcbind-1.2.7/man/rpcbind-fr.8.orig 2024-07-25 11:55:23.000000000 -0400 ++++ rpcbind-1.2.7/man/rpcbind-fr.8 2024-07-30 10:59:36.198668946 -0400 @@ -138,8 +138,8 @@ est redémarré. .Xr rpcbind 3 , .Xr rpcinfo 8 @@ -47,9 +47,9 @@ diff -up rpcbind-1.2.6/man/rpcbind-fr.8.orig rpcbind-1.2.6/man/rpcbind-fr.8 .Sh TRADUCTION Aurelien CHARBON (Sept 2003) .El -diff -up rpcbind-1.2.6/src/rpcbind.c.orig rpcbind-1.2.6/src/rpcbind.c ---- rpcbind-1.2.6/src/rpcbind.c.orig 2022-07-12 16:23:15.407315823 -0400 -+++ rpcbind-1.2.6/src/rpcbind.c 2022-07-12 16:23:33.244399078 -0400 +diff -up rpcbind-1.2.7/src/rpcbind.c.orig rpcbind-1.2.7/src/rpcbind.c +--- rpcbind-1.2.7/src/rpcbind.c.orig 2024-07-30 10:57:07.404738854 -0400 ++++ rpcbind-1.2.7/src/rpcbind.c 2024-07-30 10:59:36.198668946 -0400 @@ -105,7 +105,7 @@ char *nss_modules = "files"; /* who to suid to if -s is given */ #define RUN_AS "daemon" diff --git a/rpcbind-1.2.7-rc2.patch b/rpcbind-1.2.7-rc2.patch deleted file mode 100644 index 4c1749d..0000000 --- a/rpcbind-1.2.7-rc2.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index c0ef896..c2069a2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,6 +20,12 @@ AM_CONDITIONAL(LIBSETDEBUG, test x$lib_setdebug = xyes) - AC_ARG_ENABLE([warmstarts], - AS_HELP_STRING([--enable-warmstarts], [Enables Warm Starts @<:@default=no@:>@])) - AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes) -+AS_IF([test x$enable_warmstarts = xyes], [ -+ warmstarts_opt=-w -+], [ -+ warmstarts_opt= -+]) -+AC_SUBST([warmstarts_opt], [$warmstarts_opt]) - - AC_ARG_ENABLE([rmtcalls], - AS_HELP_STRING([--enable-rmtcalls], [Enables Remote Calls @<:@default=no@:>@])) -diff --git a/src/rpcbind.c b/src/rpcbind.c -index 25d8a90..ecebe97 100644 ---- a/src/rpcbind.c -+++ b/src/rpcbind.c -@@ -552,8 +552,10 @@ init_transport(struct netconfig *nconf) - syslog(LOG_ERR, "cannot bind %s on %s: %m", - (hosts[nhostsbak] == NULL) ? "*" : - hosts[nhostsbak], nconf->nc_netid); -- if (res != NULL) -+ if (res != NULL) { - freeaddrinfo(res); -+ res = NULL; -+ } - continue; - } else - checkbind++; -diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in -index 7b1c74b..c892ca8 100644 ---- a/systemd/rpcbind.service.in -+++ b/systemd/rpcbind.service.in -@@ -12,7 +12,7 @@ Wants=rpcbind.target - [Service] - Type=notify - # distro can provide a drop-in adding EnvironmentFile=-/??? if needed. --ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f -+ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f - - [Install] - WantedBy=multi-user.target diff --git a/rpcbind.spec b/rpcbind.spec index 9b12b3a..9caeab5 100644 --- a/rpcbind.spec +++ b/rpcbind.spec @@ -3,8 +3,8 @@ %global rpcbind_state_dir %{_rundir}/rpcbind Name: rpcbind -Version: 1.2.6 -Release: 4.rc2%{?dist}.5 +Version: 1.2.7 +Release: 0%{?dist} Summary: Universal Addresses to RPC Program Number Mapper License: BSD-3-Clause URL: http://nfsv4.bullopensource.org @@ -22,8 +22,6 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd coreutils -Patch001: rpcbind-1.2.7-rc2.patch - Patch100: rpcbind-0.2.3-systemd-envfile.patch Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch Patch102: rpcbind-0.2.4-runstatdir.patch @@ -39,15 +37,7 @@ universal addresses. It must be running on the host to be able to make RPC calls on a server on that machine. %prep -%setup -q - -%patch001 -p1 - -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 +%autosetup -p1 %build autoreconf -fisv @@ -124,6 +114,9 @@ fi %attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir} %changelog +* Tue Jul 30 2024 Steve Dickson rpcbind-1.2.7-0 +- Updated to latest upstream release: rpcbind-1_2_7 (RHEL-50505) + * Mon Jun 24 2024 Troy Dawson - 1.2.6-4.rc2.5 - Bump release for June 2024 mass rebuild diff --git a/sources b/sources index 638c1b1..81a9c45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpcbind-1.2.6.tar.bz2) = fb89c61be4c533fe2e6057749d97079a2d1c9fac0d35d6be1a159a0edbf86092b3fc121f19fa920e75aac5ecdd3f59f5978e6401d5cad16cd438c977736206a7 +SHA512 (rpcbind-1.2.7.tar.bz2) = ca1517bdab86221d13c645042cc31b25b4d2b574d63ebaa20da4f5392b611cf58811f267214293e953f504d364e5daaa5875eab7aa68a04b89e68fd5508e3926