diff -u mysql-dfsg-5.1-5.1.41/debian/changelog mysql-dfsg-5.1-5.1.41/debian/changelog --- mysql-dfsg-5.1-5.1.41/debian/changelog +++ mysql-dfsg-5.1-5.1.41/debian/changelog @@ -1,3 +1,10 @@ +mysql-dfsg-5.1 (5.1.41-3ubuntu12.1) lucid-proposed; urgency=low + + * debian/mysql-server-5.1.mysql.upstart: load AppArmor profile since + mysql can start before AppArmor now (LP: #573206). + + -- Kees Cook Sat, 01 May 2010 12:06:10 -0700 + mysql-dfsg-5.1 (5.1.41-3ubuntu12) lucid; urgency=low * Also move usr/bin/mysql_upgrade to the core package, as addition to the diff -u mysql-dfsg-5.1-5.1.41/debian/mysql-server-5.1.mysql.upstart mysql-dfsg-5.1-5.1.41/debian/mysql-server-5.1.mysql.upstart --- mysql-dfsg-5.1-5.1.41/debian/mysql-server-5.1.mysql.upstart +++ mysql-dfsg-5.1-5.1.41/debian/mysql-server-5.1.mysql.upstart @@ -16,6 +16,10 @@ #Sanity checks [ -r $HOME/my.cnf ] [ -d /var/run/mysqld ] || install -m 755 -o mysql -g root -d /var/run/mysqld + # Load AppArmor profile + if aa-status --enabled 2>/dev/null; then + apparmor_parser -r /etc/apparmor.d/usr.sbin.mysqld || true + fi LC_ALL=C BLOCKSIZE= df --portability /var/lib/mysql/. | tail -n 1 | awk '{ exit ($4<4096) }' end script