From d10fb81fe587f1356a32b4d7e03527a0a76175f2 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Fri, 3 Aug 2012 09:27:39 -0400 Subject: [PATCH] Remove section about Solaris 10 on other systems. Add missing sudoers.man.in bit to fixman.sh. --- doc/fixman.sh | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ doc/fixmdoc.sh | 3 +++ 2 files changed, 63 insertions(+) diff --git a/doc/fixman.sh b/doc/fixman.sh index b32beb89f..90828a314 100755 --- a/doc/fixman.sh +++ b/doc/fixman.sh @@ -56,5 +56,65 @@ case "$OUTFILE" in fi ;; sudoers.man.sed) + # Subsections to remove (SELinux and Solaris are adjacent) + RM_SS= + if [ X"$PSMAN" != X"1" ]; then + if [ X"$SEMAN" != X"1" ]; then + RM_SS='/^\.SS "SELinux_Spec"/,/^\.SS "[^S]/{;/^\.SS "[^S][^o][^l]/!d;};' + else + RM_SS='/^\.SS "Solaris_Priv_Spec"/,/^\.SS/{;/^\.SS "[^S][^o][^l]/!d;};' + fi + elif [ X"$SEMAN" != X"1" ]; then + RM_SS='/^\.SS "SELinux_Spec"/,/^\.SS/{;/^\.SS "[^S][^E][^L]/!d;};' + fi + if [ -n "$RM_SS" ]; then + cat >>"$OUTFILE" <<-EOF + $RM_SS + EOF + fi + + # BSD login class + if [ X"$LCMAN" != X"1" ]; then + cat >>"$OUTFILE" <<-EOF + /^On BSD systems/,/\.$/ { + d + } + /^use_loginclass$/,/^\.TP 18n$/ { + /^\.PD$/!d + } + EOF + fi + + # Solaris PrivSpec + if [ X"$PSMAN" != X"1" ]; then + cat >>"$OUTFILE" <<-EOF + s/Solaris_Priv_Spec? // + /^Solaris_Priv_Spec ::=/ { + N + d + } + /^l*i*m*i*t*privs$/,/^\.TP 18n$/ { + /^\.PD$/!d + } + /^On Solaris 10/,/^\.[sP][pP]/ { + d + } + EOF + fi + + # SELinux + SE_SED= + if [ X"$SEMAN" != X"1" ]; then + cat >>"$OUTFILE" <<-EOF + s/SELinux_Spec? // + /^SELinux_Spec ::=/ { + N + d + } + /^[rt][oy][lp]e$/,/^\.TP 18n$/ { + /^\.PD$/!d + } + EOF + fi ;; esac diff --git a/doc/fixmdoc.sh b/doc/fixmdoc.sh index 8e4d70f7a..6ef1f00ff 100755 --- a/doc/fixmdoc.sh +++ b/doc/fixmdoc.sh @@ -106,6 +106,9 @@ case "$OUTFILE" in /^\.It privs$/,/^\.It/ { /^\.It [^p][^r][^i][^v][^s]$/!d } + /^On Solaris 10/,/^\.Pp/ { + d + } EOF fi -- 2.50.0