Update to 5.3.6.
PR: ports/167125 Submitted by: maintainer (with approved plist changes)
This commit is contained in:
Xin LI
parent
ebebc1666d
commit
57aa11775b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=295165
@ -108,7 +108,7 @@ DEFAULT_MYSQL_VER?= 55
|
||||
MYSQL41_LIBVER= 14
|
||||
MYSQL50_LIBVER= 15
|
||||
MYSQL51_LIBVER= 16
|
||||
MYSQL52_LIBVER= 16
|
||||
MYSQL53_LIBVER= 16
|
||||
MYSQL55_LIBVER= 18
|
||||
|
||||
# Setting/finding MySQL version we want.
|
||||
@ -137,7 +137,7 @@ IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is i
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if (${MYSQL_VER} == "52")
|
||||
.if (${MYSQL_VER} == "53")
|
||||
_MYSQL_CLIENT= databases/mariadb-client
|
||||
_MYSQL_SERVER= databases/mariadb-server
|
||||
.else
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- scripts/Makefile.in.orig 2011-03-01 22:25:08.000000000 -0800
|
||||
+++ scripts/Makefile.in 2011-06-02 23:35:04.000000000 -0700
|
||||
@@ -477,21 +477,7 @@
|
||||
--- scripts/Makefile.in.orig 2012-04-20 18:35:25.000000000 +0200
|
||||
+++ scripts/Makefile.in 2012-04-20 18:38:15.000000000 +0200
|
||||
@@ -495,22 +495,7 @@
|
||||
BUILT_SOURCES = mysql_fix_privilege_tables.sql \
|
||||
mysql_fix_privilege_tables_sql.c
|
||||
|
||||
@ -17,13 +17,14 @@
|
||||
- mysql_convert_table_format \
|
||||
- mysql_find_rows \
|
||||
- mysqlhotcopy \
|
||||
- mytop \
|
||||
- mysqldumpslow \
|
||||
- mysqld_multi
|
||||
+bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug
|
||||
|
||||
noinst_SCRIPTS = make_binary_distribution \
|
||||
make_sharedlib_distribution \
|
||||
@@ -528,11 +514,7 @@
|
||||
@@ -548,11 +533,7 @@
|
||||
mysql_system_tables_fix.sql \
|
||||
CMakeLists.txt
|
||||
|
||||
|
||||
@ -17,11 +17,13 @@ include/mysql/errmsg.h
|
||||
include/mysql/keycache.h
|
||||
include/mysql/m_ctype.h
|
||||
include/mysql/m_string.h
|
||||
include/mysql/ma_dyncol.h
|
||||
include/mysql/my_alloc.h
|
||||
include/mysql/my_attribute.h
|
||||
include/mysql/my_compiler.h
|
||||
include/mysql/my_config.h
|
||||
include/mysql/my_dbug.h
|
||||
include/mysql/my_decimal_limits.h
|
||||
include/mysql/my_dir.h
|
||||
include/mysql/my_getopt.h
|
||||
include/mysql/my_global.h
|
||||
@ -44,6 +46,7 @@ include/mysql/plugin_auth.h
|
||||
include/mysql/plugin_auth_common.h
|
||||
include/mysql/readline.h
|
||||
include/mysql/service_my_snprintf.h
|
||||
include/mysql/service_progress_report.h
|
||||
include/mysql/service_thd_alloc.h
|
||||
include/mysql/services.h
|
||||
include/mysql/sql_common.h
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= mariadb
|
||||
PORTVERSION= 5.2.10
|
||||
PORTVERSION= 5.3.6
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES= databases ipv6
|
||||
MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
|
||||
@ -33,7 +33,7 @@ GNU_CONFIGURE= yes
|
||||
|
||||
.if !defined(MARIADB_CLIENT_SLAVE)
|
||||
USE_MYSQL= yes
|
||||
WANT_MYSQL_VER= 52
|
||||
WANT_MYSQL_VER= 53
|
||||
.endif
|
||||
|
||||
.if !defined(MARIADB_SCRIPTS_SLAVE)
|
||||
@ -77,6 +77,7 @@ OPTIONS+= ARIADB "Aria storage engine" On \
|
||||
OQGRAPH "Open Query Graph Computation engine" Off \
|
||||
PBXT "MVCC-based transactional engine" Off \
|
||||
PARTITION "Partitioning support" Off \
|
||||
HANDLERSOCKET "HandlerSocket support" On \
|
||||
NDB "Enable NDB support (implies PARTITION)" Off \
|
||||
EXAMPLES "Example engine,daemon and ftsearch plugins" Off
|
||||
.endif # .if !defined(MARIADB_CLIENT_SLAVE)
|
||||
@ -169,6 +170,13 @@ PLUGINS+= xtradb
|
||||
CONFIGURE_ARGS+= --without-plugin-xtradb
|
||||
PLIST_SUB+= XTRADB="@comment "
|
||||
.endif
|
||||
.if defined(WITH_HANDLERSOCKET)
|
||||
PLIST_SUB+= HANDLERSOCKET=""
|
||||
PLUGINS+= handlersocket
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-plugin-handlersocket
|
||||
PLIST_SUB+= HANDLERSOCKET="@comment "
|
||||
.endif
|
||||
.if defined(WITH_OQGRAPH)
|
||||
CONFIGURE_ARGS+= --with-plugin-oqgraph
|
||||
PLIST_SUB+= OQGRAPH=""
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SIZE (mariadb-5.2.10.tar.gz) = 25242675
|
||||
SHA256 (mariadb-5.2.10.tar.gz) = dbcbd4f627fa7a045094fe5e1b0d27201966937d0135e54ca892fb5ab912d7b3
|
||||
SIZE (mariadb-5.3.6.tar.gz) = 26724631
|
||||
SHA256 (mariadb-5.3.6.tar.gz) = 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- plugin/auth_pam/auth_pam.c.orig 2012-01-04 14:17:30.000000000 +0100
|
||||
+++ plugin/auth_pam/auth_pam.c 2012-01-04 14:17:36.000000000 +0100
|
||||
@@ -1,7 +1,6 @@
|
||||
#include <mysql/plugin_auth.h>
|
||||
#include <string.h>
|
||||
#include <security/pam_appl.h>
|
||||
-#include <security/pam_modules.h>
|
||||
|
||||
struct param {
|
||||
unsigned char buf[10240], *ptr;
|
||||
@ -10,6 +10,8 @@ bin/myisam_ftdump
|
||||
bin/myisamchk
|
||||
bin/myisamlog
|
||||
bin/myisampack
|
||||
bin/mytop
|
||||
%%HANDLERSOCKET%%bin/hsclient
|
||||
bin/mysql_client_test_embedded
|
||||
bin/mysql_convert_table_format
|
||||
bin/mysql_find_rows
|
||||
@ -48,6 +50,22 @@ bin/replace
|
||||
bin/resolve_stack_dump
|
||||
bin/resolveip
|
||||
%%PBXT%%bin/xtstat
|
||||
%%HANDLERSOCKET%%include/handlersocket/allocator.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/config.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/mutex.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/string_util.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/auto_addrinfo.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/escape.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/socket.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/thread.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/auto_file.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/fatal.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/string_buffer.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/util.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/auto_ptrcontainer.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/hstcpcli.hpp
|
||||
%%HANDLERSOCKET%%include/handlersocket/string_ref.hpp
|
||||
%%HANDLERSOCKET%%@dirrm include/handlersocket
|
||||
%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h
|
||||
%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h
|
||||
%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h
|
||||
@ -80,6 +98,10 @@ bin/resolveip
|
||||
%%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h
|
||||
%%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
|
||||
%%ARIADB%%lib/mysql/libaria.a
|
||||
%%HANDLERSOCKET%%lib/libhsclient.so.0
|
||||
%%HANDLERSOCKET%%lib/libhsclient.so
|
||||
%%HANDLERSOCKET%%lib/libhsclient.la
|
||||
%%HANDLERSOCKET%%lib/libhsclient.a
|
||||
lib/mysql/libdbug.a
|
||||
lib/mysql/libheap.a
|
||||
lib/mysql/libmyisam.a
|
||||
@ -96,7 +118,10 @@ lib/mysql/libmysys.a
|
||||
%%NDB%%lib/mysql/libndbclient.so
|
||||
%%NDB%%lib/mysql/libndbclient.so.3
|
||||
lib/mysql/libvio.a
|
||||
%%STATIC%%lib/mysql/plugin/auth_pam.a
|
||||
%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so.0
|
||||
%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so
|
||||
%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.la
|
||||
%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.a
|
||||
%%STATIC%%lib/mysql/plugin/auth_pam.la
|
||||
%%STATIC%%lib/mysql/plugin/auth_pam.so
|
||||
%%STATIC%%lib/mysql/plugin/auth_pam.so.0
|
||||
@ -104,15 +129,12 @@ lib/mysql/libvio.a
|
||||
%%STATIC%%lib/mysql/plugin/dialog.la
|
||||
%%STATIC%%lib/mysql/plugin/dialog.so
|
||||
%%STATIC%%lib/mysql/plugin/dialog.so.0
|
||||
%%STATIC%%lib/mysql/plugin/feedback.a
|
||||
%%STATIC%%lib/mysql/plugin/feedback.la
|
||||
%%STATIC%%lib/mysql/plugin/feedback.so
|
||||
%%STATIC%%lib/mysql/plugin/feedback.so.0
|
||||
%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.a
|
||||
%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.la
|
||||
%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so
|
||||
%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0
|
||||
%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a
|
||||
%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la
|
||||
%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so
|
||||
%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0
|
||||
@ -132,7 +154,6 @@ lib/mysql/libvio.a
|
||||
%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.la
|
||||
%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so
|
||||
%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0
|
||||
%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a
|
||||
%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la
|
||||
%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so
|
||||
%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0
|
||||
@ -151,7 +172,6 @@ lib/mysql/libvio.a
|
||||
%%SPHINX%%lib/mysql/plugin/sphinx.la
|
||||
%%SPHINX%%lib/mysql/plugin/sphinx.so
|
||||
%%SPHINX%%lib/mysql/plugin/sphinx.so.0
|
||||
%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.a
|
||||
%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.la
|
||||
%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so
|
||||
%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user