From owner-svn-ports-all@freebsd.org Mon May 2 23:18:13 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 789BFB2A383; Mon, 2 May 2016 23:18:13 +0000 (UTC) (envelope-from junovitch@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 mx1.freebsd.org (Postfix) with ESMTPS id 3EDAD19F8; Mon, 2 May 2016 23:18:13 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u42NIC5v082221; Mon, 2 May 2016 23:18:12 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u42NIC7d082219; Mon, 2 May 2016 23:18:12 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605022318.u42NIC7d082219@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 2 May 2016 23:18:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414492 - branches/2016Q2/databases/mariadb55-server X-SVN-Group: ports-branches 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.22 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, 02 May 2016 23:18:13 -0000 Author: junovitch Date: Mon May 2 23:18:12 2016 New Revision: 414492 URL: https://svnweb.freebsd.org/changeset/ports/414492 Log: MFH: r413725 r414483 - Mark OQGRAPH option BROKEN as it fails with both old and new boost - Allow to disable it properly so the build doesn't break of boost is installed - Remove OQGRAPH-related cmake flags, as they do nothing PR: 207094 Submitted by: amdmi3 Approved by: maintainer timeout (brnrd, 2 months) databases/mariadb55-{client,server}: Update to 5.5.49 - Update to latest version 5.5.49 - Fix multiple vulnerabilities - Remove embedded, ports and no-SSL options Build with SSL support by default Security: 8c2b2f11-0ebe-11e6-b55e-b499baebfeaf Reviewed by: feld (mentor) Approved by: feld (mentor) Differential Revision: D6161 Approved by: ports-secteam (with hat) Modified: branches/2016Q2/databases/mariadb55-server/Makefile branches/2016Q2/databases/mariadb55-server/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/databases/mariadb55-server/Makefile ============================================================================== --- branches/2016Q2/databases/mariadb55-server/Makefile Mon May 2 23:14:00 2016 (r414491) +++ branches/2016Q2/databases/mariadb55-server/Makefile Mon May 2 23:18:12 2016 (r414492) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.47 +PORTVERSION= 5.5.49 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ @@ -24,6 +24,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb55-client USES= cmake execinfo gmake shebangfix +USE_OPENSSL= yes SHEBANG_FILES= scripts/*.sh CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ @@ -44,6 +45,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc -DWITH_UNIT_TESTS=0 \ -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ + -DWITH_SSL=yes \ -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" @@ -57,8 +59,7 @@ BROKEN_armv6= Does not compile on arm .if !defined(CLIENT_ONLY) # MySQL-Server part -USE_MYSQL= yes -WANT_MYSQL_VER= 55m +USES+= mysql:55m CONFLICTS_INSTALL= mariadb5[0-46-9]-server-* \ mariadb1*-server-* \ @@ -70,7 +71,8 @@ USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ +CMAKE_ARGS+= -DREADLINE_INCLUDE_DIR=/usr/include \ + -DWITH_EMBEDDED_SERVER="ON" \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .else @@ -79,19 +81,10 @@ USES+= readline .endif OPTIONS_DEFINE+= FASTMTX -OPTIONS_RADIO= SSL -OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL -OPTIONS_DEFAULT+= OPENSSL OPTIONS_SUB= yes NO_OPTIONS_SORT=yes -BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL FASTMTX_DESC= Replace mutexes with spinlocks -WITHOUT_SSL_DESC= No SSL/TLS support -OPENSSL_CMAKE_ON= -DWITH_SSL=yes -OPENSSL_USE= USE_OPENSSL=yes -BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled -WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 @@ -101,12 +94,12 @@ OPTIONS_DEFINE+= MAXKEY OQGRAPH OPTIONS_DEFAULT+= MAXKEY MAXKEY_DESC= Change max key length from 1000 to 4000 + OQGRAPH_DESC= Open Query Graph Computation engine -OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH_STORAGE_ENGINE=1 OQGRAPH_USE= GCC=yes -OQGRAPH_CMAKE_ON= -DWITH_OQGRAPH_STORAGE_ENGINE=1 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs +OQGRAPH_BROKEN= yes MAXKEY_EXTRA_PATCHES= ${FILESDIR}/extra-patch-include_my_compare.h .endif @@ -124,6 +117,9 @@ CMAKE_ARGS+= -DWITH_JEMALLOC="no" USE_GCC= yes .endif +post-extract-OQGRAPH-off: + @${RM} -rf ${WRKSRC}/storage/oqgraph + post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/default.c Modified: branches/2016Q2/databases/mariadb55-server/distinfo ============================================================================== --- branches/2016Q2/databases/mariadb55-server/distinfo Mon May 2 23:14:00 2016 (r414491) +++ branches/2016Q2/databases/mariadb55-server/distinfo Mon May 2 23:18:12 2016 (r414492) @@ -1,2 +1,2 @@ -SHA256 (mariadb-5.5.47.tar.gz) = 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 -SIZE (mariadb-5.5.47.tar.gz) = 45705343 +SHA256 (mariadb-5.5.49.tar.gz) = 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 +SIZE (mariadb-5.5.49.tar.gz) = 45738390