Attachment 170408 Details for Bug 209579 – Backport of databases/mariadb101-server/files/patch-mysys_my__default.c

[patch] Backport of databases/mariadb101-server/files/patch-mysys_my__default.c

bug209579_1.diff (text/plain), 4.11 KB, created by Markus Kohlmeyer on 2016-05-17 15:10:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-05-17 15:10:56 UTC

Size: 4.11 KB

patch

obsolete

>diff -Naur databases/mysql57-client/files/patch-mysys__ssl_my__default.cc databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
>--- databases/mysql57-client/files/patch-mysys__ssl_my__default.cc	2016-05-17 14:03:26.548892000 +0200
>+++ databases/mysql57-client/files/patch-mysys__ssl_my__default.cc	2016-05-17 17:01:53.493023000 +0200
>@@ -9,18 +9,48 @@
>  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
>  static const char **default_directories = NULL;
>  
>-@@ -1409,7 +1409,10 @@ static const char **init_default_directo
>+@@ -909,6 +909,14 @@
>+       return 1;                                 /* Ignore wrong files */
>+   }
>  
>- #if defined(DEFAULT_SYSCONFDIR)
>-   if (DEFAULT_SYSCONFDIR[0])
>++  if (strstr(name, "/etc") == name)
> +  {
>-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
>-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
>++    fprintf(stderr,
>++             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
>++             name,name);
>++      goto err;
> +  }
>- #endif /* DEFAULT_SYSCONFDIR */
>++
>+   while (mysql_file_getline(buff, sizeof(buff) - 1, fp))
>+   {
>+     line++;
>+@@ -1245,7 +1253,8 @@
>+             end[(strlen(end)-1)] = ' ';
>+           else
>+             strxmov(end, conf_file, *ext , " ",  NullS);
>+-          fputs(name, stdout);
>++          if (strstr(name, "/etc") != name)
>++            fputs(name, stdout);
>+         }
>+       }
>+     }
>+@@ -1404,13 +1413,8 @@
>+ 
>+ #else
>+ 
>+-  errors += add_directory(alloc, "/etc/", dirs);
>+-  errors += add_directory(alloc, "/etc/mysql/", dirs);
>+-
>+-#if defined(DEFAULT_SYSCONFDIR)
>+-  if (DEFAULT_SYSCONFDIR[0])
>+-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
>+-#endif /* DEFAULT_SYSCONFDIR */
>++  errors += add_directory(alloc, "/usr/local/etc/", dirs);
>++  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
>  
>  #endif
>-@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f
>+ 
>+@@ -1480,7 +1484,7 @@
>    MY_STAT stat_info;
>  
>    if (!my_stat(file_name,&stat_info,MYF(0)))
>diff -Naur databases/mysql57-server/files/patch-mysys__ssl_my__default.cc databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
>--- databases/mysql57-server/files/patch-mysys__ssl_my__default.cc	2016-05-17 14:03:26.598891000 +0200
>+++ databases/mysql57-server/files/patch-mysys__ssl_my__default.cc	2016-05-17 17:02:01.712951000 +0200
>@@ -9,18 +9,48 @@
>  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
>  static const char **default_directories = NULL;
>  
>-@@ -1409,7 +1409,10 @@ static const char **init_default_directo
>+@@ -909,6 +909,14 @@
>+       return 1;                                 /* Ignore wrong files */
>+   }
>  
>- #if defined(DEFAULT_SYSCONFDIR)
>-   if (DEFAULT_SYSCONFDIR[0])
>++  if (strstr(name, "/etc") == name)
> +  {
>-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
>-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
>++    fprintf(stderr,
>++             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
>++             name,name);
>++      goto err;
> +  }
>- #endif /* DEFAULT_SYSCONFDIR */
>++
>+   while (mysql_file_getline(buff, sizeof(buff) - 1, fp))
>+   {
>+     line++;
>+@@ -1245,7 +1253,8 @@
>+             end[(strlen(end)-1)] = ' ';
>+           else
>+             strxmov(end, conf_file, *ext , " ",  NullS);
>+-          fputs(name, stdout);
>++          if (strstr(name, "/etc") != name)
>++            fputs(name, stdout);
>+         }
>+       }
>+     }
>+@@ -1404,13 +1413,8 @@
>+ 
>+ #else
>+ 
>+-  errors += add_directory(alloc, "/etc/", dirs);
>+-  errors += add_directory(alloc, "/etc/mysql/", dirs);
>+-
>+-#if defined(DEFAULT_SYSCONFDIR)
>+-  if (DEFAULT_SYSCONFDIR[0])
>+-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
>+-#endif /* DEFAULT_SYSCONFDIR */
>++  errors += add_directory(alloc, "/usr/local/etc/", dirs);
>++  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
>  
>  #endif
>-@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f
>+ 
>+@@ -1480,7 +1484,7 @@
>    MY_STAT stat_info;
>  
>    if (!my_stat(file_name,&stat_info,MYF(0)))
>

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

Attachments on bug 209579: 170407 | 170408 | 170417 | 170435 | 170441 | 171791 | 172081 | 172100