From 770b8e2647c61512b8508c61bb3a55318f31d9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 24 Sep 2024 16:46:11 +0200
Subject: [PATCH 1/4] Move yum/dnf protection removal config file under /usr

https://github.com/uapi-group/specifications/issues/76

Actually, add a new file under /usr, but keep the old file in /etc
because it's still needed for dnf. The new file in the new location
is useful because it means that we get the correct behaviour even when
/etc is emptied (on systems with new dnf version).

dnf5 reads the new location:
https://github.com/rpm-software-management/dnf5/issues/1107
https://github.com/rpm-software-management/dnf5/pull/1110
---
 sudo.spec | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/sudo.spec b/sudo.spec
index 6f483cb..63fb36f 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -131,12 +131,15 @@ install -p -d -m 700 $RPM_BUILD_ROOT/var/db/sudo
 install -p -d -m 700 $RPM_BUILD_ROOT/var/db/sudo/lectured
 install -p -d -m 750 $RPM_BUILD_ROOT/etc/sudoers.d
 install -p -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers
-#add sudo to protected packages
-install -p -d -m 755 $RPM_BUILD_ROOT/etc/dnf/protected.d/
-touch sudo.conf
-echo sudo > sudo.conf
-install -p -c -m 0644 sudo.conf $RPM_BUILD_ROOT/etc/dnf/protected.d/
-rm -f sudo.conf
+# Add sudo to protected packages. Old location for yum/dnf.
+mkdir -p $RPM_BUILD_ROOT/etc/dnf/protected.d/
+echo "sudo" >$RPM_BUILD_ROOT/etc/dnf/protected.d/sudo.conf
+# Add sudo to protected packages. New location for dnf5.
+mkdir -p $RPM_BUILD_ROOT/usr/share/dnf5/libdnf.conf.d/
+cat >$RPM_BUILD_ROOT/usr/share/dnf5/libdnf.conf.d/protect-sudo.conf <<EOF
+[main]
+protected_packages = sudo
+EOF
 
 chmod +x $RPM_BUILD_ROOT%{_libexecdir}/sudo/*.so # for stripping, reset in %%files
 
@@ -188,6 +191,9 @@ EOF
 %attr(0644,root,root) %{_tmpfilesdir}/sudo.conf
 %attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/sudo.conf
 %attr(0640,root,root) %config(noreplace) /etc/sudo.conf
+%dir /usr/share/dnf5
+%dir /usr/share/dnf5/libdnf.conf.d
+/usr/share/dnf5/libdnf.conf.d/protect-sudo.conf
 %dir /var/db/sudo
 %dir /var/db/sudo/lectured
 %attr(4111,root,root) %{_bindir}/sudo

From 1899e2aa8d10783369a1d840c2fc30cf86a6e782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Mon, 7 Jul 2025 13:10:49 +0200
Subject: [PATCH 2/4] Drop '-std=gnu17' from CFLAGS, as C23 builds fine now
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was introduced in commit e2e397029e0d35046a4cf891e075d24c7540da4f
for an older version of sudo that was FTBFS for GCC 15 defaulting to C23.

Signed-off-by: Björn Esser <besser82@fedoraproject.org>
---
 sudo.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sudo.spec b/sudo.spec
index 9e72bb5..73b3930 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -76,8 +76,6 @@ BuildRequires:  python3-devel
 # Remove bundled copy of zlib
 rm -rf zlib/
 
-export CFLAGS="$RPM_OPT_FLAGS -std=gnu17"
-
 %configure \
         --prefix=%{_prefix} \
         --sbindir=%{_sbindir} \

From 81e84c1f0692ac90603c7cbeaeeb2b891a852e45 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 18:50:05 +0000
Subject: [PATCH 3/4] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 2ead99a2b1915e06b2918b5547d0587fbe678e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20L=C3=B3pez?= <allopez@redhat.com>
Date: Tue, 21 Oct 2025 10:16:55 +0200
Subject: [PATCH 4/4] Rebase to 1.9.17p2

- sudo-1.9.17p2 is available
  Resolves: rhbz#2383665
---
 .gitignore | 1 +
 sources    | 2 +-
 sudo.spec  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e4940ce..b0986fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /sudo-1.9.15p4.tar.gz
 /sudo-1.9.15p5.tar.gz
 /sudo-1.9.17p1.tar.gz
+/sudo-1.9.17p2.tar.gz
diff --git a/sources b/sources
index 86f8d45..54e59ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sudo-1.9.17p1.tar.gz) = 1a9fb27a117b54adf5c99443b3375f7e0eaaf3a2d5a3d409f7c7b10c43432eb301d721df93fb1a8a2e45bf4a4957288d4f153359fc018af00973be57f62a1ebc
+SHA512 (sudo-1.9.17p2.tar.gz) = c8abd6ca56e54a081c9ef1e9f6579d1db5b93ff857e60d1f58d1f425d7dc23c31c58d40b7819780688f66dfdf87a1f3bbe0a78387b007e2beb1b0e546203ea93
diff --git a/sudo.spec b/sudo.spec
index e321ec4..be44d00 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,5 +1,5 @@
 # comment out if no extra version
-%global extraver p1
+%global extraver p2
 
 Summary: Allows restricted root access for specified users
 Name: sudo