ykohut/rpcbind
1
0
Fork 0
forked from rpms/rpcbind
Code Pull Requests Activity

Updated to latest upstream release: rpcbind-1_2_7 (RHEL-50505)

Browse Source 
Signed-off-by: Steve Dickson <steved@redhat.com>
Resolves: RHEL-50505
This commit is contained in:
Steve Dickson 2024-07-30 11:25:22 -04:00
parent c15ecda1dd
commit 6dc0408a35
5 changed files with 25 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,4 +1,4 @@
x86_64 x86_64
Makefile Makefile
/rpcbind-1.2.6.tar.bz2 rpcbind-1.2.7/
rpcbind-1.2.6/ /rpcbind-1.2.7.tar.bz2

32
rpcbind-0.2.4-runstatdir.patch
View File

@ -1,6 +1,6 @@
diff -up rpcbind-1.2.6/configure.ac.orig rpcbind-1.2.6/configure.ac diff -up rpcbind-1.2.7/configure.ac.orig rpcbind-1.2.7/configure.ac
--- rpcbind-1.2.6/configure.ac.orig 2022-07-12 16:23:15.409315832 -0400 --- rpcbind-1.2.7/configure.ac.orig 2024-07-30 10:57:07.374738667 -0400
+++ rpcbind-1.2.6/configure.ac 2022-07-12 16:23:33.242399069 -0400 +++ rpcbind-1.2.7/configure.ac 2024-07-30 10:59:36.195668928 -0400
@@ -32,8 +32,8 @@ AC_ARG_ENABLE([rmtcalls], @@ -32,8 +32,8 @@ AC_ARG_ENABLE([rmtcalls],
AM_CONDITIONAL(RMTCALLS, test x$enable_rmtcalls = xyes) 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_SUBST([statedir], [$with_statedir])
AC_ARG_WITH([rpcuser], AC_ARG_WITH([rpcuser],
diff -up rpcbind-1.2.6/configure.orig rpcbind-1.2.6/configure diff -up rpcbind-1.2.7/configure.orig rpcbind-1.2.7/configure
--- rpcbind-1.2.6/configure.orig 2021-05-10 13:13:18.000000000 -0400 --- rpcbind-1.2.7/configure.orig 2024-07-25 16:49:00.000000000 -0400
+++ rpcbind-1.2.6/configure 2022-07-12 16:23:33.244399078 -0400 +++ rpcbind-1.2.7/configure 2024-07-30 11:01:42.660459442 -0400
@@ -1391,7 +1391,7 @@ Optional Features: @@ -1429,7 +1429,7 @@ Optional Features:
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --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] --with-rpcuser=ARG use ARG for RPC [default=root]
@@ -3901,7 +3901,7 @@ fi @@ -4440,7 +4440,7 @@ if test ${with_statedir+y}
if test "${with_statedir+set}" = set; then : then :
withval=$with_statedir; withval=$with_statedir;
else else $as_nop
- with_statedir=/var/run/rpcbind - with_statedir=/var/run/rpcbind
+ with_statedir=/run/rpcbind + with_statedir=/run/rpcbind
fi fi
statedir=$with_statedir statedir=$with_statedir
diff -up rpcbind-1.2.6/man/rpcbind-fr.8.orig rpcbind-1.2.6/man/rpcbind-fr.8 diff -up rpcbind-1.2.7/man/rpcbind-fr.8.orig rpcbind-1.2.7/man/rpcbind-fr.8
--- rpcbind-1.2.6/man/rpcbind-fr.8.orig 2021-05-10 13:10:19.000000000 -0400 --- rpcbind-1.2.7/man/rpcbind-fr.8.orig 2024-07-25 11:55:23.000000000 -0400
+++ rpcbind-1.2.6/man/rpcbind-fr.8 2022-07-12 16:23:33.244399078 -0400 +++ rpcbind-1.2.7/man/rpcbind-fr.8 2024-07-30 10:59:36.198668946 -0400
@@ -138,8 +138,8 @@ est redémarré. @@ -138,8 +138,8 @@ est redémarré.
.Xr rpcbind 3 , .Xr rpcbind 3 ,
.Xr rpcinfo 8 .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 .Sh TRADUCTION
Aurelien CHARBON (Sept 2003) Aurelien CHARBON (Sept 2003)
.El .El
diff -up rpcbind-1.2.6/src/rpcbind.c.orig rpcbind-1.2.6/src/rpcbind.c diff -up rpcbind-1.2.7/src/rpcbind.c.orig rpcbind-1.2.7/src/rpcbind.c
--- rpcbind-1.2.6/src/rpcbind.c.orig 2022-07-12 16:23:15.407315823 -0400 --- rpcbind-1.2.7/src/rpcbind.c.orig 2024-07-30 10:57:07.404738854 -0400
+++ rpcbind-1.2.6/src/rpcbind.c 2022-07-12 16:23:33.244399078 -0400 +++ rpcbind-1.2.7/src/rpcbind.c 2024-07-30 10:59:36.198668946 -0400
@@ -105,7 +105,7 @@ char *nss_modules = "files"; @@ -105,7 +105,7 @@ char *nss_modules = "files";
/* who to suid to if -s is given */ /* who to suid to if -s is given */
#define RUN_AS "daemon" #define RUN_AS "daemon"

46
rpcbind-1.2.7-rc2.patch
View File

@ -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

19
rpcbind.spec
View File

@ -3,8 +3,8 @@
%global rpcbind_state_dir %{_rundir}/rpcbind %global rpcbind_state_dir %{_rundir}/rpcbind
Name: rpcbind Name: rpcbind
Version: 1.2.6 Version: 1.2.7
Release: 4.rc2%{?dist}.5 Release: 0%{?dist}
Summary: Universal Addresses to RPC Program Number Mapper Summary: Universal Addresses to RPC Program Number Mapper
License: BSD-3-Clause License: BSD-3-Clause
URL: http://nfsv4.bullopensource.org URL: http://nfsv4.bullopensource.org
@ -22,8 +22,6 @@ Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd coreutils Requires(postun): systemd coreutils
Patch001: rpcbind-1.2.7-rc2.patch
Patch100: rpcbind-0.2.3-systemd-envfile.patch Patch100: rpcbind-0.2.3-systemd-envfile.patch
Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch
Patch102: rpcbind-0.2.4-runstatdir.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. RPC calls on a server on that machine.
%prep %prep
%setup -q %autosetup -p1
%patch001 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
%build %build
autoreconf -fisv autoreconf -fisv
@ -124,6 +114,9 @@ fi
%attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir} %attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir}
%changelog %changelog
* Tue Jul 30 2024 Steve Dickson <steved@redhat.com> rpcbind-1.2.7-0
- Updated to latest upstream release: rpcbind-1_2_7 (RHEL-50505)
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.2.6-4.rc2.5 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.2.6-4.rc2.5
- Bump release for June 2024 mass rebuild - Bump release for June 2024 mass rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (rpcbind-1.2.6.tar.bz2) = fb89c61be4c533fe2e6057749d97079a2d1c9fac0d35d6be1a159a0edbf86092b3fc121f19fa920e75aac5ecdd3f59f5978e6401d5cad16cd438c977736206a7 SHA512 (rpcbind-1.2.7.tar.bz2) = ca1517bdab86221d13c645042cc31b25b4d2b574d63ebaa20da4f5392b611cf58811f267214293e953f504d364e5daaa5875eab7aa68a04b89e68fd5508e3926