Attachment 137158 Details for Bug 182547 – mariadb55-mycnf-20131015.patch

[patch] mariadb55-mycnf-20131015.patch

mariadb55-mycnf-20131015.patch (text/x-patch), 11.10 KB, created by Michael Gmelin on 2013-10-15 21:20:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Gmelin

Created: 2013-10-15 21:20:56 UTC

Size: 11.10 KB

patch

obsolete

>diff -ruN databases.orig/mariadb55-client/Makefile databases/mariadb55-client/Makefile
>--- databases.orig/mariadb55-client/Makefile	2013-10-15 21:41:31.980319265 +0200
>+++ databases/mariadb55-client/Makefile	2013-10-15 21:48:25.970349842 +0200
>@@ -7,7 +7,7 @@
> 
> MASTERDIR=	${.CURDIR}/../mariadb55-server
> 
>-PKGMESSAGE=	mustnotexist
>+FILESDIR=	${.CURDIR}/files
> PATCHDIR=	${.CURDIR}/files
> PLIST=		${.CURDIR}/pkg-plist
> 
>diff -ruN databases.orig/mariadb55-client/files/patch-mysys_default.c databases/mariadb55-client/files/patch-mysys_default.c
>--- databases.orig/mariadb55-client/files/patch-mysys_default.c	2013-10-15 21:41:31.970323302 +0200
>+++ databases/mariadb55-client/files/patch-mysys_default.c	2013-10-15 20:34:56.000000000 +0200
>@@ -1,5 +1,5 @@
>---- mysys/default.c.orig	2012-12-17 03:57:40.000000000 +0200
>-+++ mysys/default.c	2012-12-17 04:00:28.000000000 +0200
>+--- mysys/default.c.orig	2013-10-01 21:15:03.544135869 +0200
>++++ mysys/default.c	2013-10-01 21:15:38.871375504 +0200
> @@ -89,7 +89,7 @@
>  
>  /* Which directories are searched for options (and in which order) */
>@@ -18,11 +18,41 @@
>      /*
>        Ignore world-writable regular files.
>        This is mainly done to protect us to not read a file created by
>-@@ -1229,6 +1229,7 @@
>- #if defined(DEFAULT_SYSCONFDIR)
>-   if (DEFAULT_SYSCONFDIR[0])
>-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
>-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
>- #endif /* DEFAULT_SYSCONFDIR */
>+@@ -803,6 +803,14 @@
>+   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
>+     return 1;					/* Ignore wrong files */
>+ 
>++  if (strstr(name, "/etc") == name)
>++  {
>++    fprintf(stderr,
>++	      "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n",
>++	      name,name);
>++      goto err;
>++  }
>++
>+   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
>+   {
>+     line++;
>+@@ -1067,7 +1067,8 @@
>+           if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
>+             *end++= '.';
>+           strxmov(end, conf_file, *ext, " ", NullS);
>+-          fputs(name, stdout);
>++          if (strstr(name, "/etc") != name)
>++            fputs(name, stdout);
>+         }
>+       }
>+     }
>+@@ -1226,10 +1226,8 @@
>+   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, "%%PREFIX%%/etc/", dirs);
>++  errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
>  
>  #endif
>+ 
>diff -ruN databases.orig/mariadb55-client/files/patch-scripts_mysql_config.sh databases/mariadb55-client/files/patch-scripts_mysql_config.sh
>--- databases.orig/mariadb55-client/files/patch-scripts_mysql_config.sh	1970-01-01 01:00:00.000000000 +0100
>+++ databases/mariadb55-client/files/patch-scripts_mysql_config.sh	2013-10-15 21:59:57.920529823 +0200
>@@ -0,0 +1,14 @@
>+--- scripts/mysql_config.sh.orig	2013-09-20 01:34:23.000000000 +0300
>++++ scripts/mysql_config.sh	2013-10-15 21:23:34.000000000 +0300
>+@@ -108,8 +108,11 @@
>+ # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
>+ libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
>+ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
>++libs="$libs -L%%LOCALBASE%%/lib "
>+ libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
>++libs_r="$libs_r -L%%LOCALBASE%%/lib "
>+ embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
>++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
>+ 
>+ if [ -r "$pkglibdir/libmygcc.a" ]; then
>+   # When linking against the static library with a different version of GCC
>diff -ruN databases.orig/mariadb55-client/files/pkg-message.in databases/mariadb55-client/files/pkg-message.in
>--- databases.orig/mariadb55-client/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
>+++ databases/mariadb55-client/files/pkg-message.in	2013-10-01 23:50:26.000000000 +0200
>@@ -0,0 +1,7 @@
>+************************************************************************
>+
>+MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
>+my.cnf. Please move existing my.cnf files from those paths to
>+%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
>+
>+************************************************************************
>diff -ruN databases.orig/mariadb55-server/Makefile databases/mariadb55-server/Makefile
>--- databases.orig/mariadb55-server/Makefile	2013-10-15 21:41:32.510255891 +0200
>+++ databases/mariadb55-server/Makefile	2013-10-15 21:58:19.670709245 +0200
>@@ -2,7 +2,7 @@
> 
> PORTNAME?=	mariadb
> PORTVERSION=	5.5.33a
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	databases ipv6
> MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
> 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
>@@ -18,6 +18,9 @@
> MAINTAINER=	never@nevermind.kiev.ua
> COMMENT?=	Multithreaded SQL database (server)
> 
>+SUB_FILES=	pkg-message
>+PKGMESSAGE=	${WRKDIR}/pkg-message
>+
> SLAVEDIRS=	databases/mariadb55-client
> USES=		cmake gmake
> NO_OPTIONS_SORT=yes
>@@ -133,6 +136,8 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
>+	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/default.c
>+	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
> 
> .include <bsd.port.pre.mk>
> 
>diff -ruN databases.orig/mariadb55-server/files/mysql-server.in databases/mariadb55-server/files/mysql-server.in
>--- databases.orig/mariadb55-server/files/mysql-server.in	2013-10-15 21:41:32.500822849 +0200
>+++ databases/mariadb55-server/files/mysql-server.in	2013-10-15 21:49:53.186289856 +0200
>@@ -52,6 +52,13 @@
> 
> mysql_prestart()
> {
>+	local dir
>+	for dir in /etc /etc/mysql; do
>+		if [ -f "${dir}/my.cnf" ]; then
>+			echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
>+			return 1
>+		fi
>+	done
> 	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
> 		mysql_create_auth_tables || return 1
> 	fi
>diff -ruN databases.orig/mariadb55-server/files/patch-mysys_default.c databases/mariadb55-server/files/patch-mysys_default.c
>--- databases.orig/mariadb55-server/files/patch-mysys_default.c	2013-10-15 21:41:32.510255891 +0200
>+++ databases/mariadb55-server/files/patch-mysys_default.c	2013-10-15 20:26:48.000000000 +0200
>@@ -1,6 +1,6 @@
>---- mysys/default.c.orig	2010-11-02 23:01:13.000000000 +0100
>-+++ mysys/default.c	2010-11-10 16:39:51.000000000 +0100
>-@@ -70,7 +70,7 @@
>+--- mysys/default.c.orig	2013-10-01 21:15:03.544135869 +0200
>++++ mysys/default.c	2013-10-01 21:15:38.871375504 +0200
>+@@ -89,7 +89,7 @@
>  
>  /* Which directories are searched for options (and in which order) */
>  
>@@ -9,7 +9,7 @@
>  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
>  static const char **default_directories = NULL;
>  
>-@@ -711,7 +711,7 @@
>+@@ -785,7 +785,7 @@
>    {
>      MY_STAT stat_info;
>      if (!my_stat(name,&stat_info,MYF(0)))
>@@ -18,14 +18,41 @@
>      /*
>        Ignore world-writable regular files.
>        This is mainly done to protect us to not read a file created by
>-@@ -1153,7 +1153,10 @@
>+@@ -803,6 +803,14 @@
>+   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
>+     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 %%PREFIX%%%s\n",
>++	      name,name);
>++      goto err;
> +  }
>- #endif /* DEFAULT_SYSCONFDIR */
>++
>+   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
>+   {
>+     line++;
>+@@ -1067,7 +1067,8 @@
>+           if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
>+             *end++= '.';
>+           strxmov(end, conf_file, *ext, " ", NullS);
>+-          fputs(name, stdout);
>++          if (strstr(name, "/etc") != name)
>++            fputs(name, stdout);
>+         }
>+       }
>+     }
>+@@ -1226,10 +1226,8 @@
>+   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, "%%PREFIX%%/etc/", dirs);
>++  errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
>  
>  #endif
>+ 
>diff -ruN databases.orig/mariadb55-server/files/patch-scripts_mysql_config.sh databases/mariadb55-server/files/patch-scripts_mysql_config.sh
>--- databases.orig/mariadb55-server/files/patch-scripts_mysql_config.sh	1970-01-01 01:00:00.000000000 +0100
>+++ databases/mariadb55-server/files/patch-scripts_mysql_config.sh	2013-10-15 22:01:24.530302853 +0200
>@@ -0,0 +1,14 @@
>+--- scripts/mysql_config.sh.orig	2013-09-20 01:34:23.000000000 +0300
>++++ scripts/mysql_config.sh	2013-10-15 21:23:34.000000000 +0300
>+@@ -108,8 +108,11 @@
>+ # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
>+ libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
>+ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
>++libs="$libs -L%%LOCALBASE%%/lib "
>+ libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
>++libs_r="$libs_r -L%%LOCALBASE%%/lib "
>+ embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
>++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
>+ 
>+ if [ -r "$pkglibdir/libmygcc.a" ]; then
>+   # When linking against the static library with a different version of GCC
>diff -ruN databases.orig/mariadb55-server/files/pkg-message.in databases/mariadb55-server/files/pkg-message.in
>--- databases.orig/mariadb55-server/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
>+++ databases/mariadb55-server/files/pkg-message.in	2013-10-01 23:50:41.000000000 +0200
>@@ -0,0 +1,11 @@
>+************************************************************************
>+
>+Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
>+the first time you start the MySQL server after an upgrade from an
>+earlier version.
>+
>+MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
>+my.cnf. Please move existing my.cnf files from those paths to
>+%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
>+
>+************************************************************************
>diff -ruN databases.orig/mariadb55-server/pkg-message databases/mariadb55-server/pkg-message
>--- databases.orig/mariadb55-server/pkg-message	2013-10-15 21:41:32.510255891 +0200
>+++ databases/mariadb55-server/pkg-message	1970-01-01 01:00:00.000000000 +0100
>@@ -1,7 +0,0 @@
>-************************************************************************
>-
>-Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
>-the first time you start the MySQL server after an upgrade from an
>-earlier version.
>-
>-************************************************************************

Actions: View | Diff

Attachments on bug 182547: 137154 | 137155 | 137156 | 137157 | 137158