From 4f41fcf52f2c0fc1485d4b6d7e5ef4f476824a6a Mon Sep 17 00:00:00 2001
From: Radovan Sroka <rsroka@redhat.com>
Date: Mon, 10 Sep 2018 13:08:04 +0200
Subject: [PATCH] Rebase sudo to latest stable version

- install /etc/dnf/protected.d/sudo instead of /etc/yum/protected.d/sudo (1626968)
---
 .gitignore |  1 +
 sources    |  2 +-
 sudo.spec  | 14 +++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index aeb7960..f0d2b79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /sudo-1.8.22b1.tar.gz
 /sudo-1.8.23b3.tar.gz
 /sudo-1.8.23.tar.gz
+/sudo-1.8.25.tar.gz
diff --git a/sources b/sources
index 1aac8dc..aa1032a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sudo-1.8.23.tar.gz) = a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
+SHA512 (sudo-1.8.25.tar.gz) = f3f0c9e315484e5ba2d535f41ab722881343b1fa299f75cfad456bd41a555d80080369677e62626307df792aeabc29ba450e6f0b9c284ea2cfb8dc5e3568f46d
diff --git a/sudo.spec b/sudo.spec
index 434b5be..566efd7 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -2,8 +2,8 @@
 
 Summary: Allows restricted root access for specified users
 Name: sudo
-Version: 1.8.23
-Release: 3%{?dist}
+Version: 1.8.25
+Release: 1%{?dist}
 License: ISC
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -103,10 +103,10 @@ 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/yum/protected.d/
+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/yum/protected.d/
+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
@@ -156,7 +156,7 @@ EOF
 %config(noreplace) /etc/pam.d/sudo
 %config(noreplace) /etc/pam.d/sudo-i
 %attr(0644,root,root) %{_tmpfilesdir}/sudo.conf
-%attr(0644,root,root) /etc/yum/protected.d/sudo.conf
+%attr(0644,root,root) /etc/dnf/protected.d/sudo.conf
 %dir /var/db/sudo
 %dir /var/db/sudo/lectured
 %attr(4111,root,root) %{_bindir}/sudo
@@ -199,6 +199,10 @@ EOF
 %{_mandir}/man8/sudo_plugin.8*
 
 %changelog
+* Mon Sep 10 2018 Radovan Sroka <rsroka@redhat.com> 1.8.25-1
+- rebase sudo to latest stawble version
+- install /etc/dnf/protected.d/sudo instead of /etc/yum/protected.d/sudo (1626968)
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.23-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild