From owner-svn-ports-all@freebsd.org Mon Nov 26 18:01:55 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4842113E9EF; Mon, 26 Nov 2018 18:01:55 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6CC0580212; Mon, 26 Nov 2018 18:01:55 +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 3508776F2; Mon, 26 Nov 2018 18:01:55 +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 wAQI1ttp031799; Mon, 26 Nov 2018 18:01:55 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAQI1scJ031798; Mon, 26 Nov 2018 18:01:54 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201811261801.wAQI1scJ031798@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 26 Nov 2018 18:01:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485950 - in branches/2018Q4/databases/mariadb102-server: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2018Q4/databases/mariadb102-server: . files X-SVN-Commit-Revision: 485950 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6CC0580212 X-Spamd-Result: default: False [1.39 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.66)[0.661,0]; NEURAL_SPAM_MEDIUM(0.61)[0.607,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.12)[0.123,0] X-Rspamd-Server: mx1.freebsd.org 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: Mon, 26 Nov 2018 18:01:56 -0000 Author: brnrd Date: Mon Nov 26 18:01:54 2018 New Revision: 485950 URL: https://svnweb.freebsd.org/changeset/ports/485950 Log: MFH: r481016 databases/mariadb102-server: Update to 10.2.18 Merge missing parts from r481016 to fix build failure Approved by: ports-secteam Deleted: branches/2018Q4/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc Modified: branches/2018Q4/databases/mariadb102-server/Makefile branches/2018Q4/databases/mariadb102-server/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/mariadb102-server/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb102-server/Makefile Mon Nov 26 17:38:02 2018 (r485949) +++ branches/2018Q4/databases/mariadb102-server/Makefile Mon Nov 26 18:01:54 2018 (r485950) @@ -184,11 +184,11 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h .endif # defined(CLIENT_ONLY) -.if defined(WITH_OPENSSL_PORT) -GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system -.endif - .include + +.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} +IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system +.endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" Modified: branches/2018Q4/databases/mariadb102-server/pkg-plist ============================================================================== --- branches/2018Q4/databases/mariadb102-server/pkg-plist Mon Nov 26 17:38:02 2018 (r485949) +++ branches/2018Q4/databases/mariadb102-server/pkg-plist Mon Nov 26 18:01:54 2018 (r485950) @@ -103,7 +103,9 @@ man/man1/aria_read_log.1.gz man/man1/galera_new_cluster.1.gz man/man1/galera_recovery.1.gz man/man1/innochecksum.1.gz +man/man1/mariabackup.1.gz man/man1/mariadb-service-convert.1.gz +man/man1/mbstream.1.gz man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz @@ -113,6 +115,7 @@ man/man1/mysql.server.1.gz man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz +man/man1/mysql_ldb.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz @@ -127,11 +130,13 @@ man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz -man/man1/tokuft_logdump.1.gz -man/man1/tokuftdump.1.gz +%%TOKUDB%%man/man1/tokuft_logprint.1.gz +%%TOKUDB%%man/man1/tokuftdump.1.gz man/man1/wsrep_sst_common.1.gz +man/man1/wsrep_sst_mariabackup.1.gz man/man1/wsrep_sst_mysqldump.1.gz man/man1/wsrep_sst_rsync.1.gz +man/man1/wsrep_sst_rsync_wan.1.gz man/man1/wsrep_sst_xtrabackup-v2.1.gz man/man1/wsrep_sst_xtrabackup.1.gz man/man8/mysqld.8.gz