Bug#319526: [patch] for CAN-2005-1636

[Christian Hammers]

tags 319526 + confirmed patch pending
thanks

Hello

The attached patch has been forwarded separately to the Security Team
which will probably make a DSA from it.

bye,

-christian-


diff -u mysql-dfsg-4.1-4.1.11a/debian/patches/00list 
mysql-dfsg-4.1-4.1.11a/debian/patches/00list
--- mysql-dfsg-4.1-4.1.11a/debian/patches/00list
+++ mysql-dfsg-4.1-4.1.11a/debian/patches/00list
@@ -16,0 +17 @@
+60_SECURITY_CAN-2005-1636.dpatch
diff -u mysql-dfsg-4.1-4.1.11a/debian/po/ru.po 
mysql-dfsg-4.1-4.1.11a/debian/po/ru.po
--- mysql-dfsg-4.1-4.1.11a/debian/po/ru.po
+++ mysql-dfsg-4.1-4.1.11a/debian/po/ru.po
@@ -1,36 +1,35 @@
-# Russian messages:
-# Ilgiz Kalmetev <[EMAIL PROTECTED]>, 2003
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
+# translation of mysql-dfsg-4.1_4.1.11a-2_ru.po to Russian
+# Russian messages:
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Ilgiz Kalmetev <[EMAIL PROTECTED]>, 2003.
+# Yuriy Talakan' <[EMAIL PROTECTED]>, 2005.
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-4.1\n"
+"Project-Id-Version: mysql-dfsg-4.1_4.1.11a-2_ru\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-05-19 00:20+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
-"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
+"PO-Revision-Date: 2005-05-22 21:56+1000\n"
+"Last-Translator: Yuriy Talakan' <[EMAIL PROTECTED]>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=KOI8-R\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:3
 msgid "Important note for NIS/YP users!"
-msgstr "÷ÁÖÎÏÅ ÚÁÍÅÞÁÎÉÅ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ NIS/YP!"
+msgstr "ВажМПе заЌечаМОе Ўля пПльзПвателей 
NIS/YP!"
 
 #. Type: note
 #. Description
@@ -40,9 +39,9 @@
 "and ensure yourself that /var/lib/mysql has the right permissions (the uid/"
 "gid may be different)."
 msgstr ""
-"þÔÏÂÙ ÉÓÐÏÌØÚÏ×ÁÔØ mysql, ÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ ÜË×É×ÁÌÅÎÔÎÙÅ ÐÏÌØÚÏ×ÁÔÅÌÑ É "
-"ÇÒÕÐÐÕ ËÁË ÕËÁÚÁÎÏ ÎÉÖÅ É ÕÂÅÄÉÔØÓÑ, ÞÔÏ /var/lib/mysql ÉÍÅÅÔ ÐÒÁ×ÉÌØÎÙÅ "
-"ÐÒÁ×Á (uid/gid ÍÏÇÕÔ ÏÔÌÉÞÁÔØÓÑ)."
+"ЧтПбы ОспПльзПвать mysql, Вы ЎПлжМы 
устаМПвОть эквОвалеМтМые пПльзПвателя О "
+"группу как указаМП МОже О убеЎОться, чтП 
/var/lib/mysql ОЌеет правОльМые "
+"права (uid/gid ЌПгут ПтлОчаться)."
 
 #. Type: note
 #. Description
@@ -68,7 +67,7 @@
 #. Description
 #: ../mysql-server-4.1.templates:16
 msgid "Update Hints"
-msgstr ""
+msgstr "ППЎсказкО пП ПбМПвлеМОю"
 
 #. Type: note
 #. Description
@@ -78,19 +77,22 @@
 "make use of it mysql_fix_privilege_tables must be executed manually. The "
 "script is not supposed to give any user more rights that he had before,"
 msgstr ""
+"ИзреЎка, МапрОЌер в МПвПй старшей версОО, 
сОстеЌа прОвОлегОй улучшается. "
+"ЧтПбы ОспПльзПвать её, МаЎП вручМую 
запустОть mysql_fix_privilege_tables. "
+"ПреЎпПлагается, чтП этПт сцеМарОй Ма Ўаст 
пПльзПвателю бПльше прав, чеЌ у "
+"МегП былП,"
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:16
-#, fuzzy
 msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html";
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÒÏÞÔÉÔÅ http://www.mysql.com/doc/en/Upgrade.html";
+msgstr "ППжалуйста, прПчтОте 
http://www.mysql.com/doc/en/Upgrade.html";
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
 msgid "Install Hints"
-msgstr ""
+msgstr "ППЎсказкО пП устаМПвке"
 
 #. Type: note
 #. Description
@@ -100,57 +102,58 @@
 "of /var/lib/mysql or /var/log/mysql gets accidently removed and have "
 "manually be restored."
 msgstr ""
+"ПрО ПбМПвлеМОО с MySQL 3.23, кПтПрый 
пПставлялся с Debian Woody, "
+"сОЌвПлОческОе ссылкО, МахПЎОвшОеся в 
/var/lib/mysql ОлО /var/log/mysql, "
+"случайМП уЎаляются О ЎПлжМы быть 
вПсстаМПвлеМы вручМую."
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
-#, fuzzy
 msgid ""
 "MySQL will only install if you have a non-numeric hostname that is "
 "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command returns "
 "\"myhostname\" then there must be a line like \"10.0.0.1 myhostname\"."
 msgstr ""
-"MySQL ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎ ÔÏÌØËÏ × ÔÏÍ ÓÌÕÞÁÅ,  ÅÓÌÉ  ×ÁÛÁ  ÍÁÛÉÎÁ  ÉÍÅÅÔ "
-"îåþéóìï÷ïå ÉÍÑ ÈÏÓÔÁ, ËÏÔÏÒÏÅ ÍÏÖÎÏ ÐÅÒÅ×ÅÓÔÉ × ÞÉÓÌÏ×ÏÊ ×ÉÄ Ó ÐÏÍÏÝØÀ "
-"ÆÁÊÌÁ /etc/hosts. îÁÐÒÉÍÅÒ, ÅÓÌÉ ËÏÍÁÎÄÁ \"hostname\" ×ÏÚ×ÒÁÝÁÅÔ  ÓÔÒÏËÕ "
-"\"myhostname\", ÔÏ × ÆÁÊÌÅ ÄÏÌÖÎÁ ÂÙÔØ ÓÔÒÏËÁ \"10.0.0.1 myhostname\"."
+"MySQL буЎет устаМПвлеМ тПлькП в тПЌ случае,  
еслО  ваша  ЌашОМа  ОЌеет "
+"НЕЧИСЛОВОЕ ОЌя хПста, кПтПрПе ЌПжМП 
перевестО в чОслПвПй вОЎ с пПЌПщью "
+"файла /etc/hosts. НапрОЌер, еслО кПЌаМЎа \"hostname\" 
вПзвращает  стрПку "
+"\"myhostname\", тП в файле ЎПлжМа быть стрПка 
\"10.0.0.1 myhostname\"."
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
-#, fuzzy
 msgid ""
 "A new mysql user \"debian-sys-maint\" will be created. This mysql account is "
 "used in the start/stop and cron scripts. Don't delete."
 msgstr ""
-"âÕÄÅÔ ÓÏÚÄÁÎ ÎÏ×ÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ mysql  \"debian-sys-maint\".  ïÎ ÎÕÖÅÎ × "
-"ÓÃÅÎÁÒÉÑÈ ÚÁÐÕÓËÁ/ÏÓÔÁÎÏ×Á É cron. îÅ ÕÄÁÌÑÊÔÅ ÅÇÏ."
+"БуЎет сПзЎаМ МПвый пПльзПватель mysql  
\"debian-sys-maint\".  ОМ МужеМ в "
+"сцеМарОях запуска/ПстаМПва О cron. Не 
уЎаляйте егП."
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
-#, fuzzy
 msgid ""
 "Please remember to set a PASSWORD for the MySQL root user! If you use a /"
 "root/.my.cnf, always write the \"user\" and the \"password\" lines in there, "
 "never only the password!"
 msgstr ""
-"îÅ ÚÁÂÙ×ÁÊÔÅ ÕÓÔÁÎÏ×ÉÔØ ðáòïìø ÄÌÑ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ  MySQL!  åÓÌÉ  ×Ù "
-"ÉÓÐÏÌØÚÕÅÔÅ  /root/.my.cnf,  ÔÏ  ×ÓÅÇÄÁ  ÐÏÍÅÝÁÊÔÅ  ×  ÎÅÇÏ ÏÂÅ ÓÔÒÏËÉ \"user"
-"\" É \"password\", Á ÎÅ ÏÄÎÕ ÔÏÌØËÏ ÓÔÒÏËÕ Ó ÐÁÒÏÌÅÍ!  óÍ.  ÄÏËÕÍÅÎÔ /usr/"
-"share/doc/mysql-server/README.Debian."
+"Не забывайте устаМПвОть ПАРОЛЬ Ўля 
суперпПльзПвателя  MySQL!  ЕслО  вы "
+"ОспПльзуете  /root/.my.cnf,  тП  всегЎа  
пПЌещайте  в  МегП Пбе стрПкО \"user"
+"\" О \"password\", а Ме ПЎМу тПлькП стрПку с 
парПлеЌ!"
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
 msgid "See /usr/share/doc/mysql-server-4.1/README.Debian for more information."
 msgstr ""
+"СЌПтрОте /usr/share/doc/mysql-server-4.1/README.Debian Ўля 
бПлее пПлМПй "
+"ОМфПрЌацОО."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-4.1.templates:46
 msgid "Remove the databases from all MySQL versions?"
-msgstr ""
+msgstr "УЎалОть базы ЎаММых Ўля всех версОй 
MySQL?"
 
 #. Type: boolean
 #. Description
@@ -159,12 +162,14 @@
 "Should I remove the complete /var/lib/mysql directory tree which is used by "
 "all MySQL versions, not necessarily only the one you are about to purge?"
 msgstr ""
+"ДПлжеМ лО я пПлМПстью уЎалОть ЎеревП 
ЎОректПрОй /var/lib/mysql, кПтПрПе "
+"ОспПльзуется всеЌО версОяЌО MySQL, а Ме 
тПлькП тПй, кПтПрую вы уЎаляете?"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-4.1.templates:53
 msgid "Should MySQL start on boot?"
-msgstr "úÁÐÕÓËÁÔØ MySQL ÐÒÉ ÚÁÇÒÕÚËÅ ÓÉÓÔÅÍÙ?"
+msgstr "Запускать MySQL прО загрузке сОстеЌы?"
 
 #. Type: boolean
 #. Description
@@ -176,95 +181,3 @@
-"MySQL ÍÏÖÅÔ ÚÁÐÕÓËÁÔØÓÑ ÐÒÉ ÚÁÇÒÕÚËÅ ÓÉÓÔÅÍÙ, ÌÉÂÏ ÔÏÌØËÏ ÅÓÌÉ ×Ù ×ÒÕÞÎÕÀ "
-"××ÅÄÅÔÅ ËÏÍÁÎÄÕ '/etc/init.d/mysql start'. ÷ÙÂÅÒÉÔÅ 'ÄÁ', ÅÓÌÉ ÈÏÔÉÔÅ "
-"ÚÁÐÕÓËÁÔØ ÅÇÏ Á×ÔÏÍÁÔÉÞÅÓËÉ."
-
-#, fuzzy
-#~ msgid ""
-#~ "Should I remove all databases below /var/lib/mysql as you are purging the "
-#~ "mysql-server package?"
-#~ msgstr "õÄÁÌÑØÂ ×ÓÅ ÂÁÚÙ ÄÁÎÎÙÈ ÐÒÉ \"ÕÎÉÞÔÏÖÅÎÉÉ\" ÐÁËÅÔÁ mysql-server?"
-
-#~ msgid ""
-#~ "Networking is disabled by default for security reasons. You can enable it "
-#~ "by commenting out the skip-networking option in /etc/mysql/my.cnf."
-#~ msgstr ""
-#~ "äÏÓÔÕÐ  ÐÏ ÓÅÔÉ ÐÏ ÕÍÏÌÞÁÎÉÀ ÚÁÐÒÅÝÅÎ  ÐÏ  ÐÒÉÞÉÎÁÍ  ÂÅÚÏÐÁÓÎÏÓÔÉ.  ÷Ù "
-#~ "ÍÏÖÅÔÅ ÅÇÏ ÒÁÚÒÅÛÉÔØ,  ÒÁÓËÏÍÍÅÎÔÉÒÏ×Á×  ÏÐÃÉÀ skip-networking × ÆÁÊÌÅ /"
-#~ "etc/mysql/my.cnf."
-
-#~ msgid "security and update notice"
-#~ msgstr "úÁÍÅÞÁÎÉÑ ÐÏ ÂÅÚÏÐÁÓÎÏÓÔÉ É Ï ÏÂÎÏ×ÌÅÎÉÉ"
-
-#~ msgid ""
-#~ "Should I remove everything below /var/lib/mysql when you purge the mysql-"
-#~ "server package with the \"dpkg --purge mysql-server\" command (i.e. "
-#~ "remove everything including the configuration) somewhen? (default is not)"
-#~ msgstr ""
-#~ "îÕÖÎÏ  ÌÉ  ÕÄÁÌÑÔØ  ×ÓÅ  ÓÏÄÅÒÖÉÍÏÅ  ËÁÔÁÌÏÇÁ  /var/lib/mysql,  ËÏÇÄÁ "
-#~ "ÕÓÔÁÎÏ×ÌÅÎÎÙÊ ÐÁËÅÔ mysql-server ÕÎÉÞÔÏÖÁÅÔÓÑ ËÏÍÁÎÄÏÊ  \"dpkg --purge "
-#~ "mysql-server\" (Ô.Å. ËÏÍÁÎÄÏÊ \"ÕÄÁÌÉÔØ ×ÓÅ,  ×ËÌÀÞÁÑ  ÎÁÓÔÒÏÊËÉ\")?  ðÏ "
-#~ "ÕÍÏÌÞÁÎÉÀ ÎÅ ÕÄÁÌÑÔØ."
-
-#~ msgid "Make MySQL reachable via network?"
-#~ msgstr "òÁÚÒÅÛÉÔØ ÄÏÓÔÕÐ Ë MySQL ÐÏ ÓÅÔÉ?"
-
-#~ msgid ""
-#~ "Should MySQL listen on a network reachable TCP port? This is not "
-#~ "necessary for use on a single computer and could be a security problem."
-#~ msgstr ""
-#~ "äÏÌÖÅÎ ÌÉ MySQL ÐÒÉÎÉÍÁÔØ ÚÁÐÒÏÓÙ ÎÁ  ÓÏÅÄÉÎÅÎÉÅ  ÎÁ  TCP  ÐÏÒÔÕ?  üÔÏ "
-#~ "ÎÅÏÂÑÚÁÔÅÌØÎÏ, ÅÓÌÉ ËÌÉÅÎÔÙ MySQL  ÒÁÓÐÏÌÏÖÅÎÙ  ÎÁ ÔÏÍ ÖÅ ËÏÍÐØÀÔÅÒÅ É "
-#~ "ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë ÐÒÏÂÌÅÍÁÍ ÂÅÚÏÐÁÓÎÏÓÔÉ."
-
-#~ msgid "Enable chroot mode?"
-#~ msgstr "òÁÂÏÔÁÔØ × ÒÅÖÉÍÅ chroot?"
-
-#~ msgid ""
-#~ "MySQL is able to jail itself into the /var/lib/mysql_jail directory so "
-#~ "that users cannot modify any files outside this directory. This improves "
-#~ "resistence against crackers, too, as they are not able to modify system "
-#~ "files."
-#~ msgstr ""
-#~ "MySQL ÍÏÖÅÔ ÒÁÂÏÔÁÔØ × \"ÐÅÓÏÞÎÉÃÅ\" × ËÁÔÁÌÏÇÅ /var/lib/mysql_jail, ÔÁË "
-#~ "ÞÔÏ ÐÏÌØÚÏ×ÁÔÅÌÉ ÎÅ ÓÍÏÇÕÔ ÉÚÍÅÎÑÔØ ÆÁÊÌÙ ×ÎÅ ÜÔÏÇÏ ËÁÔÁÌÏÇÁ. ôÁËÖÅ, ÜÔÏ "
-#~ "ÕÓÉÌÉ×ÁÅÔ ÚÁÝÉÔÕ ÐÒÏÔÉ× ×ÚÌÏÍÝÉËÏ×, ÐÏÓËÏÌØËÕ ÏÎÉ ÎÅ ÓÍÏÇÕÔ ÉÚÍÅÎÉÔØ "
-#~ "ÓÉÓÔÅÍÎÙÅ ÆÁÊÌÙ."
-
-#~ msgid "Please run mysql_fix_privilege_tables !"
-#~ msgstr "ðÏÖÁÌÕÊÓÔÁ, ÚÁÐÕÓÔÉÔÅ mysql_fix_privilege_tables !"
-
-#~ msgid ""
-#~ "I will ensure secure permissions of /var/lib/mysql by replacing GIDs "
-#~ "other than root and mysql with mysql."
-#~ msgstr ""
-#~ "ñ  ÂÕÄÕ  Õ×ÅÒÅÎ × ÂÅÚÏÐÁÓÎÏÓÔÉ ÐÒÁ×  ÄÏÓÔÕÐÁ  Ë  /var/lib/mysql,  ÅÓÌÉ "
-#~ "ÇÒÕÐÐÏ×ÙÅ  ÉÄÅÎÔÉÆÉËÁÔÏÒÙ,  ÎÅ  ÒÁ×ÎÙÅ  root ÉÌÉ mysql, ÂÕÄÕÔ ÚÁÍÅÎÅÎÙ ÎÁ "
-#~ "mysql."
-
-#~ msgid ""
-#~ "Instructions how to enable SSL support are in /usr/share/doc/mysql-server/"
-#~ msgstr ""
-#~ "éÎÓÔÒÕËÃÉÉ ÐÏ ×ËÌÀÞÅÎÉÀ ÐÏÄÄÅÒÖËÉ SSL ÎÁÈÏÄÑÔÓÑ × /usr/share/doc/mysql-"
-#~ "server/"
-
-#, fuzzy
-#~ msgid "mysql_fix_privileges_tables should be executed"
-#~ msgstr "ÂÕÄÅÔ ×ÙÐÏÌÎÅÎ mysql_fix_privileges_tables"
-
-#, fuzzy
-#~ msgid ""
-#~ "The latest MySQL versions have an enhanced, more fine grained, privilege "
-#~ "system. To make use of it, some new fields must be added to the tables "
-#~ "in  the \"mysql\" database. This will not happen automatically."
-#~ msgstr ""
-#~ "ðÏÓÌÅÄÎÉÅ ×ÅÒÓÉÉ MySQL ÉÍÅÀÔ ÒÁÓÛÉÒÅÎÎÕÀ, ÂÏÌÅÅ ÏÔÌÁÖÅÎÎÕÀ, ÓÉÓÔÅÍÕ ÐÒÁ×. "
-#~ "þÔÏÂÙ ÉÓÐÏÌØÚÏ×ÁÔØ ÅÅ, × ÔÁÂÌÉÃÙ ÂÁÚÙ ÄÁÎÎÙÈ \"mysql\" ÎÁÄÏ ÄÏÂÁ×ÉÔØ "
-#~ "ÎÅÓËÏÌØËÏ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÐÏÌÅÊ. üÔÏ ÄÅÌÁÅÔÓÑ ÓÃÅÎÁÒÉÅÍ "
-#~ "mysql_fix_privilege_tables × ÔÅÞÅÎÉÅ ÄÁÎÎÏÇÏ ÏÂÎÏ×ÌÅÎÉÑ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ "
-#~ "ÔÏÇÏ, ÚÁÐÕÝÅÎ ÓÅÊÞÁÓ ÓÅÒ×ÅÒ ÉÌÉ ÎÅÔ!"
-
-#~ msgid ""
-#~ "This script is not supposed to give any user more rights that he had "
-#~ "before, if you encounter such a case, please contact me."
-#~ msgstr ""
-#~ "üÔÏÔ ÓÃÅÎÁÒÉÊ ÎÅ ÄÏÌÖÅÎ ÐÒÅÄÏÓÔÁ×ÌÑÔØ ÐÏÌØÚÏ×ÁÔÅÌÀ ÐÒÁ×Á ÂÏÌØÛÅ ÔÅÈ, "
-#~ "ËÏÔÏÒÙÅ ÏÎ ÉÍÅÌ ÄÏ ÜÔÏÇÏ, ÅÓÌÉ ÜÔÏ ÐÒÏÉÚÏÛÌÏ, ÔÏ ÓÏÏÂÝÉÔÅ ÍÎÅ."
+"MySQL ЌПжет запускаться прО загрузке 
сОстеЌы, лОбП тПлькП еслО вы вручМую "
+"ввеЎете кПЌаМЎу '/etc/init.d/mysql start'. ВыберОте 
'Ўа', еслО хПтОте "
+"запускать егП автПЌатОческО."
diff -u mysql-dfsg-4.1-4.1.11a/debian/po/fr.po 
mysql-dfsg-4.1-4.1.11a/debian/po/fr.po
--- mysql-dfsg-4.1-4.1.11a/debian/po/fr.po
+++ mysql-dfsg-4.1-4.1.11a/debian/po/fr.po
@@ -17,7 +17,7 @@
 "Project-Id-Version: mysql-dfsg-4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-05-19 00:20+0200\n"
-"PO-Revision-Date: 2005-05-09 17:55+0200\n"
+"PO-Revision-Date: 2005-05-24 07:02+0200\n"
 "Last-Translator: Christian Perrier <[EMAIL PROTECTED]>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -105,20 +105,22 @@
 "of /var/lib/mysql or /var/log/mysql gets accidently removed and have "
 "manually be restored."
 msgstr ""
+"Lors des mises à niveau depuis MySQL 3.23 (version présente dans Debian "
+"« woody »), des liens symboliques présents dans /var/lib/mysql ou /var/log/"
+"mysql sont supprimés par erreur. Vous devez les remettre en place vous-même."
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
-#, fuzzy
 msgid ""
 "MySQL will only install if you have a non-numeric hostname that is "
 "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command returns "
 "\"myhostname\" then there must be a line like \"10.0.0.1 myhostname\"."
 msgstr ""
-"MySQL ne pourra être installé que si votre nom d'hôte NON NUMÉRIQUE est "
+"MySQL ne pourra être installé que si votre nom d'hôte non numérique est "
 "établi par le fichier /etc/hosts. Par exemple, si la commande « hostname » "
-"renvoie « monnomdemachine », il doit exister une ligne du type « 10.0.0.1 "
-"monnomdemachine » dans /etc/hosts."
+"renvoie « monnomdemachine », il doit y exister une ligne du type « 10.0.0.1 "
+"monnomdemachine »."
 
 #. Type: note
 #. Description
@@ -134,22 +136,23 @@
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
-#, fuzzy
 msgid ""
 "Please remember to set a PASSWORD for the MySQL root user! If you use a /"
 "root/.my.cnf, always write the \"user\" and the \"password\" lines in there, "
 "never only the password!"
 msgstr ""
-"Veuillez penser à définir un MOT DE PASSE pour l'utilisateur root MySQL. Si "
-"vous utilisez un fichier /root/.my.cnf, n'oubliez pas d'y placer les lignes "
-"« user » et « password », et jamais le mot de passe seul. Veuillez lire /usr/"
-"share/doc/mysql-server-4.1/README.Debian pour plus d'informations."
+"Il est important de définir un mot de passe pour l'administrateur de MySQL "
+"(utilisateur « root »). Si vous utilisez un fichier /root/.my.cnf, n'oubliez "
+"pas d'y placer les lignes « user » et « password », et jamais le mot de "
+"passe seul."
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
 msgid "See /usr/share/doc/mysql-server-4.1/README.Debian for more information."
 msgstr ""
+"Veuillez consulter le fichier /usr/share/doc/mysql-server-4.1/README.Debian "
+"pour plus d'informations."
 
 #. Type: boolean
 #. Description
diff -u mysql-dfsg-4.1-4.1.11a/debian/po/ja.po 
mysql-dfsg-4.1-4.1.11a/debian/po/ja.po
--- mysql-dfsg-4.1-4.1.11a/debian/po/ja.po
+++ mysql-dfsg-4.1-4.1.11a/debian/po/ja.po
@@ -14,10 +14,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-4.1\n"
+"Project-Id-Version: mysql-dfsg-4.1 4.1.11a-2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-05-19 00:20+0200\n"
-"PO-Revision-Date: 2004-12-24 00:16+0900\n"
+"PO-Revision-Date: 2005-05-23 03:33+0900\n"
 "Last-Translator: Hideki Yamane <[EMAIL PROTECTED]>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -96,22 +96,25 @@
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
+#, fuzzy
 msgid ""
 "On upgrades from MySQL 3.23, as shipped with Debian Woody, symlinks in place "
 "of /var/lib/mysql or /var/log/mysql gets accidently removed and have "
 "manually be restored."
 msgstr ""
+"Debian Woody €Ç¥ê¥ê¡Œ¥¹€µ€ì€Æ€€€ë€è€Š€Ê MySQL 3.23 €«€é€Î¥¢¥Ã¥×¥°¥ì¡Œ¥É€Ç"
+"€Ï¡¢/var/lib/mysql €Þ€¿€Ï /var/log/mysql €ò»Ø€¹¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯€Ï€œ€ì€ËÉÕ¿ï"
+"€·€Æºïœü€µ€ì¡¢ŒêÆ°€Ç¥ê¥¹¥È¥¢€µ€ì€ë€³€È€Ë€Ê€ê€Þ€¹¡£"
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
-#, fuzzy
 msgid ""
 "MySQL will only install if you have a non-numeric hostname that is "
 "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command returns "
 "\"myhostname\" then there must be a line like \"10.0.0.1 myhostname\"."
 msgstr ""
-"MySQL €ò /etc/hosts ¥Õ¥¡¥€¥ë·Ðͳ€Ç²ò·è€Ç€­€ë¡Ö¿ô»ú€Ç€Ê€€¡×¥Û¥¹¥ÈÌŸ€ÎŸì¹ç€Î"
+"MySQL €Ï /etc/hosts ¥Õ¥¡¥€¥ë·Ðͳ€Ç²ò·è€Ç€­€ë¡Ö¿ô»ú€Ç€Ê€€¡×¥Û¥¹¥ÈÌŸ€ÎŸì¹ç€Î"
 "€ß¡¢¥€¥ó¥¹¥È¡Œ¥ë€µ€ì€Þ€¹¡£€Ä€Þ€ê¡¢\"hostname\" ¥³¥Þ¥ó¥É€¬ \"myhostname\" €òÊÖ"
 "€¹ºÝ€Ë \"10.0.0.1 myhostname\" €È€€€Š¹Ô€¬ /etc/hosts ¥Õ¥¡¥€¥ë€Ë̵€±€ì€Ð€Ê€ê€Þ"
 "€»€ó¡£"
@@ -130,28 +133,27 @@
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
-#, fuzzy
 msgid ""
 "Please remember to set a PASSWORD for the MySQL root user! If you use a /"
 "root/.my.cnf, always write the \"user\" and the \"password\" lines in there, "
 "never only the password!"
 msgstr ""
 "MySQL €Î root ¥æ¡Œ¥¶€ËÂЀ·€Æ PASSWORD €òÀßÄꀹ€ë€Î€ò˺€ì€Ê€€€Ç€¯€À€µ€€! /"
-"root/.my.cnf €ò»È€ŠŸì¹ç¡¢¥Ñ¥¹¥ï¡Œ¥É€À€±€Ç€Ï€Ê€¯¡¢€³€Î¥Õ¥¡¥€¥ëÃæ€Î \"user\" "
-"€È \"password\" ¹Ô€òµ­œÒ€·€Æ€¯€À€µ€€! €è€êŸÜºÙ€Ë€Ä€€€Æ€Ï /usr/share/doc/"
-"mysql-server-4.1/README.Debian €ò»²ŸÈ€·€Æ€¯€À€µ€€¡£"
+"root/.my.cnf €ò»È€Ã€Æ€€€ëŸì¹ç¡¢·è€·€Æ¥Ñ¥¹¥ï¡Œ¥É€À€±€Ç€Ï€Ê€¯¡¢€³€Î¥Õ¥¡¥€¥ëÃæ"
+"€Î \"user\" €È \"password\" ¹Ô€òµ­œÒ€·€Æ€¯€À€µ€€!"
 
 #. Type: note
 #. Description
 #: ../mysql-server-4.1.templates:25
 msgid "See /usr/share/doc/mysql-server-4.1/README.Debian for more information."
 msgstr ""
+"ŸÜºÙ€Ï /usr/share/doc/mysql-server-4.1/README.Debian €ò»²ŸÈ€·€Æ€¯€À€µ€€¡£"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-4.1.templates:46
 msgid "Remove the databases from all MySQL versions?"
-msgstr ""
+msgstr "ÁŽ¥Ð¡Œ¥ž¥ç¥ó€Î MySQL ¥Ç¡Œ¥¿¥Ù¡Œ¥¹€òºïœü€·€Þ€¹€«?"
 
 #. Type: boolean
 #. Description
@@ -160,6 +162,8 @@
 "Should I remove the complete /var/lib/mysql directory tree which is used by "
 "all MySQL versions, not necessarily only the one you are about to purge?"
 msgstr ""
+"€³€ì€«€é purge €·€è€Š€È€·€Æ€€€ë€â€Î€À€±€Ç€Ï̵€¯¡¢ÁŽ€Æ€Î¥Ð¡Œ¥ž¥ç¥ó€Î MySQL€¬»È"
+"ÍÑ€·€Æ€€€ë /var/lib/mysql ¥Ç¥£¥ì¥¯¥È¥ê€òŽ°ÁŽ€Ëºïœü€·€Þ€¹€«?"
 
 #. Type: boolean
 #. Description
@@ -179,18 +182,0 @@
-
-#~ msgid "Remove all databases?"
-#~ msgstr "¥Ç¡Œ¥¿¥Ù¡Œ¥¹€ò€¹€Ù€Æºïœü€·€Þ€¹€«?"
-
-#~ msgid ""
-#~ "Should I remove all databases below /var/lib/mysql as you are purging the "
-#~ "mysql-server package?"
-#~ msgstr ""
-#~ "mysql-server ¥Ñ¥Ã¥±¡Œ¥ž€ò \"purge\" €¹€ëºÝ€Ë¡¢/var/lib/mysql °Ê²Œ€Ë€¢€ë"
-#~ "¥Ç¡Œ¥¿¥Ù¡Œ¥¹€ò€¹€Ù€Æºïœü€·€Þ€¹€«?"
-
-#~ msgid ""
-#~ "Networking is disabled by default for security reasons. You can enable it "
-#~ "by commenting out the skip-networking option in /etc/mysql/my.cnf."
-#~ msgstr ""
-#~ "¥»¥­¥å¥ê¥Æ¥£Ÿå€ÎÍýͳ€«€éÉžœà€Ç€Ï¥Í¥Ã¥È¥ï¡Œ¥¯µ¡Çœ€¬Ìµžú€Ë€Ê€Ã€Æ€€€Þ€¹¡£/"
-#~ "etc/mysql/my.cnf €Î skip-networking ¥ª¥×¥·¥ç¥ó€ò¥³¥á¥ó¥È¥¢¥Š¥È€¹€ë€³€È€Ç¡¢"
-#~ "€³€ì€òÍ­žú€Ë€Ç€­€Þ€¹¡£"
diff -u mysql-dfsg-4.1-4.1.11a/debian/changelog 
mysql-dfsg-4.1-4.1.11a/debian/changelog
--- mysql-dfsg-4.1-4.1.11a/debian/changelog
+++ mysql-dfsg-4.1-4.1.11a/debian/changelog
@@ -1,3 +1,22 @@
+mysql-dfsg-4.1 (4.1.11a-4sarge1) stable; urgency=high
+
+  * Christian Hammers:
+    - SECURITY:
+      Applied the upstream patch that fixes a tempfile vulnerability in the
+      mysqld_install_db script that was found by Eric Romang and allows an
+      attacker to execute arbitrary SQL commands when the server is installed
+      or updated. The issue is known as CAN-2005-1636, the patch was made by
+      comparing this version against the one from 4.1.12. 
+      MySQL, again, did not mention any security problems in the release notes.
+      Closes: #319526
+
+  * Sean Finney:
+    - updated french translation from christian perrier (closes: #310526).
+    - updated japanese translation from hideki yamane (closes: #310263).
+    - updated russian translation from yuriy talakan (closes: #310197).
+
+ -- Christian Hammers <[EMAIL PROTECTED]>  Sun, 31 Jul 2005 21:58:07 +0200
+
 mysql-dfsg-4.1 (4.1.11a-4) unstable; urgency=high
 
   * Fixed FTBFS problem which was caused due to the fact that last uploads
only in patch2:
unchanged:
--- mysql-dfsg-4.1-4.1.11a.orig/debian/patches/60_SECURITY_CAN-2005-1636.dpatch
+++ mysql-dfsg-4.1-4.1.11a/debian/patches/60_SECURITY_CAN-2005-1636.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_SECURITY_CAN-2005-1636.dpatch by  <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream patch for the security bug known as CAN-2005-1636
+
[EMAIL PROTECTED]@
+
+--- old/scripts/mysql_install_db.sh    2005-04-01 13:36:48.000000000 +0200
++++ new/scripts/mysql_install_db.sh    2005-05-13 13:32:20.000000000 +0200
+@@ -11,7 +11,6 @@
+ windows=0
+ defaults=""
+ user=""
+-tmp_file=/tmp/mysql_install_db.$$
+ 
+ case "$1" in
+     --no-defaults|--defaults-file=*|--defaults-extra-file=*)
+@@ -223,10 +222,8 @@
+     then
+       echo "Fill help tables"
+     fi
+-    echo "use mysql;" > $tmp_file
+-    cat $tmp_file $fill_help_tables | eval "$mysqld_install_cmd_line"
++    (echo "use mysql;"; cat $fill_help_tables) | eval 
"$mysqld_install_cmd_line"
+     res=$?
+-    rm $tmp_file
+     if test $res != 0
+     then
+       echo ""