From c5f6daa7dc02e96a8ccc860ac416a42a3dfc6e9b Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Aug 14 2014 07:54:25 +0000 Subject: Rebase to version 10.0.13 --- diff --git a/.gitignore b/.gitignore index 6043979..0f144d4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /mariadb-10.0.10.tar.gz /mariadb-10.0.11.tar.gz /mariadb-10.0.12.tar.gz +/mariadb-10.0.13.tar.gz diff --git a/mariadb-basedir.patch b/mariadb-basedir.patch index eb71f70..d548ff5 100644 --- a/mariadb-basedir.patch +++ b/mariadb-basedir.patch @@ -1,14 +1,15 @@ Don't guess basedir in mysql_config; we place it under _libdir because of multilib conflicts, so use rather configured @prefix@ path directly. -diff -up mariadb-10.0.10/scripts/mysql_config.sh.p10 mariadb-10.0.10/scripts/mysql_config.sh ---- mariadb-10.0.10/scripts/mysql_config.sh.p10 2014-03-30 19:56:39.000000000 +0200 -+++ mariadb-10.0.10/scripts/mysql_config.sh 2014-04-07 18:54:19.601390650 +0200 -@@ -76,7 +76,7 @@ get_full_path () +diff -up mariadb-10.0.13/scripts/mysql_config.sh.patch32 mariadb-10.0.13/scripts/mysql_config.sh +--- mariadb-10.0.13/scripts/mysql_config.sh.patch32 2014-08-13 17:28:51.174776518 +0200 ++++ mariadb-10.0.13/scripts/mysql_config.sh 2014-08-13 17:32:18.205275028 +0200 +@@ -76,8 +76,7 @@ get_full_path () me=`get_full_path $0` --basedir=`echo $me | sed -e 's;/bin/mysql_config;;'` +-# Script might have been renamed but assume mysql_config +-basedir=`echo $me | sed -e 's;/bin/mysql_.*config.*;;'` +basedir='@prefix@' ldata='@localstatedir@' diff --git a/mariadb-mysql_config.patch b/mariadb-mysql_config.patch deleted file mode 100644 index 1ab0874..0000000 --- a/mariadb-mysql_config.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- mariadb-10.0.12/scripts/mysql_config.sh.orig 2014-06-17 11:11:54.444874750 +0200 -+++ mariadb-10.0.12/scripts/mysql_config.sh 2014-06-17 11:30:48.244454413 +0200 -@@ -176,10 +176,9 @@ Options: - pkglibdir [$pkglibdir] - plugindir [$plugindir] - EOF -- exit 0 - } - --if test $# -le 0; then usage; fi -+if test $# -le 0; then usage; exit 0; fi - - while test $# -gt 0; do - case $1 in -@@ -198,10 +197,10 @@ while test $# -gt 0; do - pkgincludedir) echo "$pkgincludedir" ;; - pkglibdir) echo "$pkglibdir" ;; - plugindir) echo "$plugindir" ;; -- *) usage ;; -+ *) echo >&2 "Unknown var: $var"; usage >&2; exit 1 ;; - esac - ;; -- *) usage ;; -+ *) echo >&2 "Unknown option: $1"; usage >&2; exit 1 ;; - esac - - shift diff --git a/mariadb-paths.patch b/mariadb-paths.patch deleted file mode 100644 index c801b0b..0000000 --- a/mariadb-paths.patch +++ /dev/null @@ -1,165 +0,0 @@ -Some hard-coded paths make problems when package is built into chroot like -Software Collections. Removing these hard-coded paths should fix it. - -Upstream report: https://mariadb.atlassian.net/browse/MDEV-6485 - - -diff -up mariadb-10.0.12/client/mysql_plugin.c.cmakepaths mariadb-10.0.12/client/mysql_plugin.c ---- mariadb-10.0.12/client/mysql_plugin.c.cmakepaths 2014-06-12 11:26:06.000000000 +0200 -+++ mariadb-10.0.12/client/mysql_plugin.c 2014-07-25 08:40:15.898059511 +0200 -@@ -90,6 +90,7 @@ static int find_plugin(char *tp_path); - static int build_bootstrap_file(char *operation, char *bootstrap); - static int dump_bootstrap_file(char *bootstrap_file); - static int bootstrap_server(char *server_path, char *bootstrap_file); -+static int find_file_in_path(char *to,const char *name); - - - int main(int argc,char *argv[]) -@@ -122,7 +123,7 @@ int main(int argc,char *argv[]) - */ - if ((error= process_options(argc, argv, operation)) || - (error= check_access()) || -- (error= find_tool("mysqld" FN_EXEEXT, server_path)) || -+ (error= find_file_in_path("mysqld" FN_EXEEXT, server_path)) || - (error= find_plugin(tp_path)) || - (error= build_bootstrap_file(operation, bootstrap))) - goto exit; -@@ -325,7 +326,7 @@ static int get_default_values() - FILE *file= 0; - - bzero(tool_path, FN_REFLEN); -- if ((error= find_tool("my_print_defaults" FN_EXEEXT, tool_path))) -+ if ((error= find_file_in_path("my_print_defaults" FN_EXEEXT, tool_path))) - goto exit; - else - { -@@ -954,6 +955,55 @@ exit: - } - - -+#if defined(__WIN__) -+#define F_OK 0 -+#define PATH_SEP ';' -+#define PROGRAM_EXTENSION ".exe" -+#else -+#define PATH_SEP ':' -+#endif -+ -+static int find_file_in_path(char *to, const char *name) -+{ -+ char *path,*pos,dir[2]; -+ const char *ext=""; -+ -+ if (!(path=getenv("PATH"))) -+ goto notfound; -+ dir[0]=FN_LIBCHAR; dir[1]=0; -+#ifdef PROGRAM_EXTENSION -+ if (!fn_ext(name)[0]) -+ ext=PROGRAM_EXTENSION; -+#endif -+ -+ for (pos=path ; (pos=strchr(pos,PATH_SEP)) ; path= ++pos) -+ { -+ if (path != pos) -+ { -+ strxmov(strnmov(to,path,(uint) (pos-path)),dir,name,ext,NullS); -+ if (!access(to,F_OK)) -+ { -+ if (opt_verbose) -+ printf("# Found tool '%s' as '%s'.\n", name, to); -+ return 0; -+ } -+ } -+ } -+#ifdef __WIN__ -+ to[0]=FN_CURLIB; -+ strxmov(to+1,dir,name,ext,NullS); -+ if (!access(to,F_OK)) /* Test in current dir */ -+ { -+ if (opt_verbose) -+ printf("# Found tool '%s' as '%s'.\n", name, to); -+ return 0; -+ } -+#endif -+notfound: -+ fprintf(stderr, "WARNING: Cannot find %s.\n", name); -+ return 1; /* File not found */ -+} -+ - /** - Locate the tool and form tool path. - -diff -up mariadb-10.0.12/mysys/my_default.c.cmakepaths mariadb-10.0.12/mysys/my_default.c ---- mariadb-10.0.12/mysys/my_default.c.cmakepaths 2014-06-12 11:26:03.000000000 +0200 -+++ mariadb-10.0.12/mysys/my_default.c 2014-07-25 08:39:04.875937851 +0200 -@@ -1224,9 +1224,6 @@ static const char **init_default_directo - - #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); -diff -up mariadb-10.0.12/scripts/mysqlaccess.sh.cmakepaths mariadb-10.0.12/scripts/mysqlaccess.sh ---- mariadb-10.0.12/scripts/mysqlaccess.sh.cmakepaths 2014-06-12 11:26:06.000000000 +0200 -+++ mariadb-10.0.12/scripts/mysqlaccess.sh 2014-07-25 08:39:04.877937855 +0200 -@@ -483,9 +483,6 @@ MySQLaccess::Report::Print_Header(); - elsif (-f "@sysconfdir@/$script_conf") { - require "@sysconfdir@/$script_conf"; - } -- elsif (-f "/etc/$script_conf") { -- require "/etc/$script_conf"; -- } - - # **************************** - # Read in all parameters -@@ -951,7 +948,6 @@ sub MergeConfigFile { - sub MergeConfigFiles { - my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<; - MergeConfigFile("@sysconfdir@/my.cnf"); -- MergeConfigFile("/etc/my.cnf"); - MergeConfigFile("$dir/.my.cnf"); - } - -diff -up mariadb-10.0.12/scripts/mysqld_multi.sh.cmakepaths mariadb-10.0.12/scripts/mysqld_multi.sh ---- mariadb-10.0.12/scripts/mysqld_multi.sh.cmakepaths 2014-06-12 11:26:04.000000000 +0200 -+++ mariadb-10.0.12/scripts/mysqld_multi.sh 2014-07-25 08:39:04.878937857 +0200 -@@ -499,9 +499,7 @@ sub list_defaults_files - - my %seen; # Don't list the same file more than once - return grep { defined $_ and not $seen{$_}++ and -f $_ and -r $_ } -- ('/etc/my.cnf', -- '/etc/mysql/my.cnf', -- '@sysconfdir@/my.cnf', -+ ('@sysconfdir@/my.cnf', - ($ENV{MYSQL_HOME} ? "$ENV{MYSQL_HOME}/my.cnf" : undef), - $opt{'extra-file'}, - ($ENV{HOME} ? "$ENV{HOME}/.my.cnf" : undef)); -diff -up mariadb-10.0.12/scripts/mytop.sh.cmakepaths mariadb-10.0.12/scripts/mytop.sh ---- mariadb-10.0.12/scripts/mytop.sh.cmakepaths 2014-06-12 11:26:06.000000000 +0200 -+++ mariadb-10.0.12/scripts/mytop.sh 2014-07-25 08:39:04.879937858 +0200 -@@ -1829,8 +1829,8 @@ sub FindProg($) - { - my $prog = shift; - my $found = undef; -- my @search_dirs = ("/bin", "/usr/bin", "/usr/sbin", -- "/usr/local/bin", "/usr/local/sbin"); -+ my @search_dirs = ("@prefix@", "@prefix@/bin", "@prefix@/sbin", -+ "@prefix@/local/bin", "@prefix@/local/sbin"); - - for (@search_dirs) - { -diff -up mariadb-10.0.12/scripts/CMakeLists.txt.patchs mariadb-10.0.12/scripts/CMakeLists.txt ---- mariadb-10.0.12/scripts/CMakeLists.txt.patchs 2014-08-04 22:21:02.577917599 +0200 -+++ mariadb-10.0.12/scripts/CMakeLists.txt 2014-08-04 22:21:42.712940832 +0200 -@@ -221,7 +221,7 @@ INSTALL_SCRIPT( - ENDIF() - - SET(prefix "${CMAKE_INSTALL_PREFIX}") --SET(sysconfdir ${prefix}) -+SET(sysconfdir ${INSTALL_SYSCONFDIR}) - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) - SET(scriptdir ${prefix}/${INSTALL_BINDIR}) diff --git a/mariadb.spec b/mariadb.spec index 2f0cc4e..347211f 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -100,11 +100,11 @@ # Make long macros shorter %global sameevr %{epoch}:%{version}-%{release} %global compatver 10.0 -%global bugfixver 12 +%global bugfixver 13 Name: %{pkgname} Version: %{compatver}.%{bugfixver} -Release: 8%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -147,7 +147,6 @@ Patch5: %{pkgnamepatch}-cipherspec.patch Patch6: %{pkgnamepatch}-file-contents.patch Patch7: %{pkgnamepatch}-dh1024.patch Patch8: %{pkgnamepatch}-scripts.patch -Patch9: %{pkgnamepatch}-paths.patch # Patches specific for this mysql package Patch30: %{pkgnamepatch}-errno.patch @@ -157,7 +156,6 @@ Patch33: %{pkgnamepatch}-covscan-signexpr.patch Patch34: %{pkgnamepatch}-covscan-stroverflow.patch Patch35: %{pkgnamepatch}-config.patch Patch36: %{pkgnamepatch}-ssltest.patch -Patch37: %{pkgnamepatch}-mysql_config.patch BuildRequires: cmake BuildRequires: libaio-devel @@ -451,7 +449,6 @@ MariaDB is a community developed branch of MySQL. %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %patch30 -p1 %patch31 -p1 %patch32 -p1 @@ -459,7 +456,6 @@ MariaDB is a community developed branch of MySQL. %patch34 -p1 %patch35 -p1 %patch36 -p1 -%patch37 -p1 sed -i -e 's/2.8.7/2.6.4/g' cmake/cpack_rpm.cmake @@ -918,6 +914,11 @@ fi %{_mandir}/man1/mysqlshow.1* %{_mandir}/man1/mysqlslap.1* %{_mandir}/man1/my_print_defaults.1* +%{_mandir}/man1/aria_chk.1.gz +%{_mandir}/man1/aria_dump_log.1.gz +%{_mandir}/man1/aria_ftdump.1.gz +%{_mandir}/man1/aria_pack.1.gz +%{_mandir}/man1/aria_read_log.1.gz %config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf %config(noreplace) %{_sysconfdir}/my.cnf.d/connect.cnf @@ -1119,6 +1120,9 @@ fi %endif %changelog +* Wed Aug 13 2014 Honza Horak - 1:10.0.13-1 +- Rebase to version 10.0.13 + * Tue Aug 12 2014 Honza Horak - 1:10.0.12-8 - Introduce -config subpackage and ship base config files here diff --git a/sources b/sources index 8a8137d..c3664dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e9a7c075526f8f2f83ad8e0933bab2f mariadb-10.0.12.tar.gz +7b2e88864b51d7d0607dc37abb8a0adb mariadb-10.0.13.tar.gz