version bump, now with bubble gum flavor and support for more arches

3 files changed, 34 insertions, 28 deletions

diff --git a/sys-apps/chpax/files/digest-chpax-0.7 b/sys-apps/chpax/files/digest-chpax-0.7
new file mode 100644
index 000000000000..f8fae8c7cba0
--- /dev/null
+++ b/sys-apps/chpax/files/digest-chpax-0.7
@@ -0,0 +1 @@
+MD5 6a0aac11abf1a40c50704c7f93bc8953 chpax-0.7.tar.gz 5255
diff --git a/sys-apps/chpax/files/pax-conf.d b/sys-apps/chpax/files/pax-conf.d
index 60469f9a4c44..a65a208b9e87 100644
--- a/sys-apps/chpax/files/pax-conf.d
+++ b/sys-apps/chpax/files/pax-conf.d
@@ -1,7 +1,7 @@
 ####################################################################
 #            Copyright 1999-2004 Gentoo Foundation                 #
 # Distributed under the terms of the GNU General Public License v2 #
-####################################################################
+###################################################################
 # chpax	prefix	description
 # p	PE	do not enforce paging based non-executable pages
 # E	ET	emulate trampolines
@@ -9,52 +9,56 @@
 # m	ME	do not restrict mprotect()
 # s	SE	do not enforce segmentation based non-executable pages
 # x	XE	do not randomize ET_EXEC base [ELF only]
+# psem	PSE	same as PE + SE + ME, or -psem
 
 # NOTE:  PS_EXEC_EXEMPT is {PAGE,SEGM}_EXEC_EXEMPT.  For executables
 # with BOTH, you should use this, as it enables -e and -m, to make
 # sure that pax doesn't cry about odd flag settings in softmode
 
-# "blkdwn_java" would be blackdown-jdk or blackdown-jre
-
 # chpax command.  If using multiple tools, can separate by spaces.
 # This one hits BOTH chpax and paxctl
 CHPAX="/sbin/chpax /sbin/paxctl"
-#CHPAX="/sbin/paxctl"
-#CHPAX="/sbin/chpax"
 
 # yes to be annoyed
-VERBOSE="no"
+#VERBOSE="yes"
 
-PSE_wine=/usr/lib/wine/bin/{wine{,build,clipsrv,dump,gcc,server,wrap,-{k,p}thread},w{mc,rc,idl}}
-# Shotgun java, because stuff breaks
-#PSE_java=/opt/blackdown-{jdk-*/{,jre/},jre-*/}bin/{java{,_vm,c},keytool,kinit,klist,ktab,orbd,policytool,rmi{d,registry},servertool,tnameserv,*}
-PSE_java=/opt/*-{jdk-*/{,jre/},jre-*/}bin/*
-PSE_openoffice=/opt/OpenOffice.org*/program/soffice.bin
-PSE_misc="/usr/X11R6/bin/XFree86 /usr/bin/blender /usr/bin/gxine \
- /usr/bin/xine /usr/bin/totem /usr/bin/acme /usr/bin/gnome-sound-recorder \
- /usr/games/bin/bzflag /usr/bin/xfce4-panel /usr/bin/{g,}xine"
+#########################################################################
+# Here's some basic apps we'll use, that we have to apply much stuff to #
+########################################################################
 
-RE_java="${PSE_java}"
-RE_misc="/usr/X11R6/bin/XFree86"
+# I'm debating if I should do the eval here or in the actual script; I'm
+# currently opting for doing it in the init.d script.
+#
+# To do it here, set things ="`eval echo /path/to/{some,binaries}`"
 
-ME_java="${PSE_java}"
-# or plug-ins don't work
-ME_misc="/usr/lib/MozillaFirefox/firefox{,-bin} /usr/bin/xmms"
+#java=/opt/blackdown-{jdk-*/{,jre/},jre-*/}bin/{java{,_vm,c},keytool,kinit,klist,ktab,orbd,policytool,rmi{d,registry},servertool,tnameserv,*}
+java="/opt/*-{jdk-*/{,jre/},jre-*/}bin/*"
+wine="/usr/lib/wine/bin/{wine{,build,clipsrv,dump,gcc,server,wrap,-{k,p}thread},w{mc,rc,idl}}"
+x11="/usr/X11R6/bin/{XFree86,Xorg}"
+xine="/usr/bin/{g,}xine"
+openoffice="/opt/OpenOffice.org*/program/soffice.bin"
+mozilla="/usr/lib/MozillaFirefox/firefox-bin /usr/lib/mozilla/mozilla-bin"
+xmms="/usr/bin/xmms"
+mplayer="/usr/bin/{g,}mplayer"
 
-XE_java="${PSE_java} /usr/X11R6/bin/XFree86"
+#####################################################
+# Miscillaneous things that need each of these tags #
+####################################################
 
+PSE_misc="/usr/bin/blender /usr/bin/totem /usr/bin/acme \
+ /usr/bin/gnome-sound-recorder /usr/games/bin/bzflag /usr/bin/xfce4-panel"
 
 ####################################
 # Settings are really applied here #
-####################################
+###################################
 
-PS_EXEC_EXEMPT="${PSE_misc} ${PSE_wine} ${PSE_java} ${PSE_openoffice}"
+PS_EXEC_EXEMPT="${PSE_misc} ${x11} ${xine} ${wine} ${java} ${openoffice} ${mplayer}"
 PAGEEXEC_EXEMPT=""
 TRAMPOLINE_EXEMPT=""
-MPROTECT_EXEMPT="${ME_java} ${ME_misc}"
-RANDMMAP_EXEMPT="${RE_java} ${RE_misc}"
+MPROTECT_EXEMPT="${java} ${mozilla} ${xmms}"
+RANDMMAP_EXEMPT="${java} ${x11}"
 SEGMEXEC_EXEMPT="${PAGEEXEC_EXEMPT}"
-RANDEXEC_EXEMPT="${XE_java}"
+RANDEXEC_EXEMPT="${java} ${x11}"
 
 # when zero flag mask is set to "yes" it will remove all pax flags from all files on reboot/stop
 #ZERO_FLAG_MASK="yes"
diff --git a/sys-apps/chpax/files/pax-init.d b/sys-apps/chpax/files/pax-init.d
index 665dd3fb15d1..ad40b5fdcae3 100644
--- a/sys-apps/chpax/files/pax-init.d
+++ b/sys-apps/chpax/files/pax-init.d
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -31,11 +31,12 @@ chpax_flag() {
 		for i in $CHPAX; do
 			#einfo "    with $i"
 			# nonverbose is ultraquiet
-			if [ "$VERBOSE" = "yes" ]; then
+			if [ "$VERBOSE" = "yes" -a -x ${fname} ]; then
+				einfo "-${flag} flagging ${fname} with $i"
 				$i -$flag ${fname}
 				[ $? != 0 ] && eerror "error: $i -$flag ${fname}"
 			else
-				$i -$flag ${fname} 2>/dev/null >/dev/null
+				[ -x ${fname} ] && $i -$flag ${fname} 2>/dev/null >/dev/null
 			fi
 		done
 	#fi