[Pkg-mysql-commits] r1244 - in trunk/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2008-05-27 19:16:11 +0000 (Tue, 27 May 2008)
New Revision: 1244

Modified:
   trunk/debian/changelog
   trunk/debian/patches/25_mysys__default.c.dpatch
Log:
Update patch 25_mysys__default.c.dpatch

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-05-27 07:03:04 UTC (rev 1243)
+++ trunk/debian/changelog	2008-05-27 19:16:11 UTC (rev 1244)
@@ -13,6 +13,8 @@
     + debian/patches/57_fix_mysql_replication.dpatch
     + debian/patches/90_upstreamdebiandir.dpatch
     + debian/patches/91_SECURITY_CVE-2007-5925.dpatch
+  * Update patches:
+    + debian/patches/25_mysys__default.c.dpatch
   * SECURITY:
     Fix for CVE-2008-2079: It was possible to circumvent privileges through
     the creation of MyISAM tables employing the DATA DIRECTORY and INDEX
@@ -32,7 +34,7 @@
     useful information is in mysql-server anyway. (closes: #480940)
   * Remove a spurious HOME= in logrotate script.  
 
- -- Norbert Tretkowski <nobse at debian.org>  Tue, 27 May 2008 09:02:34 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Tue, 27 May 2008 21:15:32 +0200
 
 mysql-dfsg-5.0 (5.0.51a-6) unstable; urgency=low
 

Modified: trunk/debian/patches/25_mysys__default.c.dpatch
===================================================================
--- trunk/debian/patches/25_mysys__default.c.dpatch	2008-05-27 07:03:04 UTC (rev 1243)
+++ trunk/debian/patches/25_mysys__default.c.dpatch	2008-05-27 19:16:11 UTC (rev 1244)
@@ -5,15 +5,15 @@
 ## DP: mysys__default.c
 
 @DPATCH@
-
---- old/mysys/default.c	2005-05-26 15:26:56.000000000 +0200
-+++ new/mysys/default.c	2005-06-08 19:54:26.434959920 +0200
-@@ -866,7 +866,7 @@
-   if ((env= getenv("ETC")))
-     *ptr++= env;
- #endif
--  *ptr++= "/etc/";
-+  *ptr++= "/etc/mysql/";
- #endif
-   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
-     *ptr++= env;
+diff -Nur mysql-dfsg-5.0-5.0.60.orig/mysys/default.c mysql-dfsg-5.0-5.0.60/mysys/default.c
+--- mysql-dfsg-5.0-5.0.60.orig/mysys/default.c	2008-04-29 00:30:15.000000000 +0200
++++ mysql-dfsg-5.0-5.0.60/mysys/default.c	2008-05-27 21:13:29.000000000 +0200
+@@ -1115,7 +1115,7 @@
+ static void init_default_directories_unix()
+ {
+   bzero((char *) default_directories, sizeof(default_directories));
+-  ADD_DIRECTORY("/etc/");
++  ADD_DIRECTORY("/etc/mysql/");
+ #ifdef DEFAULT_SYSCONFDIR
+   if (DEFAULT_SYSCONFDIR != "")
+     ADD_DIRECTORY(DEFAULT_SYSCONFDIR);