From 4f9d2374c820ab53655d2fda52140430da562ce2 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Tue, 30 Mar 2021 12:49:20 -0600
Subject: [PATCH] Do not include parent directories in rpm and deb files. Fixes
 a directory conflict with the AIX sudo rpm package. Other deb/rpm packages
 were not affected because parent dirs are omitted for a prefix of /usr.

---
 etc/sudo-logsrvd.pp | 2 ++
 etc/sudo-python.pp  | 2 ++
 etc/sudo.pp         | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/etc/sudo-logsrvd.pp b/etc/sudo-logsrvd.pp
index 663ae6dbb..5b7bf7f66 100644
--- a/etc/sudo-logsrvd.pp
+++ b/etc/sudo-logsrvd.pp
@@ -146,6 +146,7 @@ This makes it possible to have all sudo I/O logs on a central server."
 	ln -s -f ${sbindir}/sudo_logsrvd ${pp_destdir}/usr/sbin
 %endif
 
+%if [!rpm,deb]
 	# Package parent directories when not installing under /usr
 	if test "${prefix}" != "/usr"; then
 	    extradirs=`echo ${pp_destdir}${mandir}/[mc]* | sed "s#${pp_destdir}##g"`
@@ -159,6 +160,7 @@ This makes it possible to have all sudo I/O logs on a central server."
 	    done
 	    parentdirs=`echo $parentdirs | tr " " "\n" | sort -u`
 	fi
+%endif
 
 %depend [deb]
 	libc6, zlib1g, sudo
diff --git a/etc/sudo-python.pp b/etc/sudo-python.pp
index fac3b3454..5f77c1234 100644
--- a/etc/sudo-python.pp
+++ b/etc/sudo-python.pp
@@ -100,6 +100,7 @@
 	perl -pe 'last if (/^What/i && $seen++)' ${pp_destdir}$docdir/NEWS > ${pp_wrkdir}/ReadMe.txt
 %endif
 
+%if [!rpm,deb]
 	# Package parent directories when not installing under /usr
 	if test "${prefix}" != "/usr"; then
 	    extradirs=`echo ${pp_destdir}${mandir}/[mc]* | sed "s#${pp_destdir}##g"`
@@ -113,6 +114,7 @@
 	    done
 	    parentdirs=`echo $parentdirs | tr " " "\n" | sort -u`
 	fi
+%endif
 
 %depend [deb]
 	libc6, libpython@PYTHON_VERSION@, sudo
diff --git a/etc/sudo.pp b/etc/sudo.pp
index b4ac0d12f..489c1abea 100644
--- a/etc/sudo.pp
+++ b/etc/sudo.pp
@@ -315,6 +315,7 @@ still allow people to get their work done."
 	ln -s -f ${sbindir}/visudo ${pp_destdir}/usr/sbin
 %endif
 
+%if [!rpm,deb]
 	# Package parent directories when not installing under /usr
 	if test "${prefix}" != "/usr"; then
 	    extradirs=`echo ${pp_destdir}${mandir}/[mc]* | sed "s#${pp_destdir}##g"`
@@ -329,6 +330,7 @@ still allow people to get their work done."
 	    done
 	    parentdirs=`echo $parentdirs | tr " " "\n" | sort -u`
 	fi
+%endif
 
 %depend [deb]
 	libc6, libpam0g, libpam-modules, zlib1g, libselinux1