Date: Sat, 21 Sep 2013 23:11:01 GMT
From: Devil <devzone.my@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: ports/182287: Update MariaDB 5.5.33a databases/mariadb55-{client, server}
Message-ID: <201309212311.r8LNB1Qk007336@oldred.freebsd.org>
Resent-Message-ID: <201309212320.r8LNK0jo058631@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182287
>Category: ports
>Synopsis: Update MariaDB 5.5.33a databases/mariadb55-{client,server}
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Sep 21 23:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Devil
>Release: 10.0-ALPHA2
>Organization:
North
>Environment:
10.0-ALPHA2 amd64
>Description:
Changelog:
- 5.5.33a https://mariadb.com/kb/en/mariadb-5533a-changelog/
- 5.5.33 https://mariadb.com/kb/en/mariadb-5533-changelog/
- 5.5.31 https://mariadb.com/kb/en/mariadb-5532-changelog/
Release Notes:
- 5.5.33a https://mariadb.com/kb/en/mariadb-5533a-release-notes/
- 5.5.33 https://mariadb.com/kb/en/mariadb-5533-release-notes/
- 5.5.31 https://mariadb.com/kb/en/mariadb-5532-release-notes/
>How-To-Repeat:
UnitTest:
unittest/mysys/explain_filename-t.cc:21:26: fatal error: mysqld_error.h: No such file or directory
jemalloc and not working (TODO)
Which jemalloc to use, possible values:
'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)
>Fix:
-DWITH_JEMALLOC="system"
-DWITHOUT_UNIT_TESTS=1
Patch attached with submission follows:
diff -ruN /usr/ports/databases/mariadb55-client/files/patch-CMakeLists.txt /usr/ports/databases/mariadb55-client/files/patch-CMakeLists.txt
--- /usr/ports/databases/mariadb55-client/files/patch-CMakeLists.txt 2013-09-22 00:51:17.621767768 +0200
+++ /usr/ports/databases/mariadb55-client/files/patch-CMakeLists.txt 2013-09-22 00:57:04.250749433 +0200
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2013-01-29 16:12:48.000000000 +0200
-+++ CMakeLists.txt 2013-02-01 20:09:31.000000000 +0200
-@@ -303,28 +303,8 @@
+--- CMakeLists.txt.orig 2013-09-21 23:02:13.302525036 +0300
++++ CMakeLists.txt 2013-09-21 23:03:21.409524633 +0300
+@@ -306,28 +306,8 @@
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(libservices)
ADD_SUBDIRECTORY(scripts)
@@ -29,17 +29,17 @@
IF(UNIX)
ADD_SUBDIRECTORY(man)
ENDIF()
-@@ -362,6 +342,7 @@
+@@ -366,6 +346,7 @@
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
+IF(FALSE)
- INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql
- DESTINATION ${INSTALL_DOCREADMEDIR}
- COMPONENT Readme
-@@ -372,6 +353,7 @@
+ INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
+ COMPONENT Readme)
+ INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
+@@ -373,6 +354,7 @@
IF(UNIX)
- INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+ INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
ENDIF()
+ENDIF()
diff -ruN /usr/ports/databases/mariadb55-server/Makefile /usr/ports/databases/mariadb55-server/Makefile
--- /usr/ports/databases/mariadb55-server/Makefile 2013-09-22 00:51:10.498767573 +0200
+++ /usr/ports/databases/mariadb55-server/Makefile 2013-09-22 00:54:36.531753224 +0200
@@ -1,7 +1,7 @@
# $FreeBSD: databases/mariadb55-server/Makefile 327717 2013-09-20 16:13:47Z bapt $
PORTNAME?= mariadb
-PORTVERSION= 5.5.31
+PORTVERSION= 5.5.33a
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
@@ -44,6 +44,8 @@
-DINSTALL_SHAREDIR="share" \
-DINSTALL_SQLBENCHDIR="share/mysql" \
-DINSTALL_SUPPORTFILESDIR="share/mysql" \
+ -DWITH_JEMALLOC="system" \
+ -DWITHOUT_UNIT_TESTS=1 \
-DWITH_LIBEDIT=0 \
-DWITH_LIBWRAP=1
diff -ruN /usr/ports/databases/mariadb55-server/files/patch-CMakeLists.txt /usr/ports/databases/mariadb55-server/files/patch-CMakeLists.txt
--- /usr/ports/databases/mariadb55-server/files/patch-CMakeLists.txt 2013-09-22 00:51:10.498767573 +0200
+++ /usr/ports/databases/mariadb55-server/files/patch-CMakeLists.txt 2013-09-22 00:56:27.638748990 +0200
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2012-11-28 17:49:36.000000000 +0200
-+++ CMakeLists.txt 2012-12-23 02:25:55.000000000 +0200
-@@ -306,17 +306,12 @@
+--- CMakeLists.txt.orig 2013-09-21 22:54:39.925562157 +0300
++++ CMakeLists.txt 2013-09-21 22:55:38.004557095 +0300
+@@ -310,17 +310,12 @@
ADD_SUBDIRECTORY(support-files)
IF(NOT WITHOUT_SERVER)
@@ -18,17 +18,17 @@
IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
ADD_SUBDIRECTORY(internal)
-@@ -360,6 +355,7 @@
+@@ -366,6 +361,7 @@
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
+IF(FALSE)
- INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql
- DESTINATION ${INSTALL_DOCREADMEDIR}
- COMPONENT Readme
-@@ -370,6 +366,7 @@
+ INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
+ COMPONENT Readme)
+ INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
+@@ -373,6 +369,7 @@
IF(UNIX)
- INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+ INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
ENDIF()
+ENDIF()
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309212311.r8LNB1Qk007336>