From owner-svn-ports-head@freebsd.org Mon May 2 21:06:54 2016 Return-Path: Delivered-To: svn-ports-head@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 25C4BB2A3AB; Mon, 2 May 2016 21:06:54 +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 mx1.freebsd.org (Postfix) with ESMTPS id D8B8E1AB0; Mon, 2 May 2016 21:06:53 +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 u42L6r6S042191; Mon, 2 May 2016 21:06:53 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u42L6qZ2042189; Mon, 2 May 2016 21:06:52 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201605022106.u42L6qZ2042189@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 2 May 2016 21:06:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414483 - head/databases/mariadb55-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 May 2016 21:06:54 -0000 Author: brnrd Date: Mon May 2 21:06:52 2016 New Revision: 414483 URL: https://svnweb.freebsd.org/changeset/ports/414483 Log: 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 Modified: head/databases/mariadb55-server/Makefile head/databases/mariadb55-server/distinfo Modified: head/databases/mariadb55-server/Makefile ============================================================================== --- head/databases/mariadb55-server/Makefile Mon May 2 21:05:41 2016 (r414482) +++ head/databases/mariadb55-server/Makefile Mon May 2 21:06:52 2016 (r414483) @@ -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/ \ @@ -26,6 +26,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" \ @@ -46,6 +47,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" @@ -59,8 +61,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-* \ @@ -72,7 +73,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 @@ -81,19 +83,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 Modified: head/databases/mariadb55-server/distinfo ============================================================================== --- head/databases/mariadb55-server/distinfo Mon May 2 21:05:41 2016 (r414482) +++ head/databases/mariadb55-server/distinfo Mon May 2 21:06:52 2016 (r414483) @@ -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