From owner-svn-ports-all@freebsd.org Sun Sep 1 14:21:29 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D5CBDB723; Sun, 1 Sep 2019 14:21:29 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46LwPh7009z4Mf4; Sun, 1 Sep 2019 14:21:28 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D31302ADE; Sun, 1 Sep 2019 14:21:28 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x81ELSGJ028860; Sun, 1 Sep 2019 14:21:28 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x81ELRqP028156; Sun, 1 Sep 2019 14:21:27 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201909011421.x81ELRqP028156@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 1 Sep 2019 14:21:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510693 - in head/databases: mariadb104-client mariadb104-server mariadb104-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/databases: mariadb104-client mariadb104-server mariadb104-server/files X-SVN-Commit-Revision: 510693 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Sep 2019 14:21:29 -0000 Author: brnrd Date: Sun Sep 1 14:21:27 2019 New Revision: 510693 URL: https://svnweb.freebsd.org/changeset/ports/510693 Log: databases/mariadb104-server: Security update to 10.4.7 Security: 198e6220-ac8b-11e9-a1c7-b499baebfeaf Added: head/databases/mariadb104-server/files/patch-MDEV-20248 (contents, props changed) head/databases/mariadb104-server/files/patch-MDEV-20258 (contents, props changed) Modified: head/databases/mariadb104-client/Makefile head/databases/mariadb104-server/Makefile head/databases/mariadb104-server/distinfo Modified: head/databases/mariadb104-client/Makefile ============================================================================== --- head/databases/mariadb104-client/Makefile Sun Sep 1 13:50:09 2019 (r510692) +++ head/databases/mariadb104-client/Makefile Sun Sep 1 14:21:27 2019 (r510693) @@ -6,6 +6,8 @@ PKGNAMESUFFIX= 104-client COMMENT= Multithreaded SQL database (client) +BROKEN_i386= compile error: undeclared identifier 'my_atomic_add32' + MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/} FILESDIR= ${.CURDIR}/files Modified: head/databases/mariadb104-server/Makefile ============================================================================== --- head/databases/mariadb104-server/Makefile Sun Sep 1 13:50:09 2019 (r510692) +++ head/databases/mariadb104-server/Makefile Sun Sep 1 14:21:27 2019 (r510693) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.4.6 -PORTREVISION?= 2 +PORTVERSION= 10.4.7 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -149,6 +149,7 @@ OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-li ROCKSDB_USES= python SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy +TOKUDB_BROKEN= Error with bundled liblzma TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi Modified: head/databases/mariadb104-server/distinfo ============================================================================== --- head/databases/mariadb104-server/distinfo Sun Sep 1 13:50:09 2019 (r510692) +++ head/databases/mariadb104-server/distinfo Sun Sep 1 14:21:27 2019 (r510693) @@ -1,3 +1,3 @@ -TIMESTAMP = 1561918517 -SHA256 (mariadb-10.4.6.tar.gz) = a270fe6169a1aaf6f2cbbc945de2c954d818c48e1a0fc02fbed92ecb94678e70 -SIZE (mariadb-10.4.6.tar.gz) = 76710358 +TIMESTAMP = 1564591340 +SHA256 (mariadb-10.4.7.tar.gz) = c8e6a6d0bb4f22c416ed675d24682a3ecfa383c5283efee70c8edf131374d817 +SIZE (mariadb-10.4.7.tar.gz) = 78155161 Added: head/databases/mariadb104-server/files/patch-MDEV-20248 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb104-server/files/patch-MDEV-20248 Sun Sep 1 14:21:27 2019 (r510693) @@ -0,0 +1,13 @@ +--- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2019-07-30 11:32:15 UTC ++++ storage/rocksdb/rocksdb/port/jemalloc_helper.h +@@ -12,6 +12,10 @@ + #include + #endif + ++#ifdef __FreeBSD__ ++#define JEMALLOC_USABLE_SIZE_CONST const ++#endif ++ + #ifndef JEMALLOC_CXX_THROW + #define JEMALLOC_CXX_THROW + #endif Added: head/databases/mariadb104-server/files/patch-MDEV-20258 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb104-server/files/patch-MDEV-20258 Sun Sep 1 14:21:27 2019 (r510693) @@ -0,0 +1,22 @@ +--- plugin/auth_pam/testing/pam_mariadb_mtr.c.orig 2019-07-30 11:32:16.000000000 +0000 ++++ plugin/auth_pam/testing/pam_mariadb_mtr.c 2019-08-20 18:31:37.712246000 +0000 +@@ -15,6 +15,9 @@ + + #define N 3 + ++typedef unsigned int uint; ++typedef unsigned short ushort; ++ + int pam_sm_authenticate(pam_handle_t *pamh, int flags, + int argc, const char *argv[]) + { +--- plugin/auth_pam/CMakeLists.txt.orig 2019-07-30 11:32:16.000000000 +0000 ++++ plugin/auth_pam/CMakeLists.txt 2019-08-23 12:04:17.702326000 +0000 +@@ -21,7 +21,4 @@ IF(HAVE_PAM_APPL_H) + WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)" + COMPONENT Server) + ENDIF() +- IF(TARGET auth_pam OR TARGET auth_pam_v1) +- ADD_SUBDIRECTORY(testing) +- ENDIF() + ENDIF(HAVE_PAM_APPL_H)