[patch] chpax init.d patch to whatever was in the portage tree at the time.

pax-init.d.20040221.diff (text/plain), 1.57 KB, created by John Richard Moser on 2004-02-21 20:38:11 UTC

--- /usr/portage/sys-apps/chpax/files/pax-init.d	2003-11-22 19:29:35.000000000 -0500
+++ /etc/init.d/chpax	2004-02-21 23:31:50.788555441 -0500
@@ -7,23 +7,40 @@ depend() {
 }
 
 checkconfig() {
-	/sbin/chpax -v /sbin/chpax >/dev/null 2>&1 || return 1
+	if [ "x$CHPAX" = "x" ]; then
+		#CHPAX=/sbin/paxctl
+		CHPAX=/sbin/chpax
+	fi
+	$CHPAX -v $CHPAX >/dev/null 2>&1 || return 1
 }
 
 chpax_flag() {
 	flag=$1
 	fname=$2
 
-	if [ -w "$fname" ]; then
-		#einfo "chpax $flags $fname"
-		/sbin/chpax -$flag ${fname}
-		[ $? != 0 ] && eerror "error: chpax -$flag ${fname}"
+	#einfo "chpax -$flag ${fname}"
+	if [ -w ${fname} ]; then
+		einfo "$CHPAX -$flag ${fname}"
+		$CHPAX -$flag ${fname}
+		[ $? != 0 ] && eerror "error: $CHPAX -$flag ${fname}"
 	fi
 }
 
+fix_exempts() {
+	#need to do this for foo{,bar,baz} expressions to work.
+	PAGEEXEC_EXEMPT=`eval echo $PAGEEXEC_EXEMPT`
+	TRAMPOLINE_EXEMPT=`eval echo $TRAMPOLINE_EXEMPT`
+	RANDMMAP_EXEMPT=`eval echo $RANDMMAP_EXEMPT`
+	MPROTECT_EXEMPT=`eval echo $MPROTECT_EXEMPT`
+	SEGMEXEC_EXEMPT=`eval echo $SEGMEXEC_EXEMPT`
+	RANDEXEC_EXEMPT=`eval echo $RANDEXEC_EXEMPT`
+}
+
 start() {
 	checkconfig || return 1
 
+	fix_exempts
+
 	for p in $PAGEEXEC_EXEMPT; do chpax_flag p ${p} ;done
 	for e in $TRAMPOLINE_EXEMPT; do chpax_flag e ${e} ;done
 	for r in $RANDMMAP_EXEMPT; do chpax_flag r ${r} ;done
@@ -38,6 +55,7 @@ stop() {
 	checkconfig || return 1
 
 	[ "$ZERO_FLAG_MASK" = "yes" ] || return 0
+	fix_exempts
 	einfo "chpax zero flag masking"
 	for p in $PAGEEXEC_EXEMPT; do chpax_flag z ${p} ;done
 	for e in $TRAMPOLINE_EXEMPT; do chpax_flag z ${e} ;done