isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dependency check for libssl on Debian/Ubuntu with OpenSSL 3.

Browse Source 
Also add check for python 3.10 and 3.11 and remove versions < 3.4.
Fixes building on Ubuntu 22.04.
This commit is contained in:
Todd C. Miller
2022-05-15 07:45:51 -06:00
parent 55bd6272c0
commit b61a55eb1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/mkpkg
View File

@@ -327,7 +327,7 @@ case "$osversion" in
fi fi
PPVARS="${PPVARS}${PPVARS+$space}linux_audit=$linux_audit" PPVARS="${PPVARS}${PPVARS+$space}linux_audit=$linux_audit"
# Use correct libssl dependency # Use correct libssl dependency
libssl_dep=`dpkg-query -S /usr/lib/${MULTIARCH}${MULTIARCH:+/}libssl.so.1.[0-9]* /lib/${MULTIARCH}${MULTIARCH:+/}libssl.so.1.[0-9]* 2>/dev/null | sort -rn | awk -F: '{ print $1; exit }'` libssl_dep=`dpkg-query -S /usr/lib/${MULTIARCH}${MULTIARCH:+/}libssl.so.[1-9]* /lib/${MULTIARCH}${MULTIARCH:+/}libssl.so.[1-9]* 2>/dev/null | sort -rn | awk -F: '{ print $1; exit }'`
if [ -z "$libssl_dep" ]; then if [ -z "$libssl_dep" ]; then
echo "unable to determine package for libssl" 1>&2 echo "unable to determine package for libssl" 1>&2
exit 1 exit 1
@@ -451,7 +451,7 @@ case "$osversion" in
PYTHON="/usr/bin/python3"; export PYTHON PYTHON="/usr/bin/python3"; export PYTHON
else else
# Sometimes the /usr/bin/python3 is missing # Sometimes the /usr/bin/python3 is missing
for f in /usr/bin/python3.9 /usr/bin/python3.8 /usr/bin/python3.7 /usr/bin/python3.6 /usr/bin/python3.5 /usr/bin/python3.4 /usr/bin/python3.3 /usr/bin/python3.2 /usr/bin/python3.1 /usr/bin/python3.0; do for f in /usr/bin/python3.11 /usr/bin/python3.10 /usr/bin/python3.9 /usr/bin/python3.8 /usr/bin/python3.7 /usr/bin/python3.6 /usr/bin/python3.5 /usr/bin/python3.4; do
if [ -x $f ]; then if [ -x $f ]; then
PYTHON="$f"; export PYTHON PYTHON="$f"; export PYTHON
break break