diff --git a/rpcbind-0.2.3-systemd-envfile.patch b/rpcbind-0.2.3-systemd-envfile.patch index 2bfc248900c61eef0249264ffa41341e6128b820..60da4c6df8a073e816b60ba57bebc1ee6ed9a032 100644 --- a/rpcbind-0.2.3-systemd-envfile.patch +++ b/rpcbind-0.2.3-systemd-envfile.patch @@ -1,11 +1,11 @@ -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:49:07.830889473 -0500 -+++ rpcbind-0.2.4/systemd/rpcbind.service.in 2017-12-16 15:49:43.156610673 -0500 +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 2022-07-12 16:18:16.272919592 -0400 ++++ rpcbind-1.2.6/systemd/rpcbind.service.in 2022-07-12 16:19:14.153189756 -0400 @@ -12,6 +12,7 @@ Wants=rpcbind.target [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_OPTIONS @warmstarts_opt@ -f [Install] diff --git a/rpcbind-0.2.3-systemd-tmpfiles.patch b/rpcbind-0.2.3-systemd-tmpfiles.patch index b9a84576ecc50c61b7a6de69ea65ddae2038c31a..f574fdf097a08ec4f6c06863e9270b444e287e92 100644 --- a/rpcbind-0.2.3-systemd-tmpfiles.patch +++ b/rpcbind-0.2.3-systemd-tmpfiles.patch @@ -1,7 +1,7 @@ -diff -up rpcbind-1.2.5/configure.ac.orig rpcbind-1.2.5/configure.ac ---- rpcbind-1.2.5/configure.ac.orig 2018-08-15 10:51:19.000000000 -0400 -+++ rpcbind-1.2.5/configure.ac 2018-08-15 11:14:23.933946110 -0400 -@@ -56,6 +56,17 @@ AC_ARG_WITH([systemdsystemunitdir], +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:21:09.682728993 -0400 ++++ rpcbind-1.2.6/configure.ac 2022-07-12 16:21:41.137875815 -0400 +@@ -62,6 +62,17 @@ AC_ARG_WITH([systemdsystemunitdir], fi 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], [ AC_CHECK_LIB([wrap], [hosts_access], , 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 ---- rpcbind-1.2.5/Makefile.am.orig 2018-08-15 10:51:19.000000000 -0400 -+++ rpcbind-1.2.5/Makefile.am 2018-08-15 11:14:23.934946111 -0400 +diff -up rpcbind-1.2.6/Makefile.am.orig rpcbind-1.2.6/Makefile.am +--- rpcbind-1.2.6/Makefile.am.orig 2021-05-10 13:10:19.000000000 -0400 ++++ rpcbind-1.2.6/Makefile.am 2022-07-12 16:21:41.137875815 -0400 @@ -59,6 +59,9 @@ rpcbind_LDADD += $(SYSTEMD_LIBS) systemdsystemunit_DATA = \ systemd/rpcbind.service \ @@ -32,9 +32,9 @@ diff -up rpcbind-1.2.5/Makefile.am.orig rpcbind-1.2.5/Makefile.am endif rpcinfo_SOURCES = src/rpcinfo.c -diff -up rpcbind-1.2.5/systemd/rpcbind.conf.orig rpcbind-1.2.5/systemd/rpcbind.conf ---- rpcbind-1.2.5/systemd/rpcbind.conf.orig 2018-08-15 11:14:23.934946111 -0400 -+++ rpcbind-1.2.5/systemd/rpcbind.conf 2018-08-15 11:14:23.934946111 -0400 +diff -up rpcbind-1.2.6/systemd/rpcbind.conf.orig rpcbind-1.2.6/systemd/rpcbind.conf +--- rpcbind-1.2.6/systemd/rpcbind.conf.orig 2022-07-12 16:21:41.137875815 -0400 ++++ rpcbind-1.2.6/systemd/rpcbind.conf 2022-07-12 16:21:41.137875815 -0400 @@ -0,0 +1,2 @@ +#Type Path Mode UID GID Age Argument +D /run/rpcbind 0700 rpc rpc - - diff --git a/rpcbind-0.2.4-runstatdir.patch b/rpcbind-0.2.4-runstatdir.patch index 90c1dae5075d22255eeaa5a3cd7f40c0717f3180..96affba00735d86c44470b647f4052eff00da368 100644 --- a/rpcbind-0.2.4-runstatdir.patch +++ b/rpcbind-0.2.4-runstatdir.patch @@ -1,7 +1,7 @@ -diff -up rpcbind-1.2.5/configure.ac.orig rpcbind-1.2.5/configure.ac ---- rpcbind-1.2.5/configure.ac.orig 2018-08-15 11:15:14.188974027 -0400 -+++ rpcbind-1.2.5/configure.ac 2018-08-15 11:15:44.948991114 -0400 -@@ -26,8 +26,8 @@ AC_ARG_ENABLE([rmtcalls], +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) 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_ARG_WITH([rpcuser], -diff -up rpcbind-1.2.5/configure.orig rpcbind-1.2.5/configure ---- rpcbind-1.2.5/configure.orig 2018-08-15 11:00:32.000000000 -0400 -+++ rpcbind-1.2.5/configure 2018-08-15 11:15:44.951991115 -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.5/configure.orig rpcbind-1.2.5/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.5/man/rpcbind-fr.8.orig rpcbind-1.2.5/man/rpcbind-fr.8 ---- rpcbind-1.2.5/man/rpcbind-fr.8.orig 2018-08-15 10:51:19.000000000 -0400 -+++ rpcbind-1.2.5/man/rpcbind-fr.8 2018-08-15 11:15:44.951991115 -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,10 +47,10 @@ diff -up rpcbind-1.2.5/man/rpcbind-fr.8.orig rpcbind-1.2.5/man/rpcbind-fr.8 .Sh TRADUCTION Aurelien CHARBON (Sept 2003) .El -diff -up rpcbind-1.2.5/src/rpcbind.c.orig rpcbind-1.2.5/src/rpcbind.c ---- rpcbind-1.2.5/src/rpcbind.c.orig 2018-08-15 10:51:19.000000000 -0400 -+++ rpcbind-1.2.5/src/rpcbind.c 2018-08-15 11:15:44.952991116 -0400 -@@ -106,7 +106,7 @@ char *nss_modules = "files"; +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-0.2.4-systemd-rundir.patch b/rpcbind-0.2.4-systemd-rundir.patch index da08d7a1f294174f5e3dd5cc3c9a5ed9bc2c9a2d..a3dc01f4e565b5736b58a594963ae0dd65edd96e 100644 --- a/rpcbind-0.2.4-systemd-rundir.patch +++ b/rpcbind-0.2.4-systemd-rundir.patch @@ -1,7 +1,7 @@ -diff -up rpcbind-0.2.4/src/rpcbind.c.orig rpcbind-0.2.4/src/rpcbind.c ---- rpcbind-0.2.4/src/rpcbind.c.orig 2017-03-21 10:12:35.005190509 -0400 -+++ rpcbind-0.2.4/src/rpcbind.c 2017-03-21 10:36:45.510507649 -0400 -@@ -144,6 +144,8 @@ static void rbllist_add(rpcprog_t, rpcve +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:25:36.422972803 -0400 ++++ rpcbind-1.2.6/src/rpcbind.c 2022-07-12 16:26:00.679085433 -0400 +@@ -143,6 +143,8 @@ static void rbllist_add(rpcprog_t, rpcve static void terminate(int); 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 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 */ struct rlimit rl; int maxrec = RPC_MAXDATASIZE; diff --git a/rpcbind-0.2.4-systemd-service.patch b/rpcbind-0.2.4-systemd-service.patch index 0350020cdac6bf73b63d45b2f7d00a6cc535c17c..5987a4f4bc8d5766ea1fb2a14d9e35b9d4df778a 100644 --- a/rpcbind-0.2.4-systemd-service.patch +++ b/rpcbind-0.2.4-systemd-service.patch @@ -1,7 +1,7 @@ -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@ +diff -up rpcbind-1.2.7/systemd/rpcbind.service.in.orig rpcbind-1.2.7/systemd/rpcbind.service.in +--- rpcbind-1.2.7/systemd/rpcbind.service.in.orig 2024-08-06 15:49:22.161273198 -0400 ++++ rpcbind-1.2.7/systemd/rpcbind.service.in 2024-08-06 15:49:49.210454941 -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 @@ -11,3 +11,10 @@ diff -up rpcbind-0.2.4/systemd/rpcbind.service.in.orig rpcbind-0.2.4/systemd/rpc [Service] Type=notify + # distro can provide a drop-in adding EnvironmentFile=-/??? if needed. + EnvironmentFile=/etc/sysconfig/rpcbind +-ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f ++ExecStart=@_sbindir@/rpcbind $RPCBIND_ARGS @warmstarts_opt@ -f + + [Install] + WantedBy=multi-user.target diff --git a/rpcbind-1.2.6.tar.bz2 b/rpcbind-1.2.6.tar.bz2 deleted file mode 100644 index 311c2e710bdb3ab299a1172aafd02a15ea1390f1..0000000000000000000000000000000000000000 Binary files a/rpcbind-1.2.6.tar.bz2 and /dev/null differ diff --git a/rpcbind-1.2.7.tar.bz2 b/rpcbind-1.2.7.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..fcf4384d4de306c2468e9ee27e7258f2addb1ab5 Binary files /dev/null and b/rpcbind-1.2.7.tar.bz2 differ diff --git a/rpcbind-fix-double-free-in-init_transport.patch b/rpcbind-fix-double-free-in-init_transport.patch deleted file mode 100644 index 3384fd80593bb15cfd48dabe599a47a9336e3597..0000000000000000000000000000000000000000 --- a/rpcbind-fix-double-free-in-init_transport.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1e00cd123044661fd4f921d1e7216ed9255bb3d1 Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" -Date: Tue, 1 Feb 2022 08:46:40 -0500 -Subject: [PATCH] rpcbind: fix double free in init_transport - -$ rpcbind -h 127.0.0.1 -free(): double free detected in tcache 2 -Aborted - -Fixes: a6889bba949b ("Removed resource leaks from src/rpcbind.c") -Resolves: https://sourceforge.net/p/rpcbind/bugs/6/ -Signed-off-by: Dmitry V. Levin -Signed-off-by: Steve Dickson ---- - src/rpcbind.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -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++; --- -1.8.3.1 diff --git a/rpcbind.spec b/rpcbind.spec index 773144d4db73700059dda1506143945d9301c54a..14b6a8694ff8cba8dad67b65001cba00d2e6e0ae 100644 --- a/rpcbind.spec +++ b/rpcbind.spec @@ -1,11 +1,11 @@ -%define anolis_release 3 +%define anolis_release 1 # These are macros to be usable outside of the build section %global rpcbind_user_group rpc %global rpcbind_state_dir %{_rundir}/rpcbind Name: rpcbind -Version: 1.2.6 +Version: 1.2.7 Release: %{anolis_release}%{?dist} Summary: Universal Addresses to RPC Program Number Mapper License: BSD @@ -30,7 +30,6 @@ Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch Patch102: rpcbind-0.2.4-runstatdir.patch Patch103: rpcbind-0.2.4-systemd-service.patch Patch104: rpcbind-0.2.4-systemd-rundir.patch -Patch105: rpcbind-fix-double-free-in-init_transport.patch Provides: portmap = %{version}-%{release} Obsoletes: portmap <= 4.0-65.3 @@ -127,6 +126,10 @@ fi %doc AUTHORS ChangeLog README %changelog +* Wed Mar 19 2025 happy_orange - 1.2.7-1 +- update to 1.2.7 +- remove the patch that has been commit in source + * Tue Jan 03 2023 Kaihao Bai - 1.2.6-3 - add bugfix patch