[Pkg-mysql-commits] r1271 - trunk/debian/patches

[Norbert Tretkowski]

Author: nobse
Date: 2008-06-21 12:48:00 +0000 (Sat, 21 Jun 2008)
New Revision: 1271

Modified:
   trunk/debian/patches/92_SECURITY_CVE-2008-2079.dpatch
Log:
Update CVE-2008-2079 patch

Modified: trunk/debian/patches/92_SECURITY_CVE-2008-2079.dpatch
===================================================================
--- trunk/debian/patches/92_SECURITY_CVE-2008-2079.dpatch	2008-06-21 12:20:09 UTC (rev 1270)
+++ trunk/debian/patches/92_SECURITY_CVE-2008-2079.dpatch	2008-06-21 12:48:00 UTC (rev 1271)
@@ -9,8 +9,8 @@
 ## DP: DIRECTORY is now disallowed.
 
 @DPATCH@
---- mysql-test/r/symlink.result.orig
-+++ mysql-test/r/symlink.result
+--- a/mysql-test/r/symlink.result.orig
++++ b/mysql-test/r/symlink.result
 @@ -100,23 +100,15 @@ t1	CREATE TABLE `t1` (
  ) ENGINE=MyISAM DEFAULT CHARSET=latin1
  drop table t1;
@@ -103,8 +103,8 @@
 +CREATE TABLE t1 (a INT) ENGINE MYISAM;
 +DROP TABLE t1;
  End of 5.0 tests
---- mysql-test/t/symlink.test.orig
-+++ mysql-test/t/symlink.test
+--- a/mysql-test/t/symlink.test.orig
++++ b/mysql-test/t/symlink.test
 @@ -127,29 +127,22 @@ drop table t1;
  #
  # BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE
@@ -237,8 +237,8 @@
 +DROP TABLE t1;
  
  --echo End of 5.0 tests
---- sql/mysql_priv.h.orig
-+++ sql/mysql_priv.h
+--- a/sql/mysql_priv.h.orig
++++ b/sql/mysql_priv.h
 @@ -1255,6 +1255,7 @@ void my_dbopt_free(void);
  extern time_t server_start_time, flush_status_time;
  extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH],
@@ -247,8 +247,8 @@
              def_ft_boolean_syntax[sizeof(ft_boolean_syntax)];
  #define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list))
  extern MY_TMPDIR mysql_tmpdir_list;
---- sql/mysqld.cc.orig
-+++ sql/mysqld.cc
+--- a/sql/mysqld.cc.orig
++++ b/sql/mysqld.cc
 @@ -453,14 +453,13 @@ char log_error_file[FN_REFLEN], glob_hos
  char mysql_real_data_home[FN_REFLEN],
       language[FN_REFLEN], reg_ext[FN_EXTLEN], mysql_charsets_dir[FN_REFLEN],
@@ -276,8 +276,8 @@
    convert_dirname(language,language,NullS);
    (void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir
    (void) my_load_path(mysql_real_data_home,mysql_real_data_home,mysql_home);
---- sql/sql_parse.cc.orig
-+++ sql/sql_parse.cc
+--- a/sql/sql_parse.cc.orig
++++ b/sql/sql_parse.cc
 @@ -76,6 +76,7 @@ static void remove_escape(char *name);
  static bool append_file_to_dir(THD *thd, const char **filename_ptr,
  			       const char *table_name);