Page MenuHomeFreeBSD
Differential D3953

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

Authored by brnrd on Oct 20 2015, 7:30 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Jan 11, 8:02 AM
Unknown Object (File)
Wed, Jan 8, 4:05 AM
Unknown Object (File)
Sat, Jan 4, 11:28 AM
Unknown Object (File)
Wed, Dec 25, 7:49 AM
Unknown Object (File)
Sun, Dec 22, 2:20 AM
Unknown Object (File)
Tue, Dec 17, 2:56 PM
Unknown Object (File)
Dec 12 2024, 5:17 PM
Unknown Object (File)
Dec 11 2024, 3:58 PM
View All Files
Subscribers
freebsd_com.jkkn.dk
martijn_pacno.net
Tokens
"Like" token, awarded by ultima1252_gmail.com.

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

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 1147
Build 1151: 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.
brnrd added a comment.Nov 15 2015, 2:44 PM

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

antoine requested changes to this revision.Nov 15 2015, 3:07 PM
antoine added a reviewer: antoine.
antoine added a subscriber: antoine.

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
brnrd updated this revision to Diff 10197.Nov 15 2015, 4:31 PM
brnrd edited edge metadata.

Separate new ports from Uses refactor

brnrd updated this revision to Diff 10198.Nov 15 2015, 4:32 PM
brnrd edited edge metadata.

Add diffs for the correct MariaDB version

brnrd updated this object.Nov 15 2015, 4:32 PM
brnrd added a comment.Nov 15 2015, 4:49 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.
brnrd updated this revision to Diff 11691.Dec 25 2015, 11:22 PM
brnrd marked 2 inline comments as done.

Update patches to MariaDB 10.1.9

brnrd updated this revision to Diff 11841.Jan 1 2016, 11:51 AM

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

brnrd updated this revision to Diff 11842.Jan 1 2016, 12:59 PM
brnrd marked an inline comment as done.

Fixes for the remaining comments

  • Use variables to construct INSTALL_CONFLICTS
  • Work around missing install/strip target in -client
brnrd updated this revision to Diff 11844.Jan 1 2016, 2:52 PM

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

brnrd added a comment.Jan 2 2016, 10:19 AM

[[ 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
koobs accepted this revision.Jan 2 2016, 4:37 PM
koobs updated this object.
koobs edited edge metadata.

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.
brnrd updated this revision to Diff 11885.Jan 3 2016, 8:45 PM
brnrd 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
brnrd added a comment.Jan 5 2016, 8:08 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)
koobs requested changes to this revision.Jan 7 2016, 1:42 PM
koobs edited edge metadata.
  • 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
brnrd updated this revision to Diff 12090.Jan 10 2016, 11:06 AM
brnrd edited edge metadata.

Annotate patches, don't use bundled libs

brnrd updated this revision to Diff 12329.Jan 14 2016, 9:04 PM
brnrd edited edge metadata.

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

brnrd added a comment.Jan 14 2016, 9:06 PM

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?

brnrd updated this revision to Diff 13104.Feb 7 2016, 3:05 PM
brnrd marked an inline comment as done.

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 ↗(On Diff #13104)

No default?

This revision now requires changes to proceed.Feb 13 2016, 11:41 AM
brnrd updated this revision to Diff 13261.Feb 13 2016, 11:52 AM
brnrd edited edge metadata.

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 ↗(On Diff #13104)

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

brnrd updated this revision to Diff 13262.Feb 13 2016, 12:02 PM
brnrd marked an inline comment as done.
brnrd edited edge metadata.

Set a default for GSSAPI libs

koobs accepted this revision.Feb 13 2016, 12:09 PM
koobs edited edge metadata.

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.

feld accepted this revision.Feb 13 2016, 3:59 PM
feld edited edge metadata.

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

Revision Contents
Changeset List

Diff 10197

View Options

databases/Makefile

Loading...
View Options

databases/mariadb-server/

Loading...
View Options

databases/mariadb-server/Makefile

Loading...
View Options

databases/mariadb-server/distinfo

Loading...
View Options

databases/mariadb-server/files/extra-patch-include__my_handler.h

Loading...
View Options

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

Loading...
View Options

databases/mariadb-server/files/patch-Makefile.in

Loading...
View Options

databases/mariadb-server/files/patch-man__Makefile.in

Loading...
View Options

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

Loading...
View Options

databases/mariadb-server/files/scripts__Makefile.in

Loading...
View Options

databases/mariadb-server/pkg-descr

Loading...
View Options

databases/mariadb-server/pkg-plist

Loading...
View Options

databases/mariadb101-client/

Loading...
View Options

databases/mariadb101-client/Makefile

Loading...
View Options

databases/mariadb101-client/files/

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

databases/mariadb101-client/pkg-plist

Loading...