commit 7fdb99c8cd7bf095fdca45a86950b0f648a65de8
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Fri Oct 28 19:46:51 2016 +0200
- builds but more work is needed (files; testing)
mariadb.spec | 72 +++++++++++--------------------------------------
mysql-alpha.patch | 12 ---------
mysql-bug-34192.patch | 58 ---------------------------------------
mysql-bug-67018.patch | 11 --------
mysql-build.patch | 12 ---------
mysql-libwrap.patch | 19 -------------
mysql-maria-libs.patch | 50 ----------------------------------
mysql-sql-cxx-pic.patch | 10 -------
mysql-upgrade.patch | 31 ---------------------
9 files changed, 16 insertions(+), 259 deletions(-)
---
diff --git a/mariadb.spec b/mariadb.spec
index 32a131d..95ff5c0 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -28,14 +28,14 @@ Summary(ru.UTF-8): MariaDB - быстрый SQL-сервер
Summary(uk.UTF-8): MariaDB - швидкий SQL-сервер
Summary(zh_CN.UTF-8): MariaDB数据库服务器
Name: mariadb
-Version: 10.0.10
-Release: 0.5
+Version: 10.1.18
+Release: 0.1
License: GPL + MariaDB FLOSS Exception
Group: Applications/Databases
-Source0:
http://ftp.osuosl.org/pub/mariadb/%{name}-%{version}/kvm-tarbake-jaunty-x86/mariadb-%{version}.tar.gz
-# Source0-md5: 14ce22b8197d4eae88d237776d47220f
-Source100: http://sphinxsearch.com/files/sphinx-2.1.7-release.tar.gz
-# Source100-md5: f4bda397e0499df965af41939a489df3
+Source0:
https://downloads.mariadb.org/f/%{name}-%{version}/source/%{name}-%{version}.tar.gz
+# Source0-md5: 173b88ab54bdd1fc51483b6b26bef849
+Source100: http://sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
+# Source100-md5: 5cac34f3d78a9d612ca4301abfcbd666
Source1: mysql.init
Source2: mysql.sysconfig
Source3: mysql.logrotate
@@ -48,23 +48,7 @@ Source10: mysql-ndb-mgm.sysconfig
Source11: mysql-ndb-cpc.init
Source12: mysql-ndb-cpc.sysconfig
Source13: mysql-client.conf
-#Patch0: mysql-maria-libs.patch
-Patch1: mysql-libwrap.patch
-Patch2: mysql-c++.patch
-Patch3: mysql-info.patch
-Patch4: mysql-sql-cxx-pic.patch
-#Patch5: mysql-noproc.patch
-#Patch6: mysql-system-users.patch
-Patch7: mysql-bug-34192.patch
-Patch8: mysql-client-config.patch
-Patch9: mysql-build.patch
-Patch10: mysql-alpha.patch
-#Patch11: mysql-upgrade.patch
-#Patch12: mysql-NDB_CXXFLAGS.patch
-#Patch14: mysql-bug-18156.patch
-#Patch16: mysql-bug-29082.patch
-#Patch17: %{name}-libevent.patch
-Patch18: mysql-bug-67018.patch
+Patch0: mysql-client-config.patch
URL: https://mariadb.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -251,7 +235,7 @@ Summary: MariaDB additional utilities written in Perl
Summary(pl.UTF-8): Dodatkowe narzędzia do MariaDB napisane w Perlu
Group: Applications/Databases
Requires: %{name}-extras = %{version}-%{release}
-Requires: perl(DBD::mysql)
+Requires: perl-DBD-mysql
%description extras-perl
MariaDB additional utilities written in Perl.
@@ -366,7 +350,7 @@ Summary(uk.UTF-8): MariaDB - бенчмарки
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
Requires: %{name}-client
-Requires: perl(DBD::mysql)
+Requires: perl-DBD-mysql
%description bench
This package contains MariaDB benchmark scripts and data.
@@ -460,29 +444,8 @@ process.
%if %{with sphinx}
mv sphinx-*/mysqlse storage/sphinx
%endif
-#%patch0 -p1
-#%{?with_tcpd:%patch1 -p1} # WHATS PURPOSE OF THIS PATCH?
-#%%patch2 -p1 # NEEDS CHECK, which exact program needs -lc++
-#%%patch3 -p1 # NEEDS UPDATE
-%ifarch alpha
-# this is strange: mysqld functions for UDF modules are not explicitly defined,
-# so -rdynamic is used; in such case gcc3+ld on alpha doesn't like C++ vtables
-# in objects compiled without -fPIC
-%patch4 -p1
-# gcc 3.3.x ICE
-%patch10 -p1
-%endif
-#%patch5 -p1
-#%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-#%patch11 -p1
-#%%patch12 -p1 # OUTDATED?
-#%%patch14 -p1 # OUTDATED?
-#%%patch16 -p1 # NO FILE IN CVS
-#%patch17 -p1
-%patch18 -p1
+
+%patch0 -p1
%build
install -d build
@@ -547,9 +510,6 @@ install -d
$RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,%{name},skel}
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-%{__mv}
$RPM_BUILD_ROOT%{_docdir}/{COPYING,COPYING.LESSER,CREDITS,INFO_BIN,INFO_SRC} .
-%{__mv}
$RPM_BUILD_ROOT%{_docdir}/{INSTALL-BINARY,README,README-TOKUDB,README.md,TODO} .
-
cp -p Docs/mysql.info $RPM_BUILD_ROOT%{_infodir}
# we use our own
@@ -628,7 +588,7 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck
%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_waitpid.1*
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql.server*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysqlman.1*
+#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysqlman.1*
#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/comp_err.1*
# we don't package those (we have no -test or -testsuite pkg) and some of them
just segfault
@@ -706,7 +666,7 @@ fi
%files
%defattr(644,root,root,755)
-%doc KNOWN_BUGS.txt README COPYING.LESSER CREDITS TODO COPYING INFO_BIN
INFO_SRC INSTALL-BINARY README-TOKUDB README.md
+%doc KNOWN_BUGS.txt README COPYING.LESSER CREDITS COPYING
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/mysql
%attr(754,root,root) /etc/rc.d/init.d/mysql
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/sysconfig/mysql
@@ -730,7 +690,7 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/plugin/auth_test_plugin.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/dialog.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/dialog_examples.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/feedback.so
+#%attr(755,root,root) %{_libdir}/%{name}/plugin/feedback.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_federated.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_innodb.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/handlersocket.so
@@ -774,7 +734,7 @@ fi
%{_mandir}/man1/myisampack.1*
%{_mandir}/man1/my_print_defaults.1*
%{_mandir}/man1/mysqlcheck.1*
-%{_mandir}/man1/mysql_fix_privilege_tables.1*
+#%{_mandir}/man1/mysql_fix_privilege_tables.1*
%{_mandir}/man1/mysql_upgrade.1*
%{_mandir}/man1/mysql_plugin.1*
%{_mandir}/man8/mysqld.8*
@@ -914,7 +874,7 @@ fi
#%{_mandir}/man1/mysqlmanager-pwgen.1*
%{_mandir}/man1/mysqlshow.1*
%{_mandir}/man1/mysqlslap.1*
-%{_mandir}/man8/mysqlmanager.8*
+#%{_mandir}/man8/mysqlmanager.8*
%files libs
%defattr(644,root,root,755)
diff --git a/mysql-alpha.patch b/mysql-alpha.patch
deleted file mode 100644
index a93b2fd..0000000
--- a/mysql-alpha.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urbB mysql-5.0.15.org/ndb/src/kernel/blocks/dbtc/Makefile.am
mysql-5.0.15/ndb/src/kernel/blocks/dbtc/Makefile.am
---- mysql-5.0.15.org/ndb/src/kernel/blocks/dbtc/Makefile.am 2005-10-17
03:27:27.000000000 +0200
-+++ mysql-5.0.15/ndb/src/kernel/blocks/dbtc/Makefile.am 2005-10-25
15:15:29.000000000 +0200
-@@ -1,5 +1,7 @@
- noinst_LIBRARIES = libdbtc.a
-
-+CXXFLAGS += -O0
-+
- libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp
-
- include $(top_srcdir)/ndb/config/common.mk.am
-
diff --git a/mysql-bug-34192.patch b/mysql-bug-34192.patch
deleted file mode 100644
index d6491d4..0000000
--- a/mysql-bug-34192.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Chad MILLERDate: February 1 2008 5:53pm
-Subject: bk commit into 5.0 tree (cmiller:1.2572) BUG#34192
-
-Below is the list of changes that have just been committed into a local
-5.0 repository of cmiller. When cmiller does a push these changes
-will be propagated to the main repository and, within 24 hours after the
-push, to the public repository.
-For information on how to access the public repository
-see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
-
-ChangeSet@stripped, 2008-02-01 11:53:48-05:00, cmiller@stripped +1 -0
- Bug#34192: mysqldump from mysql 5.0.51 silently fails on dumping \
- databases from 4.0 server
-
- Contribution from Arkadiusz Miskiewicz. No CLA required for this size.
-
- mysqldump treated a failure to set the results charset as a severe
- error.
-
- Now, don't try to set the charset for the SHOW CREATE TABLE statement,
- if the dumper doesn't want SET NAMES or the remote server doesn't
- support changing charsets.
-
- (The original patch tried to set the charset to binary and back in
- any case, and only exited-with-failure if the dumper wanted it and
- the remote server supported it.)
-
- client/mysqldump.c@stripped, 2008-02-01 11:53:46-05:00, cmiller@stripped +13
-3
- Don't set the charset for receiving results if it's not wanted or if
- the server doesn't support it.
-
-diff -Nrup a/client/mysqldump.c b/client/mysqldump.c
---- a/client/mysqldump.c 2007-12-04 22:07:00 -05:00
-+++ b/client/mysqldump.c 2008-02-01 11:53:46 -05:00
-@@ -1705,10 +1705,20 @@ static uint get_table_structure(char *ta
-
- my_snprintf(buff, sizeof(buff), "show create table %s", result_table);
-
-- if (switch_character_set_results(mysql, "binary") ||
-- mysql_query_with_error_report(mysql, &result, buff) ||
-- switch_character_set_results(mysql, default_charset))
-+ if (opt_set_charset) /* Was forced to false if server is too old. */
-+ {
-+ if (switch_character_set_results(mysql, "binary") != 0)
-+ DBUG_RETURN(0);
-+ }
-+
-+ if (mysql_query_with_error_report(mysql, &result, buff) != 0)
- DBUG_RETURN(0);
-+
-+ if (opt_set_charset) /* Was forced to false if server is too old. */
-+ {
-+ if (switch_character_set_results(mysql, default_charset) != 0)
-+ DBUG_RETURN(0);
-+ }
-
- if (path)
- {
diff --git a/mysql-bug-67018.patch b/mysql-bug-67018.patch
deleted file mode 100644
index ac280be..0000000
--- a/mysql-bug-67018.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sql/mysqld.cc 2014-04-07 08:41:22.178686821 +0200
-+++ b/sql/mysqld.cc 2014-04-07 08:46:10.282352356 +0200
-@@ -6200,7 +6200,7 @@
- The connection was refused by TCP wrappers.
- There are no details (by client IP) available to update the
host_cache.
- */
-- statistic_increment(connection_tcpwrap_errors, &LOCK_status);
-+ statistic_increment(connection_errors_tcpwrap, &LOCK_status);
- continue;
- }
- }
diff --git a/mysql-build.patch b/mysql-build.patch
deleted file mode 100644
index 11ef6ee..0000000
--- a/mysql-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNbB mysql-5.0.13-rc.org/sql/mysqld.cc mysql-5.0.13-rc/sql/mysqld.cc
---- mysql-5.0.13-rc.org/sql/mysqld.cc 2005-09-22 21:39:56.000000000 +0200
-+++ mysql-5.0.13-rc/sql/mysqld.cc 2005-09-29 19:29:59.991454000 +0200
-@@ -3183,7 +3183,7 @@
- init_ssl();
-
- #ifdef HAVE_LIBWRAP
-- libwrapName= my_progname+dirname_length(my_progname);
-+ libwrapName= (char *)my_progname+dirname_length(my_progname);
- openlog(libwrapName, LOG_PID, LOG_AUTH);
- #endif
-
diff --git a/mysql-libwrap.patch b/mysql-libwrap.patch
deleted file mode 100644
index 78c7959..0000000
--- a/mysql-libwrap.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- mysql-4.1.9/sql/mysqld.cc.orig 2005-01-11 23:06:00.000000000 +0100
-+++ mysql-4.1.9/sql/mysqld.cc 2005-02-06 17:21:26.238717200 +0100
-@@ -133,7 +133,16 @@
- #endif /* __WIN__ */
-
- #ifdef HAVE_LIBWRAP
-+#define hosts_access hosts_access_old
-+#define sock_host sock_host_old
-+#define eval_client eval_client_old
- #include <tcpd.h>
-+#undef hosts_access
-+#undef sock_host
-+#undef eval_client
-+extern int hosts_access(struct request_info *);
-+extern int sock_host(struct request_info *);
-+extern int eval_client(struct request_info *);
- #include <syslog.h>
- #ifdef NEED_SYS_SYSLOG_H
- #include <sys/syslog.h>
diff --git a/mysql-maria-libs.patch b/mysql-maria-libs.patch
deleted file mode 100644
index c8d5e24..0000000
--- a/mysql-maria-libs.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- mysql-5.1.23a-maria-alpha/configure.in~ 2008-03-03 22:43:19.000000000
+0200
-+++ mysql-5.1.23a-maria-alpha/configure.in 2008-03-03 22:43:54.847337579
+0200
-@@ -787,9 +787,9 @@
-
- AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
-
--AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
-- AC_CHECK_LIB(nsl, gethostbyname_r))
--AC_CHECK_FUNC(gethostbyname_r)
-+AC_CHECK_FUNC(gethostbyname_r, [],
-+ [AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
-+ [AC_CHECK_LIB(nsl, gethostbyname_r)])])
-
- AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
- AC_CHECK_FUNC(yp_get_default_domain, ,
-@@ -836,7 +836,11 @@
- # This may get things to compile even if bind-8 is installed
- AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
- # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
--AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
-+save_LIBS="$LIBS"
-+AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
-+AC_SUBST(LIBCRYPT)
-+AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
-+LIBS="$save_LIBS"
- # See if we need a library for address lookup.
- AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
-
---- mysql-5.0.21/libmysql_r/Makefile.am~ 2006-05-02 16:55:15.179229923
+0300
-+++ mysql-5.0.21/libmysql_r/Makefile.am 2006-05-02 16:56:08.080408785
+0300
-@@ -30,7 +30,7 @@
- include $(top_srcdir)/libmysql/Makefile.shared
-
- nodist_libmysqlclient_r_la_SOURCES = $(target_sources)
--libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)
-+libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las) -lpthread
- libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
-
- link_sources:
---- mysql-5.1.21-beta/sql/Makefile.am~ 2007-08-29 18:58:33.000000000 +0300
-+++ mysql-5.1.21-beta/sql/Makefile.am 2007-08-29 19:01:33.000000000 +0300
-@@ -43,7 +43,7 @@
- @pstack_libs@ \
- @mysql_plugin_libs@ \
- $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
-- $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
-+ $(yassl_libs) $(openssl_libs) @LIBCRYPT@
@MYSQLD_EXTRA_LIBS@
-
- noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
- item_strfunc.h item_timefunc.h \
diff --git a/mysql-sql-cxx-pic.patch b/mysql-sql-cxx-pic.patch
deleted file mode 100644
index 5e82fe8..0000000
--- a/mysql-sql-cxx-pic.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysql-5.0.26/sql/Makefile.am~ 2006-10-10 21:06:32.407695412 +0300
-+++ mysql-5.0.26/sql/Makefile.am 2006-10-11 00:35:45.939463254 +0300
-@@ -122,6 +122,7 @@
- DISTCLEANFILES = lex_hash.h sql_yacc.output
-
- AM_YFLAGS = -d --debug --verbose
-+AM_CXXFLAGS = -fPIC
-
- mysql_tzinfo_to_sql.cc:
- rm -f mysql_tzinfo_to_sql.cc
diff --git a/mysql-upgrade.patch b/mysql-upgrade.patch
deleted file mode 100644
index b1d0935..0000000
--- a/mysql-upgrade.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysql-5.1.28-rc/client/mysql_upgrade.c~ 2008-09-14 23:53:11.000000000
+0300
-+++ mysql-5.1.28-rc/client/mysql_upgrade.c 2008-09-15 00:02:34.047520349
+0300
-@@ -31,12 +31,12 @@
- # endif
- #endif
-
--static char mysql_path[FN_REFLEN];
--static char mysqlcheck_path[FN_REFLEN];
-+static char *mysql_path = "/usr/bin/mysql";
-+static char *mysqlcheck_path = "/usr/sbin/mysqlcheck";
-
- static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag;
- static uint my_end_arg= 0;
--static char *opt_user= (char*)"root";
-+static char *opt_user= (char*)"mysql";
-
- static DYNAMIC_STRING ds_args;
-
-@@ -761,12 +761,6 @@
- dynstr_append_os_quoted(&ds_args, "--user=", opt_user, NullS);
- dynstr_append(&ds_args, " ");
-
-- /* Find mysql */
-- find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name);
--
-- /* Find mysqlcheck */
-- find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"),
self_name);
--
- /*
- Read the mysql_upgrade_info file to check if mysql_upgrade
- already has been run for this installation of MySQL
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mariadb.git/commitdiff/7fdb99c8cd7bf095fdca45a86950b0f648a65de8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
