diff options
| author | brnrd <brnrd@FreeBSD.org> | 2018-11-25 03:17:05 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2018-11-25 03:17:05 +0800 |
| commit | 9c6b62832a756dc729f1f129b9fc3e06d8ec2443 (patch) | |
| tree | 5f1ff156599d7611e556ccdfe271a0bc4b052b22 /databases | |
| parent | 22ac6f126c6e4e830e4f043efd0b9e7475707b44 (diff) | |
| download | freebsd-ports-gnome-9c6b62832a756dc729f1f129b9fc3e06d8ec2443.tar.gz freebsd-ports-gnome-9c6b62832a756dc729f1f129b9fc3e06d8ec2443.tar.zst freebsd-ports-gnome-9c6b62832a756dc729f1f129b9fc3e06d8ec2443.zip | |
databases/mariadb103-server: Security update to 10.3.11
- Add workaround for LZ4, SNAPPY build issues [1]
PR: 233212 [1]
Reported by: Peter Putzer <freebsd mnd sc>
MFH: 2018Q4
Security: ec5072b0-d43a-11e8-a6d2-b499baebfeaf
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb103-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mariadb103-client/pkg-plist | 1 | ||||
| -rw-r--r-- | databases/mariadb103-server/Makefile | 13 | ||||
| -rw-r--r-- | databases/mariadb103-server/distinfo | 6 |
4 files changed, 15 insertions, 6 deletions
diff --git a/databases/mariadb103-client/Makefile b/databases/mariadb103-client/Makefile index a9849c687556..f336d508877a 100644 --- a/databases/mariadb103-client/Makefile +++ b/databases/mariadb103-client/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= mariadb -PORTREVISION= 2 PKGNAMESUFFIX= 103-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mariadb103-client/pkg-plist b/databases/mariadb103-client/pkg-plist index 04206d21ac6c..23c2700af704 100644 --- a/databases/mariadb103-client/pkg-plist +++ b/databases/mariadb103-client/pkg-plist @@ -54,6 +54,7 @@ lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so +libdata/pkgconfig/libmariadb.pc @comment man/man1/aria_chk.1.gz @comment man/man1/aria_dump_log.1.gz @comment man/man1/aria_ftdump.1.gz diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index ca722cfcfa6d..23b4d6513f59 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.10 -PORTREVISION?= 1 +PORTVERSION= 10.3.11 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -139,6 +139,7 @@ INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 +CONNECT_EXTRA_USES= gnome GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_AUTH_GSSAPI_CLIENT=NO LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON @@ -199,4 +200,12 @@ post-patch: ${WRKSRC}/cmake/os/DragonFly.cmake .endif +# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 +post-configure-INNOBASE-on: + ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ + -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ + -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ + -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \ + ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt + .include <bsd.port.post.mk> diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 1c760d6667d8..9894c9af6116 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538732181 -SHA256 (mariadb-10.3.10.tar.gz) = 57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda -SIZE (mariadb-10.3.10.tar.gz) = 70493771 +TIMESTAMP = 1542715300 +SHA256 (mariadb-10.3.11.tar.gz) = 211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2 +SIZE (mariadb-10.3.11.tar.gz) = 70669435 |