Sync changes to SLFO-1.2 branch

0001-change-lockingdir-to-run.patch

@@ -0,0 +1,25 @@
+From 4d32e143124fa47466bbc91f54067674f212c3e3 Mon Sep 17 00:00:00 2001
+From: Thomas Blume <thomas.blume@suse.com>
+Date: Wed, 12 Jun 2019 10:09:01 +0200
+Subject: [PATCH] change lockingdir to /run
+
+---
+ src/rpcbind.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rpcbind.c b/src/rpcbind.c
+index cc848b1..65054ff 100644
+--- a/src/rpcbind.c
++++ b/src/rpcbind.c
+@@ -105,7 +105,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 "/run/rpcbind.lock"
+ 
+ int runasdaemon = 0;
+ int insecure = 0;
+-- 
+2.16.4
+

0001-systemd-rpcbind.service-Add-hardening-bsc-1181400.patch

@@ -0,0 +1,39 @@
+From 913dc9e39032cf8d06c8f3260ef7fcca636a9ebb Mon Sep 17 00:00:00 2001
+From: Johannes Segitz <jsegitz@suse.com>
+Date: Fri, 23 Aug 2024 00:51:43 +0200
+Subject: [PATCH] systemd/rpcbind.service: Add hardening (bsc#1181400)
+
+Signed-off-by: Johannes Segitz <jsegitz@suse.com>
+[ pvorel: Rebased for 1.2.7 ]
+Signed-off-by: Petr Vorel <pvorel@suse.cz>
+---
+ systemd/rpcbind.service.in | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
+index 97207e0..b03409b 100644
+--- a/systemd/rpcbind.service.in
++++ b/systemd/rpcbind.service.in
+@@ -11,6 +11,19 @@ Wants=rpcbind.target
+ After=sysinit.target
+ 
+ [Service]
++# added automatically, for details please see
++# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
++ProtectSystem=full
++ProtectHome=true
++PrivateDevices=true
++ProtectHostname=true
++ProtectClock=true
++ProtectKernelTunables=true
++ProtectKernelModules=true
++ProtectKernelLogs=true
++ProtectControlGroups=true
++RestrictRealtime=true
++# end of automatic additions
+ Type=notify
+ # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
+ EnvironmentFile=-/etc/sysconfig/rpcbind
+-- 
+2.45.2
+

0001-systemd-rpcbind.service-Fix-ordering-add-etc-sysconf.patch

@@ -0,0 +1,40 @@
+From e400274134c1401359ef38df34fc300e0fba2fba Mon Sep 17 00:00:00 2001
+From: Thomas Blume <thomas.blume@suse.com>
+Date: Thu, 22 Aug 2024 22:36:49 +0200
+Subject: [PATCH] systemd/rpcbind.service: Fix ordering, add
+ /etc/sysconfig/rpcbind
+
+* Add ordering dependency to rpcbind.service (bsc#1117217)
+* Add EnvironmentFile=-/etc/sysconfig/rpcbind to rpcbind.service.in
+  (bsc#824621)
+
+Link: https://bugzilla.suse.com/show_bug.cgi?id=1117217
+Link: https://bugzilla.suse.com/show_bug.cgi?id=824621
+Reviewed-by: Petr Vorel <pvorel@suse.cz>
+Signed-off-by: Thomas Blume <thomas.blume@suse.com>
+[ pvorel: rebased for 1.2.7 ]
+Signed-off-by: Petr Vorel <pvorel@suse.cz>
+---
+ systemd/rpcbind.service.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
+index c892ca8..97207e0 100644
+--- a/systemd/rpcbind.service.in
++++ b/systemd/rpcbind.service.in
+@@ -8,10 +8,12 @@ RequiresMountsFor=@statedir@
+ # rpcbind.socket, no matter how this unit is started.
+ Requires=rpcbind.socket
+ Wants=rpcbind.target
++After=sysinit.target
+ 
+ [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
+ 
+ [Install]
+-- 
+2.45.2
+

rpcbind-1.2.8.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:964132c389918e8964d7334936b6dd10ef025b300c6b29e693ba0f29550e3de5
-size 129079

rpcbind.changes

@@ -1,34 +1,10 @@
 -------------------------------------------------------------------
-Mon Jul 28 07:14:31 UTC 2025 - Petr Vorel <pvorel@suse.cz>
+Mon Feb 17 08:51:10 UTC 2025 - Thomas Blume <thomas.blume@suse.com>
-
-- Update to rpcbind 1.2.8
-  https://lore.kernel.org/linux-nfs/b553cc5a-46eb-453b-80f0-cfe69ccb7b21@redhat.com/
-  * Added -v (print version and compile flags)
-  * A number of systemd updates/bug fixes.
-  * A number of manpage updates.
-  * Moved rpcbind.lock and default configs to /run instead of /var/run
-  * A couple of bug fixes
-- systemd: Upstream added systemd EnvironmentFile: 1) /etc/rpcbind.conf 2)
-  /etc/default/rpcbind 3) /etc/sysconfig/rpcbind (the only one originally used
-  in openSUSE patch for boo#1117217)
-- systemd: Add 'systemd-tmpfiles-setup.service' into 'Wants' and 'After'
-  targets (originally openSUSE patch for boo#1117217 added 'After=sysinit.target')
-- Removed openSUSE downstream patches (accepted upstream):
-  * 0001-systemd-rpcbind.service-Fix-ordering-add-etc-sysconf.patch
-  * 0001-systemd-rpcbind.service-Add-hardening-bsc-1181400.patch
-  * 0001-change-lockingdir-to-run.patch
-
--------------------------------------------------------------------
-Wed Dec 11 03:20:26 UTC 2024 - William Brown <william.brown@suse.com>
 
 - Require system-user-nobody for as the rpc user relies on `nobody`
   from this package
 
--------------------------------------------------------------------
-Thu Aug 22 20:26:41 UTC 2024 - Petr Vorel <pvorel@suse.cz>
-
 - Update to rpcbind 1.2.7
-  https://sourceforge.net/projects/rpcbind/files/rpcbind/1.2.7/1.2.7-ChangeLog/download
   * rpcinfo: try connecting using abstract address
   * Listen on an AF_UNIX abstract address if supported
   * autotools/systemd: call rpcbind with -w only on enabled warm starts

rpcbind.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rpcbind
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           rpcbind
-Version:        1.2.8
+Version:        1.2.7
 Release:        0
 Summary:        Transport independent RPC portmapper
 # Git-Web:      http://git.linux-nfs.org/?p=steved/rpcbind.git;a=summary
@@ -31,6 +31,9 @@ URL:            http://rpcbind.sourceforge.net
 Source:         https://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Source2:        sysconfig.rpcbind
 Source5:        rpc-user.conf
+Patch1:         0001-systemd-rpcbind.service-Fix-ordering-add-etc-sysconf.patch
+Patch2:         0001-change-lockingdir-to-run.patch
+Patch3:         0001-systemd-rpcbind.service-Add-hardening-bsc-1181400.patch
 BuildRequires:  libtirpc-devel >= 1.0.1
 BuildRequires:  libtool
 BuildRequires:  pkgconfig