summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2017-10-02 19:14:21 +0300
committerIgor Pashev <pashev.igor@gmail.com>2017-10-02 19:14:21 +0300
commit61ae84b815fe9bf8c24193f7143f4626acd10836 (patch)
tree53835ad66cec4c6fea206b2be072610376b42af4
parentc6e5492129395c48edb57ef96b6adc582f38d0a6 (diff)
downloadmariadb-10.1-61ae84b815fe9bf8c24193f7143f4626acd10836.tar.gz
Disable apparmor altogether
-rw-r--r--debian/control1
-rwxr-xr-xdebian/mariadb-server-10.1.install1
-rwxr-xr-xdebian/rules3
3 files changed, 0 insertions, 5 deletions
diff --git a/debian/control b/debian/control
index 410027e..44b62b5 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: bison,
cmake,
cracklib-runtime,
debhelper (>= 9),
- dh-apparmor [linux-any],
dh-exec,
dh-systemd [linux-any],
dh-smf [illumos-any],
diff --git a/debian/mariadb-server-10.1.install b/debian/mariadb-server-10.1.install
index 7508238..2b9d6c6 100755
--- a/debian/mariadb-server-10.1.install
+++ b/debian/mariadb-server-10.1.install
@@ -10,7 +10,6 @@ debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
debian/additions/source_mariadb-10.1.py usr/share/apport/package-hooks
debian/mariadb-server-10.1.insserv.conf => etc/insserv.conf.d/mariadb
-etc/apparmor.d/usr.sbin.mysqld
[linux-any] lib/systemd/system/mariadb@.service
[linux-any] lib/systemd/system/mariadb.service
usr/bin/aria_chk
diff --git a/debian/rules b/debian/rules
index 0118624..c91f9a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,9 +141,6 @@ endif
# to satisfy Debian reproducible build requirements
nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.1/mysqld.sym.gz
- # rename and install AppArmor profile
- install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
-
override_dh_installlogrotate-arch:
dh_installlogrotate --name mysql-server