Compare commits

...

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

2
.gitignore vendored

@ -1 +1 @@
SOURCES/rpcbind-1.2.6.tar.bz2 SOURCES/rpcbind-1.2.7.tar.bz2

@ -1 +1 @@
a6dad1d9454f42f2f25a92caba8d3d7bddf527e3 SOURCES/rpcbind-1.2.6.tar.bz2 7457d744b3f7d250aed0852ea01f4d563ab75b75 SOURCES/rpcbind-1.2.7.tar.bz2

@ -1,11 +1,11 @@
diff -up rpcbind-0.2.4/systemd/rpcbind.service.in.orig rpcbind-0.2.4/systemd/rpcbind.service.in diff -up rpcbind-1.2.6/systemd/rpcbind.service.in.orig rpcbind-1.2.6/systemd/rpcbind.service.in
--- rpcbind-0.2.4/systemd/rpcbind.service.in.orig 2017-12-16 15:49:07.830889473 -0500 --- rpcbind-1.2.6/systemd/rpcbind.service.in.orig 2022-07-12 16:18:16.272919592 -0400
+++ rpcbind-0.2.4/systemd/rpcbind.service.in 2017-12-16 15:49:43.156610673 -0500 +++ rpcbind-1.2.6/systemd/rpcbind.service.in 2022-07-12 16:19:14.153189756 -0400
@@ -12,6 +12,7 @@ Wants=rpcbind.target @@ -12,6 +12,7 @@ Wants=rpcbind.target
[Service] [Service]
Type=notify Type=notify
# distro can provide a drop-in adding EnvironmentFile=-/??? if needed. # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
+EnvironmentFile=/etc/sysconfig/rpcbind +EnvironmentFile=/etc/sysconfig/rpcbind
ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f
[Install] [Install]

@ -1,7 +1,7 @@
diff -up rpcbind-1.2.5/configure.ac.orig rpcbind-1.2.5/configure.ac diff -up rpcbind-1.2.6/configure.ac.orig rpcbind-1.2.6/configure.ac
--- rpcbind-1.2.5/configure.ac.orig 2018-08-15 10:51:19.000000000 -0400 --- rpcbind-1.2.6/configure.ac.orig 2022-07-12 16:21:09.682728993 -0400
+++ rpcbind-1.2.5/configure.ac 2018-08-15 11:14:23.933946110 -0400 +++ rpcbind-1.2.6/configure.ac 2022-07-12 16:21:41.137875815 -0400
@@ -56,6 +56,17 @@ AC_ARG_WITH([systemdsystemunitdir], @@ -62,6 +62,17 @@ AC_ARG_WITH([systemdsystemunitdir],
fi fi
AM_CONDITIONAL(SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) AM_CONDITIONAL(SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
@ -19,9 +19,9 @@ diff -up rpcbind-1.2.5/configure.ac.orig rpcbind-1.2.5/configure.ac
AS_IF([test x$enable_libwrap = xyes], [ AS_IF([test x$enable_libwrap = xyes], [
AC_CHECK_LIB([wrap], [hosts_access], , AC_CHECK_LIB([wrap], [hosts_access], ,
AC_MSG_ERROR([libwrap support requested but unable to find libwrap])) AC_MSG_ERROR([libwrap support requested but unable to find libwrap]))
diff -up rpcbind-1.2.5/Makefile.am.orig rpcbind-1.2.5/Makefile.am diff -up rpcbind-1.2.6/Makefile.am.orig rpcbind-1.2.6/Makefile.am
--- rpcbind-1.2.5/Makefile.am.orig 2018-08-15 10:51:19.000000000 -0400 --- rpcbind-1.2.6/Makefile.am.orig 2021-05-10 13:10:19.000000000 -0400
+++ rpcbind-1.2.5/Makefile.am 2018-08-15 11:14:23.934946111 -0400 +++ rpcbind-1.2.6/Makefile.am 2022-07-12 16:21:41.137875815 -0400
@@ -59,6 +59,9 @@ rpcbind_LDADD += $(SYSTEMD_LIBS) @@ -59,6 +59,9 @@ rpcbind_LDADD += $(SYSTEMD_LIBS)
systemdsystemunit_DATA = \ systemdsystemunit_DATA = \
systemd/rpcbind.service \ systemd/rpcbind.service \
@ -32,9 +32,9 @@ diff -up rpcbind-1.2.5/Makefile.am.orig rpcbind-1.2.5/Makefile.am
endif endif
rpcinfo_SOURCES = src/rpcinfo.c rpcinfo_SOURCES = src/rpcinfo.c
diff -up rpcbind-1.2.5/systemd/rpcbind.conf.orig rpcbind-1.2.5/systemd/rpcbind.conf diff -up rpcbind-1.2.6/systemd/rpcbind.conf.orig rpcbind-1.2.6/systemd/rpcbind.conf
--- rpcbind-1.2.5/systemd/rpcbind.conf.orig 2018-08-15 11:14:23.934946111 -0400 --- rpcbind-1.2.6/systemd/rpcbind.conf.orig 2022-07-12 16:21:41.137875815 -0400
+++ rpcbind-1.2.5/systemd/rpcbind.conf 2018-08-15 11:14:23.934946111 -0400 +++ rpcbind-1.2.6/systemd/rpcbind.conf 2022-07-12 16:21:41.137875815 -0400
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+#Type Path Mode UID GID Age Argument +#Type Path Mode UID GID Age Argument
+D /run/rpcbind 0700 rpc rpc - - +D /run/rpcbind 0700 rpc rpc - -

@ -1,7 +1,7 @@
diff -up rpcbind-1.2.5/configure.ac.orig rpcbind-1.2.5/configure.ac diff -up rpcbind-1.2.7/configure.ac.orig rpcbind-1.2.7/configure.ac
--- rpcbind-1.2.5/configure.ac.orig 2018-08-15 11:15:14.188974027 -0400 --- rpcbind-1.2.7/configure.ac.orig 2024-07-30 10:57:07.374738667 -0400
+++ rpcbind-1.2.5/configure.ac 2018-08-15 11:15:44.948991114 -0400 +++ rpcbind-1.2.7/configure.ac 2024-07-30 10:59:36.195668928 -0400
@@ -26,8 +26,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)
AC_ARG_WITH([statedir], AC_ARG_WITH([statedir],
@ -12,10 +12,10 @@ diff -up rpcbind-1.2.5/configure.ac.orig rpcbind-1.2.5/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.5/configure.orig rpcbind-1.2.5/configure diff -up rpcbind-1.2.7/configure.orig rpcbind-1.2.7/configure
--- rpcbind-1.2.5/configure.orig 2018-08-15 11:00:32.000000000 -0400 --- rpcbind-1.2.7/configure.orig 2024-07-25 16:49:00.000000000 -0400
+++ rpcbind-1.2.5/configure 2018-08-15 11:15:44.951991115 -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.5/configure.orig rpcbind-1.2.5/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.5/man/rpcbind-fr.8.orig rpcbind-1.2.5/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.5/man/rpcbind-fr.8.orig 2018-08-15 10:51:19.000000000 -0400 --- rpcbind-1.2.7/man/rpcbind-fr.8.orig 2024-07-25 11:55:23.000000000 -0400
+++ rpcbind-1.2.5/man/rpcbind-fr.8 2018-08-15 11:15:44.951991115 -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,10 +47,10 @@ diff -up rpcbind-1.2.5/man/rpcbind-fr.8.orig rpcbind-1.2.5/man/rpcbind-fr.8
.Sh TRADUCTION .Sh TRADUCTION
Aurelien CHARBON (Sept 2003) Aurelien CHARBON (Sept 2003)
.El .El
diff -up rpcbind-1.2.5/src/rpcbind.c.orig rpcbind-1.2.5/src/rpcbind.c diff -up rpcbind-1.2.7/src/rpcbind.c.orig rpcbind-1.2.7/src/rpcbind.c
--- rpcbind-1.2.5/src/rpcbind.c.orig 2018-08-15 10:51:19.000000000 -0400 --- rpcbind-1.2.7/src/rpcbind.c.orig 2024-07-30 10:57:07.404738854 -0400
+++ rpcbind-1.2.5/src/rpcbind.c 2018-08-15 11:15:44.952991116 -0400 +++ rpcbind-1.2.7/src/rpcbind.c 2024-07-30 10:59:36.198668946 -0400
@@ -106,7 +106,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"

@ -1,7 +1,7 @@
diff -up rpcbind-0.2.4/src/rpcbind.c.orig rpcbind-0.2.4/src/rpcbind.c diff -up rpcbind-1.2.6/src/rpcbind.c.orig rpcbind-1.2.6/src/rpcbind.c
--- rpcbind-0.2.4/src/rpcbind.c.orig 2017-03-21 10:12:35.005190509 -0400 --- rpcbind-1.2.6/src/rpcbind.c.orig 2022-07-12 16:25:36.422972803 -0400
+++ rpcbind-0.2.4/src/rpcbind.c 2017-03-21 10:36:45.510507649 -0400 +++ rpcbind-1.2.6/src/rpcbind.c 2022-07-12 16:26:00.679085433 -0400
@@ -144,6 +144,8 @@ static void rbllist_add(rpcprog_t, rpcve @@ -143,6 +143,8 @@ static void rbllist_add(rpcprog_t, rpcve
static void terminate(int); static void terminate(int);
static void parseargs(int, char *[]); static void parseargs(int, char *[]);
@ -10,7 +10,7 @@ diff -up rpcbind-0.2.4/src/rpcbind.c.orig rpcbind-0.2.4/src/rpcbind.c
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@@ -151,13 +153,21 @@ main(int argc, char *argv[]) @@ -150,13 +152,21 @@ main(int argc, char *argv[])
void *nc_handle; /* Net config handle */ void *nc_handle; /* Net config handle */
struct rlimit rl; struct rlimit rl;
int maxrec = RPC_MAXDATASIZE; int maxrec = RPC_MAXDATASIZE;

@ -1,6 +1,6 @@
diff -up rpcbind-1.2.6/systemd/rpcbind.service.in.orig rpcbind-1.2.6/systemd/rpcbind.service.in diff -up rpcbind-1.2.7/systemd/rpcbind.service.in.orig rpcbind-1.2.7/systemd/rpcbind.service.in
--- rpcbind-1.2.6/systemd/rpcbind.service.in.orig 2021-06-23 14:09:47.696252854 -0400 --- rpcbind-1.2.7/systemd/rpcbind.service.in.orig 2024-08-06 15:49:22.161273198 -0400
+++ rpcbind-1.2.6/systemd/rpcbind.service.in 2021-06-23 14:10:25.279413508 -0400 +++ rpcbind-1.2.7/systemd/rpcbind.service.in 2024-08-06 15:49:49.210454941 -0400
@@ -7,13 +7,14 @@ RequiresMountsFor=@statedir@ @@ -7,13 +7,14 @@ RequiresMountsFor=@statedir@
# Make sure we use the IP addresses listed for # Make sure we use the IP addresses listed for
# rpcbind.socket, no matter how this unit is started. # rpcbind.socket, no matter how this unit is started.
@ -13,8 +13,8 @@ diff -up rpcbind-1.2.6/systemd/rpcbind.service.in.orig rpcbind-1.2.6/systemd/rpc
Type=notify Type=notify
# distro can provide a drop-in adding EnvironmentFile=-/??? if needed. # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
EnvironmentFile=/etc/sysconfig/rpcbind EnvironmentFile=/etc/sysconfig/rpcbind
-ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f -ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f
+ExecStart=@_sbindir@/rpcbind $RPCBIND_ARGS -w -f +ExecStart=@_sbindir@/rpcbind $RPCBIND_ARGS @warmstarts_opt@ -f
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

@ -1,15 +0,0 @@
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-08-16 10:16:03.196903368 -0400
+++ rpcbind-1.2.6/src/rpcbind.c 2022-08-16 10:16:38.595062481 -0400
@@ -562,8 +562,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++;

@ -3,11 +3,11 @@
%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: 5%{?dist} Release: 3%{?dist}
Summary: Universal Addresses to RPC Program Number Mapper Summary: Universal Addresses to RPC Program Number Mapper
License: BSD License: BSD-3-Clause
URL: https://sourceforge.net/projects/rpcbind/ URL: http://nfsv4.bullopensource.org
Source0: http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2 Source0: http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
Source1: %{name}.sysconfig Source1: %{name}.sysconfig
@ -18,19 +18,14 @@ BuildRequires: make
BuildRequires: automake, autoconf, libtool, systemd, systemd-devel BuildRequires: automake, autoconf, libtool, systemd, systemd-devel
BuildRequires: libtirpc-devel, quota-devel BuildRequires: libtirpc-devel, quota-devel
Requires(pre): coreutils shadow-utils Requires(pre): coreutils shadow-utils
Requires(post): systemd policycoreutils Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd coreutils Requires(postun): systemd coreutils
#
# RHEL9.1
#
Patch001: rpcbind-1.2.6-double-free.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
Patch103: rpcbind-1.2.6-systemd-service.patch Patch103: rpcbind-0.2.4-systemd-service.patch
Patch104: rpcbind-0.2.4-systemd-rundir.patch Patch104: rpcbind-0.2.4-systemd-rundir.patch
Provides: portmap = %{version}-%{release} Provides: portmap = %{version}-%{release}
@ -102,13 +97,6 @@ then
/bin/systemctl reenable rpcbind.socket >/dev/null 2>&1 || : /bin/systemctl reenable rpcbind.socket >/dev/null 2>&1 || :
/bin/systemctl restart rpcbind.socket >/dev/null 2>&1 || : /bin/systemctl restart rpcbind.socket >/dev/null 2>&1 || :
fi fi
if [ ! -d /var/lib/rpcbind ]
then
mkdir /var/lib/rpcbind
chown rpc:rpc /var/lib/rpcbind
[ -x /usr/sbin/restorecon ] && \
/usr/sbin/restorecon /var/lib/rpcbind
fi
%files %files
%license COPYING %license COPYING
@ -125,33 +113,55 @@ 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 Sep 6 2022 Steve Dickson <steved@redhat.com> - 1.2.6-5 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.2.7-3
- Fixed a typo in changelog (bz 2115517) - Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Wed Aug 7 2024 Steve Dickson <steved@redhat.com> rpcbind-1.2.7-2
- Disable remote calls (RHEL-35644)
* Tue Aug 6 2024 Steve Dickson <steved@redhat.com> rpcbind-1.2.7-1
- The default config RPCBIND_ARGS in /etc/sysconfig/rpcbind is wrong (RHEL-32326)
* 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
- Bump release for June 2024 mass rebuild
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-4.rc2.4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-4.rc2.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Oct 16 2023 Pavel Reichl <preichl@redhat.com> - 1.2.6-4.rc2.2
- Convert License tag to SPDX format
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-4.rc2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Aug 16 2022 Steve Dickson <steved@redhat.com> - 1.2.6-4 * Tue Feb 28 2023 Steve Dickson <steved@redhat.com> 1.2.6-4.rc2
- Use %autosetup -p1 to make sure patches apply (bz 2115517) - Updated to latest upstream RC release: rpcbind-1_2_7-rc2
* Tue Aug 16 2022 Steve Dickson <steved@redhat.com> - 1.2.6-3 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-4
- Fixed a double free in init_transport (bz 2115517) - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.6-2 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Related: rhbz#1991688
* Wed Jun 23 2021 Steve Dickson <steved@redhat.com> - 1.2.6-1 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-2
- Use sysconfig variable in service file (bz 1972094) - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
- Make sure policycoreutils is installed before using it (bz 1972133)
- Make sure /var/lib/rpcbind exists (bz 1972133)
- Corrected the URL reference (bz 1972117)
* Tue Jun 22 2021 Steve Dickson <steved@redhat.com> - 1.2.6-0 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-1
- Rebased to latest upstream release: rpcbind-1-2-6 (bz 1959128) - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Jun 7 2021 Steve Dickson <steved@redhat.com> - 1.2.5-6.rc1 * Mon May 17 2021 Steve Dickson <steved@redhat.com> 1.2.6-0
- Disable remote calls (bz 1923041) - Updated to latest upstream release: rpcbind-1_2_6 (bz 1959127)
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.5-5.rc1.5 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.2.5-5.rc1.5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-5.rc1.4 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-5.rc1.4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save