diff --git a/profiles/Makefile b/profiles/Makefile index 37ba4400c..cb5e8e07a 100644 --- a/profiles/Makefile +++ b/profiles/Makefile @@ -33,21 +33,25 @@ common/Make.rules: $(COMMONDIR)/Make.rules endif DESTDIR=/ -EXTRASDIR=${DESTDIR}/usr/src/immunix/SubDomain/profiles/extras +PROFILES_DEST=${DESTDIR}/etc/apparmor.d +EXTRAS_DEST=${DESTDIR}/etc/apparmor/profiles/extras/ +PROFILES_SOURCE=./apparmor.d +EXTRAS_SOURCE=./apparmor/profiles/extras/ +SUBDIRS_MUST_BE_SKIPPED=${PROFILES_SOURCE}/abstractions ${PROFILES_SOURCE}/program-chunks ${PROFILES_SOURCE}/tunables +PROFILES_TO_COPY=$(filter-out ${SUBDIRS_MUST_BE_SKIPPED}, $(wildcard ${PROFILES_SOURCE}/*)) .PHONY: install install: - install -d ${DESTDIR}/etc/apparmor.d - install -m 644 enabled/* ${DESTDIR}/etc/apparmor.d - install -d ${EXTRASDIR} - install -m 644 extras/* ${EXTRASDIR} - install -m 755 -d ${DESTDIR}/etc/apparmor.d/abstractions \ - ${DESTDIR}/etc/apparmor.d/program-chunks \ - ${DESTDIR}/etc/apparmor.d/tunables - install -m 644 abstractions/* ${DESTDIR}/etc/apparmor.d/abstractions - install -m 644 program-chunks/* ${DESTDIR}/etc/apparmor.d/program-chunks - install -m 644 tunables/* ${DESTDIR}/etc/apparmor.d/tunables - + install -m 755 -d ${PROFILES_DEST} + install -m 755 -d ${PROFILES_DEST}/abstractions \ + ${PROFILES_DEST}/program-chunks \ + ${PROFILES_DEST}/tunables + install -m 644 ${PROFILES_TO_COPY} ${PROFILES_DEST} + install -m 644 ${PROFILES_SOURCE}/abstractions/* ${PROFILES_DEST}/abstractions + install -m 644 ${PROFILES_SOURCE}/program-chunks/* ${PROFILES_DEST}/program-chunks + install -m 644 ${PROFILES_SOURCE}/tunables/* ${PROFILES_DEST}/tunables + install -m 755 -d ${EXTRAS_DEST} + install -m 644 ${EXTRAS_SOURCE}/* ${EXTRAS_DEST} .PHONY: clean clean: @@ -69,21 +73,15 @@ ifndef LOGPROF LOGPROF=/usr/sbin/aa-logprof endif -ENABLED_PATH=./enabled -EXTRAS_PATH=./extras +EXTRAS_PATH=${EXTRAS_SOURCE}/profiles/extras IGNORE_FILES=${EXTRAS_PATH}/README -CHECK_PROFILES=$(filter-out ${IGNORE_FILES}, $(wildcard ${ENABLED_PATH}/*) $(wildcard ${EXTRAS_PATH}/*)) -CHECK_INCLUDES=${PWD} +CHECK_PROFILES=$(filter-out ${IGNORE_FILES}, $(wildcard ${PROFILES_SOURCE}/*) $(wildcard ${EXTRAS_PATH}/*)) .PHONY: check check: - @echo "*** Checking profiles against apparmor_parser" + @echo "*** Checking profiles from ${PROFILES_SOURCE} and ${EXTRAS_PATH} against apparmor_parser" $(Q)for profile in ${CHECK_PROFILES} ; do \ - ${PARSER} -S -b ${CHECK_INCLUDES} $${profile} > /dev/null ; \ + ${PARSER} -S -I ${PWD}/apparmor.d $${profile} > /dev/null ; \ done - -.PHONY: check-install -check-install: - $(Q)make check ENABLED_PATH=${DESTDIR}/etc/apparmor.d EXTRAS_PATH=${EXTRASDIR} CHECK_INCLUDES=${DESTDIR}/etc/apparmor.d - @echo "*** Checking profiles against logprof" - $(Q)${LOGPROF} -d ${DESTDIR}/etc/apparmor.d -f /dev/null + @echo "*** Checking profiles from ${PROFILES_SOURCE} against logprof" + $(Q)${LOGPROF} -d ${PROFILES_SOURCE} -f /dev/null diff --git a/profiles/apparmor-profiles.spec.in b/profiles/apparmor-profiles.spec.in index e46488a9f..81e1dde6a 100644 --- a/profiles/apparmor-profiles.spec.in +++ b/profiles/apparmor-profiles.spec.in @@ -55,8 +55,7 @@ This package is part of a suite of tools that used to be named SubDomain. %install [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} -make install DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro} \ - EXTRASDIR=${RPM_BUILD_ROOT}/%{extras_dir}/ +make install DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro} %clean [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf $RPM_BUILD_ROOT diff --git a/profiles/abstractions/X b/profiles/apparmor.d/abstractions/X similarity index 100% rename from profiles/abstractions/X rename to profiles/apparmor.d/abstractions/X diff --git a/profiles/abstractions/audio b/profiles/apparmor.d/abstractions/audio similarity index 100% rename from profiles/abstractions/audio rename to profiles/apparmor.d/abstractions/audio diff --git a/profiles/abstractions/authentication b/profiles/apparmor.d/abstractions/authentication similarity index 100% rename from profiles/abstractions/authentication rename to profiles/apparmor.d/abstractions/authentication diff --git a/profiles/abstractions/base b/profiles/apparmor.d/abstractions/base similarity index 100% rename from profiles/abstractions/base rename to profiles/apparmor.d/abstractions/base diff --git a/profiles/abstractions/bash b/profiles/apparmor.d/abstractions/bash similarity index 100% rename from profiles/abstractions/bash rename to profiles/apparmor.d/abstractions/bash diff --git a/profiles/abstractions/consoles b/profiles/apparmor.d/abstractions/consoles similarity index 100% rename from profiles/abstractions/consoles rename to profiles/apparmor.d/abstractions/consoles diff --git a/profiles/abstractions/fonts b/profiles/apparmor.d/abstractions/fonts similarity index 100% rename from profiles/abstractions/fonts rename to profiles/apparmor.d/abstractions/fonts diff --git a/profiles/abstractions/gnome b/profiles/apparmor.d/abstractions/gnome similarity index 100% rename from profiles/abstractions/gnome rename to profiles/apparmor.d/abstractions/gnome diff --git a/profiles/abstractions/kde b/profiles/apparmor.d/abstractions/kde similarity index 100% rename from profiles/abstractions/kde rename to profiles/apparmor.d/abstractions/kde diff --git a/profiles/abstractions/kerberosclient b/profiles/apparmor.d/abstractions/kerberosclient similarity index 100% rename from profiles/abstractions/kerberosclient rename to profiles/apparmor.d/abstractions/kerberosclient diff --git a/profiles/abstractions/mdns b/profiles/apparmor.d/abstractions/mdns similarity index 100% rename from profiles/abstractions/mdns rename to profiles/apparmor.d/abstractions/mdns diff --git a/profiles/abstractions/mysql b/profiles/apparmor.d/abstractions/mysql similarity index 100% rename from profiles/abstractions/mysql rename to profiles/apparmor.d/abstractions/mysql diff --git a/profiles/abstractions/nameservice b/profiles/apparmor.d/abstractions/nameservice similarity index 100% rename from profiles/abstractions/nameservice rename to profiles/apparmor.d/abstractions/nameservice diff --git a/profiles/abstractions/nis b/profiles/apparmor.d/abstractions/nis similarity index 100% rename from profiles/abstractions/nis rename to profiles/apparmor.d/abstractions/nis diff --git a/profiles/abstractions/perl b/profiles/apparmor.d/abstractions/perl similarity index 100% rename from profiles/abstractions/perl rename to profiles/apparmor.d/abstractions/perl diff --git a/profiles/abstractions/php5 b/profiles/apparmor.d/abstractions/php5 similarity index 100% rename from profiles/abstractions/php5 rename to profiles/apparmor.d/abstractions/php5 diff --git a/profiles/abstractions/python b/profiles/apparmor.d/abstractions/python similarity index 100% rename from profiles/abstractions/python rename to profiles/apparmor.d/abstractions/python diff --git a/profiles/abstractions/ruby b/profiles/apparmor.d/abstractions/ruby similarity index 100% rename from profiles/abstractions/ruby rename to profiles/apparmor.d/abstractions/ruby diff --git a/profiles/abstractions/svn-repositories b/profiles/apparmor.d/abstractions/svn-repositories similarity index 100% rename from profiles/abstractions/svn-repositories rename to profiles/apparmor.d/abstractions/svn-repositories diff --git a/profiles/abstractions/user-download b/profiles/apparmor.d/abstractions/user-download similarity index 100% rename from profiles/abstractions/user-download rename to profiles/apparmor.d/abstractions/user-download diff --git a/profiles/abstractions/user-mail b/profiles/apparmor.d/abstractions/user-mail similarity index 100% rename from profiles/abstractions/user-mail rename to profiles/apparmor.d/abstractions/user-mail diff --git a/profiles/abstractions/user-manpages b/profiles/apparmor.d/abstractions/user-manpages similarity index 100% rename from profiles/abstractions/user-manpages rename to profiles/apparmor.d/abstractions/user-manpages diff --git a/profiles/abstractions/user-tmp b/profiles/apparmor.d/abstractions/user-tmp similarity index 100% rename from profiles/abstractions/user-tmp rename to profiles/apparmor.d/abstractions/user-tmp diff --git a/profiles/abstractions/user-write b/profiles/apparmor.d/abstractions/user-write similarity index 100% rename from profiles/abstractions/user-write rename to profiles/apparmor.d/abstractions/user-write diff --git a/profiles/abstractions/web-data b/profiles/apparmor.d/abstractions/web-data similarity index 100% rename from profiles/abstractions/web-data rename to profiles/apparmor.d/abstractions/web-data diff --git a/profiles/abstractions/winbind b/profiles/apparmor.d/abstractions/winbind similarity index 100% rename from profiles/abstractions/winbind rename to profiles/apparmor.d/abstractions/winbind diff --git a/profiles/abstractions/wutmp b/profiles/apparmor.d/abstractions/wutmp similarity index 100% rename from profiles/abstractions/wutmp rename to profiles/apparmor.d/abstractions/wutmp diff --git a/profiles/abstractions/xad b/profiles/apparmor.d/abstractions/xad similarity index 100% rename from profiles/abstractions/xad rename to profiles/apparmor.d/abstractions/xad diff --git a/profiles/enabled/bin.ping b/profiles/apparmor.d/bin.ping similarity index 100% rename from profiles/enabled/bin.ping rename to profiles/apparmor.d/bin.ping diff --git a/profiles/program-chunks/postfix-common b/profiles/apparmor.d/program-chunks/postfix-common similarity index 100% rename from profiles/program-chunks/postfix-common rename to profiles/apparmor.d/program-chunks/postfix-common diff --git a/profiles/enabled/sbin.klogd b/profiles/apparmor.d/sbin.klogd similarity index 100% rename from profiles/enabled/sbin.klogd rename to profiles/apparmor.d/sbin.klogd diff --git a/profiles/enabled/sbin.syslog-ng b/profiles/apparmor.d/sbin.syslog-ng similarity index 100% rename from profiles/enabled/sbin.syslog-ng rename to profiles/apparmor.d/sbin.syslog-ng diff --git a/profiles/enabled/sbin.syslogd b/profiles/apparmor.d/sbin.syslogd similarity index 100% rename from profiles/enabled/sbin.syslogd rename to profiles/apparmor.d/sbin.syslogd diff --git a/profiles/tunables/global b/profiles/apparmor.d/tunables/global similarity index 100% rename from profiles/tunables/global rename to profiles/apparmor.d/tunables/global diff --git a/profiles/tunables/home b/profiles/apparmor.d/tunables/home similarity index 100% rename from profiles/tunables/home rename to profiles/apparmor.d/tunables/home diff --git a/profiles/enabled/usr.sbin.identd b/profiles/apparmor.d/usr.sbin.identd similarity index 100% rename from profiles/enabled/usr.sbin.identd rename to profiles/apparmor.d/usr.sbin.identd diff --git a/profiles/enabled/usr.sbin.mdnsd b/profiles/apparmor.d/usr.sbin.mdnsd similarity index 100% rename from profiles/enabled/usr.sbin.mdnsd rename to profiles/apparmor.d/usr.sbin.mdnsd diff --git a/profiles/enabled/usr.sbin.named b/profiles/apparmor.d/usr.sbin.named similarity index 100% rename from profiles/enabled/usr.sbin.named rename to profiles/apparmor.d/usr.sbin.named diff --git a/profiles/enabled/usr.sbin.nscd b/profiles/apparmor.d/usr.sbin.nscd similarity index 100% rename from profiles/enabled/usr.sbin.nscd rename to profiles/apparmor.d/usr.sbin.nscd diff --git a/profiles/enabled/usr.sbin.ntpd b/profiles/apparmor.d/usr.sbin.ntpd similarity index 100% rename from profiles/enabled/usr.sbin.ntpd rename to profiles/apparmor.d/usr.sbin.ntpd diff --git a/profiles/enabled/usr.sbin.traceroute b/profiles/apparmor.d/usr.sbin.traceroute similarity index 100% rename from profiles/enabled/usr.sbin.traceroute rename to profiles/apparmor.d/usr.sbin.traceroute diff --git a/profiles/extras/README b/profiles/apparmor/profiles/extras/README similarity index 100% rename from profiles/extras/README rename to profiles/apparmor/profiles/extras/README diff --git a/profiles/extras/bin.netstat b/profiles/apparmor/profiles/extras/bin.netstat similarity index 100% rename from profiles/extras/bin.netstat rename to profiles/apparmor/profiles/extras/bin.netstat diff --git a/profiles/extras/etc.cron.daily.logrotate b/profiles/apparmor/profiles/extras/etc.cron.daily.logrotate similarity index 100% rename from profiles/extras/etc.cron.daily.logrotate rename to profiles/apparmor/profiles/extras/etc.cron.daily.logrotate diff --git a/profiles/extras/etc.cron.daily.slocate.cron b/profiles/apparmor/profiles/extras/etc.cron.daily.slocate.cron similarity index 100% rename from profiles/extras/etc.cron.daily.slocate.cron rename to profiles/apparmor/profiles/extras/etc.cron.daily.slocate.cron diff --git a/profiles/extras/etc.cron.daily.tmpwatch b/profiles/apparmor/profiles/extras/etc.cron.daily.tmpwatch similarity index 100% rename from profiles/extras/etc.cron.daily.tmpwatch rename to profiles/apparmor/profiles/extras/etc.cron.daily.tmpwatch diff --git a/profiles/extras/opt.gnome.bin.evolution-2.4 b/profiles/apparmor/profiles/extras/opt.gnome.bin.evolution-2.4 similarity index 100% rename from profiles/extras/opt.gnome.bin.evolution-2.4 rename to profiles/apparmor/profiles/extras/opt.gnome.bin.evolution-2.4 diff --git a/profiles/extras/opt.gnome.bin.gaim b/profiles/apparmor/profiles/extras/opt.gnome.bin.gaim similarity index 100% rename from profiles/extras/opt.gnome.bin.gaim rename to profiles/apparmor/profiles/extras/opt.gnome.bin.gaim diff --git a/profiles/extras/opt.gnome.lib.GConf.2.gconfd-2 b/profiles/apparmor/profiles/extras/opt.gnome.lib.GConf.2.gconfd-2 similarity index 100% rename from profiles/extras/opt.gnome.lib.GConf.2.gconfd-2 rename to profiles/apparmor/profiles/extras/opt.gnome.lib.GConf.2.gconfd-2 diff --git a/profiles/extras/opt.gnome.lib.bonobo.bonobo-activation-server b/profiles/apparmor/profiles/extras/opt.gnome.lib.bonobo.bonobo-activation-server similarity index 100% rename from profiles/extras/opt.gnome.lib.bonobo.bonobo-activation-server rename to profiles/apparmor/profiles/extras/opt.gnome.lib.bonobo.bonobo-activation-server diff --git a/profiles/extras/opt.gnome.lib.evolution-data-server-1.2.evolution-data-server-1.4 b/profiles/apparmor/profiles/extras/opt.gnome.lib.evolution-data-server-1.2.evolution-data-server-1.4 similarity index 100% rename from profiles/extras/opt.gnome.lib.evolution-data-server-1.2.evolution-data-server-1.4 rename to profiles/apparmor/profiles/extras/opt.gnome.lib.evolution-data-server-1.2.evolution-data-server-1.4 diff --git a/profiles/extras/sbin.dhclient b/profiles/apparmor/profiles/extras/sbin.dhclient similarity index 100% rename from profiles/extras/sbin.dhclient rename to profiles/apparmor/profiles/extras/sbin.dhclient diff --git a/profiles/extras/sbin.dhcpcd b/profiles/apparmor/profiles/extras/sbin.dhcpcd similarity index 100% rename from profiles/extras/sbin.dhcpcd rename to profiles/apparmor/profiles/extras/sbin.dhcpcd diff --git a/profiles/extras/sbin.portmap b/profiles/apparmor/profiles/extras/sbin.portmap similarity index 100% rename from profiles/extras/sbin.portmap rename to profiles/apparmor/profiles/extras/sbin.portmap diff --git a/profiles/extras/sbin.resmgrd b/profiles/apparmor/profiles/extras/sbin.resmgrd similarity index 100% rename from profiles/extras/sbin.resmgrd rename to profiles/apparmor/profiles/extras/sbin.resmgrd diff --git a/profiles/extras/sbin.rpc.lockd b/profiles/apparmor/profiles/extras/sbin.rpc.lockd similarity index 100% rename from profiles/extras/sbin.rpc.lockd rename to profiles/apparmor/profiles/extras/sbin.rpc.lockd diff --git a/profiles/extras/sbin.rpc.statd b/profiles/apparmor/profiles/extras/sbin.rpc.statd similarity index 100% rename from profiles/extras/sbin.rpc.statd rename to profiles/apparmor/profiles/extras/sbin.rpc.statd diff --git a/profiles/extras/usr.NX.bin.nxclient b/profiles/apparmor/profiles/extras/usr.NX.bin.nxclient similarity index 100% rename from profiles/extras/usr.NX.bin.nxclient rename to profiles/apparmor/profiles/extras/usr.NX.bin.nxclient diff --git a/profiles/extras/usr.X11R6.bin.acroread b/profiles/apparmor/profiles/extras/usr.X11R6.bin.acroread similarity index 99% rename from profiles/extras/usr.X11R6.bin.acroread rename to profiles/apparmor/profiles/extras/usr.X11R6.bin.acroread index 60eeeb079..a9d6ab2bd 100644 --- a/profiles/extras/usr.X11R6.bin.acroread +++ b/profiles/apparmor/profiles/extras/usr.X11R6.bin.acroread @@ -1,4 +1,4 @@ -# $Id:$ +# $Id$ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE diff --git a/profiles/extras/usr.X11R6.bin.ethereal b/profiles/apparmor/profiles/extras/usr.X11R6.bin.ethereal similarity index 100% rename from profiles/extras/usr.X11R6.bin.ethereal rename to profiles/apparmor/profiles/extras/usr.X11R6.bin.ethereal diff --git a/profiles/extras/usr.X11R6.bin.xfs b/profiles/apparmor/profiles/extras/usr.X11R6.bin.xfs similarity index 100% rename from profiles/extras/usr.X11R6.bin.xfs rename to profiles/apparmor/profiles/extras/usr.X11R6.bin.xfs diff --git a/profiles/extras/usr.bin.apropos b/profiles/apparmor/profiles/extras/usr.bin.apropos similarity index 100% rename from profiles/extras/usr.bin.apropos rename to profiles/apparmor/profiles/extras/usr.bin.apropos diff --git a/profiles/extras/usr.bin.fam b/profiles/apparmor/profiles/extras/usr.bin.fam similarity index 100% rename from profiles/extras/usr.bin.fam rename to profiles/apparmor/profiles/extras/usr.bin.fam diff --git a/profiles/extras/usr.bin.freshclam b/profiles/apparmor/profiles/extras/usr.bin.freshclam similarity index 100% rename from profiles/extras/usr.bin.freshclam rename to profiles/apparmor/profiles/extras/usr.bin.freshclam diff --git a/profiles/extras/usr.bin.man b/profiles/apparmor/profiles/extras/usr.bin.man similarity index 100% rename from profiles/extras/usr.bin.man rename to profiles/apparmor/profiles/extras/usr.bin.man diff --git a/profiles/extras/usr.bin.mlmmj-bounce b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-bounce similarity index 100% rename from profiles/extras/usr.bin.mlmmj-bounce rename to profiles/apparmor/profiles/extras/usr.bin.mlmmj-bounce diff --git a/profiles/extras/usr.bin.mlmmj-maintd b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-maintd similarity index 100% rename from profiles/extras/usr.bin.mlmmj-maintd rename to profiles/apparmor/profiles/extras/usr.bin.mlmmj-maintd diff --git a/profiles/extras/usr.bin.mlmmj-make-ml.sh b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-make-ml.sh similarity index 100% rename from profiles/extras/usr.bin.mlmmj-make-ml.sh rename to profiles/apparmor/profiles/extras/usr.bin.mlmmj-make-ml.sh diff --git a/profiles/extras/usr.bin.mlmmj-process b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-process similarity index 100% rename from profiles/extras/usr.bin.mlmmj-process rename to profiles/apparmor/profiles/extras/usr.bin.mlmmj-process diff --git a/profiles/extras/usr.bin.mlmmj-recieve b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-recieve similarity index 100% rename from profiles/extras/usr.bin.mlmmj-recieve rename to profiles/apparmor/profiles/extras/usr.bin.mlmmj-recieve diff --git a/profiles/extras/usr.bin.mlmmj-send b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-send similarity index 100% rename from profiles/extras/usr.bin.mlmmj-send rename to profiles/apparmor/profiles/extras/usr.bin.mlmmj-send diff --git a/profiles/extras/usr.bin.mlmmj-sub b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-sub similarity index 100% rename from profiles/extras/usr.bin.mlmmj-sub rename to profiles/apparmor/profiles/extras/usr.bin.mlmmj-sub diff --git a/profiles/extras/usr.bin.mlmmj-unsub b/profiles/apparmor/profiles/extras/usr.bin.mlmmj-unsub similarity index 100% rename from profiles/extras/usr.bin.mlmmj-unsub rename to profiles/apparmor/profiles/extras/usr.bin.mlmmj-unsub diff --git a/profiles/extras/usr.bin.opera b/profiles/apparmor/profiles/extras/usr.bin.opera similarity index 100% rename from profiles/extras/usr.bin.opera rename to profiles/apparmor/profiles/extras/usr.bin.opera diff --git a/profiles/extras/usr.bin.passwd b/profiles/apparmor/profiles/extras/usr.bin.passwd similarity index 100% rename from profiles/extras/usr.bin.passwd rename to profiles/apparmor/profiles/extras/usr.bin.passwd diff --git a/profiles/extras/usr.bin.procmail b/profiles/apparmor/profiles/extras/usr.bin.procmail similarity index 100% rename from profiles/extras/usr.bin.procmail rename to profiles/apparmor/profiles/extras/usr.bin.procmail diff --git a/profiles/extras/usr.bin.spamc b/profiles/apparmor/profiles/extras/usr.bin.spamc similarity index 100% rename from profiles/extras/usr.bin.spamc rename to profiles/apparmor/profiles/extras/usr.bin.spamc diff --git a/profiles/extras/usr.bin.svnserve b/profiles/apparmor/profiles/extras/usr.bin.svnserve similarity index 100% rename from profiles/extras/usr.bin.svnserve rename to profiles/apparmor/profiles/extras/usr.bin.svnserve diff --git a/profiles/extras/usr.lib.RealPlayer10.realplay b/profiles/apparmor/profiles/extras/usr.lib.RealPlayer10.realplay similarity index 100% rename from profiles/extras/usr.lib.RealPlayer10.realplay rename to profiles/apparmor/profiles/extras/usr.lib.RealPlayer10.realplay diff --git a/profiles/extras/usr.lib.firefox.firefox-bin b/profiles/apparmor/profiles/extras/usr.lib.firefox.firefox-bin similarity index 100% rename from profiles/extras/usr.lib.firefox.firefox-bin rename to profiles/apparmor/profiles/extras/usr.lib.firefox.firefox-bin diff --git a/profiles/extras/usr.lib.firefox.firefox.sh b/profiles/apparmor/profiles/extras/usr.lib.firefox.firefox.sh similarity index 100% rename from profiles/extras/usr.lib.firefox.firefox.sh rename to profiles/apparmor/profiles/extras/usr.lib.firefox.firefox.sh diff --git a/profiles/extras/usr.lib.firefox.mozilla-xremote-client b/profiles/apparmor/profiles/extras/usr.lib.firefox.mozilla-xremote-client similarity index 100% rename from profiles/extras/usr.lib.firefox.mozilla-xremote-client rename to profiles/apparmor/profiles/extras/usr.lib.firefox.mozilla-xremote-client diff --git a/profiles/extras/usr.lib.man-db.man b/profiles/apparmor/profiles/extras/usr.lib.man-db.man similarity index 100% rename from profiles/extras/usr.lib.man-db.man rename to profiles/apparmor/profiles/extras/usr.lib.man-db.man diff --git a/profiles/extras/usr.lib.openldap.slapd b/profiles/apparmor/profiles/extras/usr.lib.openldap.slapd similarity index 100% rename from profiles/extras/usr.lib.openldap.slapd rename to profiles/apparmor/profiles/extras/usr.lib.openldap.slapd diff --git a/profiles/extras/usr.lib.postfix.anvil b/profiles/apparmor/profiles/extras/usr.lib.postfix.anvil similarity index 100% rename from profiles/extras/usr.lib.postfix.anvil rename to profiles/apparmor/profiles/extras/usr.lib.postfix.anvil diff --git a/profiles/extras/usr.lib.postfix.bounce b/profiles/apparmor/profiles/extras/usr.lib.postfix.bounce similarity index 100% rename from profiles/extras/usr.lib.postfix.bounce rename to profiles/apparmor/profiles/extras/usr.lib.postfix.bounce diff --git a/profiles/extras/usr.lib.postfix.cleanup b/profiles/apparmor/profiles/extras/usr.lib.postfix.cleanup similarity index 100% rename from profiles/extras/usr.lib.postfix.cleanup rename to profiles/apparmor/profiles/extras/usr.lib.postfix.cleanup diff --git a/profiles/extras/usr.lib.postfix.discard b/profiles/apparmor/profiles/extras/usr.lib.postfix.discard similarity index 100% rename from profiles/extras/usr.lib.postfix.discard rename to profiles/apparmor/profiles/extras/usr.lib.postfix.discard diff --git a/profiles/extras/usr.lib.postfix.error b/profiles/apparmor/profiles/extras/usr.lib.postfix.error similarity index 100% rename from profiles/extras/usr.lib.postfix.error rename to profiles/apparmor/profiles/extras/usr.lib.postfix.error diff --git a/profiles/extras/usr.lib.postfix.flush b/profiles/apparmor/profiles/extras/usr.lib.postfix.flush similarity index 100% rename from profiles/extras/usr.lib.postfix.flush rename to profiles/apparmor/profiles/extras/usr.lib.postfix.flush diff --git a/profiles/extras/usr.lib.postfix.lmtp b/profiles/apparmor/profiles/extras/usr.lib.postfix.lmtp similarity index 100% rename from profiles/extras/usr.lib.postfix.lmtp rename to profiles/apparmor/profiles/extras/usr.lib.postfix.lmtp diff --git a/profiles/extras/usr.lib.postfix.local b/profiles/apparmor/profiles/extras/usr.lib.postfix.local similarity index 100% rename from profiles/extras/usr.lib.postfix.local rename to profiles/apparmor/profiles/extras/usr.lib.postfix.local diff --git a/profiles/extras/usr.lib.postfix.master b/profiles/apparmor/profiles/extras/usr.lib.postfix.master similarity index 100% rename from profiles/extras/usr.lib.postfix.master rename to profiles/apparmor/profiles/extras/usr.lib.postfix.master diff --git a/profiles/extras/usr.lib.postfix.nqmgr b/profiles/apparmor/profiles/extras/usr.lib.postfix.nqmgr similarity index 100% rename from profiles/extras/usr.lib.postfix.nqmgr rename to profiles/apparmor/profiles/extras/usr.lib.postfix.nqmgr diff --git a/profiles/extras/usr.lib.postfix.oqmgr b/profiles/apparmor/profiles/extras/usr.lib.postfix.oqmgr similarity index 100% rename from profiles/extras/usr.lib.postfix.oqmgr rename to profiles/apparmor/profiles/extras/usr.lib.postfix.oqmgr diff --git a/profiles/extras/usr.lib.postfix.pickup b/profiles/apparmor/profiles/extras/usr.lib.postfix.pickup similarity index 100% rename from profiles/extras/usr.lib.postfix.pickup rename to profiles/apparmor/profiles/extras/usr.lib.postfix.pickup diff --git a/profiles/extras/usr.lib.postfix.pipe b/profiles/apparmor/profiles/extras/usr.lib.postfix.pipe similarity index 100% rename from profiles/extras/usr.lib.postfix.pipe rename to profiles/apparmor/profiles/extras/usr.lib.postfix.pipe diff --git a/profiles/extras/usr.lib.postfix.proxymap b/profiles/apparmor/profiles/extras/usr.lib.postfix.proxymap similarity index 100% rename from profiles/extras/usr.lib.postfix.proxymap rename to profiles/apparmor/profiles/extras/usr.lib.postfix.proxymap diff --git a/profiles/extras/usr.lib.postfix.qmgr b/profiles/apparmor/profiles/extras/usr.lib.postfix.qmgr similarity index 100% rename from profiles/extras/usr.lib.postfix.qmgr rename to profiles/apparmor/profiles/extras/usr.lib.postfix.qmgr diff --git a/profiles/extras/usr.lib.postfix.qmqpd b/profiles/apparmor/profiles/extras/usr.lib.postfix.qmqpd similarity index 100% rename from profiles/extras/usr.lib.postfix.qmqpd rename to profiles/apparmor/profiles/extras/usr.lib.postfix.qmqpd diff --git a/profiles/extras/usr.lib.postfix.scache b/profiles/apparmor/profiles/extras/usr.lib.postfix.scache similarity index 100% rename from profiles/extras/usr.lib.postfix.scache rename to profiles/apparmor/profiles/extras/usr.lib.postfix.scache diff --git a/profiles/extras/usr.lib.postfix.showq b/profiles/apparmor/profiles/extras/usr.lib.postfix.showq similarity index 100% rename from profiles/extras/usr.lib.postfix.showq rename to profiles/apparmor/profiles/extras/usr.lib.postfix.showq diff --git a/profiles/extras/usr.lib.postfix.smtp b/profiles/apparmor/profiles/extras/usr.lib.postfix.smtp similarity index 100% rename from profiles/extras/usr.lib.postfix.smtp rename to profiles/apparmor/profiles/extras/usr.lib.postfix.smtp diff --git a/profiles/extras/usr.lib.postfix.smtpd b/profiles/apparmor/profiles/extras/usr.lib.postfix.smtpd similarity index 100% rename from profiles/extras/usr.lib.postfix.smtpd rename to profiles/apparmor/profiles/extras/usr.lib.postfix.smtpd diff --git a/profiles/extras/usr.lib.postfix.spawn b/profiles/apparmor/profiles/extras/usr.lib.postfix.spawn similarity index 100% rename from profiles/extras/usr.lib.postfix.spawn rename to profiles/apparmor/profiles/extras/usr.lib.postfix.spawn diff --git a/profiles/extras/usr.lib.postfix.tlsmgr b/profiles/apparmor/profiles/extras/usr.lib.postfix.tlsmgr similarity index 100% rename from profiles/extras/usr.lib.postfix.tlsmgr rename to profiles/apparmor/profiles/extras/usr.lib.postfix.tlsmgr diff --git a/profiles/extras/usr.lib.postfix.trivial-rewrite b/profiles/apparmor/profiles/extras/usr.lib.postfix.trivial-rewrite similarity index 100% rename from profiles/extras/usr.lib.postfix.trivial-rewrite rename to profiles/apparmor/profiles/extras/usr.lib.postfix.trivial-rewrite diff --git a/profiles/extras/usr.lib.postfix.verify b/profiles/apparmor/profiles/extras/usr.lib.postfix.verify similarity index 100% rename from profiles/extras/usr.lib.postfix.verify rename to profiles/apparmor/profiles/extras/usr.lib.postfix.verify diff --git a/profiles/extras/usr.lib.postfix.virtual b/profiles/apparmor/profiles/extras/usr.lib.postfix.virtual similarity index 100% rename from profiles/extras/usr.lib.postfix.virtual rename to profiles/apparmor/profiles/extras/usr.lib.postfix.virtual diff --git a/profiles/extras/usr.sbin.dhcpd b/profiles/apparmor/profiles/extras/usr.sbin.dhcpd similarity index 100% rename from profiles/extras/usr.sbin.dhcpd rename to profiles/apparmor/profiles/extras/usr.sbin.dhcpd diff --git a/profiles/extras/usr.sbin.httpd2-prefork b/profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork similarity index 100% rename from profiles/extras/usr.sbin.httpd2-prefork rename to profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork diff --git a/profiles/extras/usr.sbin.imapd b/profiles/apparmor/profiles/extras/usr.sbin.imapd similarity index 100% rename from profiles/extras/usr.sbin.imapd rename to profiles/apparmor/profiles/extras/usr.sbin.imapd diff --git a/profiles/extras/usr.sbin.in.fingerd b/profiles/apparmor/profiles/extras/usr.sbin.in.fingerd similarity index 100% rename from profiles/extras/usr.sbin.in.fingerd rename to profiles/apparmor/profiles/extras/usr.sbin.in.fingerd diff --git a/profiles/extras/usr.sbin.in.ftpd b/profiles/apparmor/profiles/extras/usr.sbin.in.ftpd similarity index 100% rename from profiles/extras/usr.sbin.in.ftpd rename to profiles/apparmor/profiles/extras/usr.sbin.in.ftpd diff --git a/profiles/extras/usr.sbin.in.ntalkd b/profiles/apparmor/profiles/extras/usr.sbin.in.ntalkd similarity index 100% rename from profiles/extras/usr.sbin.in.ntalkd rename to profiles/apparmor/profiles/extras/usr.sbin.in.ntalkd diff --git a/profiles/extras/usr.sbin.ipop2d b/profiles/apparmor/profiles/extras/usr.sbin.ipop2d similarity index 100% rename from profiles/extras/usr.sbin.ipop2d rename to profiles/apparmor/profiles/extras/usr.sbin.ipop2d diff --git a/profiles/extras/usr.sbin.ipop3d b/profiles/apparmor/profiles/extras/usr.sbin.ipop3d similarity index 100% rename from profiles/extras/usr.sbin.ipop3d rename to profiles/apparmor/profiles/extras/usr.sbin.ipop3d diff --git a/profiles/extras/usr.sbin.lighttpd b/profiles/apparmor/profiles/extras/usr.sbin.lighttpd similarity index 100% rename from profiles/extras/usr.sbin.lighttpd rename to profiles/apparmor/profiles/extras/usr.sbin.lighttpd diff --git a/profiles/extras/usr.sbin.mysqld b/profiles/apparmor/profiles/extras/usr.sbin.mysqld similarity index 100% rename from profiles/extras/usr.sbin.mysqld rename to profiles/apparmor/profiles/extras/usr.sbin.mysqld diff --git a/profiles/extras/usr.sbin.nmbd b/profiles/apparmor/profiles/extras/usr.sbin.nmbd similarity index 100% rename from profiles/extras/usr.sbin.nmbd rename to profiles/apparmor/profiles/extras/usr.sbin.nmbd diff --git a/profiles/extras/usr.sbin.oidentd b/profiles/apparmor/profiles/extras/usr.sbin.oidentd similarity index 100% rename from profiles/extras/usr.sbin.oidentd rename to profiles/apparmor/profiles/extras/usr.sbin.oidentd diff --git a/profiles/extras/usr.sbin.popper b/profiles/apparmor/profiles/extras/usr.sbin.popper similarity index 98% rename from profiles/extras/usr.sbin.popper rename to profiles/apparmor/profiles/extras/usr.sbin.popper index 1ff4932cc..32d20c427 100644 --- a/profiles/extras/usr.sbin.popper +++ b/profiles/apparmor/profiles/extras/usr.sbin.popper @@ -1,4 +1,4 @@ -# $Id:$ +# $Id$ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE diff --git a/profiles/extras/usr.sbin.postalias b/profiles/apparmor/profiles/extras/usr.sbin.postalias similarity index 100% rename from profiles/extras/usr.sbin.postalias rename to profiles/apparmor/profiles/extras/usr.sbin.postalias diff --git a/profiles/extras/usr.sbin.postdrop b/profiles/apparmor/profiles/extras/usr.sbin.postdrop similarity index 100% rename from profiles/extras/usr.sbin.postdrop rename to profiles/apparmor/profiles/extras/usr.sbin.postdrop diff --git a/profiles/extras/usr.sbin.postmap b/profiles/apparmor/profiles/extras/usr.sbin.postmap similarity index 100% rename from profiles/extras/usr.sbin.postmap rename to profiles/apparmor/profiles/extras/usr.sbin.postmap diff --git a/profiles/extras/usr.sbin.postqueue b/profiles/apparmor/profiles/extras/usr.sbin.postqueue similarity index 100% rename from profiles/extras/usr.sbin.postqueue rename to profiles/apparmor/profiles/extras/usr.sbin.postqueue diff --git a/profiles/extras/usr.sbin.sendmail b/profiles/apparmor/profiles/extras/usr.sbin.sendmail similarity index 100% rename from profiles/extras/usr.sbin.sendmail rename to profiles/apparmor/profiles/extras/usr.sbin.sendmail diff --git a/profiles/extras/usr.sbin.sendmail.postfix b/profiles/apparmor/profiles/extras/usr.sbin.sendmail.postfix similarity index 100% rename from profiles/extras/usr.sbin.sendmail.postfix rename to profiles/apparmor/profiles/extras/usr.sbin.sendmail.postfix diff --git a/profiles/extras/usr.sbin.sendmail.sendmail b/profiles/apparmor/profiles/extras/usr.sbin.sendmail.sendmail similarity index 100% rename from profiles/extras/usr.sbin.sendmail.sendmail rename to profiles/apparmor/profiles/extras/usr.sbin.sendmail.sendmail diff --git a/profiles/extras/usr.sbin.smbd b/profiles/apparmor/profiles/extras/usr.sbin.smbd similarity index 100% rename from profiles/extras/usr.sbin.smbd rename to profiles/apparmor/profiles/extras/usr.sbin.smbd diff --git a/profiles/extras/usr.sbin.spamd b/profiles/apparmor/profiles/extras/usr.sbin.spamd similarity index 100% rename from profiles/extras/usr.sbin.spamd rename to profiles/apparmor/profiles/extras/usr.sbin.spamd diff --git a/profiles/extras/usr.sbin.squid b/profiles/apparmor/profiles/extras/usr.sbin.squid similarity index 100% rename from profiles/extras/usr.sbin.squid rename to profiles/apparmor/profiles/extras/usr.sbin.squid diff --git a/profiles/extras/usr.sbin.sshd b/profiles/apparmor/profiles/extras/usr.sbin.sshd similarity index 100% rename from profiles/extras/usr.sbin.sshd rename to profiles/apparmor/profiles/extras/usr.sbin.sshd diff --git a/profiles/extras/usr.sbin.useradd b/profiles/apparmor/profiles/extras/usr.sbin.useradd similarity index 100% rename from profiles/extras/usr.sbin.useradd rename to profiles/apparmor/profiles/extras/usr.sbin.useradd diff --git a/profiles/extras/usr.sbin.userdel b/profiles/apparmor/profiles/extras/usr.sbin.userdel similarity index 100% rename from profiles/extras/usr.sbin.userdel rename to profiles/apparmor/profiles/extras/usr.sbin.userdel diff --git a/profiles/extras/usr.sbin.vsftpd b/profiles/apparmor/profiles/extras/usr.sbin.vsftpd similarity index 100% rename from profiles/extras/usr.sbin.vsftpd rename to profiles/apparmor/profiles/extras/usr.sbin.vsftpd diff --git a/profiles/extras/usr.sbin.xinetd b/profiles/apparmor/profiles/extras/usr.sbin.xinetd similarity index 100% rename from profiles/extras/usr.sbin.xinetd rename to profiles/apparmor/profiles/extras/usr.sbin.xinetd diff --git a/profiles/profiles.exclude b/profiles/profiles.exclude deleted file mode 100644 index 066f4a72d..000000000 --- a/profiles/profiles.exclude +++ /dev/null @@ -1,4 +0,0 @@ -CVS -Makefile -profiles.exclude -subdomain-profiles.spec diff --git a/profiles/program-chunks-disabled/apache-default-uri b/profiles/program-chunks-disabled/apache-default-uri deleted file mode 100644 index 0b1600aa1..000000000 --- a/profiles/program-chunks-disabled/apache-default-uri +++ /dev/null @@ -1,55 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # These entries are common document locations that should be served - # from apache's DEFAULT_URI subprofile. - - # Note that mod_perl, mod_php, mod_python, etc, allows in-apache - # execution of content regardless of 'x' permissions, as no exec(2) - # takes place to perform a domain change. - - # suexec execution of CGIs will require appropriate permissions - /usr/sbin/suexec2 ixr, - - # Allow logging on suse: - /var/log/apache2/** rwl, - # Allow logging on red hat: - /var/log/httpd/** rwl, - - # Allow any CGIs in user directories to run, inheriting the apache profile: - # /home/*/public_html/** ixr, - # (note that if you are using mod_change_hat, you have a choice of - # providing neccesary access in this file OR in URI-specific hats, or - # hats in the , , or directives. Please - # see the user's guide for more information. - - # Allow site-wide CGIs to run, inheriting the apache profile: - # /srv/www/cgi-bin/** ixr, - # /var/www/cgi-bin/** ixr, - - /home/*/public_html r, - /home/*/public_html/** r, - # Red Hat locations - /var/www/html/** r, - /var/www/icons/*.{gif,jpg,png} r, - /var/www/error/* r, - # SuSE locations (LSB?) - /srv/www/htdocs r, - /srv/www/htdocs/** r, - /srv/www/icons/*.{gif,jpg,png} r, - # SuSE location of the apache manual + error pages - /usr/share/apache2/** r, - - # php session state - /var/lib/php/sess_* rwl, - diff --git a/profiles/program-chunks-disabled/mozilla b/profiles/program-chunks-disabled/mozilla deleted file mode 100644 index 13bdb0c6a..000000000 --- a/profiles/program-chunks-disabled/mozilla +++ /dev/null @@ -1,62 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # None of us use mozilla as a mail client, irc client, or news client. - # So, uh, this profile is guaranteed to be insufficient for anything - # other than web browsing. Fixes welcome. - - #include - #include - #include - #include - #include - #include - #include - #include - /bin/netstat px, - /bin/bash ix, - /dev/mixer* rw, - /dev/dsp rw, - /dev/urandom rw, - /dev/random rw, - /etc/esd.conf r, - /etc/fstab r, - /etc/mailcap r, - /etc/mime.types r, - /etc/mtab r, - /etc/pluggerrc r, - /etc/X11/fs/config r, - /proc/net r, - /proc/net/appletalk r, - /proc/net/dev r, - /proc/net/ipx r, - /proc/net/unix r, - /proc/meminfo r, - /usr/bin/esd rpx, - - /usr/lib64/flash-plugin/* r, - /usr/lib64/browser-plugins/** r, - /usr/lib64/mozilla-1.[1-9][a-z]*/** r, - /usr/lib64/mozilla-1.[1-9]/** r, - /usr/lib64/mozilla/** r, - /usr/lib64/netscape/** r, - /usr/lib/flash-plugin/* r, - /usr/lib/browser-plugins/** r, - /usr/lib/mozilla-1.[1-9][a-z]*/** r, - /usr/lib/mozilla-1.[1-9]/** r, - /usr/lib/mozilla/** r, - /usr/lib/netscape/** r, - - /opt/mozilla/** r, - # let mozilla read package documentation - /usr/share/doc/** r, diff --git a/profiles/program-chunks-disabled/rsync b/profiles/program-chunks-disabled/rsync deleted file mode 100644 index a1d8e12f2..000000000 --- a/profiles/program-chunks-disabled/rsync +++ /dev/null @@ -1,18 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # where in the filesystem to allow access? - /** r, - /home/** rwl, - /usr/bin/ssh rx, - /tmp/ssh-*/agent.* w, diff --git a/profiles/program-chunks-disabled/user-abiword-docs b/profiles/program-chunks-disabled/user-abiword-docs deleted file mode 100644 index 594030155..000000000 --- a/profiles/program-chunks-disabled/user-abiword-docs +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # AbiWord doc storage directory, per-user - /home/*/.AbiSuite/** rwl, - /home/*/docs/** r, - diff --git a/profiles/program-chunks-disabled/user-acroread b/profiles/program-chunks-disabled/user-acroread deleted file mode 100644 index 9ef2dd79c..000000000 --- a/profiles/program-chunks-disabled/user-acroread +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # per-user acrobat configuration files - /home/*/.adobe/* rwl , - /home/*/.acrobat/* rwl , - /home/*/.acrorc rwl , - - # as a pdf viewer, it might be asked to read PDFs from anywhere. - # feel free to remove this line if this doesn't match site policy. - /**pdf r , - diff --git a/profiles/program-chunks-disabled/user-bash b/profiles/program-chunks-disabled/user-bash deleted file mode 100644 index 2873331fa..000000000 --- a/profiles/program-chunks-disabled/user-bash +++ /dev/null @@ -1,19 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # user-specific bash files - /home/* r, - /home/*/.bashrc r, - /home/*/.profile r, - /home/*/.bash_profile r, - /home/*/.bash_history rw, diff --git a/profiles/program-chunks-disabled/user-ee b/profiles/program-chunks-disabled/user-ee deleted file mode 100644 index 6b438c7a5..000000000 --- a/profiles/program-chunks-disabled/user-ee +++ /dev/null @@ -1,18 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # per-user ee settings - /home/*/.ee/settings rw, - /home/*/.ee/minis/** rw, - - diff --git a/profiles/program-chunks-disabled/user-ethereal b/profiles/program-chunks-disabled/user-ethereal deleted file mode 100644 index 121502c54..000000000 --- a/profiles/program-chunks-disabled/user-ethereal +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # per-user storage of configration - /root/.ethereal/** rw, - /home/*/.ethereal/** rw, - - # ethereal needs this if you want to save or open a capture file in - # /tmp - / r, - /tmp r, - /home r, - /home/*/tmp r, - /home/*/tmp/** rw, diff --git a/profiles/program-chunks-disabled/user-evolution b/profiles/program-chunks-disabled/user-evolution deleted file mode 100644 index eb6746d7c..000000000 --- a/profiles/program-chunks-disabled/user-evolution +++ /dev/null @@ -1,44 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - - # some per-user evolution files - - # imported from /usr/bin/bonobo-moniker-xmldb - /home/*/evolution/config.xmldb* rwl, - /home/*/evolution/private/config.xmldb* rwl, - - # imported from /usr/bin/evolution - /home/*/evolution rw, - /home/*/evolution/private rwx, - /home/*/evolution/** rw, - - # imported from /usr/bin/evolution-addressbook - /home/*/evolution/addressbook-sources.xml r, - /home/*/.gnome/accels/evolution-addressbook rw, - - # imported from /usr/bin/evolution-calendar - /home/*/evolution/config/* rw, - - # imported from /usr/bin/evolution-mail - /home/*/.camel_certs/* rw, - /home/*/evolution/*.db rw, - /home/*/evolution/*.xml r, - /home/*/evolution/config/* rw, - /home/*/evolution/local/** rw, - /home/*/evolution/mail/** rwl, - - # imported from /usr/bin/wombat - /home/*/evolution/local/Contacts/addressbook.db rw, - /home/*/evolution/local/**.{ics,ics~} rwl, - diff --git a/profiles/program-chunks-disabled/user-fetchmail b/profiles/program-chunks-disabled/user-fetchmail deleted file mode 100644 index bf4b8fc3e..000000000 --- a/profiles/program-chunks-disabled/user-fetchmail +++ /dev/null @@ -1,18 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # per-user fetchmail configuration - /home/*/.fetchmailrc r, - /home/*/.fetchmail.log rw, - /home/*/.fetchmail.pid rwl, - diff --git a/profiles/program-chunks-disabled/user-gconf b/profiles/program-chunks-disabled/user-gconf deleted file mode 100644 index 59b731508..000000000 --- a/profiles/program-chunks-disabled/user-gconf +++ /dev/null @@ -1,19 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # per-user gconf configuration - /home/*/.gconfd/lock/* rwl, - /home/*/.gconfd/saved_state* rwl, - /home/*/.gconf r, - /home/*/.gconf/** rwl, - diff --git a/profiles/program-chunks-disabled/user-gnupg b/profiles/program-chunks-disabled/user-gnupg deleted file mode 100644 index d28ee8804..000000000 --- a/profiles/program-chunks-disabled/user-gnupg +++ /dev/null @@ -1,21 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - - # per-user gpg settings - /home/*/.gnupg/* rwl, - /root/.gnupg/* rwl, - # perhaps you wish to allow your users to use gpg on random files in - # their home directories? The default, without this access, appears to - # be good enough for mutt & gpg use. - # /home/*/* rwl, diff --git a/profiles/program-chunks-disabled/user-irssi b/profiles/program-chunks-disabled/user-irssi deleted file mode 100644 index 43b8a5175..000000000 --- a/profiles/program-chunks-disabled/user-irssi +++ /dev/null @@ -1,19 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # per-user irssi configuration - /home/*/.irclogs/** rwl, - /home/*/.irssi/* rw , - /home/*/.irssi/scripts/* r , - /home/*/.irssi/session rwl, - diff --git a/profiles/program-chunks-disabled/user-mail-executables b/profiles/program-chunks-disabled/user-mail-executables deleted file mode 100644 index fbd4926f3..000000000 --- a/profiles/program-chunks-disabled/user-mail-executables +++ /dev/null @@ -1,30 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # sometimes .signatures are rotated through helper programs, or one - # wishes to pipe a mail message through a shell command - /home/*/.findquote px, - /bin/gzip px, - /usr/X11R6/bin/xloadimage px, - /usr/bin/ee px, - /usr/bin/fetchmail px, - /usr/bin/htmlview px, - /usr/bin/gpg px, - /usr/bin/pgpewrap px, - /usr/bin/tr px, - /usr/bin/unrtf px, - /usr/bin/w3m px, - /usr/bin/xpdf px, - /usr/local/bin/unrtf px, - - diff --git a/profiles/program-chunks-disabled/user-mozilla b/profiles/program-chunks-disabled/user-mozilla deleted file mode 100644 index cbc793daa..000000000 --- a/profiles/program-chunks-disabled/user-mozilla +++ /dev/null @@ -1,29 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - - # per-user mozilla config files - /home/*/.mozilla/** rwl, - /home/*/.Xdefaults r, - /home/*/.mailcap r, - /home/*/.mime.types r, - # per-user ESD - /home/*/.esd_auth r, - - # perhaps you wish your users to be able to execute programs right - # from mozilla? - /usr/X11R6/bin/gv px, - /usr/bin/plugger px, - /usr/bin/xpdf px, - /usr/X11R6/bin/xmessage px, - diff --git a/profiles/program-chunks-disabled/user-rcommands b/profiles/program-chunks-disabled/user-rcommands deleted file mode 100644 index 82dcce1bb..000000000 --- a/profiles/program-chunks-disabled/user-rcommands +++ /dev/null @@ -1,21 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # per-user .rhosts files -- if you don't want to allow them, please - # comment these line out - /root/.rhosts r, - /home/*/.rhosts r, - - # some programs you may wish to allow to run - /bin/ls ix, - diff --git a/profiles/program-chunks-disabled/user-samba b/profiles/program-chunks-disabled/user-samba deleted file mode 100644 index 97562b5fc..000000000 --- a/profiles/program-chunks-disabled/user-samba +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # per-user configuration of samba home directories - /home/* r, - /home/*/[a-zA-Z0-9]** rwl, - diff --git a/profiles/program-chunks-disabled/user-spamassassin b/profiles/program-chunks-disabled/user-spamassassin deleted file mode 100644 index 5e2f00f7e..000000000 --- a/profiles/program-chunks-disabled/user-spamassassin +++ /dev/null @@ -1,38 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # per-user spamassassin configs - /home/*/.spamassassin/* rwl, - # per-user razor configs - /home/*/.razor{,/*} r , - /home/*/.razor/razor-agent.log w , - /home/*/.razor/servers.discovery.lst.lock rwl, - /home/*/.razor/servers.nomination.lst.lock rwl, - /home/*/.razor/servers.catalogue.lst.lock rwl, - /home/*/.razor/servers.catalogue.lst rwl, - /home/*/.razor/servers.discovery.lst rwl, - /home/*/.razor/servers.nomination.lst rwl, - /home/*/.razor/server*conf rwl, - # chrooted versions of above - /.razor{,/*} r , - /.razor/razor-agent.log w , - /.razor/servers.discovery.lst.lock rwl, - /.razor/servers.nomination.lst.lock rwl, - /.razor/servers.catalogue.lst.lock rwl, - /.razor/servers.catalogue.lst rwl, - /.razor/servers.discovery.lst rwl, - /.razor/servers.nomination.lst rwl, - /.razor/server*conf rwl, - - # global spamassassin configs - /etc/mail/spamassassin{,/*} r, diff --git a/profiles/program-chunks-disabled/user-spamd b/profiles/program-chunks-disabled/user-spamd deleted file mode 100644 index 148a9719c..000000000 --- a/profiles/program-chunks-disabled/user-spamd +++ /dev/null @@ -1,15 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # spamd should just use everything the spamassassin standalone can use - #include diff --git a/profiles/program-chunks-disabled/user-telnetd b/profiles/program-chunks-disabled/user-telnetd deleted file mode 100644 index fcc83c88b..000000000 --- a/profiles/program-chunks-disabled/user-telnetd +++ /dev/null @@ -1,15 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - # per-user home directories -- ** probably not needed - /home/* r, diff --git a/profiles/program-chunks-disabled/user-w3m b/profiles/program-chunks-disabled/user-w3m deleted file mode 100644 index fa7df9b54..000000000 --- a/profiles/program-chunks-disabled/user-w3m +++ /dev/null @@ -1,28 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - - # per-user w3m files - /home/*/.bashrc r, - /home/*/.mime.types r, - /home/*/.rnd rw, - /home/*/.w3m/* rwl, - - # helpers that w3m may execute: - /bin/gunzip rix, - /usr/lib/gdk-pixbuf/** r, - /usr/lib64/gdk-pixbuf/** r, - - # suse - /opt/gnome/lib/gdk-pixbuf/** r, - /opt/gnome/lib64/gdk-pixbuf/** r, diff --git a/profiles/program-chunks-disabled/user-xmms b/profiles/program-chunks-disabled/user-xmms deleted file mode 100644 index 03e244208..000000000 --- a/profiles/program-chunks-disabled/user-xmms +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - - # $Id$ - - - # per-user configuration of xmms, music-storage - /home/*/.xmms/* r , - /home/*/.xmms/config rw , - /home/*/.xmms/xmms.m3u rw , - /home/*/mp3 r , - /home/*/mp3/** r , - # globally-available music storage? - #/mnt/** r , -