Attachment 170435 Details for Bug 209579 – merging two patches about my.cnf place

[patch] merging two patches about my.cnf place

patch-databases_mysql57-fix_mycnf.diff (text/plain), 5.04 KB, created by Mahdi Mokhtari on 2016-05-18 11:46:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mahdi Mokhtari

Created: 2016-05-18 11:46:07 UTC

Size: 5.04 KB

patch

obsolete

>Index: databases/mysql57-client/Makefile
>===================================================================
>--- databases/mysql57-client/Makefile	(revision 415433)
>+++ databases/mysql57-client/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mysql
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> PKGNAMESUFFIX=	57-client
> 
> COMMENT=	Multithreaded SQL database (client)
>Index: databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
>===================================================================
>--- databases/mysql57-client/files/patch-mysys__ssl_my__default.cc	(revision 415433)
>+++ databases/mysql57-client/files/patch-mysys__ssl_my__default.cc	(working copy)
>@@ -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)))
>Index: databases/mysql57-server/Makefile
>===================================================================
>--- databases/mysql57-server/Makefile	(revision 415433)
>+++ databases/mysql57-server/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	mysql
> PORTVERSION=	5.7.12
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.7
> PKGNAMESUFFIX?=	57-server
>@@ -51,7 +51,6 @@
> 		-DINSTALL_SHAREDIR="share" \
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
> 		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
>-		-DSYSCONFDIR="${ETCDIR}" \
> 		-DWITH_BOOST="${WRKSRC}/boost" \
> 		-DWITH_EDITLINE=system \
> 		-DWITH_LIBEVENT=system \
>Index: databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
>===================================================================
>--- databases/mysql57-server/files/patch-mysys__ssl_my__default.cc	(revision 415433)
>+++ databases/mysql57-server/files/patch-mysys__ssl_my__default.cc	(working copy)
>@@ -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