mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 01:49:11 +00:00
Code Issues Releases Wiki Activity

Do not include parent directories in rpm and deb files.

Browse Source 
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.
This commit is contained in:
Todd C. Miller 2021-03-30 12:49:20 -06:00
parent a40e4b3867
commit 4f9d2374c8
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/sudo-logsrvd.pp
View File

@ -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 ln -s -f ${sbindir}/sudo_logsrvd ${pp_destdir}/usr/sbin
%endif %endif
%if [!rpm,deb]
# Package parent directories when not installing under /usr # Package parent directories when not installing under /usr
if test "${prefix}" != "/usr"; then if test "${prefix}" != "/usr"; then
extradirs=`echo ${pp_destdir}${mandir}/[mc]* | sed "s#${pp_destdir}##g"` 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 done
parentdirs=`echo $parentdirs | tr " " "\n" | sort -u` parentdirs=`echo $parentdirs | tr " " "\n" | sort -u`
fi fi
%endif
%depend [deb] %depend [deb]
libc6, zlib1g, sudo libc6, zlib1g, sudo

2
etc/sudo-python.pp
View File

@ -100,6 +100,7 @@
perl -pe 'last if (/^What/i && $seen++)' ${pp_destdir}$docdir/NEWS > ${pp_wrkdir}/ReadMe.txt perl -pe 'last if (/^What/i && $seen++)' ${pp_destdir}$docdir/NEWS > ${pp_wrkdir}/ReadMe.txt
%endif %endif
%if [!rpm,deb]
# Package parent directories when not installing under /usr # Package parent directories when not installing under /usr
if test "${prefix}" != "/usr"; then if test "${prefix}" != "/usr"; then
extradirs=`echo ${pp_destdir}${mandir}/[mc]* | sed "s#${pp_destdir}##g"` extradirs=`echo ${pp_destdir}${mandir}/[mc]* | sed "s#${pp_destdir}##g"`
@ -113,6 +114,7 @@
done done
parentdirs=`echo $parentdirs | tr " " "\n" | sort -u` parentdirs=`echo $parentdirs | tr " " "\n" | sort -u`
fi fi
%endif
%depend [deb] %depend [deb]
libc6, libpython@PYTHON_VERSION@, sudo libc6, libpython@PYTHON_VERSION@, sudo

2
etc/sudo.pp
View File

@ -315,6 +315,7 @@ still allow people to get their work done."
ln -s -f ${sbindir}/visudo ${pp_destdir}/usr/sbin ln -s -f ${sbindir}/visudo ${pp_destdir}/usr/sbin
%endif %endif
%if [!rpm,deb]
# Package parent directories when not installing under /usr # Package parent directories when not installing under /usr
if test "${prefix}" != "/usr"; then if test "${prefix}" != "/usr"; then
extradirs=`echo ${pp_destdir}${mandir}/[mc]* | sed "s#${pp_destdir}##g"` extradirs=`echo ${pp_destdir}${mandir}/[mc]* | sed "s#${pp_destdir}##g"`
@ -329,6 +330,7 @@ still allow people to get their work done."
done done
parentdirs=`echo $parentdirs | tr " " "\n" | sort -u` parentdirs=`echo $parentdirs | tr " " "\n" | sort -u`
fi fi
%endif
%depend [deb] %depend [deb]
libc6, libpam0g, libpam-modules, zlib1g, libselinux1 libc6, libpam0g, libpam-modules, zlib1g, libselinux1