diff --git a/.gitignore b/.gitignore index 1a0073b..f5d986e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ x86_64 Makefile -rpcbind-1.2.8-build/ -/rpcbind-1.2.8.tar.bz2 +/rpcbind-1.2.6.tar.bz2 +rpcbind-1.2.6/ diff --git a/rpcbind-0.2.3-systemd-envfile.patch b/rpcbind-0.2.3-systemd-envfile.patch new file mode 100644 index 0000000..2bfc248 --- /dev/null +++ b/rpcbind-0.2.3-systemd-envfile.patch @@ -0,0 +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 +@@ -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 + + [Install] diff --git a/rpcbind-0.2.3-systemd-tmpfiles.patch b/rpcbind-0.2.3-systemd-tmpfiles.patch index 20f57b1..b9a8457 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.7/configure.ac.orig rpcbind-1.2.7/configure.ac ---- rpcbind-1.2.7/configure.ac.orig 2024-07-25 11:55:23.000000000 -0400 -+++ rpcbind-1.2.7/configure.ac 2024-07-25 16:55:38.334208493 -0400 -@@ -73,6 +73,17 @@ AC_ARG_WITH([systemdsystemunitdir], +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], fi AM_CONDITIONAL(SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) @@ -19,9 +19,9 @@ diff -up rpcbind-1.2.7/configure.ac.orig rpcbind-1.2.7/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.7/Makefile.am.orig rpcbind-1.2.7/Makefile.am ---- rpcbind-1.2.7/Makefile.am.orig 2024-07-25 11:55:23.000000000 -0400 -+++ rpcbind-1.2.7/Makefile.am 2024-07-25 16:55:38.335208500 -0400 +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 @@ -59,6 +59,9 @@ rpcbind_LDADD += $(SYSTEMD_LIBS) systemdsystemunit_DATA = \ systemd/rpcbind.service \ @@ -32,9 +32,9 @@ diff -up rpcbind-1.2.7/Makefile.am.orig rpcbind-1.2.7/Makefile.am endif rpcinfo_SOURCES = src/rpcinfo.c -diff -up rpcbind-1.2.7/systemd/rpcbind.conf.orig rpcbind-1.2.7/systemd/rpcbind.conf ---- rpcbind-1.2.7/systemd/rpcbind.conf.orig 2024-07-25 16:55:38.335208500 -0400 -+++ rpcbind-1.2.7/systemd/rpcbind.conf 2024-07-25 16:55:38.335208500 -0400 +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 @@ -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 new file mode 100644 index 0000000..90c1dae --- /dev/null +++ b/rpcbind-0.2.4-runstatdir.patch @@ -0,0 +1,61 @@ +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], + AM_CONDITIONAL(RMTCALLS, test x$enable_rmtcalls = xyes) + + AC_ARG_WITH([statedir], +- AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/var/run/rpcbind@:>@]) +- ,, [with_statedir=/var/run/rpcbind]) ++ AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/run/rpcbind@:>@]) ++ ,, [with_statedir=/run/rpcbind]) + 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: + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +- --with-statedir=ARG use ARG as state dir [default=/var/run/rpcbind] ++ --with-statedir=ARG use ARG as state dir [default=/run/rpcbind] + + --with-rpcuser=ARG use ARG for RPC [default=root] + +@@ -3901,7 +3901,7 @@ fi + if test "${with_statedir+set}" = set; then : + withval=$with_statedir; + else +- 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 +@@ -138,8 +138,8 @@ est redémarré. + .Xr rpcbind 3 , + .Xr rpcinfo 8 + .Sh FILES +-.Bl -tag -width /var/run/rpcbind.sock -compact +-.It Pa /var/run/rpcbind.sock ++.Bl -tag -width /run/rpcbind.sock -compact ++.It Pa /run/rpcbind.sock + .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"; + /* who to suid to if -s is given */ + #define RUN_AS "daemon" + +-#define RPCBINDDLOCK "/var/run/rpcbind.lock" ++#define RPCBINDDLOCK RPCBIND_STATEDIR "/rpcbind.lock" + + int runasdaemon = 0; + int insecure = 0; diff --git a/rpcbind-0.2.4-systemd-rundir.patch b/rpcbind-0.2.4-systemd-rundir.patch index ffecb53..da08d7a 100644 --- a/rpcbind-0.2.4-systemd-rundir.patch +++ b/rpcbind-0.2.4-systemd-rundir.patch @@ -1,16 +1,16 @@ -diff -up rpcbind-1.2.8/src/rpcbind.c.orig rpcbind-1.2.8/src/rpcbind.c ---- rpcbind-1.2.8/src/rpcbind.c.orig 2025-07-26 16:57:24.000000000 -0400 -+++ rpcbind-1.2.8/src/rpcbind.c 2025-07-26 17:15:51.933467872 -0400 -@@ -214,6 +214,8 @@ static void version() - fprintf(stderr, "\n"); - } +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 + static void terminate(int); + static void parseargs(int, char *[]); +char *systemdtmp = "/usr/bin/systemd-tmpfiles --create rpcbind.conf"; + int main(int argc, char *argv[]) { -@@ -221,13 +223,21 @@ main(int argc, char *argv[]) +@@ -151,13 +153,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 new file mode 100644 index 0000000..0350020 --- /dev/null +++ b/rpcbind-0.2.4-systemd-service.patch @@ -0,0 +1,13 @@ +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.spec b/rpcbind.spec index 0676bb2..e586577 100644 --- a/rpcbind.spec +++ b/rpcbind.spec @@ -3,53 +3,47 @@ %global rpcbind_state_dir %{_rundir}/rpcbind Name: rpcbind -Version: 1.2.8 -Release: 0%{?dist} +Version: 1.2.6 +Release: 1%{?dist} Summary: Universal Addresses to RPC Program Number Mapper -License: BSD-3-Clause +License: BSD URL: http://nfsv4.bullopensource.org Source0: http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2 Source1: %{name}.sysconfig Requires: glibc-common setup -Requires: libtirpc >= 1.3.5 Conflicts: man-pages < 2.43-12 BuildRequires: make BuildRequires: automake, autoconf, libtool, systemd, systemd-devel BuildRequires: libtirpc-devel, quota-devel -Requires(pre): coreutils +Requires(pre): coreutils shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd coreutils -Patch100: rpcbind-0.2.3-systemd-tmpfiles.patch -Patch101: rpcbind-0.2.4-systemd-rundir.patch +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 +Patch104: rpcbind-0.2.4-systemd-rundir.patch Provides: portmap = %{version}-%{release} Obsoletes: portmap <= 4.0-65.3 -%if "%{_sbindir}" == "%{_bindir}" -# Compat symlinks for Requires in other packages. -# We rely on filesystem to create the symlinks for us. -Requires: filesystem(unmerged-sbin-symlinks) -Provides: /usr/sbin/rpcbind -Provides: /usr/sbin/rpcinfo -%endif - %description The rpcbind utility is a server that converts RPC program numbers into universal addresses. It must be running on the host to be able to make RPC calls on a server on that machine. %prep -%autosetup -p1 - -# Create a sysusers.d config file -cat >rpcbind.sysusers.conf </dev/null || groupadd -f -g 32 -r rpc +if ! getent passwd rpc >/dev/null ; then + if ! getent passwd 32 >/dev/null ; then + useradd -l -c "Rpcbind Daemon" -d /var/lib/rpcbind \ + -g rpc -M -s /sbin/nologin -o -u 32 rpc > /dev/null 2>&1 + else + useradd -l -c "Rpcbind Daemon" -d /var/lib/rpcbind \ + -g rpc -M -s /sbin/nologin rpc > /dev/null 2>&1 + fi +fi %post %systemd_post rpcbind.service rpcbind.socket @@ -89,16 +94,15 @@ install -m0644 -D rpcbind.sysusers.conf %{buildroot}%{_sysusersdir}/rpcbind.conf %preun %systemd_preun rpcbind.service rpcbind.socket -# NOTE: We only restart rpcbind.socket in the %postun scriptlet in order to -# avoid the race described in: -# -# https://github.com/systemd/systemd/issues/13271 -# https://github.com/systemd/systemd/issues/8102 -# -# Restarting rpcbind.socket causes rpcbind.service to be restarted automatically -# due to "Requires=rpcbind.socket" in the rpcbind.service unit file. %postun -%systemd_postun_with_restart rpcbind.socket +%systemd_postun_with_restart rpcbind.service rpcbind.socket + +%triggerin -- rpcbind > 0.2.2-2.0 +if systemctl -q is-enabled rpcbind.socket +then + /bin/systemctl reenable rpcbind.socket >/dev/null 2>&1 || : + /bin/systemctl restart rpcbind.socket >/dev/null 2>&1 || : +fi %files %license COPYING @@ -106,82 +110,15 @@ install -m0644 -D rpcbind.sysusers.conf %{buildroot}%{_sysusersdir}/rpcbind.conf %doc AUTHORS ChangeLog README %{_bindir}/rpcbind %{_bindir}/rpcinfo -%if "%{_sbindir}" != "%{_bindir}" %{_sbindir}/rpcbind %{_sbindir}/rpcinfo -%endif %{_mandir}/man8/* %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket %{_tmpfilesdir}/%{name}.conf %attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir} -%{_sysusersdir}/rpcbind.conf %changelog -* Sat Jul 26 2025 Steve Dickson 1.2.8-0 -- Updated to latest upstream release: rpcbind-1_2_8 (bz 2300081) - -* Fri Jul 25 2025 Fedora Release Engineering - 1.2.7-2.rc1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Wed May 7 2025 Scott Mayhew - 1.2.7-2.rc1 -- Fix rpm scriptlets to remove excessive restarts during upgrade - -* Wed Jan 29 2025 Zbigniew JÄ™drzejewski-Szmek - 1.2.7-1.rc1.4 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Sat Jan 18 2025 Fedora Release Engineering - 1.2.7-1.rc1.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Jan 14 2025 Panu Matilainen - 1.2.7-1.rc1.2 -- Add provides for the manually created rpc user and group - -* Sun Jan 12 2025 Zbigniew JÄ™drzejewski-Szmek - 1.2.7-1.rc1.1 -- Rebuilt for the bin-sbin merge (2nd attempt) - -* Mon Sep 9 2024 Steve Dickson 1.2.8-rc1 -- Updated to latest upstream RC release: rpcbind-1_2_8-rc1 - -* Tue Aug 13 2024 Steve Dickson 1.2.7-1 -- Added Requirement for libtirpc (bz 2304327) - -* Thu Jul 25 2024 Steve Dickson 1.2.7-0 -- Updated to latest upstream release: rpcbind-1_2_7 - -* Fri Jul 19 2024 Fedora Release Engineering - 1.2.6-5.rc3.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Apr 11 2024 Zbigniew JÄ™drzejewski-Szmek - 1.2.6-5.rc3 -- Prepare for bin-sbin merge - (https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin) - -* Mon Mar 18 2024 Steve Dickson 1.2.6-4.rc3 -- Updated to latest upstream RC release: rpcbind-1_2_7-rc3 - -* Fri Jan 26 2024 Fedora Release Engineering - 1.2.6-4.rc2.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 1.2.6-4.rc2.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Oct 16 2023 Pavel Reichl - 1.2.6-4.rc2.2 -- Convert License tag to SPDX format - -* Fri Jul 21 2023 Fedora Release Engineering - 1.2.6-4.rc2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Feb 28 2023 Steve Dickson 1.2.6-4.rc2 -- Updated to latest upstream RC release: rpcbind-1_2_7-rc2 - -* Fri Jan 20 2023 Fedora Release Engineering - 1.2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Fri Jul 23 2021 Fedora Release Engineering - 1.2.6-1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 26c4f09..638c1b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpcbind-1.2.8.tar.bz2) = 66f3955a67c4d0142ec635614ceafbc9bdbea985f2edaeec903f17efaf3c2e98f6483e8e6b7f1358cf8d2c1c877b281d153a3bf1b6748b6d259ae7ad1465ee71 +SHA512 (rpcbind-1.2.6.tar.bz2) = fb89c61be4c533fe2e6057749d97079a2d1c9fac0d35d6be1a159a0edbf86092b3fc121f19fa920e75aac5ecdd3f59f5978e6401d5cad16cd438c977736206a7