Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Feb 2023 19:46:39 GMT
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7817c5e1b92e - main - databases/mariadb106-server: Update to 10.6.12
Message-ID:  <202302191946.31JJkdUH094323@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7817c5e1b92ed3ad496e2397dda57810f4ab6ac1

commit 7817c5e1b92ed3ad496e2397dda57810f4ab6ac1
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2023-02-19 19:40:19 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2023-02-19 19:46:34 +0000

    databases/mariadb106-server: Update to 10.6.12
    
     * 267386 Fixes broken symlink
     * 269654 Fixes issue in mysql_config patch
    
    PR:             269457, 267386 [1], 269654 [2]
    Reported by:    Ivan Rozhuk <rozhuk im gmail com> [1], Oleg Sidorkin <osidorkin gmail com> [2]
---
 databases/mariadb106-server/Makefile                             | 3 ++-
 databases/mariadb106-server/distinfo                             | 6 +++---
 databases/mariadb106-server/files/patch-scripts_mysql__config.sh | 2 +-
 databases/mariadb106-server/pkg-plist                            | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
index 62d88db75701..26def325d2f8 100644
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	10.6.11
+PORTVERSION=	10.6.12
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
@@ -266,6 +266,7 @@ post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
 		${STAGEDIR}${PREFIX}/include/mysql/server/private \
 		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \
+		${STAGEDIR}${PREFIX}/libexec/rcmysql \
 		${STAGEDIR}/suite \
 		${STAGEDIR}${ETCDIR}/init.d \
 		${STAGEDIR}${ETCDIR}/logrotate.d \
diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo
index f1bc2c18198b..e96a17eea53d 100644
--- a/databases/mariadb106-server/distinfo
+++ b/databases/mariadb106-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669463174
-SHA256 (mariadb-10.6.11.tar.gz) = 5784ba4c5d8793badba58348576824d9849ec152e9cbee47a1765161d840c94a
-SIZE (mariadb-10.6.11.tar.gz) = 94742041
+TIMESTAMP = 1675594941
+SHA256 (mariadb-10.6.12.tar.gz) = 3ed2eb7429c2fae5423ca55c661742d107e35246f1ab0c107096f0c4b839463a
+SIZE (mariadb-10.6.12.tar.gz) = 95085449
diff --git a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh
index f8321be63ecc..31b54bf148c5 100644
--- a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh
+++ b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh
@@ -4,7 +4,7 @@
  # Create options 
  libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
  embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -%%LOCALBASE%%/lib "
++embedded_libs="-L$embedded_libs -%%LOCALBASE%%/lib "
  
  include="-I$pkgincludedir"
  if [ "$basedir" != "/usr" ]; then
diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist
index 748c0e8dcb89..c1457ba63b3c 100644
--- a/databases/mariadb106-server/pkg-plist
+++ b/databases/mariadb106-server/pkg-plist
@@ -79,6 +79,7 @@ include/mysql/server/little_endian.h
 include/mysql/server/m_ctype.h
 include/mysql/server/m_string.h
 include/mysql/server/ma_dyncol.h
+include/mysql/server/mariadb_capi_rename.h
 include/mysql/server/my_alloc.h
 include/mysql/server/my_attribute.h
 include/mysql/server/my_byteorder.h
@@ -212,7 +213,6 @@ lib/mysql/plugin/type_test.so
 lib/mysql/plugin/zstd.so
 libexec/mariadbd
 libexec/mysqld
-libexec/rcmysql
 @comment share/man/man1/aria_chk.1.gz
 @comment share/man/man1/aria_dump_log.1.gz
 @comment share/man/man1/aria_ftdump.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302191946.31JJkdUH094323>