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

Restore the ability to override default configure settings.

Browse Source 
The user-specified options must go last...
This commit is contained in:
Todd C. Miller
2023-12-30 11:21:08 -07:00
parent 00b2bd3589
commit 69a024304f
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/mkpkg
View File

@@ -318,7 +318,7 @@ case "$osversion" in
if [ -z $osmajor ] || [ $osmajor -ge 14 ]; then if [ -z $osmajor ] || [ $osmajor -ge 14 ]; then
with_apparmor=true with_apparmor=true
fi fi
configure_opts="${configure_opts}${configure_opts+$tab}--enable-admin-flag${tab}--without-lecture" configure_opts="--enable-admin-flag${tab}--without-lecture${configure_opts+$tab}${configure_opts}"
;; ;;
esac esac
@@ -330,12 +330,12 @@ case "$osversion" in
# Python plugins # Python plugins
with_python=true with_python=true
# PAM # PAM
configure_opts="${configure_opts}${configure_opts+$tab}--with-pam" configure_opts="--with-pam${configure_opts+$tab}${configure_opts}"
# Linux audit # Linux audit
configure_opts="${configure_opts}${configure_opts+$tab}--with-linux-audit" configure_opts="--with-linux-audit${configure_opts+$tab}${configure_opts}"
# AppArmor # AppArmor
if [ X"$with_apparmor" = X"true" ]; then if [ X"$with_apparmor" = X"true" ]; then
configure_opts="${configure_opts}${configure_opts+$tab}--with-apparmor" configure_opts="--with-apparmor${configure_opts+$tab}${configure_opts}"
fi fi
;; ;;
esac esac
@@ -348,13 +348,12 @@ case "$osversion" in
MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null` MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`
# Note, must indent with tabs, not spaces due to IFS trickery # Note, must indent with tabs, not spaces due to IFS trickery
if [ "$flavor" = "ldap" ]; then if [ "$flavor" = "ldap" ]; then
configure_opts="${configure_opts}${configure_opts+$tab}--with-ldap configure_opts="--with-ldap${tab}--with-ldap-conf-file=/etc/sudo-ldap.conf${configure_opts+$tab}${configure_opts}"
--with-ldap-conf-file=/etc/sudo-ldap.conf"
else else
configure_opts="${configure_opts}${configure_opts+$tab}--with-sssd" configure_opts="--with-sssd${configure_opts+$tab}${configure_opts}"
if [ -n "$MULTIARCH" ]; then if [ -n "$MULTIARCH" ]; then
# SSSD backend needs to know where to find the sssd lib # SSSD backend needs to know where to find the sssd lib
configure_opts="${configure_opts}${configure_opts+$tab}--with-sssd-lib=/usr/lib/$MULTIARCH" configure_opts="--with-sssd-lib=/usr/lib/$MULTIARCH${configure_opts+$tab}${configure_opts}"
fi fi
fi fi
configure_opts="--prefix=/usr configure_opts="--prefix=/usr