--- Begin Message ---
Package: mysql-dfsg-5.1
Version: 5.1.34-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu karmic ubuntu-patch
In Ubuntu, we've applied the attached patch to achieve the following:
- debian/additions/debian-start.inc.sh: support ANSI mode (LP: #310211)
More information can be found in the Ubuntu bug:
https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/310211
We thought you might be interested in doing the same.
-- System Information:
Debian Release: lenny/sid
APT prefers hardy-updates
APT policy: (500, 'hardy-updates'), (500, 'hardy-security'), (500, 'hardy')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24-24-server (SMP w/2 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u mysql-dfsg-5.1-5.1.34/debian/control
mysql-dfsg-5.1-5.1.34/debian/control
--- mysql-dfsg-5.1-5.1.34/debian/control
+++ mysql-dfsg-5.1-5.1.34/debian/control
@@ -1,7 +1,8 @@
Source: mysql-dfsg-5.1
Section: misc
Priority: optional
-Maintainer: Debian MySQL Maintainers <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Debian MySQL Maintainers
<[email protected]>
Uploaders: Norbert Tretkowski <[email protected]>
Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper (>= 4.1.16),
file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>=
7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev,
psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, gs,
dpatch, gawk, bison, lsb-release
Standards-Version: 3.8.0
@@ -12,7 +13,7 @@
Package: libmysqlclient16
Section: libs
Architecture: any
-Depends: mysql-common (>= ${source:Version}), ${shlibs:Depends}
+Depends: mysql-common (>= 5.1.30really5.0.75-0ubuntu5), ${shlibs:Depends}
Description: MySQL database client library
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
@@ -21,19 +22,20 @@
.
This package includes the client library.
-Package: libmysqlclient15-dev
+Package: libmysqlclient16-dev
Architecture: all
Section: libdevel
Depends: libmysqlclient-dev (>= ${source:Version})
Description: MySQL database development files - empty transitional package
This is an empty package that depends on libmysqlclient-dev to ease the
- transition for packages with versioned build-deps on libmysqlclient15-dev.
+ transition for packages with versioned build-deps on libmysqlclient16-dev.
Package: libmysqlclient-dev
Architecture: any
Section: libdevel
Depends: libmysqlclient16 (>= ${source:Version}), zlib1g-dev, ,
${shlibs:Depends}
-Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev
+Replaces: libmysqlclient16-dev (<< ${source:Version})
+Conflicts: libmysqlclient16-dev (<< ${source:Version}), libmysqlclient15-dev,
libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev
Description: MySQL database development files
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
@@ -42,26 +44,9 @@
.
This package includes development libraries and header files.
-Package: mysql-common
-Section: database
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mysql-common-4.1
-Provides: mysql-common-4.1
-Replaces: mysql-common-4.1
-Description: MySQL database common files (e.g. /etc/mysql/my.cnf)
- MySQL is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MySQL are speed, robustness and
- ease of use.
- .
- This package includes files needed by all versions of the client library
- (e.g. /etc/mysql/my.cnf).
-
Package: mysql-client-5.1
Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202),
mysql-common (>= ${source:Version}), libmysqlclient16 (>= ${source:Version}),
${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: virtual-mysql-client, mysql-client, mysql-client-4.1
+Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202),
mysql-common (>= 5.1.30really5.0.75-0ubuntu5), libmysqlclient16 (>=
${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0
Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0
Description: MySQL database client binaries
@@ -73,14 +58,25 @@
This package includes the client binaries and the additional tools
innotop and mysqlreport.
+Package: mysql-server-core-5.1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmysqlclient16 (>=
${binary:Version})
+Replaces: mysql-server-5.1 (<< ${source:Version})
+Description: MySQL database core server files
+ MySQL is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MySQL are speed, robustness and
+ ease of use.
+ .
+ This package includes the core server files, as used by Akonadi.
+
Package: mysql-server-5.1
Architecture: any
-Suggests: tinyca
-Recommends: mailx, libhtml-template-perl
-Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
-Depends: mysql-client-5.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
+Suggests: tinyca, mailx
+Recommends: libhtml-template-perl
+Pre-Depends: mysql-common (>= 5.1.30really5.0.75-0ubuntu5), adduser (>= 3.40),
debconf
+Depends: mysql-client-5.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10),
mysql-server-core-5.1 (>= ${binary:Version})
Conflicts: mysql-server (<< ${source:Version}), mysql-server-4.1
-Provides: mysql-server, virtual-mysql-server, mysql-server-5.0
Replaces: mysql-server (<< ${source:Version}), mysql-server-5.0
Description: MySQL database server binaries
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
@@ -93,25 +88,0 @@
-Package: mysql-server
-Section: database
-Architecture: all
-Depends: mysql-server-5.1
-Description: MySQL database server (metapackage depending on the latest
version)
- This is an empty package that depends on the current "best" version of
- mysql-server (currently mysql-server-5.1), as determined by the MySQL
- maintainers. Install this package if in doubt about which MySQL
- version you need. That will install the version recommended by the
- package maintainers.
- .
- MySQL is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MySQL are speed, robustness and
- ease of use.
-
-Package: mysql-client
-Section: database
-Architecture: all
-Depends: mysql-client-5.1
-Description: MySQL database client (metapackage depending on the latest
version)
- This is an empty package that depends on the current "best" version of
- mysql-client (currently mysql-client-5.1), as determined by the MySQL
- maintainers. Install this package if in doubt about which MySQL version
- you want, as this is the one we consider to be in the best shape.
diff -u mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.README.Debian
mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.README.Debian
--- mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.README.Debian
+++ mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.README.Debian
@@ -109,0 +110,10 @@
+
+
+* APPARMOR PROFILE
+==================
+If your system uses apparmor, please note that the shipped enforcing profile
+works with the default installation, and changes in your configuration may
+require changes to the installed apparmor profile. Please see
+https://wiki.ubuntu.com/DebuggingApparmor before filing a bug against this
+software.
+
diff -u mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.mysql.init
mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.mysql.init
--- mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.mysql.init
+++ mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.mysql.init
@@ -21,8 +21,11 @@
. /lib/lsb/init-functions
-SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
+# NOTE: Copying this script and changing the CONF variable here isn't
+# enough to run multiple instances of mysqld. Debian/Ubuntu doesn't
+# currently support such a configuration out of the box.
CONF=/etc/mysql/my.cnf
+SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
# priority can be overriden and "-s" adds output to stderr
@@ -51,9 +54,9 @@
## Do some sanity checks before even trying to start mysqld.
sanity_checks() {
# check for config file
- if [ ! -r /etc/mysql/my.cnf ]; then
- log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See
README.Debian.gz"
- echo "WARNING: /etc/mysql/my.cnf cannot be read. See
README.Debian.gz" | $ERR_LOGGER
+ if [ ! -r "$CONF" ]; then
+ log_warning_msg "$0: WARNING: $CONF cannot be read. See README.Debian.gz"
+ echo "WARNING: $CONF cannot be read. See README.Debian.gz"
| $ERR_LOGGER
fi
# check for diskspace shortage
diff -u mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.postinst
mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.postinst
--- mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.postinst
+++ mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.postinst
@@ -28,6 +28,7 @@
set_mysql_rootpw() {
# forget we ever saw the password. don't use reset to keep the seen
status
db_set mysql-server/root_password ""
+ db_set mysql-server/root_password_again ""
tfile=`mktemp`
if [ ! -f "$tfile" ]; then
@@ -200,7 +201,7 @@
" Index_priv='Y', Alter_priv='Y', Super_priv='Y', Show_db_priv='Y', "\
" Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y',
"\
" Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\
- " Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y'
"\
+ " Show_view_priv='Y', Create_routine_priv='Y',
Alter_routine_priv='Y', "\
" Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y' "`;
fix_privs=`/bin/echo -e \
"USE mysql;\n" \
@@ -237,6 +238,11 @@
set +e
echo "$install_plugins" |
$MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
set -e
+
+ # Reload AppArmor profile
+ if [ -x /etc/init.d/apparmor ]; then
+ invoke-rc.d apparmor force-reload || true
+ fi
;;
abort-upgrade|abort-remove|abort-configure)
diff -u mysql-dfsg-5.1-5.1.34/debian/rules mysql-dfsg-5.1-5.1.34/debian/rules
--- mysql-dfsg-5.1-5.1.34/debian/rules
+++ mysql-dfsg-5.1-5.1.34/debian/rules
@@ -65,9 +65,9 @@
sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
CC=$${MYSQL_BUILD_CC:-gcc} \
- CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O3 -DBIG_JOINS=1
${FORCE_FPIC_CFLAGS}"} \
+ CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O3 -DBIG_JOINS=1
${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
CXX=$${MYSQL_BUILD_CXX:-g++} \
- CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1
-felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS}"} \
+ CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1
-felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS}
-fno-strict-aliasing"} \
./configure \
--build=${DEB_BUILD_GNU_TYPE} \
--host=${DEB_HOST_GNU_TYPE} \
@@ -225,6 +225,8 @@
install -m 0755 scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
mkdir -p $(TMP)/usr/share/doc/mysql-server-5.1/examples
mv $(TMP)/usr/share/mysql/*cnf
$(TMP)/usr/share/doc/mysql-server-5.1/examples/
+ mv $(TMP)/usr/mysql-test/ $(TMP)/usr/share/mysql/mysql-test/
+ mv $(TMP)/usr/sql-bench/ $(TMP)/usr/share/mysql/sql-bench/
rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
$(TMP)/usr/share/mysql/mysql-log-rotate \
$(TMP)/usr/share/mysql/mysql.server \
@@ -246,6 +248,9 @@
cp debian/mysql-server-5.1.mysql-server.logrotate
$$d/_etc_logrotate.d_mysql-server; \
cp debian/additions/debian-start $$d/_etc_mysql_debian-start;
+ # install AppArmor profile
+ install -D -m 644 debian/apparmor-profile
$(TMP)/etc/apparmor.d/usr.sbin.mysqld
+
dh_movefiles
# Build architecture-independent files here.
diff -u mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.dirs
mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.dirs
--- mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.dirs
+++ mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.dirs
@@ -1,3 +1,4 @@
+etc/apparmor.d/force-complain
etc/init.d
etc/logrotate.d
usr/bin
diff -u mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.files
mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.files
--- mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.files
+++ mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.files
@@ -1,4 +1,5 @@
usr/lib/mysql/*so*
+etc/apparmor.d/usr.sbin.mysqld
etc/mysql/debian-start
usr/bin/msql2mysql
usr/bin/my_print_defaults
@@ -22,7 +23,6 @@
usr/bin/replace
usr/bin/resolve_stack_dump
usr/bin/resolveip
-usr/sbin/mysqld
usr/share/doc/mysql-server-5.1/
usr/share/lintian/overrides/mysql-server-5.1
usr/share/man/man1/msql2mysql.1
@@ -52,2 +52,10 @@
-usr/share/man/man8/mysqld.8
-usr/share/mysql/
+usr/share/mysql/debian-start.inc.sh
+usr/share/mysql/echo_stderr
+usr/share/mysql/errmsg.txt
+usr/share/mysql/fill_help_tables.sql
+usr/share/mysql/mysqld_multi.server
+usr/share/mysql/mysql_fix_privilege_tables.sql
+usr/share/mysql/mysql_system_tables_data.sql
+usr/share/mysql/mysql_system_tables.sql
+usr/share/mysql/mysql_test_data_timezone.sql
+usr/share/mysql/ndb-config-2-node.ini
diff -u mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.config
mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.config
--- mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.config
+++ mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.config
@@ -13,13 +13,14 @@
db_go
fi
-# only ask this question on fresh installs and during "reconfiguration".
+# only ask this question on fresh installs, during "reconfiguration" and when
+# not upgrading from an existing 5.0 installation.
# there is also an additional check for empty root passwords in the
# postinst script when the tools are available for us to use.
-if [ "$1" = "configure" ] && [ -z "$2" ] || [ "$1" = "reconfigure" ]; then
+if [ "$1" = "configure" ] && ([ -z "$2" ] && [ ! -e
"/var/lib/mysql/debian-5.0.flag" ] ) || [ "$1" = "reconfigure" ]; then
while :; do
RET=""
- db_input medium mysql-server/root_password || true
+ db_input high mysql-server/root_password || true
db_go
db_get mysql-server/root_password
# if password isn't empty we ask for password verification
@@ -29,7 +30,7 @@
break
fi
ROOT_PW="$RET"
- db_input medium mysql-server/root_password_again || true
+ db_input high mysql-server/root_password_again || true
db_go
db_get mysql-server/root_password_again
if [ "$RET" == "$ROOT_PW" ]; then
diff -u mysql-dfsg-5.1-5.1.34/debian/changelog
mysql-dfsg-5.1-5.1.34/debian/changelog
diff -u mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.postrm
mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.postrm
--- mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.postrm
+++ mysql-dfsg-5.1-5.1.34/debian/mysql-server-5.1.postrm
@@ -78,6 +78,9 @@
fi
# (normally) End automatically added section
+if [ "$1" = "purge" ] ; then
+ rm -f /etc/apparmor.d/force-complain/usr.sbin.mysqld >/dev/null 2>&1 ||
true
+fi
# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.1 is
installed
exit 0
diff -u mysql-dfsg-5.1-5.1.34/debian/additions/debian-start.inc.sh
mysql-dfsg-5.1-5.1.34/debian/additions/debian-start.inc.sh
--- mysql-dfsg-5.1-5.1.34/debian/additions/debian-start.inc.sh
+++ mysql-dfsg-5.1-5.1.34/debian/additions/debian-start.inc.sh
@@ -19,9 +19,9 @@
# We have to use xargs in this case, because a for loop barfs on the
# spaces in the thing to be looped over.
LC_ALL=C $MYSQL --skip-column-names --batch -e '
- select concat("select count(*) into @discard from `",
- TABLE_SCHEMA, "`.`", TABLE_NAME, "`")
- from information_schema.TABLES where ENGINE="MyISAM"' | \
+ select concat('\''select count(*) into @discard from `'\'',
+ TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'')
+ from information_schema.TABLES where ENGINE='\''MyISAM'\' | \
xargs -i $MYSQL --skip-column-names --silent --batch \
--force -e "{}" >$tempfile
if [ -s $tempfile ]; then
diff -u mysql-dfsg-5.1-5.1.34/debian/additions/my.cnf
mysql-dfsg-5.1-5.1.34/debian/additions/my.cnf
--- mysql-dfsg-5.1-5.1.34/debian/additions/my.cnf
+++ mysql-dfsg-5.1-5.1.34/debian/additions/my.cnf
@@ -32,6 +32,13 @@
#
# * Basic Settings
#
+
+#
+# * IMPORTANT
+# If you make changes to these settings and your system uses apparmor, you
may
+# also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
+#
+
user = mysql
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
@@ -39,7 +46,6 @@
basedir = /usr
datadir = /var/lib/mysql
tmpdir = /tmp
-language = /usr/share/mysql/english
skip-external-locking
#
# For compatibility to other Debian packages that still use
diff -u mysql-dfsg-5.1-5.1.34/debian/po/ar.po
mysql-dfsg-5.1-5.1.34/debian/po/ar.po
--- mysql-dfsg-5.1-5.1.34/debian/po/ar.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/ar.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: templates\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-05-01 13:04+0300\n"
"Last-Translator: Ossama M. Khayat <[email protected]>\n"
"Language-Team: Arabic <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/gl.po
mysql-dfsg-5.1-5.1.34/debian/po/gl.po
--- mysql-dfsg-5.1-5.1.34/debian/po/gl.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/gl.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-04-20 09:44+0200\n"
"Last-Translator: Jacobo Tarrio <[email protected]>\n"
"Language-Team: Galician <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/cs.po
mysql-dfsg-5.1-5.1.34/debian/po/cs.po
--- mysql-dfsg-5.1-5.1.34/debian/po/cs.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/cs.po
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-05-01 13:01+0200\n"
"Last-Translator: Miroslav Kure <[email protected]>\n"
"Language-Team: Czech <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/pt_BR.po
mysql-dfsg-5.1-5.1.34/debian/po/pt_BR.po
--- mysql-dfsg-5.1-5.1.34/debian/po/pt_BR.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/pt_BR.po
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-04-21 15:59-0300\n"
"Last-Translator: André Luís Lopes <[email protected]>\n"
"Language-Team: Debian-BR Project <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/es.po
mysql-dfsg-5.1-5.1.34/debian/po/es.po
--- mysql-dfsg-5.1-5.1.34/debian/po/es.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/es.po
@@ -41,7 +41,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-05-28 22:21+0200\n"
"Last-Translator: Javier Fernández-Sanguino <[email protected]>\n"
"Language-Team: Debian l10 Spanish <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/fr.po
mysql-dfsg-5.1-5.1.34/debian/po/fr.po
--- mysql-dfsg-5.1-5.1.34/debian/po/fr.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/fr.po
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-04-19 22:43+0200\n"
"Last-Translator: Christian Perrier <[email protected]>\n"
"Language-Team: French <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/eu.po
mysql-dfsg-5.1-5.1.34/debian/po/eu.po
--- mysql-dfsg-5.1-5.1.34/debian/po/eu.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/eu.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1_5.0.26-3-debconf_eu\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-02-19 09:33+0100\n"
"Last-Translator: Piarres Beobide <[email protected]>\n"
"Language-Team: Euskara <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/nl.po
mysql-dfsg-5.1-5.1.34/debian/po/nl.po
--- mysql-dfsg-5.1-5.1.34/debian/po/nl.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/nl.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2006-02-19 10:20+0100\n"
"Last-Translator: Thijs Kinkhorst <[email protected]>\n"
"Language-Team: Debian-Dutch <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/it.po
mysql-dfsg-5.1-5.1.34/debian/po/it.po
--- mysql-dfsg-5.1-5.1.34/debian/po/it.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/it.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1 5.0.38 italian debconf templates\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-04-22 15:43+0200\n"
"Last-Translator: Luca Monducci <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/ro.po
mysql-dfsg-5.1-5.1.34/debian/po/ro.po
--- mysql-dfsg-5.1-5.1.34/debian/po/ro.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/ro.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: po-debconf://mysql-dfsg\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2006-12-20 21:27+0200\n"
"Last-Translator: stan ioan-eugen <[email protected]>\n"
"Language-Team: romanian <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/ca.po
mysql-dfsg-5.1-5.1.34/debian/po/ca.po
--- mysql-dfsg-5.1-5.1.34/debian/po/ca.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/ca.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-4.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2004-01-31 19:20GMT\n"
"Last-Translator: Aleix Badia i Bosch <[email protected]>\n"
"Language-Team: Debian L10n Catalan <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/templates.pot
mysql-dfsg-5.1-5.1.34/debian/po/templates.pot
--- mysql-dfsg-5.1-5.1.34/debian/po/templates.pot
+++ mysql-dfsg-5.1-5.1.34/debian/po/templates.pot
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <em...@address>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/pt.po
mysql-dfsg-5.1-5.1.34/debian/po/pt.po
--- mysql-dfsg-5.1-5.1.34/debian/po/pt.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/pt.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-05-05 21:01+0100\n"
"Last-Translator: Miguel Figueiredo <[email protected]>\n"
"Language-Team: Portuguese <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/da.po
mysql-dfsg-5.1-5.1.34/debian/po/da.po
--- mysql-dfsg-5.1-5.1.34/debian/po/da.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/da.po
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-4.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-05-30 22:41+0200\n"
"Last-Translator: Claus Hindsgaul <[email protected]>\n"
"Language-Team: Danish\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/tr.po
mysql-dfsg-5.1-5.1.34/debian/po/tr.po
--- mysql-dfsg-5.1-5.1.34/debian/po/tr.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/tr.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-4.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2004-06-05 08:53+0300\n"
"Last-Translator: Gürkan Aslan <[email protected]>\n"
"Language-Team: Turkish <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/ru.po
mysql-dfsg-5.1-5.1.34/debian/po/ru.po
--- mysql-dfsg-5.1-5.1.34/debian/po/ru.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/ru.po
@@ -17,7 +17,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1_5.0.32-6_ru\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-02-19 11:28+0900\n"
"Last-Translator: Yuriy Talakan' <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/de.po
mysql-dfsg-5.1-5.1.34/debian/po/de.po
--- mysql-dfsg-5.1-5.1.34/debian/po/de.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/de.po
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1_5.0.41-2_de\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-05-29 16:05+0200\n"
"Last-Translator: Alwin Meschede <[email protected]>\n"
"Language-Team: german <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/sv.po
mysql-dfsg-5.1-5.1.34/debian/po/sv.po
--- mysql-dfsg-5.1-5.1.34/debian/po/sv.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/sv.po
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-02-18 14:48+0100\n"
"Last-Translator: Andreas Henriksson <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/ja.po
mysql-dfsg-5.1-5.1.34/debian/po/ja.po
--- mysql-dfsg-5.1-5.1.34/debian/po/ja.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/ja.po
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1 5.0.32-6\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-02-18 22:25+0900\n"
"Last-Translator: Hideki Yamane (Debian-JP) <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
diff -u mysql-dfsg-5.1-5.1.34/debian/po/nb.po
mysql-dfsg-5.1-5.1.34/debian/po/nb.po
--- mysql-dfsg-5.1-5.1.34/debian/po/nb.po
+++ mysql-dfsg-5.1-5.1.34/debian/po/nb.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: mysql_nb\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2009-04-20 20:33+0200\n"
+"POT-Creation-Date: 2009-06-25 12:57-0400\n"
"PO-Revision-Date: 2007-02-18 12:13+0100\n"
"Last-Translator: Bjørn Steensrud <[email protected]>\n"
"Language-Team: Norwegian Bokmål <[email protected]>\n"
only in patch2:
unchanged:
--- mysql-dfsg-5.1-5.1.34.orig/debian/apparmor-profile
+++ mysql-dfsg-5.1-5.1.34/debian/apparmor-profile
@@ -0,0 +1,36 @@
+# vim:syntax=apparmor
+# Last Modified: Tue Jun 19 17:37:30 2007
+#include <tunables/global>
+
+/usr/sbin/mysqld {
+ #include <abstractions/base>
+ #include <abstractions/nameservice>
+ #include <abstractions/user-tmp>
+ #include <abstractions/mysql>
+ #include <abstractions/winbind>
+
+ capability dac_override,
+ capability sys_resource,
+ capability setgid,
+ capability setuid,
+
+ network tcp,
+
+ /etc/hosts.allow r,
+ /etc/hosts.deny r,
+
+ /etc/mysql/*.pem r,
+ /etc/mysql/conf.d/ r,
+ /etc/mysql/conf.d/* r,
+ /etc/mysql/my.cnf r,
+ /usr/sbin/mysqld mr,
+ /usr/share/mysql/** r,
+ /var/log/mysql.log rw,
+ /var/log/mysql.err rw,
+ /var/lib/mysql/ r,
+ /var/lib/mysql/** rwk,
+ /var/log/mysql/ r,
+ /var/log/mysql/* rw,
+ /var/run/mysqld/mysqld.pid w,
+ /var/run/mysqld/mysqld.sock w,
+}
only in patch2:
unchanged:
--- mysql-dfsg-5.1-5.1.34.orig/debian/mysql-server-core-5.1.files
+++ mysql-dfsg-5.1-5.1.34/debian/mysql-server-core-5.1.files
@@ -0,0 +1,26 @@
+usr/sbin/mysqld
+usr/share/man/man8/mysqld.8
+usr/share/mysql/charsets
+usr/share/mysql/czech
+usr/share/mysql/danish
+usr/share/mysql/dutch
+usr/share/mysql/english
+usr/share/mysql/estonian
+usr/share/mysql/french
+usr/share/mysql/german
+usr/share/mysql/greek
+usr/share/mysql/hungarian
+usr/share/mysql/italian
+usr/share/mysql/japanese
+usr/share/mysql/korean
+usr/share/mysql/norwegian
+usr/share/mysql/norwegian-ny
+usr/share/mysql/polish
+usr/share/mysql/portuguese
+usr/share/mysql/romanian
+usr/share/mysql/russian
+usr/share/mysql/serbian
+usr/share/mysql/slovak
+usr/share/mysql/spanish
+usr/share/mysql/swedish
+usr/share/mysql/ukrainian
--- End Message ---
