From owner-dev-commits-ports-main@freebsd.org Sun Aug 8 18:50:10 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 A1578661DBE; Sun, 8 Aug 2021 18:50:10 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GjSvQ48b5z3NWH; Sun, 8 Aug 2021 18:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 76CC719D06; Sun, 8 Aug 2021 18:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 178IoAhM045208; Sun, 8 Aug 2021 18:50:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 178IoA6d045205; Sun, 8 Aug 2021 18:50:10 GMT (envelope-from git) Date: Sun, 8 Aug 2021 18:50:10 GMT Message-Id: <202108081850.178IoA6d045205@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: aa7bf2b545f6 - main - databases/mariadb105-server: Update to 10.5.12 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa7bf2b545f6068e84dd0c3dc9e4c85f22a7bc2d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2021 18:50:10 -0000 The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa7bf2b545f6068e84dd0c3dc9e4c85f22a7bc2d commit aa7bf2b545f6068e84dd0c3dc9e4c85f22a7bc2d Author: Bernard Spil AuthorDate: 2021-08-08 11:47:31 +0000 Commit: Bernard Spil CommitDate: 2021-08-08 18:50:01 +0000 databases/mariadb105-server: Update to 10.5.12 * Update/fix i386 build [1] PR: 257047 [1] Reported by: Raymond Quakkelaar Security: 38a4a043-e937-11eb-9b84-d4c9ef517024 --- databases/mariadb105-server/Makefile | 10 ++++------ databases/mariadb105-server/distinfo | 6 +++--- .../files/patch-storage_mroonga_CMakeLists.txt | 11 ----------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index 20076043c55b..7fc6be271dd8 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,7 +1,7 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.5.11 +PORTVERSION= 10.5.12 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -25,7 +25,7 @@ LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 # Ugly workaround for MariaDB/CMake library detection LDFLAGS+= -L${LOCALBASE}/lib -USES= bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl +USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -211,13 +211,11 @@ PLIST_SUB+= WSREP="@comment " .endif .if ${ARCH} == i386 -USE_GCC= 9 -CFLAGS+= -DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE -CXXFLAGS+= -fpermissive +USE_GCC= yes +CFLAGS+= -latomic -fasynchronous-unwind-tables .endif post-patch: - ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index e6392dc83a4c..148012cb3dbe 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624477722 -SHA256 (mariadb-10.5.11.tar.gz) = 761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a -SIZE (mariadb-10.5.11.tar.gz) = 99037098 +TIMESTAMP = 1628155943 +SHA256 (mariadb-10.5.12.tar.gz) = ab4f1ca69a30c5372e191a68e8b543a74168327680fb1f4067e8cc0a5582e4bd +SIZE (mariadb-10.5.12.tar.gz) = 101914615 diff --git a/databases/mariadb105-server/files/patch-storage_mroonga_CMakeLists.txt b/databases/mariadb105-server/files/patch-storage_mroonga_CMakeLists.txt deleted file mode 100644 index a00932dc6b01..000000000000 --- a/databases/mariadb105-server/files/patch-storage_mroonga_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/mroonga/CMakeLists.txt.orig 2020-06-23 15:10:17 UTC -+++ storage/mroonga/CMakeLists.txt -@@ -80,7 +80,7 @@ else() - set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) - endif() - --file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) -+file(READ ${MRN_SOURCE_DIR}/version_txt MRN_VERSION) - file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) - file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) - file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO)