~sbeattie/apparmor/apparmor-precise-proposed

« back to all changes in this revision

Viewing changes to profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork

  • Committer: Jamie Strandboge
  • Date: 2012-03-02 17:12:15 UTC
  • Revision ID: jamie@canonical.com-20120302171215-rnheljjnhxiv5qwa
Tags: 2.7.99-0ubuntu2
* New upstream release which also pulls in 2.7.0-1 changes from Debian.
  For the sake of simplicity, I have added the 2.7.0-1 changelog entry after
  2.7.0-0ubuntu7 even though chronologically it appeared in Debian between
  2.7.0-0ubuntu4 and 2.7.0-0ubuntu5.
  - LP: #940422 (FFe)
* Drop the following patches, included upstream:
  - 0003-commits-through-r1882.patch
  - 0004-lp887992.patch
  - 0005-lp884748.patch
  - 0006-lp870992.patch
  - 0007-lp860856.patch
  - 0008-lp852062.patch
  - 0009-lp851977.patch
  - 0010-lp890894.patch
  - 0011-lp817956.patch
  - 0012-lp458922.patch
  - 0013-lp769148.patch
  - 0014-lp904548.patch
  - 0015-lp712584.patch
  - 0016-lp562831.patch
  - 0017-lp662906.patch
  - 0018-deny-home-pki-so.patch
  - 0019-lp899963.patch
  - 0020-lp912754a.patch
  - 0021-lp912754b.patch
  - 0022-workaround-lp851986.patch
  - 0023-syslog-ng-needs-dac-read-search.patch
  - 0024-fix-python-and-ruby-autogeneration.patch
  - 0025-lp914184.patch
  - 0026-lp914190.patch
  - 0027-lp914386.patch
  - 0028-testsuite-fixes.patch
  - 0029-lp917628.patch
  - 0030-lp916285.patch
  - 0031-lp917639.patch
  - 0032-lp917641.patch
  - 0033-add-ubuntu-helpers-to-plugins-common.patch
  - 0034-lp917859.patch
  - 0035-kde-should-use-kde4.patch
  - 0036-lp929531.patch
  - 0036-fix-manpage-errors.patch
* Rename 0037-add-aa-easyprof.patch 0003-add-aa-easyprof.patch
* debian/apparmor-profiles.postrm: clean out autogenerated files created by
  apparmor-profiles.postinst (Closes: 656451)
* debian/patches/0004-lp918879.patch: allow /etc/drirc in the X abstraction
  (LP: #918879)
* debian/patches/0005-disable-minimization.patch: do to LP: 940362,
  minimization is not working correctly. Disable it for now.
* debian/po/pt.po add new Portuguese translation, thanks to Pedro Ribeiro,
  (Closes: 651434).
* debian/control: do not require initramfs-tools on !linux-any
  (Closes: 651297).
* debian/{control,rules,debhelper/*}: move dh_apparmor into separate
  binary package, out of debhelper (Closes: 649784).
* debian/{control,rules}: fix up lack of real build-indep.
* debian/patches/0036-fix-manpage-errors.patch: minor man page cleanups.
* merge changes from Ubuntu (r1443).

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#include <tunables/global>
13
13
 
14
14
/usr/sbin/httpd2-prefork {
 
15
  #include <abstractions/apache2-common>
15
16
  #include <abstractions/base>
16
17
  #include <abstractions/consoles>
17
18
  #include <abstractions/kerberosclient>
78
79
  /usr/local/tomcat/conf/mod_jk.conf r,
79
80
  /usr/local/tomcat/conf/workers-ajp12.properties r,
80
81
  /usr/sbin/httpd2-prefork r,
81
 
  /usr/share/apache2/error/* r,
82
 
  /usr/share/apache2/error/include/* r,
83
82
  /usr/share/misc/magic.mime r,
84
83
  /usr/share/snmp/mibs r,
85
84
  /usr/share/snmp/mibs/*.{txt,mib} r,
125
124
  /srv/www/icons/*.{gif,jpg,png}     r,
126
125
  /srv/www/vhosts                    r,
127
126
  /srv/www/vhosts/**                 r,
128
 
  # SuSE location of the apache manual + error pages
129
 
  /usr/share/apache2/**              r,
130
127
 
131
128
  # php session state
132
129
  /var/lib/php/sess_*                rwl,
133
130
 
134
131
 
135
132
  ^HANDLING_UNTRUSTED_INPUT {
136
 
    #include <abstractions/nameservice>
 
133
    #include <abstractions/apache2-common>
137
134
    /var/log/apache2/*     w,
138
 
    /**.htaccess           r,
139
135
  }
140
136
 
141
137
  ^DEFAULT_URI {
142
 
    #include <abstractions/nameservice>
 
138
    #include <abstractions/apache2-common>
143
139
    #include <abstractions/base>
144
140
 
145
141
    # Note that mod_perl, mod_php, mod_python, etc, allows in-apache
176
172
    /srv/www/icons/*.{gif,jpg,png}     r,
177
173
    /srv/www/vhosts                    r,
178
174
    /srv/www/vhosts/**                 r,
179
 
    # SuSE location of the apache manual + error pages
180
 
    /usr/share/apache2/**              r,
181
175
 
182
176
    # php session state
183
177
    /var/lib/php/sess_*                rwl,