.gitignore

@@ -35,4 +35,3 @@
 /sudo-1.9.15p4.tar.gz
 /sudo-1.9.15p5.tar.gz
 /sudo-1.9.17p1.tar.gz
-/sudo-1.9.17p2.tar.gz

sources

@@ -1 +1 @@
-SHA512 (sudo-1.9.17p2.tar.gz) = c8abd6ca56e54a081c9ef1e9f6579d1db5b93ff857e60d1f58d1f425d7dc23c31c58d40b7819780688f66dfdf87a1f3bbe0a78387b007e2beb1b0e546203ea93
+SHA512 (sudo-1.9.17p1.tar.gz) = 1a9fb27a117b54adf5c99443b3375f7e0eaaf3a2d5a3d409f7c7b10c43432eb301d721df93fb1a8a2e45bf4a4957288d4f153359fc018af00973be57f62a1ebc

sudo.spec

@@ -1,5 +1,5 @@
 # comment out if no extra version
-%global extraver p2
+%global extraver p1
 
 Summary: Allows restricted root access for specified users
 Name: sudo
@@ -76,6 +76,8 @@ BuildRequires:  python3-devel
 # Remove bundled copy of zlib
 rm -rf zlib/
 
+export CFLAGS="$RPM_OPT_FLAGS -std=gnu17"
+
 %configure \
         --prefix=%{_prefix} \
         --sbindir=%{_sbindir} \
@@ -116,15 +118,12 @@ 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. 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
+#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
 
 chmod +x $RPM_BUILD_ROOT%{_libexecdir}/sudo/*.so # for stripping, reset in %%files
 
@@ -175,9 +174,6 @@ 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