From bdfa7262fc394c069d41a07198d1ebf090620776 Mon Sep 17 00:00:00 2001
From: importbot <releng@rockylinux.org>
Date: Fri, 20 Dec 2024 20:18:40 +0000
Subject: [PATCH] import systemd-257-2.el10
---
.systemd.metadata | 2 +-
...workflows-to-run-on-source-git-setup.patch | 2 +-
.../0002-ci-setup-source-git-automation.patch | 6 +-
...03-ci-reconfigure-Packit-for-RHEL-10.patch | 2 +-
...eate-user-journals-for-users-with-hi.patch | 2 +-
...-tmpfiles-make-purge-hard-to-mis-use.patch | 4 +-
...-use-system-auth-in-pam-systemd-user.patch | 2 +-
...e-start-rhel10-naming-and-include-rh.patch | 2 +-
...les-copy-40-redhat.rules-from-RHEL-9.patch | 2 +-
...nd-set-RemoveIPC-to-false-by-default.patch | 4 +-
...reate-resolv.conf-stub-resolv.conf-s.patch | 2 +-
...al-order-after-network-online.target.patch | 2 +-
...il-increase-random-seed-size-to-1024.patch | 2 +-
...able-systemd-journald-audit.socket-b.patch | 2 +-
...f-don-t-touch-current-audit-settings.patch | 2 +-
...evator-kernel-command-line-parameter.patch | 2 +-
...tTasksMax-to-80-of-the-kernel-pid.ma.patch | 2 +-
...ink-change-the-default-MACAddressPol.patch | 2 +-
...g-level-of-messages-about-use-of-Kil.patch | 2 +-
SOURCES/0019-taint-remove-unmerged-bin.patch | 2 +-
SOURCES/0020-presets-remove-resolved.patch | 2 +-
...st-only-for-Fedora-and-CentOS-Stream.patch | 2 +-
...aint-remove-unused-variable-usr_sbin.patch | 2 +-
...ackit-drop-the-libarchive-workaround.patch | 2 +-
...ult-process-and-store-core-files-up-.patch | 2 +-
...mounted-as-tmpfs-without-the-user-s-.patch | 2 +-
...nit-don-t-add-Requires-for-tmp.mount.patch | 2 +-
...its-add-Install-section-to-tmp.mount.patch | 2 +-
...le-tmp.mount-statically-in-local-fs..patch | 2 +-
...if-naming-scheme-add-rhel-9.5-scheme.patch | 2 +-
...eme-rename-rhel-10.0-to-rhel-10.0.be.patch | 2 +-
...eme-disable-NAMING_FIRMWARE_NODE_SUN.patch | 2 +-
...ng-scheme-introduce-rhel-10.0-scheme.patch | 2 +-
...t-bail-if-SHELL_-variables-are-unset.patch | 58 -------------------
SPECS/systemd.spec | 6 +-
35 files changed, 41 insertions(+), 97 deletions(-)
delete mode 100644 SOURCES/0033-profile.d-don-t-bail-if-SHELL_-variables-are-unset.patch
diff --git a/.systemd.metadata b/.systemd.metadata
index 55f5540..09f18a6 100644
--- a/.systemd.metadata
+++ b/.systemd.metadata
@@ -1 +1 @@
-14f6907eb5e289d8c39cbe1ef891ca54d8a0e3582c986a9ef5844b3f29add43b SOURCES/systemd-257.tar.gz
+6a2e4b3d055966d5c77fc067653da2cdd047b0968a01b181b4e551c00f632f33 SOURCES/systemd-257.tar.gz
diff --git a/SOURCES/0001-ci-update-workflows-to-run-on-source-git-setup.patch b/SOURCES/0001-ci-update-workflows-to-run-on-source-git-setup.patch
index f68f1ab..9df098c 100644
--- a/SOURCES/0001-ci-update-workflows-to-run-on-source-git-setup.patch
+++ b/SOURCES/0001-ci-update-workflows-to-run-on-source-git-setup.patch
@@ -1,4 +1,4 @@
-From de58c5c9d265444f6916015fd3e747012b07d958 Mon Sep 17 00:00:00 2001
+From 3553500ea1d9dddeeb05e5fa3bed02a3c64b882f Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Thu, 16 May 2024 14:24:38 +0200
Subject: [PATCH] ci: update workflows to run on source-git setup
diff --git a/SOURCES/0002-ci-setup-source-git-automation.patch b/SOURCES/0002-ci-setup-source-git-automation.patch
index 777947e..ac65cfe 100644
--- a/SOURCES/0002-ci-setup-source-git-automation.patch
+++ b/SOURCES/0002-ci-setup-source-git-automation.patch
@@ -1,4 +1,4 @@
-From ce0e5f2206de1c6fa2b48177e076f4e6be5faae2 Mon Sep 17 00:00:00 2001
+From 952dfb240674f2afc334460d11e38ccccfb69d60 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Thu, 16 May 2024 14:36:04 +0200
Subject: [PATCH] ci: setup source-git automation
@@ -473,10 +473,10 @@ index 0000000000..c2e3a2d4d0
+Each Pull Request has to pass all enabled tests that are automatically run using GitHub Actions, CentOS Stream CI, and others.
+If CI failure is unrelated to the change introduced in Pull Request, the downstream maintainer will set the `ci-waived` label and explain why CI was waived.
diff --git a/README.md b/README.md
-index 12f1381f08..421a2e6572 100644
+index 9e026b287c..5e82465f77 100644
--- a/README.md
+++ b/README.md
-@@ -30,7 +30,7 @@ Please see the [Code Map](docs/ARCHITECTURE.md) for information about this repos
+@@ -27,7 +27,7 @@ Please see the [Code Map](docs/ARCHITECTURE.md) for information about this repos
Please see the [Hacking guide](docs/HACKING.md) for information on how to hack on systemd and test your modifications.
diff --git a/SOURCES/0003-ci-reconfigure-Packit-for-RHEL-10.patch b/SOURCES/0003-ci-reconfigure-Packit-for-RHEL-10.patch
index 53c0bd6..e9f479b 100644
--- a/SOURCES/0003-ci-reconfigure-Packit-for-RHEL-10.patch
+++ b/SOURCES/0003-ci-reconfigure-Packit-for-RHEL-10.patch
@@ -1,4 +1,4 @@
-From 5c2ddd385ccfdf8ed57d2624ab95aa25f9e09bd5 Mon Sep 17 00:00:00 2001
+From ec05646d8b34762d270ab8d3f703e06828ed0a03 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Fri, 17 May 2024 13:55:40 +0200
Subject: [PATCH] ci: reconfigure Packit for RHEL 10
diff --git a/SOURCES/0004-journal-again-create-user-journals-for-users-with-hi.patch b/SOURCES/0004-journal-again-create-user-journals-for-users-with-hi.patch
index 2d94138..f1a3949 100644
--- a/SOURCES/0004-journal-again-create-user-journals-for-users-with-hi.patch
+++ b/SOURCES/0004-journal-again-create-user-journals-for-users-with-hi.patch
@@ -1,4 +1,4 @@
-From bd654fc852571f2e87b3579fe0544c3859516de7 Mon Sep 17 00:00:00 2001
+From f37a654f54717a0f85abb14f82a980685169161a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 9 Jan 2024 11:28:04 +0100
Subject: [PATCH] journal: again create user journals for users with high uids
diff --git a/SOURCES/0005-tmpfiles-make-purge-hard-to-mis-use.patch b/SOURCES/0005-tmpfiles-make-purge-hard-to-mis-use.patch
index cf33177..f33fb5f 100644
--- a/SOURCES/0005-tmpfiles-make-purge-hard-to-mis-use.patch
+++ b/SOURCES/0005-tmpfiles-make-purge-hard-to-mis-use.patch
@@ -1,4 +1,4 @@
-From b9215bbda704a4773de41190a0b2ce004d579bda Mon Sep 17 00:00:00 2001
+From dad955382c2e795e5f5d79ed89957d4af63880ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 18 Jun 2024 20:32:10 +0200
Subject: [PATCH] tmpfiles: make --purge hard to (mis-)use
@@ -13,7 +13,7 @@ Related: RHEL-40924
1 file changed, 17 insertions(+)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 86bf16356d..539c18f5e0 100644
+index bff05cda6f..9190f604a5 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -4213,6 +4213,7 @@ static int parse_argv(int argc, char *argv[]) {
diff --git a/SOURCES/0006-fedora-use-system-auth-in-pam-systemd-user.patch b/SOURCES/0006-fedora-use-system-auth-in-pam-systemd-user.patch
index 87190b0..f57c1da 100644
--- a/SOURCES/0006-fedora-use-system-auth-in-pam-systemd-user.patch
+++ b/SOURCES/0006-fedora-use-system-auth-in-pam-systemd-user.patch
@@ -1,4 +1,4 @@
-From 992d0ebb01617ecc48a5667527a02f53d33d3c4a Mon Sep 17 00:00:00 2001
+From e3b9e1165b0cfc9267fb9c1f42a85b6e8cd39f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 14 Dec 2022 22:24:53 +0100
Subject: [PATCH] fedora: use system-auth in pam systemd-user
diff --git a/SOURCES/0007-net-naming-scheme-start-rhel10-naming-and-include-rh.patch b/SOURCES/0007-net-naming-scheme-start-rhel10-naming-and-include-rh.patch
index 4d23050..ba472dc 100644
--- a/SOURCES/0007-net-naming-scheme-start-rhel10-naming-and-include-rh.patch
+++ b/SOURCES/0007-net-naming-scheme-start-rhel10-naming-and-include-rh.patch
@@ -1,4 +1,4 @@
-From bae9a92843339ced3fdca08e094881ff638b6b71 Mon Sep 17 00:00:00 2001
+From 2ffae8b36845e354c038c1619b78c205cd20cf09 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 25 Jun 2024 14:00:45 +0200
Subject: [PATCH] net-naming-scheme: start rhel10 naming and include rhel8 and
diff --git a/SOURCES/0008-rules-copy-40-redhat.rules-from-RHEL-9.patch b/SOURCES/0008-rules-copy-40-redhat.rules-from-RHEL-9.patch
index 5195259..1e87c48 100644
--- a/SOURCES/0008-rules-copy-40-redhat.rules-from-RHEL-9.patch
+++ b/SOURCES/0008-rules-copy-40-redhat.rules-from-RHEL-9.patch
@@ -1,4 +1,4 @@
-From 53a7f74c61db28b21bab57b9f9b3b068c6a40649 Mon Sep 17 00:00:00 2001
+From 6d267290d76302f9770b2f400a7ed992b6dcb42c Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Wed, 12 Jun 2024 14:23:30 +0200
Subject: [PATCH] rules: copy 40-redhat.rules from RHEL 9
diff --git a/SOURCES/0009-logind-set-RemoveIPC-to-false-by-default.patch b/SOURCES/0009-logind-set-RemoveIPC-to-false-by-default.patch
index 328a578..ae363f5 100644
--- a/SOURCES/0009-logind-set-RemoveIPC-to-false-by-default.patch
+++ b/SOURCES/0009-logind-set-RemoveIPC-to-false-by-default.patch
@@ -1,4 +1,4 @@
-From bb8e0604ab3033d5436b1ea7b2bdfde077208f58 Mon Sep 17 00:00:00 2001
+From 138db841fbefdbb2fb293be06afe245b32cd95b1 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Wed, 1 Aug 2018 10:58:28 +0200
Subject: [PATCH] logind: set RemoveIPC to false by default
@@ -26,7 +26,7 @@ index 66240b58fe..3265b134e0 100644
<xi:include href="version-info.xml" xpointer="v212"/></listitem>
</varlistentry>
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
-index fad276f195..5c05afb197 100644
+index 9892285805..197b1e8cd2 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -36,7 +36,7 @@ void manager_reset_config(Manager *m) {
diff --git a/SOURCES/0010-tmpfiles-don-t-create-resolv.conf-stub-resolv.conf-s.patch b/SOURCES/0010-tmpfiles-don-t-create-resolv.conf-stub-resolv.conf-s.patch
index 44ce976..24f297c 100644
--- a/SOURCES/0010-tmpfiles-don-t-create-resolv.conf-stub-resolv.conf-s.patch
+++ b/SOURCES/0010-tmpfiles-don-t-create-resolv.conf-stub-resolv.conf-s.patch
@@ -1,4 +1,4 @@
-From 04aacb1500c8625db8ec30d3cbeaacaf337653ad Mon Sep 17 00:00:00 2001
+From 2a735b1d1260278103a9c4fce2417b5e93a10b5f Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Thu, 5 Aug 2021 17:11:47 +0200
Subject: [PATCH] tmpfiles: don't create resolv.conf -> stub-resolv.conf
diff --git a/SOURCES/0011-rc-local-order-after-network-online.target.patch b/SOURCES/0011-rc-local-order-after-network-online.target.patch
index 99ed7aa..9a5e7ba 100644
--- a/SOURCES/0011-rc-local-order-after-network-online.target.patch
+++ b/SOURCES/0011-rc-local-order-after-network-online.target.patch
@@ -1,4 +1,4 @@
-From f1c96726a753198321ce124c413476d6eb1b2d43 Mon Sep 17 00:00:00 2001
+From d477232d7330b512ef41ad75e9997c0aac900276 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 11 Mar 2021 15:48:23 +0100
Subject: [PATCH] rc-local: order after network-online.target
diff --git a/SOURCES/0012-random-util-increase-random-seed-size-to-1024.patch b/SOURCES/0012-random-util-increase-random-seed-size-to-1024.patch
index 09ca3e9..0f8dde3 100644
--- a/SOURCES/0012-random-util-increase-random-seed-size-to-1024.patch
+++ b/SOURCES/0012-random-util-increase-random-seed-size-to-1024.patch
@@ -1,4 +1,4 @@
-From bb9588c6bef5d4ec69665e30a7ae142ce02d5935 Mon Sep 17 00:00:00 2001
+From e7b0c09ce9340d8d996fb1801ba66b6513f38be5 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 15 Jul 2021 11:15:17 +0200
Subject: [PATCH] random-util: increase random seed size to 1024
diff --git a/SOURCES/0013-journal-don-t-enable-systemd-journald-audit.socket-b.patch b/SOURCES/0013-journal-don-t-enable-systemd-journald-audit.socket-b.patch
index 6d03578..f97f6c5 100644
--- a/SOURCES/0013-journal-don-t-enable-systemd-journald-audit.socket-b.patch
+++ b/SOURCES/0013-journal-don-t-enable-systemd-journald-audit.socket-b.patch
@@ -1,4 +1,4 @@
-From 5a60eea4b59d1ec3620726c9307ce32f91f8bb3d Mon Sep 17 00:00:00 2001
+From 407a281c19897303a3f0f730151fd6a59bdf0846 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Thu, 2 May 2019 14:11:54 +0200
Subject: [PATCH] journal: don't enable systemd-journald-audit.socket by
diff --git a/SOURCES/0014-journald.conf-don-t-touch-current-audit-settings.patch b/SOURCES/0014-journald.conf-don-t-touch-current-audit-settings.patch
index 94fef45..7c97e81 100644
--- a/SOURCES/0014-journald.conf-don-t-touch-current-audit-settings.patch
+++ b/SOURCES/0014-journald.conf-don-t-touch-current-audit-settings.patch
@@ -1,4 +1,4 @@
-From 1ee56a7495a28b9479f49d664a56e1be8ee0f4b4 Mon Sep 17 00:00:00 2001
+From d556abba450e23e900eedece11305c48b77a248f Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 5 Aug 2021 15:26:13 +0200
Subject: [PATCH] journald.conf: don't touch current audit settings
diff --git a/SOURCES/0015-rules-add-elevator-kernel-command-line-parameter.patch b/SOURCES/0015-rules-add-elevator-kernel-command-line-parameter.patch
index 532db99..3e5de1e 100644
--- a/SOURCES/0015-rules-add-elevator-kernel-command-line-parameter.patch
+++ b/SOURCES/0015-rules-add-elevator-kernel-command-line-parameter.patch
@@ -1,4 +1,4 @@
-From 9a50ecbb2ce61e7679b9e30c16cd9e18f3004e7c Mon Sep 17 00:00:00 2001
+From 634847fd61e037e9e119b018ed50bd1997c24886 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Tue, 12 Feb 2019 16:58:16 +0100
Subject: [PATCH] rules: add elevator= kernel command line parameter
diff --git a/SOURCES/0016-pid1-bump-DefaultTasksMax-to-80-of-the-kernel-pid.ma.patch b/SOURCES/0016-pid1-bump-DefaultTasksMax-to-80-of-the-kernel-pid.ma.patch
index a245bf4..a2a48fe 100644
--- a/SOURCES/0016-pid1-bump-DefaultTasksMax-to-80-of-the-kernel-pid.ma.patch
+++ b/SOURCES/0016-pid1-bump-DefaultTasksMax-to-80-of-the-kernel-pid.ma.patch
@@ -1,4 +1,4 @@
-From 051e7668f89db42292bd5b060fdda07e6232effd Mon Sep 17 00:00:00 2001
+From bfb8c22224948b56f3d8310572987dcd54bd59c6 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Wed, 1 Aug 2018 13:19:39 +0200
Subject: [PATCH] pid1: bump DefaultTasksMax to 80% of the kernel pid.max value
diff --git a/SOURCES/0017-udev-net-setup-link-change-the-default-MACAddressPol.patch b/SOURCES/0017-udev-net-setup-link-change-the-default-MACAddressPol.patch
index 565098e..a20e089 100644
--- a/SOURCES/0017-udev-net-setup-link-change-the-default-MACAddressPol.patch
+++ b/SOURCES/0017-udev-net-setup-link-change-the-default-MACAddressPol.patch
@@ -1,4 +1,4 @@
-From 053b814d8f22c15e07f25ce5820d27a25d80a68b Mon Sep 17 00:00:00 2001
+From ec6d57d8ff39de440393955a8de88883a014a4b6 Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Tue, 21 Sep 2021 15:01:19 +0200
Subject: [PATCH] udev/net-setup-link: change the default MACAddressPolicy to
diff --git a/SOURCES/0018-core-decrease-log-level-of-messages-about-use-of-Kil.patch b/SOURCES/0018-core-decrease-log-level-of-messages-about-use-of-Kil.patch
index 775a290..95b73bf 100644
--- a/SOURCES/0018-core-decrease-log-level-of-messages-about-use-of-Kil.patch
+++ b/SOURCES/0018-core-decrease-log-level-of-messages-about-use-of-Kil.patch
@@ -1,4 +1,4 @@
-From 06b4116be34987c24502088bcff404621ea658fa Mon Sep 17 00:00:00 2001
+From ed6ec13adeea59d7534f694c03e08f403b2fe411 Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Tue, 22 Feb 2022 13:24:11 +0100
Subject: [PATCH] core: decrease log level of messages about use of
diff --git a/SOURCES/0019-taint-remove-unmerged-bin.patch b/SOURCES/0019-taint-remove-unmerged-bin.patch
index 09b102d..c6fe207 100644
--- a/SOURCES/0019-taint-remove-unmerged-bin.patch
+++ b/SOURCES/0019-taint-remove-unmerged-bin.patch
@@ -1,4 +1,4 @@
-From 42a6e71e98d03988ecf0915183f7c228690d2788 Mon Sep 17 00:00:00 2001
+From 574ba06befc0a56ada6ee9b125f105573ee5f06a Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 8 Jul 2024 14:44:45 +0200
Subject: [PATCH] taint: remove unmerged-bin
diff --git a/SOURCES/0020-presets-remove-resolved.patch b/SOURCES/0020-presets-remove-resolved.patch
index 6139bae..b63a8de 100644
--- a/SOURCES/0020-presets-remove-resolved.patch
+++ b/SOURCES/0020-presets-remove-resolved.patch
@@ -1,4 +1,4 @@
-From e10f3e04f92d72ecac5179609b6dc900443625b5 Mon Sep 17 00:00:00 2001
+From 1a3648b92c97ab60104a4a0023fd96711c7a256b Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 8 Jul 2024 13:13:10 +0200
Subject: [PATCH] presets: remove resolved
diff --git a/SOURCES/0021-ci-run-mkosi-test-only-for-Fedora-and-CentOS-Stream.patch b/SOURCES/0021-ci-run-mkosi-test-only-for-Fedora-and-CentOS-Stream.patch
index 0098b40..4755d68 100644
--- a/SOURCES/0021-ci-run-mkosi-test-only-for-Fedora-and-CentOS-Stream.patch
+++ b/SOURCES/0021-ci-run-mkosi-test-only-for-Fedora-and-CentOS-Stream.patch
@@ -1,4 +1,4 @@
-From 44b06a0c152412b9e08db6caae10a3b73fa240ef Mon Sep 17 00:00:00 2001
+From e24597f722f9a6af3809704d76df8087d8f79c5a Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 16 Jul 2024 10:08:06 +0200
Subject: [PATCH] ci: run mkosi test only for Fedora and CentOS Stream
diff --git a/SOURCES/0022-taint-remove-unused-variable-usr_sbin.patch b/SOURCES/0022-taint-remove-unused-variable-usr_sbin.patch
index 54a4f1c..aa61e00 100644
--- a/SOURCES/0022-taint-remove-unused-variable-usr_sbin.patch
+++ b/SOURCES/0022-taint-remove-unused-variable-usr_sbin.patch
@@ -1,4 +1,4 @@
-From f224307ee5d471a6b619244e6e36c9740e4319f5 Mon Sep 17 00:00:00 2001
+From 5af7d3308ed778445a945688dcf339f940644d53 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 16 Jul 2024 10:09:23 +0200
Subject: [PATCH] taint: remove unused variable `usr_sbin`
diff --git a/SOURCES/0023-packit-drop-the-libarchive-workaround.patch b/SOURCES/0023-packit-drop-the-libarchive-workaround.patch
index d2b0aa7..ebb6c8d 100644
--- a/SOURCES/0023-packit-drop-the-libarchive-workaround.patch
+++ b/SOURCES/0023-packit-drop-the-libarchive-workaround.patch
@@ -1,4 +1,4 @@
-From 17218ad668ec29b0ea7556bd67e5a7170e1ab794 Mon Sep 17 00:00:00 2001
+From 67fd26df5f6fbe2780b2ab308eb39088efc86844 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 17 Jul 2024 12:19:03 +0200
Subject: [PATCH] packit: drop the libarchive workaround
diff --git a/SOURCES/0024-coredump-by-default-process-and-store-core-files-up-.patch b/SOURCES/0024-coredump-by-default-process-and-store-core-files-up-.patch
index d4144b5..09687e0 100644
--- a/SOURCES/0024-coredump-by-default-process-and-store-core-files-up-.patch
+++ b/SOURCES/0024-coredump-by-default-process-and-store-core-files-up-.patch
@@ -1,4 +1,4 @@
-From 78b2176529760fac86dfc994f13fefbcd6a4b5aa Mon Sep 17 00:00:00 2001
+From 52243386bfc005ed52903c958e172fcb70a1236a Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Fri, 5 Apr 2024 15:56:58 +0200
Subject: [PATCH] coredump: by default process and store core files up to 1GiB
diff --git a/SOURCES/0025-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch b/SOURCES/0025-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch
index b3ecbf5..42099e3 100644
--- a/SOURCES/0025-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch
+++ b/SOURCES/0025-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch
@@ -1,4 +1,4 @@
-From 038ea755196a3270fc5a8074ee5a3e55fd5b88be Mon Sep 17 00:00:00 2001
+From 12bef1e0622eeb1cb4b1ed2e3d63fb1d38b1527a Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Tue, 15 May 2018 09:24:20 +0200
Subject: [PATCH] Avoid /tmp being mounted as tmpfs without the user's will
diff --git a/SOURCES/0026-unit-don-t-add-Requires-for-tmp.mount.patch b/SOURCES/0026-unit-don-t-add-Requires-for-tmp.mount.patch
index 980bc7e..2c6de81 100644
--- a/SOURCES/0026-unit-don-t-add-Requires-for-tmp.mount.patch
+++ b/SOURCES/0026-unit-don-t-add-Requires-for-tmp.mount.patch
@@ -1,4 +1,4 @@
-From 781f75b5677cb1843f2c51859b160ee4110c330a Mon Sep 17 00:00:00 2001
+From 4d152dcd8bad5d8049390aa98f408b14b536db16 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 5 Sep 2016 12:47:09 +0200
Subject: [PATCH] unit: don't add Requires for tmp.mount
diff --git a/SOURCES/0027-units-add-Install-section-to-tmp.mount.patch b/SOURCES/0027-units-add-Install-section-to-tmp.mount.patch
index 03ff401..3eb620c 100644
--- a/SOURCES/0027-units-add-Install-section-to-tmp.mount.patch
+++ b/SOURCES/0027-units-add-Install-section-to-tmp.mount.patch
@@ -1,4 +1,4 @@
-From 2d2c58ac4f748caa6b8726a1c155729aa70472ca Mon Sep 17 00:00:00 2001
+From 4aff4ef75b58b4fcc8cc02529feb6bdc2c564c9c Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Tue, 22 Jan 2019 10:28:42 +0100
Subject: [PATCH] units: add [Install] section to tmp.mount
diff --git a/SOURCES/0028-units-don-t-enable-tmp.mount-statically-in-local-fs..patch b/SOURCES/0028-units-don-t-enable-tmp.mount-statically-in-local-fs..patch
index e3a4eca..332dc13 100644
--- a/SOURCES/0028-units-don-t-enable-tmp.mount-statically-in-local-fs..patch
+++ b/SOURCES/0028-units-don-t-enable-tmp.mount-statically-in-local-fs..patch
@@ -1,4 +1,4 @@
-From 19091a48b923a990183c791f25bcf4fb24fc1b67 Mon Sep 17 00:00:00 2001
+From 940c4cd0fc9245ac3c5530a6b902c0ec77f28d48 Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Wed, 22 Sep 2021 14:38:00 +0200
Subject: [PATCH] units: don't enable tmp.mount statically in local-fs.target
diff --git a/SOURCES/0029-netif-naming-scheme-add-rhel-9.5-scheme.patch b/SOURCES/0029-netif-naming-scheme-add-rhel-9.5-scheme.patch
index 8237856..2c435ac 100644
--- a/SOURCES/0029-netif-naming-scheme-add-rhel-9.5-scheme.patch
+++ b/SOURCES/0029-netif-naming-scheme-add-rhel-9.5-scheme.patch
@@ -1,4 +1,4 @@
-From 339250daaa9eb39cc690c2b2a2cedaa7bbb04a85 Mon Sep 17 00:00:00 2001
+From 7b31af5f75649e847cf3d19e1e6e44758237ce28 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Thu, 8 Aug 2024 13:12:58 +0200
Subject: [PATCH] netif-naming-scheme: add rhel-9.5 scheme
diff --git a/SOURCES/0030-netif-naming-scheme-rename-rhel-10.0-to-rhel-10.0.be.patch b/SOURCES/0030-netif-naming-scheme-rename-rhel-10.0-to-rhel-10.0.be.patch
index d90c2de..6e6b4f7 100644
--- a/SOURCES/0030-netif-naming-scheme-rename-rhel-10.0-to-rhel-10.0.be.patch
+++ b/SOURCES/0030-netif-naming-scheme-rename-rhel-10.0-to-rhel-10.0.be.patch
@@ -1,4 +1,4 @@
-From f878792eb14fb051d03dc91cc87f46ec6dd5f692 Mon Sep 17 00:00:00 2001
+From c20009926d4d143bd8fc605695092ae8403d1a20 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 22 Aug 2024 13:42:11 +0200
Subject: [PATCH] netif-naming-scheme: rename rhel-10.0 to rhel-10.0.beta
diff --git a/SOURCES/0031-net-naming-scheme-disable-NAMING_FIRMWARE_NODE_SUN.patch b/SOURCES/0031-net-naming-scheme-disable-NAMING_FIRMWARE_NODE_SUN.patch
index d47db3b..4319754 100644
--- a/SOURCES/0031-net-naming-scheme-disable-NAMING_FIRMWARE_NODE_SUN.patch
+++ b/SOURCES/0031-net-naming-scheme-disable-NAMING_FIRMWARE_NODE_SUN.patch
@@ -1,4 +1,4 @@
-From 06efc733d10fba0b1282e1e65b4d464587d4ad41 Mon Sep 17 00:00:00 2001
+From d4db6a9e9e139432fd78574458de4ff72d697843 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 22 Aug 2024 13:47:56 +0200
Subject: [PATCH] net-naming-scheme: disable NAMING_FIRMWARE_NODE_SUN
diff --git a/SOURCES/0032-netif-naming-scheme-introduce-rhel-10.0-scheme.patch b/SOURCES/0032-netif-naming-scheme-introduce-rhel-10.0-scheme.patch
index 8b9c979..06d5a84 100644
--- a/SOURCES/0032-netif-naming-scheme-introduce-rhel-10.0-scheme.patch
+++ b/SOURCES/0032-netif-naming-scheme-introduce-rhel-10.0-scheme.patch
@@ -1,4 +1,4 @@
-From 8711965bf33fafe4685bb3df1d130c4fa45251d4 Mon Sep 17 00:00:00 2001
+From 5d21d8fba63d27a563137304324f5a52f527cbef Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Mon, 16 Dec 2024 15:08:50 +0100
Subject: [PATCH] netif-naming-scheme: introduce rhel-10.0 scheme
diff --git a/SOURCES/0033-profile.d-don-t-bail-if-SHELL_-variables-are-unset.patch b/SOURCES/0033-profile.d-don-t-bail-if-SHELL_-variables-are-unset.patch
deleted file mode 100644
index 84a4d66..0000000
--- a/SOURCES/0033-profile.d-don-t-bail-if-SHELL_-variables-are-unset.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2a6fbf9da93ad2f76aa5578641e39801a13fd5dd Mon Sep 17 00:00:00 2001
-From: Tobias Klauser <tklauser@distanz.ch>
-Date: Wed, 11 Dec 2024 15:10:39 +0100
-Subject: [PATCH] profile.d: don't bail if $SHELL_* variables are unset
-
-If - for whatever reason - a script uses set -u (nounset) and includes
-/etc/profile.d/70-systemd-shell-extra.sh (e.g. transitively via
-/etc/profile) the script would fail with:
-
- /etc/profile.d/70-systemd-shell-extra.sh: line 15: SHELL_PROMPT_PREFIX: unbound variable
-
-For example:
-
- $ cat > foo.sh <<EOF
- #!/bin/sh
- set -u
-
- source /etc/profile
- EOF
- $ chmod 700 foo.sh
- $ ./foo.sh
- /etc/profile.d/70-systemd-shell-extra.sh: line 15: SHELL_PROMPT_PREFIX: unbound variable
-
-Fix this by using shell parameter substitution[^1] (which is a POSIX
-shell concept) to set the $SHELL_* variables to the empty string if
-undefined.
-
-[^1]: https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/utilities/V3_chap02.html
-
-(cherry picked from commit 12e33d332b3f8754f4d5d0d21d5d3f0de8adc54c)
-
-Related: RHEL-71409
----
- profile.d/70-systemd-shell-extra.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/profile.d/70-systemd-shell-extra.sh b/profile.d/70-systemd-shell-extra.sh
-index 70be3341b9..dae77e4bc7 100644
---- a/profile.d/70-systemd-shell-extra.sh
-+++ b/profile.d/70-systemd-shell-extra.sh
-@@ -12,14 +12,14 @@
- # credentials shell.prompt.prefix, shell.prompt.suffix and shell.welcome, and
- # are propagated into these environment variables by pam_systemd(8).
-
--if [ -n "$SHELL_PROMPT_PREFIX" ]; then
-+if [ -n "${SHELL_PROMPT_PREFIX-}" ]; then
- PS1="$SHELL_PROMPT_PREFIX$PS1"
- fi
-
--if [ -n "$SHELL_PROMPT_SUFFIX" ]; then
-+if [ -n "${SHELL_PROMPT_SUFFIX-}" ]; then
- PS1="$PS1$SHELL_PROMPT_SUFFIX"
- fi
-
--if [ -n "$SHELL_WELCOME" ]; then
-+if [ -n "${SHELL_WELCOME-}" ]; then
- printf '%b\n' "$SHELL_WELCOME"
- fi
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 8e3cfee..2aeb074 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -48,7 +48,7 @@ Url: https://systemd.io
# Allow users to specify the version and release when building the rpm by
# setting the %%version_override and %%release_override macros.
Version: %{?version_override}%{!?version_override:257}
-Release: 1%{?dist}
+Release: 2%{?dist}
%global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?)
@@ -141,7 +141,6 @@ Patch0029: 0029-netif-naming-scheme-add-rhel-9.5-scheme.patch
Patch0030: 0030-netif-naming-scheme-rename-rhel-10.0-to-rhel-10.0.be.patch
Patch0031: 0031-net-naming-scheme-disable-NAMING_FIRMWARE_NODE_SUN.patch
Patch0032: 0032-netif-naming-scheme-introduce-rhel-10.0-scheme.patch
-Patch0033: 0033-profile.d-don-t-bail-if-SHELL_-variables-are-unset.patch
# Downstream-only patches (9000–9999)
@@ -1072,6 +1071,9 @@ rm -f .file-list-*
rm -f %{name}.lang
%changelog
+* Fri Dec 20 2024 Jan Macku <jamacku@redhat.com> - 257-2
+- Rebase to new upstream stable release v257.1 (RHEL-71409)
+
* Tue Dec 17 2024 Jan Macku <jamacku@redhat.com> - 257-1
- Rebase to new upstream release v257 (RHEL-71409)
- netif-naming-scheme: introduce rhel-10.0 scheme (RHEL-44417)
--
GitLab