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

If libssl_dep was not passed in, use ldd to determine its value.

Browse Source 
Normally, mkpkg will figure this out, but if the user does "make
package" outside of the mkpkg script, libssl_dep will not be set.
This commit is contained in:
Todd C. Miller 2021-04-13 10:00:57 -06:00
parent 28d41cecad
commit d028410bf7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/sudo-logsrvd.pp
View File

@ -117,6 +117,10 @@ This makes it possible to have all sudo I/O logs on a central server."
$name: unstripped-binary-or-object $name: unstripped-binary-or-object
EOF EOF
chmod 644 ${pp_wrkdir}/${name}/usr/share/lintian/overrides/${name} chmod 644 ${pp_wrkdir}/${name}/usr/share/lintian/overrides/${name}
# If libssl_dep not passed in, try to figure it out
if test -z "$libssl_dep"; then
libssl_dep="`ldd $libexecdir/sudo/sudoers.so 2>&1 | sed -n 's/^[ ]*libssl\.so\([0-9.]*\).*/libssl\1/p'`"
fi
%endif %endif
%if [rpm] %if [rpm]

7
etc/sudo.pp
View File

@ -90,9 +90,6 @@ still allow people to get their work done."
if test -n "$linux_audit"; then if test -n "$linux_audit"; then
pp_rpm_requires="audit-libs >= $linux_audit" pp_rpm_requires="audit-libs >= $linux_audit"
fi fi
if test -z "$libssl_dep"; then
libssl_dep="libssl1.1"
fi
# The package manager will handle an existing sudoers file # The package manager will handle an existing sudoers file
rm -f ${pp_destdir}$sudoersdir/sudoers.dist rm -f ${pp_destdir}$sudoersdir/sudoers.dist
%else %else
@ -155,6 +152,10 @@ still allow people to get their work done."
$name: unstripped-binary-or-object $name: unstripped-binary-or-object
EOF EOF
chmod 644 ${pp_wrkdir}/${name}/usr/share/lintian/overrides/${name} chmod 644 ${pp_wrkdir}/${name}/usr/share/lintian/overrides/${name}
# If libssl_dep not passed in, try to figure it out
if test -z "$libssl_dep"; then
libssl_dep="`ldd $libexecdir/sudo/sudoers.so 2>&1 | sed -n 's/^[ ]*libssl\.so\([0-9.]*\).*/libssl\1/p'`"
fi
%endif %endif
%if [rpm] %if [rpm]