CVS commit: pkgsrc/databases/mariadb1011-client

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May 21 09:52:52 UTC 2024

Modified Files:
        pkgsrc/databases/mariadb1011-client: Makefile Makefile.common PLIST
            distinfo
        pkgsrc/databases/mariadb1011-client/patches: patch-CMakeLists.txt

Log Message:
mariadb1011: Update to 10.11.8

Fixes various reliability issues, and CVE-2024-21096


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb1011-client/Makefile
cvs rdiff -u -r1.11 -r1.12 \
    pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb1011-client/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/mariadb1011-client/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb1011-client/Makefile
diff -u pkgsrc/databases/mariadb1011-client/Makefile:1.7 pkgsrc/databases/mariadb1011-client/Makefile:1.8
--- pkgsrc/databases/mariadb1011-client/Makefile:1.7    Thu May 16 06:14:39 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile        Tue May 21 09:52:52 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2024/05/16 06:14:39 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2024/05/21 09:52:52 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   2
 COMMENT=       MariaDB 10.11, a free MySQL compatible database (client)
 
 CONFLICTS=     mysql-client-[0-9]*

Index: pkgsrc/databases/mariadb1011-client/Makefile.common
diff -u pkgsrc/databases/mariadb1011-client/Makefile.common:1.11 pkgsrc/databases/mariadb1011-client/Makefile.common:1.12
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.11    Wed May 15 19:21:42 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Tue May 21 09:52:52 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.11 2024/05/15 19:21:42 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.12 2024/05/21 09:52:52 nia Exp $
 #
 # used by databases/mariadb1011-client/Makefile
 # used by databases/mariadb1011-server/Makefile
 # used by databases/mariadb1011-embedded/Makefile
 
-DISTNAME=      mariadb-10.11.7
+DISTNAME=      mariadb-10.11.8
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 
@@ -37,6 +37,7 @@ MARIADB_EXTRA_CHARSET?=       ${MYSQL_EXTRA_CH
 BUILD_DEFS+=           VARBASE
 
 CMAKE_ARGS+=           -DCOMPILATION_COMMENT="pkgsrc"
+CMAKE_ARGS+=           -DMANUFACTURER="pkgsrc"
 
 CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE="Release"
 
@@ -73,6 +74,8 @@ CMAKE_ARGS+=          -DPLUGIN_FEEDBACK=NO
 # Requires Java
 CMAKE_ARGS+=           -DCONNECT_WITH_JDBC=OFF
 
+CMAKE_ARGS+=           -DCONNECT_WITH_LIBXML2=OFF
+
 # Options which affect generation of includes
 CMAKE_ARGS+=           -DWITH_ARIA_STORAGE_ENGINE=ON
 CMAKE_ARGS+=           -DWITH_PARTITION_STORAGE_ENGINE=ON

Index: pkgsrc/databases/mariadb1011-client/PLIST
diff -u pkgsrc/databases/mariadb1011-client/PLIST:1.1 pkgsrc/databases/mariadb1011-client/PLIST:1.2
--- pkgsrc/databases/mariadb1011-client/PLIST:1.1       Mon Jul 10 22:55:49 2023
+++ pkgsrc/databases/mariadb1011-client/PLIST   Tue May 21 09:52:52 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2023/07/10 22:55:49 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/05/21 09:52:52 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -58,7 +58,6 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql/client_plugin.h
 include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth_common.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
@@ -135,6 +134,7 @@ include/mysql/server/mysql/service_md5.h
 include/mysql/server/mysql/service_my_crypt.h
 include/mysql/server/mysql/service_my_print_error.h
 include/mysql/server/mysql/service_my_snprintf.h
+include/mysql/server/mysql/service_print_check_msg.h
 include/mysql/server/mysql/service_progress_report.h
 include/mysql/server/mysql/service_sha1.h
 include/mysql/server/mysql/service_sha2.h

Index: pkgsrc/databases/mariadb1011-client/distinfo
diff -u pkgsrc/databases/mariadb1011-client/distinfo:1.5 pkgsrc/databases/mariadb1011-client/distinfo:1.6
--- pkgsrc/databases/mariadb1011-client/distinfo:1.5    Fri May  3 09:48:19 2024
+++ pkgsrc/databases/mariadb1011-client/distinfo        Tue May 21 09:52:52 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2024/05/03 09:48:19 wiz Exp $
+$NetBSD: distinfo,v 1.6 2024/05/21 09:52:52 nia Exp $
 
-BLAKE2s (mariadb-10.11.7.tar.gz) = 66a70689bd177e2b4c886b9fdda7426314c767207408d2ded8d8f4f6714ab3d5
-SHA512 (mariadb-10.11.7.tar.gz) = a6ebc9ba88b52e5d339b176b6fa48c03fcbe5bb590740a02c1bbd083a3d62e619937e645de2504a9f9adeed2f67127fab0307dece524b7c5217ad5df0f3ccc71
-Size (mariadb-10.11.7.tar.gz) = 100584592 bytes
+BLAKE2s (mariadb-10.11.8.tar.gz) = 786329da47785061212e877e1e0cc56451f155f48c61de743b15b7afa8a52dc3
+SHA512 (mariadb-10.11.8.tar.gz) = 61bdbe4a51adb438335c22bfcf75f59864fa0412c7ed6e938ef73fd602c2ef27131dbeef83cd314f2bea54135c6e8f8646608ff96a7ce6ce2c74f34ef6a8675f
+Size (mariadb-10.11.8.tar.gz) = 100913048 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = 9bdc3c88521b9bd217d37d286950a71ae0d0e1e0
+SHA1 (patch-CMakeLists.txt) = b41fc869c3ebf0b13138a566a03080a0f3475551
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = e9c33cd51c11b6be309ee6d1404da2d9ece38efd
 SHA1 (patch-cmake_libfmt.cmake) = 2337c62c19d625b44e5082d0f1cae6afde708601

Index: pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt:1.1 pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt:1.1        Mon Jul 10 22:55:49 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt    Tue May 21 09:52:52 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2023/07/10 22:55:49 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2024/05/21 09:52:52 nia Exp $
 
 Allow building a server-only configuration.
 
---- CMakeLists.txt.orig        2023-06-05 17:14:07.000000000 +0000
+--- CMakeLists.txt.orig        2024-05-10 21:02:16.000000000 +0000
 +++ CMakeLists.txt
-@@ -426,8 +426,6 @@ ENDIF()
+@@ -441,8 +441,6 @@ ENDIF()
  
  UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
  
@@ -13,7 +13,7 @@ Allow building a server-only configurati
  INCLUDE(cpack_tgz)
  INCLUDE(cpack_rpm)
  INCLUDE(cpack_deb)
-@@ -438,19 +436,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+@@ -453,19 +451,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -33,7 +33,7 @@ Allow building a server-only configurati
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER)
-@@ -469,23 +464,26 @@ IF(NOT WITHOUT_SERVER)
+@@ -484,23 +479,26 @@ IF(NOT WITHOUT_SERVER)
      ADD_SUBDIRECTORY(win/upgrade_wizard)
      ADD_SUBDIRECTORY(win/packaging)
    ENDIF()
@@ -65,7 +65,16 @@ Allow building a server-only configurati
    ENDIF()
    # minimal target to build only binaries for export
    ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
-@@ -569,41 +567,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
+@@ -572,7 +570,7 @@ IF(WIN32 AND SIGNCODE)
+   INSTALL(SCRIPT ${PROJECT_BINARY_DIR}/sign.cmake)
+ ENDIF()
+ 
+-FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES VAR MARIADB_FEATURE_SUMMARY)
++FEATURE_SUMMARY(WHAT ALL VAR MARIADB_FEATURE_SUMMARY)
+ 
+ OPTION(FEATURE_SUMMARY "Print feature summary at the end of configure step" ON)
+ IF (FEATURE_SUMMARY)
+@@ -584,41 +582,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
    MESSAGE(WARNING "
  You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries!  You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software 
Foundation.")
  ENDIF()