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

Add hiuxmpp where we have hpux for special cases.

Browse Source 
Also move the HP-UX 11.00 pread(2) workaround into the section where
pread(2) is tested for, not before it.
This commit is contained in:
Todd C. Miller
2021-04-15 13:07:13 -06:00
parent 620b0dec86
commit d76cc96af6
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
configure vendored
View File

@@ -20053,9 +20053,17 @@ done
case "$host_os" in
hpux*)
if test X"$ac_cv_func_pread" = X"yes"; then
for ac_func in pread
do :
ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
if test "x$ac_cv_func_pread" = xyes
then :
printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h
# pread(2) on 32-bit HP-UX 11.00 is buggy, use pread64(2) instead.
case "$host_os" in
hpux*|hiuxmpp*)
O_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
@@ -20077,16 +20085,8 @@ fi
done
CPPFLAGS="$O_CPPFLAGS"
fi
;;
esac
for ac_func in pread
do :
ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
if test "x$ac_cv_func_pread" = xyes
then :
printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h
;;
esac
else $as_nop
@@ -26987,7 +26987,7 @@ fi
found=no
# On HP-UX, libibmldap has a hidden dependency on libCsup
case "$host_os" in
hpux*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lCsup" >&5
hpux*|hiuxmpp*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lCsup" >&5
printf %s "checking for main in -lCsup... " >&6; }
if test ${ac_cv_lib_Csup_main+y}
then :
@@ -27782,7 +27782,7 @@ fi
# so always link against -lpthread on HP-UX if it is available.
# This check should go after all other libraries tests.
case "$host_os" in
hpux*)
hpux*|hiuxmpp*)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5
printf %s "checking for main in -lpthread... " >&6; }
if test ${ac_cv_lib_pthread_main+y}
@@ -28346,7 +28346,7 @@ fi
else
case "$host_os" in
hpux*)
hpux*|hiuxmpp*)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Bhidden_def" >&5
printf %s "checking whether C compiler accepts -Bhidden_def... " >&6; }
if test ${ax_cv_check_cflags___Bhidden_def+y}
@@ -28572,7 +28572,7 @@ printf "%s\n" "$sudo_cv_var_solaris_ld_anon_map" >&6; }
LT_LDDEP="\$(shlib_map)"; LT_LDEXPORTS="-Wl,-M,\$(shlib_map)"
fi
;;
hpux*)
hpux*|hiuxmpp*)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ld supports controlling exported symbols" >&5
printf %s "checking whether ld supports controlling exported symbols... " >&6; }
if test ${sudo_cv_var_hpux_ld_symbol_export+y}
@@ -31979,7 +31979,7 @@ fi
if test "$with_pam" = "yes"; then
case $host_os in
hpux*)
hpux*|hiuxmpp*)
if test -f /usr/lib/security/libpam_hpsec.so.1; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: You may wish to add the following line to /etc/pam.conf" >&5
printf "%s\n" "$as_me: You may wish to add the following line to /etc/pam.conf" >&6;}

24
configure.ac
View File

@@ -2689,19 +2689,19 @@ dnl Function checks
dnl
AC_FUNC_GETGROUPS
AC_CHECK_FUNCS_ONCE([fexecve fmemopen killpg nl_langinfo faccessat wordexp getauxval fseeko])
case "$host_os" in
hpux*)
if test X"$ac_cv_func_pread" = X"yes"; then
AC_CHECK_FUNCS([pread], [
# pread(2) on 32-bit HP-UX 11.00 is buggy, use pread64(2) instead.
case "$host_os" in
hpux*|hiuxmpp*)
O_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
AC_CHECK_FUNCS([pread64 pwrite64], [
AC_DEFINE([_LARGEFILE64_SOURCE], [1], [Define to 1 to enable 64-bit versions of standard C functions on 32-bit systems.])
])
CPPFLAGS="$O_CPPFLAGS"
fi
;;
esac
AC_CHECK_FUNCS([pread], [], [
;;
esac
], [
AC_LIBOBJ(pread)
SUDO_APPEND_COMPAT_EXP(sudo_pread)
])
@@ -4258,7 +4258,7 @@ if test ${with_ldap-'no'} != "no"; then
found=no
# On HP-UX, libibmldap has a hidden dependency on libCsup
case "$host_os" in
hpux*) AC_CHECK_LIB(Csup, main, [IBMLDAP_EXTRA=" -lCsup"]);;
hpux*|hiuxmpp*) AC_CHECK_LIB(Csup, main, [IBMLDAP_EXTRA=" -lCsup"]);;
esac
AC_SEARCH_LIBS([ldap_init], ["ibmldap${IBMLDAP_EXTRA}" "ibmldap -lidsldif${IBMLDAP_EXTRA}" "ldap" "ldap -llber" "ldap -llber -lssl -lcrypto" "ibmldap${IBMLDAP_EXTRA}]", [
test "${ac_cv_search_ldap_init}" != "none required" && LDAP_LIBS="${ac_cv_search_ldap_init}"
@@ -4422,7 +4422,7 @@ fi
# so always link against -lpthread on HP-UX if it is available.
# This check should go after all other libraries tests.
case "$host_os" in
hpux*)
hpux*|hiuxmpp*)
AC_CHECK_LIB(pthread, main, [SUDO_LIBS="${SUDO_LIBS} -lpthread"])
AC_DEFINE(_REENTRANT)
;;
@@ -4518,7 +4518,7 @@ if test -n "$GCC"; then
])
else
case "$host_os" in
hpux*)
hpux*|hiuxmpp*)
AX_CHECK_COMPILE_FLAG([-Bhidden_def], [
# HP-UX cc may not allow __declspec(dllexport) to be
# used in conjunction with #pragma HP_DEFINED_EXTERNAL
@@ -4614,7 +4614,7 @@ EOF
LT_LDDEP="\$(shlib_map)"; LT_LDEXPORTS="-Wl,-M,\$(shlib_map)"
fi
;;
hpux*)
hpux*|hiuxmpp*)
AC_CACHE_CHECK([whether ld supports controlling exported symbols],
[sudo_cv_var_hpux_ld_symbol_export],
[
@@ -4999,7 +4999,7 @@ dnl Spew any text the user needs to know about
dnl
if test "$with_pam" = "yes"; then
case $host_os in
hpux*)
hpux*|hiuxmpp*)
if test -f /usr/lib/security/libpam_hpsec.so.1; then
AC_MSG_NOTICE([You may wish to add the following line to /etc/pam.conf])
AC_MSG_NOTICE([sudo session required libpam_hpsec.so.1 bypass_umask bypass_last_login])