Details

Reviewers

antoine
koobs
feld
flo

Group Reviewers

portmgr

Commits

rP408832: databases/mariadb101-{client,server}: Add missing patches
rP408823: databases/mariadb101-server: Remove empty files after repo-copy
rP408822: [NEW PORTS] databases/mariadb101-{server,client}: 10.1.11

Summary

Proposed commit log:

[NEW PORTS] databases/mariadb101-{server,client}: 10.1.10

MariaDB is one of the most popular database servers in the world. It’s made
by the original developers of MySQL and guaranteed to stay open source.
Notable users include Wikipedia, Facebook and Google.

MariaDB turns data into structured information in a wide array of
applications, ranging from banking to websites. It is an enhanced, drop-in
replacement for MySQL. MariaDB is used because it is fast, scalable and
robust, with a rich ecosystem of storage engines, plugins and many other
tools make it very versatile for a wide variety of use cases.

MariaDB is developed as open source software and as a relational database
it provides an SQL interface for accessing data. This latest versions of
MariaDB also include GIS and JSON features.

WWW: http://mariadb.org/

Reviewed_by:	koobs (mentor), feld (mentor)
Approved by:	
Differential_Revision:	D3953

Test Plan

portlint -AC (clean)
poudriere testport -client 10.2amd64 -server 10.2amd64 -client 9.3amd64 -server 9.3amd64
Build with various options (pending)

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 1907
Build 1914: arc lint + arc unit

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes

brnrd updated this object.Nov 15 2015, 2:40 PM

brnrd added a reviewer: flo.

brnrd added a subscriber: feld.

This requires the removal of the MariaDB 5.3 ports before the new ports can be added.

Please create seperate reviews for mariabd* addition and USES=mysql, those changes are orthogonal

This revision now requires changes to proceed.Nov 15 2015, 3:07 PM

Separate new ports from Uses refactor

Add diffs for the correct MariaDB version

brnrd updated this object.Nov 15 2015, 4:32 PM

In D3953#87513, @antoine wrote:

Please create seperate reviews for mariabd* addition and USES=mysql, those changes are orthogonal

See D4166

martijn_pacno.net added a subscriber: martijn_pacno.net.Dec 2 2015, 12:07 PM

freebsd_com.jkkn.dk added a subscriber: freebsd_com.jkkn.dk.Dec 4 2015, 7:12 PM

koobs edited reviewers, added: feld; removed: vsevolod.Dec 24 2015, 12:35 PM

koobs retitled this revision from databases/mariadb101: New -client and -server ports to [NEW PORTS] databases/mariadb101-{server,client}: 10.1.8.

koobs removed subscribers: antoine, feld.

brnrd retitled this revision from [NEW PORTS] databases/mariadb101-{server,client}: 10.1.8 to [NEW PORTS] databases/mariadb101-{server,client}: 10.1.9.Dec 25 2015, 11:06 PM

brnrd updated this object.

Update patches to MariaDB 10.1.9

Update MariaDB 10.1 port

Update to latest version 10.1.10
Add upstream patch for json.cpp clang failure
Use regular strip target

brnrd retitled this revision from [NEW PORTS] databases/mariadb101-{server,client}: 10.1.9 to [NEW PORTS] databases/mariadb101-{server,client}: 10.1.10.Jan 1 2016, 11:53 AM

brnrd edited the test plan for this revision. (Show Details)

brnrd marked 3 inline comments as done.Jan 1 2016, 12:56 PM

brnrd added inline comments.

databases/mariadb101-client/Makefile
16	That's the intention. Adding portname[0-9]* for all ports as this quenches portlint warnings.
databases/mariadb101-client/files/patch-cmake_jemalloc.cmake
6–22	Not at the moment. jemalloc is in base in FreeBSD and the MariaDB doesn't detect that correctly

Fixes for the remaining comments

Use variables to construct INSTALL_CONFLICTS
Work around missing install/strip target in -client

Refactor and upstream jemalloc patch

brnrd added inline comments.Jan 1 2016, 8:08 PM

databases/mariadb101-client/files/patch-cmake_jemalloc.cmake
5–21	Refactored patch and submitted it upstream

[[ https://mariadb.atlassian.net/browse/MDEV-9350 | [PATCH] Fix jemalloc detection for FreeBSD ]]

brnrd edited the test plan for this revision. (Show Details)Jan 2 2016, 10:23 AM

Hmm, am not a fan of negative options, in this case WITHOUT_SSL.

OPTIONS_RADIO allows for none, one or more options to be selected (contrary to what it's name might imply) and having grepped the ports tree for other references to WITHOUT_SSL, none are used in the context of OPTIONS in the same way, other than other mysql/mariadb ports.

Other ports solve this as follows:

./ftp/vsftpd-ext/Makefile:.if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL)

Unfortunately this also precludes the use of OPTIONS helpers, which isn't by itself a warrant for a WITHOUT_SSL option.

Having said that because the other mysql/mariadb ports already use this construct, im happy for it to proceed for now, but I would encourage you to refactor these ports to remove the need for WITHOUT_SSL as an option, while retaining support for users turning SSL support off via WITHOUT_SSL

feld accepted this revision.Jan 3 2016, 8:19 PM

feld edited edge metadata.

Fix OpenSSL and TokuDB options

Upstream has removed building without SSL
TokuDB wasn't building at all before
Make more storage modules configurable

brnrd updated this object.Jan 4 2016, 2:47 PM

brnrd edited edge metadata.

brnrd updated this object.Jan 5 2016, 7:52 PM

Replaced the proposed commit message, the one that was there was no longer accurate. Replaced with http://mariadb.org/about/ and replaced The latest with This latest.

svn rm-ed the whole thing, then repo-copied mariadb100- dirs and fixed remaining renames in files/patch*. Just ran both though poudriere testport and they are OK still.

brnrd updated this object.Jan 5 2016, 9:00 PM

brnrd edited the test plan for this revision. (Show Details)

All patches need what/why breadcrumbs (comments) with upstream references/links if available (mailing lists, issues, commits)
We (project, not royal) strongly prefer not to use bundled libraries. I would prefer to see WOLFSSL as an OPTION{_DEFAULT} with SSL (OPEN) as an alternative option, in an OPTIONS_SINGLE group

This revision now requires changes to proceed.Jan 7 2016, 1:42 PM

Annotate patches, don't use bundled libs

Annotate patches, don't use bundled libs, work around arc failure

To get the patch in using arc after repocopy I had to create 2 empty patches
databases/mariadb101-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
databases/mariadb101-server/files/patch-scripts_CMakeLists.txt

koobs added inline comments.Jan 18 2016, 9:16 AM

databases/mariadb101-client/files/patch-scripts_mysql_config.sh
7–9 ↗	(On Diff #12329)	Can't these be passed into CMAKE_* ? What is the root cause for incorrect/missing in the first place?

Update patch for MariaDB 10.1.11

Patch for CyaSSL no longer required
Patch for json included upstream
Add gssapi auth plugin (with upstream fix)

brnrd added inline comments.Feb 7 2016, 6:29 PM

databases/mariadb101-client/files/patch-scripts_mysql_config.sh
7–9 ↗	(On Diff #12329)	$pkglibdir is dir to MariaDB's libs (default /usr/local/lib/mysql) LIBS_FOR_CLIENTS is the libraries themselves, so I can't see a way to fix this. There's an error here though: /usr/local -> %%LOCALBASE%%

koobs requested changes to this revision.Feb 13 2016, 11:41 AM

koobs edited edge metadata.

koobs added inline comments.

databases/mariadb101-client/files/patch-scripts_mysql_config.sh
7 ↗	(On Diff #13104)	Was changing this from: +libs="$libs -L%%LOCALBASE%%/lib" +libs_r="$libs_r -L%%LOCALBASE%%/lib" +embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib" intentional?
databases/mariadb101-server/Makefile
32	No default?

This revision now requires changes to proceed.Feb 13 2016, 11:41 AM

Fix LOCALBASE hard coding

brnrd marked an inline comment as done.Feb 13 2016, 11:56 AM

brnrd added inline comments.

databases/mariadb101-server/Makefile
32	Added OPTIONS_DEFAULT= GSSAPI_BASE

brnrd marked 2 inline comments as done.Feb 13 2016, 11:59 AM

brnrd added inline comments.

databases/mariadb101-client/files/patch-scripts_mysql_config.sh
12 ↗	(On Diff #13261)	Fixed

Set a default for GSSAPI libs

Pending review by @feld, which I recommend given at least the size of this port.

I note that the replacement of hardcoded /usr/local paths in patches will be deferred to post-initial commit.

Builds for me, approved

Closed by commit rP408822: [NEW PORTS] databases/mariadb101-{server,client}: 10.1.11 (authored by brnrd). · Explain WhyFeb 13 2016, 7:02 PM

This revision was automatically updated to reflect the committed changes.

brnrd mentioned this in rP408822: [NEW PORTS] databases/mariadb101-{server,client}: 10.1.11.

brnrd mentioned this in rP408823: databases/mariadb101-server: Remove empty files after repo-copy.

brnrd mentioned this in rP408832: databases/mariadb101-{client,server}: Add missing patches.Feb 13 2016, 10:34 PM

[NEW PORTS] databases/mariadb101-{server,client}: 10.1.10ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 11842

Mk/bsd.database.mk

databases/mariadb101-client/

databases/mariadb101-client/Makefile

databases/mariadb101-client/files/

databases/mariadb101-client/files/patch-CMakeLists.txt

databases/mariadb101-client/files/patch-client_CMakeLists.txt

databases/mariadb101-client/files/patch-cmake_jemalloc.cmake

databases/mariadb101-client/files/patch-extra_CMakeLists.txt

databases/mariadb101-client/files/patch-extra_yassl_taocrypt_src_integer.cpp

databases/mariadb101-client/files/patch-include_CMakeLists.txt

databases/mariadb101-client/files/patch-include_my__compare.h

databases/mariadb101-client/files/patch-include_mysql_service__encryption.h

databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt

databases/mariadb101-client/files/patch-libservices_CMakeLists.txt

databases/mariadb101-client/files/patch-man_CMakeLists.txt

databases/mariadb101-client/files/patch-mysys_my__default.c

databases/mariadb101-client/files/patch-pcre_CMakeLists.txt

databases/mariadb101-client/files/patch-scripts_CMakeLists.txt

databases/mariadb101-client/files/patch-sql_CMakeLists.txt

databases/mariadb101-client/files/patch-support-files_CMakeLists.txt

databases/mariadb101-client/files/pkg-message.in

databases/mariadb101-client/pkg-plist

databases/mariadb101-server/

databases/mariadb101-server/Makefile

databases/mariadb101-server/distinfo

databases/mariadb101-server/files/

databases/mariadb101-server/files/extra-patch-include_my__compare.h

databases/mariadb101-server/files/mysql-server.in

databases/mariadb101-server/files/patch-CMakeLists.txt

databases/mariadb101-server/files/patch-client_CMakeLists.txt

databases/mariadb101-server/files/patch-cmake_jemalloc.cmake

databases/mariadb101-server/files/patch-extra_CMakeLists.txt

databases/mariadb101-server/files/patch-extra_yassl_taocrypt_src_integer.cpp

databases/mariadb101-server/files/patch-include_CMakeLists.txt

databases/mariadb101-server/files/patch-include_mysql_service__encryption.h

databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt

databases/mariadb101-server/files/patch-libservices_CMakeLists.txt

databases/mariadb101-server/files/patch-man_CMakeLists.txt

databases/mariadb101-server/files/patch-mysys_my__default.c

databases/mariadb101-server/files/patch-pcre_CMakeLists.txt

databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh

databases/mariadb101-server/files/patch-sql_CMakeLists.txt

databases/mariadb101-server/files/patch-sql_sql__trigger.cc

databases/mariadb101-server/files/patch-sql_sql__view.cc

databases/mariadb101-server/files/patch-sql_sys__vars.cc

databases/mariadb101-server/files/patch-storage_PerconaFT-index_portability_memory.cc

databases/mariadb101-server/files/patch-storage_connect_json.cpp

databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt

databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake

databases/mariadb101-server/files/patch-support-files_CMakeLists.txt

databases/mariadb101-server/files/pkg-message.in

databases/mariadb101-server/pkg-descr

databases/mariadb101-server/pkg-plist

[NEW PORTS] databases/mariadb101-{server,client}: 10.1.10
ClosedPublic
Actions

Revision Contents
Changeset List