Back out AIX-specific change to set the sudo_noexec path to the .a
file, we do really want to use the .so file. Since libtool doesn't do that correctly, just install the .so file ourselves in the Makefile.
This commit is contained in:
Todd C. Miller
@@ -65,6 +65,7 @@ sysconfdir = @sysconfdir@
|
||||
libexecdir = @libexecdir@
|
||||
datarootdir = @datarootdir@
|
||||
mandir = @mandir@
|
||||
noexecfile = @NOEXECFILE@
|
||||
noexecdir = @NOEXECDIR@
|
||||
|
||||
# Directory in which to install sudo.
|
||||
@@ -410,12 +411,8 @@ install-binaries: $(PROGS)
|
||||
$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo
|
||||
@SELINUX@ $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s sesh $(DESTDIR)$(libexecdir)/sesh
|
||||
|
||||
|
||||
install-noexec: sudo_noexec.la
|
||||
$(LIBTOOL) --mode=install $(INSTALL) sudo_noexec.la $(DESTDIR)$(noexecdir)
|
||||
|
||||
bininst-noexec: sudo_noexec.la
|
||||
$(LIBTOOL) --mode=install $(INSTALL) sudo_noexec.la $(DESTDIR)$(noexecdir)
|
||||
test -f .libs/$(noexecfile) && $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0755 .libs/$(noexecfile) $(DESTDIR)$(noexecdir)
|
||||
|
||||
install-sudoers:
|
||||
test -f $(DESTDIR)$(sudoersdir)/sudoers || \
|
||||
|
||||
32
configure
vendored
32
configure
vendored
@@ -826,6 +826,7 @@ devdir
|
||||
mansectsu
|
||||
mansectform
|
||||
mansrcdir
|
||||
NOEXECFILE
|
||||
NOEXECDIR
|
||||
noexec_file
|
||||
INSTALL_NOEXEC
|
||||
@@ -2101,6 +2102,7 @@ echo "$as_me: Configuring Sudo version 1.7" >&6;}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
timeout=5
|
||||
@@ -6207,7 +6209,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 6210 "configure"' > conftest.$ac_ext
|
||||
echo '#line 6212 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@@ -8066,11 +8068,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8069: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8071: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8073: \$? = $ac_status" >&5
|
||||
echo "$as_me:8075: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@@ -8356,11 +8358,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8359: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8361: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8363: \$? = $ac_status" >&5
|
||||
echo "$as_me:8365: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@@ -8460,11 +8462,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8463: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8465: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:8467: \$? = $ac_status" >&5
|
||||
echo "$as_me:8469: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@@ -10820,7 +10822,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10823 "configure"
|
||||
#line 10825 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@@ -10920,7 +10922,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10923 "configure"
|
||||
#line 10925 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@@ -11599,6 +11601,7 @@ fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $with_noexec" >&5
|
||||
echo "${ECHO_T}$with_noexec" >&6; }
|
||||
NOEXECFILE="sudo_noexec$_shrext"
|
||||
NOEXECDIR="`echo $with_noexec|sed 's:^\(.*\)/[^/]*:\1:'`"
|
||||
|
||||
if test "$with_devel" = "yes" -a -n "$GCC"; then
|
||||
@@ -11946,12 +11949,6 @@ done
|
||||
|
||||
fi
|
||||
|
||||
# AIX shared libs use the .a suffix unless run-time linking
|
||||
# is being used (determined by libtool).
|
||||
if test X"$with_noexec" != X"no" && X"$aix_use_runtimelinking" != X"yes"; then
|
||||
with_noexec=`echo $with_noexec | sed 's/\.so$/.a/'`
|
||||
fi
|
||||
|
||||
# AIX-specific functions
|
||||
|
||||
for ac_func in getuserattr
|
||||
@@ -24199,6 +24196,7 @@ devdir!$devdir$ac_delim
|
||||
mansectsu!$mansectsu$ac_delim
|
||||
mansectform!$mansectform$ac_delim
|
||||
mansrcdir!$mansrcdir$ac_delim
|
||||
NOEXECFILE!$NOEXECFILE$ac_delim
|
||||
NOEXECDIR!$NOEXECDIR$ac_delim
|
||||
noexec_file!$noexec_file$ac_delim
|
||||
INSTALL_NOEXEC!$INSTALL_NOEXEC$ac_delim
|
||||
@@ -24231,7 +24229,6 @@ env_editor!$env_editor$ac_delim
|
||||
passwd_tries!$passwd_tries$ac_delim
|
||||
tty_tickets!$tty_tickets$ac_delim
|
||||
insults!$insults$ac_delim
|
||||
root_sudo!$root_sudo$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -24273,6 +24270,7 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
root_sudo!$root_sudo$ac_delim
|
||||
path_info!$path_info$ac_delim
|
||||
ldap_conf!$ldap_conf$ac_delim
|
||||
ldap_secret!$ldap_secret$ac_delim
|
||||
@@ -24315,7 +24313,7 @@ KRB5CONFIG!$KRB5CONFIG$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
||||
@@ -41,6 +41,7 @@ AC_SUBST(devdir)
|
||||
AC_SUBST(mansectsu)
|
||||
AC_SUBST(mansectform)
|
||||
AC_SUBST(mansrcdir)
|
||||
AC_SUBST(NOEXECFILE)
|
||||
AC_SUBST(NOEXECDIR)
|
||||
AC_SUBST(noexec_file)
|
||||
AC_SUBST(INSTALL_NOEXEC)
|
||||
@@ -1232,6 +1233,7 @@ AC_ARG_WITH(noexec, [ --with-noexec[=PATH] fully qualified pathname of sud
|
||||
*) ;;
|
||||
esac], [with_noexec="$libexecdir/sudo_noexec$_shrext"])
|
||||
AC_MSG_RESULT($with_noexec)
|
||||
NOEXECFILE="sudo_noexec$_shrext"
|
||||
NOEXECDIR="`echo $with_noexec|sed 's:^\(.*\)/[[^/]]*:\1:'`"
|
||||
|
||||
dnl
|
||||
@@ -1332,12 +1334,6 @@ case "$host" in
|
||||
AC_CHECK_FUNCS(authenticate, [AUTH_EXCL_DEF="AIX_AUTH"])
|
||||
fi
|
||||
|
||||
# AIX shared libs use the .a suffix unless run-time linking
|
||||
# is being used (determined by libtool).
|
||||
if test X"$with_noexec" != X"no" && X"$aix_use_runtimelinking" != X"yes"; then
|
||||
with_noexec=`echo $with_noexec | sed 's/\.so$/.a/'`
|
||||
fi
|
||||
|
||||
# AIX-specific functions
|
||||
AC_CHECK_FUNCS(getuserattr)
|
||||
SUDO_OBJS="$SUDO_OBJS aix.o"
|
||||
|
||||
Reference in New Issue
Block a user