diff options
| author |   Ned Ludd <solar@gentoo.org> | 2004-06-28 00:24:45 +0000 |
|---|---|---|
| committer | Ned Ludd <solar@gentoo.org> | 2004-06-28 00:24:45 +0000 |
| commit | ede634e9c3b420769e648ab26847d8a6ca00c5f5 (patch) | |
| tree | 1cde788abdcf2128a2e28a92738dbcf4ce900e82 /sys-apps/chpax | |
| parent | fix bugs 55150, 52165, 52912 and 55129 (Manifest recommit) (diff) | |
| download | gentoo-2-ede634e9c3b420769e648ab26847d8a6ca00c5f5.tar.gz gentoo-2-ede634e9c3b420769e648ab26847d8a6ca00c5f5.tar.bz2 gentoo-2-ede634e9c3b420769e648ab26847d8a6ca00c5f5.zip | |
updated conf.d script from bug #40665
Diffstat (limited to 'sys-apps/chpax')
| -rw-r--r-- | sys-apps/chpax/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/chpax/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/chpax/files/pax-conf.d | 30 |
3 files changed, 22 insertions, 15 deletions
diff --git a/sys-apps/chpax/ChangeLog b/sys-apps/chpax/ChangeLog index 058e5346a943..2c80aae2e690 100644 --- a/sys-apps/chpax/ChangeLog +++ b/sys-apps/chpax/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/chpax # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/ChangeLog,v 1.22 2004/06/25 03:08:24 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/ChangeLog,v 1.23 2004/06/28 00:24:45 solar Exp $ + + 27 Jun 2004; <solar@gentoo.org> files/pax-conf.d: + updated conf.d script from bug #40665 06 Jun 2004; <solar@gentoo.org> files/pax-conf.d, files/pax-init.d: Updated chpax/paxctl init/conf scripts. Submitted by John Richard Moser. bug diff --git a/sys-apps/chpax/Manifest b/sys-apps/chpax/Manifest index 02957a845e67..3e3843c78a56 100644 --- a/sys-apps/chpax/Manifest +++ b/sys-apps/chpax/Manifest @@ -4,5 +4,5 @@ MD5 a65853c35a47e472e2e32c58cd623d79 ChangeLog 3084 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 d95ac8cbc92ddd4a9e401455d79571f7 files/digest-chpax-0.5 59 MD5 1ae95ccec87f81057389495cbc6bb641 files/digest-chpax-0.6.1 62 -MD5 cfd2df93c63b8d12ac23e4acf4c87a90 files/pax-conf.d 2316 +MD5 24b8ee0e3532d4c35c6931da32decfba files/pax-conf.d 2343 MD5 48c3ae2e2fe82506ce17f8f42074dfc0 files/pax-init.d 2355 diff --git a/sys-apps/chpax/files/pax-conf.d b/sys-apps/chpax/files/pax-conf.d index c37b73d1a5f5..60469f9a4c44 100644 --- a/sys-apps/chpax/files/pax-conf.d +++ b/sys-apps/chpax/files/pax-conf.d @@ -1,5 +1,5 @@ #################################################################### -# Copyright 1999-2003 Gentoo Technologies, Inc. # +# Copyright 1999-2004 Gentoo Foundation # # Distributed under the terms of the GNU General Public License v2 # #################################################################### # chpax prefix description @@ -26,32 +26,36 @@ CHPAX="/sbin/chpax /sbin/paxctl" VERBOSE="no" PSE_wine=/usr/lib/wine/bin/{wine{,build,clipsrv,dump,gcc,server,wrap,-{k,p}thread},w{mc,rc,idl}} -PSE_blkdwn_java=/opt/blackdown-{jdk-*/{,jre/},jre-*/}bin/{java{,_vm,c},keytool,kinit,klist,ktab,orbd,policytool,rmi{d,registry},servertool,tnameserv} +# 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/{,g}mplayer \ - /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" +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" -RE_blkdwn_java="${SPE_blkdwn_java} /usr/X11R6/bin/XFree86" +RE_java="${PSE_java}" +RE_misc="/usr/X11R6/bin/XFree86" -ME_blkdwn_java="${PSE_blkdwn_java}" +ME_java="${PSE_java}" # or plug-ins don't work ME_misc="/usr/lib/MozillaFirefox/firefox{,-bin} /usr/bin/xmms" -XE_blkdwn_java="${PSE_blkdwn_java} /usr/X11R6/bin/XFree86" +XE_java="${PSE_java} /usr/X11R6/bin/XFree86" #################################### # Settings are really applied here # #################################### -PS_EXEC_EXEMPT="${PSE_misc} ${PSE_wine} ${PSE_blkdwn_java} ${PSE_openoffice}" +PS_EXEC_EXEMPT="${PSE_misc} ${PSE_wine} ${PSE_java} ${PSE_openoffice}" PAGEEXEC_EXEMPT="" TRAMPOLINE_EXEMPT="" -MPROTECT_EXEMPT="${ME_blkdwn_java} ${ME_misc}" -RANDMMAP_EXEMPT="${RE_blkdwn_java}" +MPROTECT_EXEMPT="${ME_java} ${ME_misc}" +RANDMMAP_EXEMPT="${RE_java} ${RE_misc}" SEGMEXEC_EXEMPT="${PAGEEXEC_EXEMPT}" -RANDEXEC_EXEMPT="${XE_blkdwn_java}" +RANDEXEC_EXEMPT="${XE_java}" # when zero flag mask is set to "yes" it will remove all pax flags from all files on reboot/stop -ZERO_FLAG_MASK="yes" +#ZERO_FLAG_MASK="yes" + |