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

Use correct init.d dir on HP-UX.

Browse Source 
Fix pp warnings from rc.d and init.d dirs.
This commit is contained in:
Todd C. Miller
2014-02-16 11:00:41 -07:00
parent 96d87d55dd
commit 0bf299c690
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@@ -14256,8 +14256,25 @@ done
: ${mansectsu='1m'} : ${mansectsu='1m'}
: ${mansectform='4'} : ${mansectform='4'}
# HP-UX does not clear /var/run so we need to do it
INIT_SCRIPT=hpux.sh
INIT_DIR=/sbin/rc.d/init.d
RC_LINK=/sbin/rc2.d/S900sudo
# HP-UX shared libs must be executable # HP-UX shared libs must be executable
SHLIB_MODE=0755 SHLIB_MODE=0755
for ac_func in pstat_getproc
do :
ac_fn_c_check_func "$LINENO" "pstat_getproc" "ac_cv_func_pstat_getproc"
if test "x$ac_cv_func_pstat_getproc" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PSTAT_GETPROC 1
_ACEOF
fi
done
;; ;;
*-*-hpux*) *-*-hpux*)
# AFS support needs -lBSD # AFS support needs -lBSD
@@ -14269,7 +14286,7 @@ done
# HP-UX does not clear /var/run so we need to do it # HP-UX does not clear /var/run so we need to do it
INIT_SCRIPT=hpux.sh INIT_SCRIPT=hpux.sh
INIT_DIR=/etc/rc.d/init.d INIT_DIR=/sbin/rc.d/init.d
RC_LINK=/sbin/rc2.d/S900sudo RC_LINK=/sbin/rc2.d/S900sudo
# HP-UX shared libs must be executable # HP-UX shared libs must be executable

9
configure.ac
View File

@@ -1691,8 +1691,15 @@ case "$host" in
: ${mansectsu='1m'} : ${mansectsu='1m'}
: ${mansectform='4'} : ${mansectform='4'}
# HP-UX does not clear /var/run so we need to do it
INIT_SCRIPT=hpux.sh
INIT_DIR=/sbin/rc.d/init.d
RC_LINK=/sbin/rc2.d/S900sudo
# HP-UX shared libs must be executable # HP-UX shared libs must be executable
SHLIB_MODE=0755 SHLIB_MODE=0755
AC_CHECK_FUNCS(pstat_getproc)
;; ;;
*-*-hpux*) *-*-hpux*)
# AFS support needs -lBSD # AFS support needs -lBSD
@@ -1704,7 +1711,7 @@ case "$host" in
# HP-UX does not clear /var/run so we need to do it # HP-UX does not clear /var/run so we need to do it
INIT_SCRIPT=hpux.sh INIT_SCRIPT=hpux.sh
INIT_DIR=/etc/rc.d/init.d INIT_DIR=/sbin/rc.d/init.d
RC_LINK=/sbin/rc2.d/S900sudo RC_LINK=/sbin/rc2.d/S900sudo
# HP-UX shared libs must be executable # HP-UX shared libs must be executable

11
sudo.pp
View File

@@ -292,9 +292,16 @@ still allow people to get their work done."
/usr/sbin/visudo 0755 root: symlink $sbindir/visudo /usr/sbin/visudo 0755 root: symlink $sbindir/visudo
%endif %endif
%if [aix] %if [aix]
/etc/rc.d/ ignore
/etc/rc.d/rc2.d/ ignore
/etc/rc.d/rc2.d/** ignore
/etc/rc.d/init.d/ ignore
/etc/rc.d/init.d/sudo 0755 root: /etc/rc.d/init.d/sudo 0755 root:
%endif %endif
%if [sd] %if [sd]
/sbin/rc2.d/ ignore
/sbin/rc2.d/** ignore
/sbin/init.d/ ignore
/sbin/init.d/sudo 0755 root: /sbin/init.d/sudo 0755 root:
%endif %endif
@@ -377,12 +384,12 @@ still allow people to get their work done."
rm -f /etc/rc.d/rc2.d/S90sudo rm -f /etc/rc.d/rc2.d/S90sudo
ln -s /etc/rc.d/init.d/sudo /etc/rc.d/rc2.d/S90sudo ln -s /etc/rc.d/init.d/sudo /etc/rc.d/rc2.d/S90sudo
fi fi
%endif
%post [sd] %post [sd]
# Create /sbin/rc2.d/S900sudo link # Create /sbin/rc2.d/S900sudo link
rm -f /sbin/rc2.d/S900sudo rm -f /sbin/rc2.d/S900sudo
ln -s /sbin/init.d/sudo /sbin/rc2.d/S900sudo ln -s /sbin/init.d/sudo /sbin/rc2.d/S900sudo
%endif
%preun %preun
# Remove the time stamp dir and its contents # Remove the time stamp dir and its contents
# We currently leave the lecture status files installed # We currently leave the lecture status files installed