diff options
author | tm <tm@pkgsrc.org> | 2021-12-14 08:59:18 +0000 |
---|---|---|
committer | tm <tm@pkgsrc.org> | 2021-12-14 08:59:18 +0000 |
commit | 176172ef44608d4c209b39d3a3fc170a8c191d61 (patch) | |
tree | 76254d327890e8e92544892dc0523d33adac9cb5 | |
parent | 5908d9c20625fcffba71cbbf48b906bcaf109497 (diff) | |
download | pkgsrc-176172ef44608d4c209b39d3a3fc170a8c191d61.tar.gz |
Pullup ticket #6550 - requested by nia
databases/mariadb106: security fix
Revisions pulled up:
- databases/mariadb106-client/Makefile 1.4
- databases/mariadb106-client/Makefile.common 1.6
- databases/mariadb106-client/PLIST 1.2
- databases/mariadb106-client/distinfo 1.5
- databases/mariadb106-client/patches/patch-CMakeLists.txt 1.2
- databases/mariadb106-client/patches/patch-plugin_auth__pam_CMakeLists.txt deleted
- databases/mariadb106-client/patches/patch-plugin_auth__socket_auth__socket.c deleted
- databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt 1.2
- databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h 1.1
- databases/mariadb106-server/Makefile 1.7
- databases/mariadb106-server/PLIST 1.5
---
Module Name: pkgsrc
Committed By: nia
Date: Sat Nov 27 23:40:28 UTC 2021
Modified Files:
pkgsrc/databases/mariadb106-client: Makefile Makefile.common PLIST
distinfo
pkgsrc/databases/mariadb106-client/patches: patch-CMakeLists.txt
patch-scripts_CMakeLists.txt
pkgsrc/databases/mariadb106-server: Makefile PLIST
Added Files:
pkgsrc/databases/mariadb106-client/patches:
patch-storage_innobase_include_transactional__lock__guard.h
Removed Files:
pkgsrc/databases/mariadb106-client/patches:
patch-plugin_auth__pam_CMakeLists.txt
patch-plugin_auth__socket_auth__socket.c
Log Message:
mariadb106*: Update to 10.6.5
Release notes:
https://mariadb.com/kb/en/mariadb-1065-release-notes/
10 files changed, 94 insertions, 62 deletions
diff --git a/databases/mariadb106-client/Makefile.common b/databases/mariadb106-client/Makefile.common index 29430d38b43..14426eb398c 100644 --- a/databases/mariadb106-client/Makefile.common +++ b/databases/mariadb106-client/Makefile.common @@ -1,12 +1,11 @@ -# $NetBSD: Makefile.common,v 1.5 2021/09/01 06:21:46 nia Exp $ +# $NetBSD: Makefile.common,v 1.5.2.1 2021/12/14 08:59:18 tm Exp $ # # used by databases/mariadb106-client/Makefile # used by databases/mariadb106-server/Makefile -DISTNAME= mariadb-10.6.4 +DISTNAME= mariadb-10.6.5 CATEGORIES= databases -MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/ -MASTER_SITES+= https://archive.mariadb.org/${DISTNAME}/source/ +MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/ MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE= https://mariadb.org/ @@ -47,6 +46,8 @@ CMAKE_ARGS+= -DINSTALL_LIBDIR="lib" CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}" CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql" CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="" +CMAKE_ARGS+= -DINSTALL_PAMDIR="lib/security" +CMAKE_ARGS+= -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam" CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin" CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin" CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin" diff --git a/databases/mariadb106-client/PLIST b/databases/mariadb106-client/PLIST index 61b00bfc183..d8652fe0c34 100644 --- a/databases/mariadb106-client/PLIST +++ b/databases/mariadb106-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2021/08/04 15:47:24 nia Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2021/12/14 08:59:18 tm Exp $ bin/mariadb bin/mariadb-access bin/mariadb-admin @@ -181,6 +181,7 @@ include/mysql/server/private/my_default.h include/mysql/server/private/my_handler_errors.h include/mysql/server/private/my_libwrap.h include/mysql/server/private/my_md5.h +include/mysql/server/private/my_minidump.h include/mysql/server/private/my_nosys.h include/mysql/server/private/my_rdtsc.h include/mysql/server/private/my_rnd.h diff --git a/databases/mariadb106-client/distinfo b/databases/mariadb106-client/distinfo index fd7065c5b72..584b5645d33 100644 --- a/databases/mariadb106-client/distinfo +++ b/databases/mariadb106-client/distinfo @@ -1,22 +1,21 @@ -$NetBSD: distinfo,v 1.2 2021/08/07 08:55:50 nia Exp $ +$NetBSD: distinfo,v 1.2.2.1 2021/12/14 08:59:18 tm Exp $ -SHA1 (mariadb-10.6.4.tar.gz) = d955487a1bfd5e1478e607d6077130d50ca817d0 -RMD160 (mariadb-10.6.4.tar.gz) = 11277c51648b2a85e6c8433b5aaa3b05e3f3efa5 -SHA512 (mariadb-10.6.4.tar.gz) = c216244ce126e6f8954303a76078dc12146e8ea941041edd215dc05201adda1d5158cd7f1c9831328f783aba4f884965ae288f33bbc43229bc6224a4f1079071 -Size (mariadb-10.6.4.tar.gz) = 84947143 bytes +SHA1 (mariadb-10.6.5.tar.gz) = 7f385c8ee242f0b164db3dd72d39b26fac141c40 +RMD160 (mariadb-10.6.5.tar.gz) = 5bff753eb0239c3c9039fe3bab0a7b8fa70c52f6 +SHA512 (mariadb-10.6.5.tar.gz) = 5aafe0a8d5ae54a6f798a6fd0cf922521f5b8e54ef5fb5c7db1cf798a7755f5910bb0b8a6c371cb8253dfb48f4ebca0becd6eb543b68473d564d2092df3185a1 +Size (mariadb-10.6.5.tar.gz) = 85061860 bytes SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f -SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811 +SHA1 (patch-CMakeLists.txt) = ea2f334ff1743e1676fe73e9946d0759c68e1d31 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403 -SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51 -SHA1 (patch-plugin_auth__socket_auth__socket.c) = 094d49d8302be8e7111b6eddd3b6462a553cc22a -SHA1 (patch-scripts_CMakeLists.txt) = e58c21db8fe03f85c496bbdc04c8e30f4a7a7f24 +SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3 SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836 +SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = 1db38a9c1ec3ce7274dc08cb9c5b42d474b431aa SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301 SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12 diff --git a/databases/mariadb106-client/patches/patch-CMakeLists.txt b/databases/mariadb106-client/patches/patch-CMakeLists.txt index 30710dae56d..6e68aa1ef91 100644 --- a/databases/mariadb106-client/patches/patch-CMakeLists.txt +++ b/databases/mariadb106-client/patches/patch-CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.1.2.1 2021/12/14 08:59:19 tm Exp $ Allow building a server-only configuration. ---- CMakeLists.txt.orig 2021-05-05 21:00:18.000000000 +0000 +--- CMakeLists.txt.orig 2021-11-05 20:03:29.000000000 +0000 +++ CMakeLists.txt -@@ -421,8 +421,6 @@ ENDIF() +@@ -418,8 +418,6 @@ ENDIF() UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE) @@ -13,7 +13,7 @@ Allow building a server-only configuration. INCLUDE(cpack_rpm) INCLUDE(cpack_deb) -@@ -432,13 +430,11 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG) +@@ -429,19 +427,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG) # Add storage engines and plugins. CONFIGURE_PLUGINS() @@ -27,7 +27,13 @@ Allow building a server-only configuration. ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(sql/share) -@@ -461,23 +457,26 @@ IF(NOT WITHOUT_SERVER) + + IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(sql) + OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) +@@ -460,23 +455,26 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() @@ -59,3 +65,45 @@ Allow building a server-only configuration. ENDIF() # minimal target to build only binaries for export ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED}) +@@ -557,41 +555,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() +- +-IF(NOT WITHOUT_SERVER) +- # Define target for minimal mtr-testable build +- ADD_CUSTOM_TARGET(minbuild) +- ADD_DEPENDENCIES(minbuild +- aria_chk +- aria_pack +- mariadb +- mariadb-admin +- mariadb-binlog +- mariadb-check +- mariadb-client-test +- mariadb-conv +- mariadb-dump +- mariadb-import +- mariadb-plugin +- mariadb-show +- mariadb-slap +- mariadb-test +- mariadb-tzinfo-to-sql +- mariadb-upgrade +- mariadbd +- my_print_defaults +- my_safe_process +- myisam_ftdump +- myisamchk +- myisamlog +- myisampack +- perror +- replace) +- IF(WIN32) +- ADD_DEPENDENCIES(minbuild echo mariadb-install-db my_safe_kill) +- ENDIF() +- ADD_CUSTOM_TARGET(smoketest +- COMMAND perl ./mysql-test-run.pl main.1st +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/mysql-test) +- ADD_DEPENDENCIES(smoketest minbuild) +-ENDIF() diff --git a/databases/mariadb106-client/patches/patch-plugin_auth__pam_CMakeLists.txt b/databases/mariadb106-client/patches/patch-plugin_auth__pam_CMakeLists.txt deleted file mode 100644 index 19179b359e5..00000000000 --- a/databases/mariadb106-client/patches/patch-plugin_auth__pam_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-plugin_auth__pam_CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $ - -Check for pam_ext.h (not available on NetBSD). - ---- plugin/auth_pam/CMakeLists.txt.orig 2021-02-18 23:22:29.000000000 +0000 -+++ plugin/auth_pam/CMakeLists.txt -@@ -43,7 +43,7 @@ IF(HAVE_PAM_APPL_H) - WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)" - COMPONENT Server) - ENDIF() -- IF(TARGET auth_pam OR TARGET auth_pam_v1) -+ IF(HAVE_PAM_EXT_H AND (TARGET auth_pam OR TARGET auth_pam_v1)) - ADD_SUBDIRECTORY(testing) - ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c) - TARGET_LINK_LIBRARIES(pam_user_map pam) diff --git a/databases/mariadb106-client/patches/patch-plugin_auth__socket_auth__socket.c b/databases/mariadb106-client/patches/patch-plugin_auth__socket_auth__socket.c deleted file mode 100644 index 1a2f1f5b37a..00000000000 --- a/databases/mariadb106-client/patches/patch-plugin_auth__socket_auth__socket.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-plugin_auth__socket_auth__socket.c,v 1.1 2021/08/04 15:47:24 nia Exp $ - -Add SO_PEERCRED definitions for NetBSD. -https://github.com/MariaDB/server/pull/1884 - ---- plugin/auth_socket/auth_socket.c.orig 2021-07-05 10:15:49.000000000 +0000 -+++ plugin/auth_socket/auth_socket.c -@@ -47,6 +47,13 @@ - #define uid cr_uid - #define ucred xucred - -+#elif defined HAVE_UNPCBID -+#include <sys/un.h> -+#define level 0 -+#define SO_PEERCRED LOCAL_PEEREID -+#define uid unp_euid -+#define ucred unpcbid -+ - #elif defined HAVE_GETPEERUCRED - #include <ucred.h> - diff --git a/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt b/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt index 4923c7fa51a..e7b824b9fd7 100644 --- a/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt +++ b/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt @@ -1,8 +1,8 @@ -$NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $ +$NetBSD: patch-scripts_CMakeLists.txt,v 1.1.2.1 2021/12/14 08:59:19 tm Exp $ Allow building a server-only configuration. ---- scripts/CMakeLists.txt.orig 2021-07-05 10:15:49.000000000 +0000 +--- scripts/CMakeLists.txt.orig 2021-11-05 20:03:30.000000000 +0000 +++ scripts/CMakeLists.txt @@ -324,22 +324,26 @@ ELSE() mariadbd-safe diff --git a/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h b/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h new file mode 100644 index 00000000000..b147da6162b --- /dev/null +++ b/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h @@ -0,0 +1,20 @@ +$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.1.2.2 2021/12/14 08:59:19 tm Exp $ + +Strange build failures on NetBSD: +error: 'rw_lock' is not an accessible base of 'page_hash_latch' + +--- storage/innobase/include/transactional_lock_guard.h.orig 2021-11-05 20:03:31.000000000 +0000 ++++ storage/innobase/include/transactional_lock_guard.h +@@ -21,12 +21,6 @@ this program; if not, write to the Free + #if defined __powerpc64__ && defined __clang__ && defined __linux__ + #elif defined __powerpc64__&&defined __GNUC__&&defined __linux__&&__GNUC__ > 4 + #elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64) +-#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__) +-# if __GNUC__ >= 8 +-# elif defined __clang_major__ && __clang_major__ > 6 +-# else +-# define NO_ELISION +-# endif + #else /* Transactional memory has not been implemented for this ISA */ + # define NO_ELISION + #endif diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index f6ae24abf24..4016e5622e8 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2021/08/12 10:51:31 nia Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2021/12/14 08:59:19 tm Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 1 COMMENT= MariaDB 10.6, a free MySQL compatible database (server) CONFLICTS= mysql-server-[0-9]* diff --git a/databases/mariadb106-server/PLIST b/databases/mariadb106-server/PLIST index 0cf8656d726..d87ce48374f 100644 --- a/databases/mariadb106-server/PLIST +++ b/databases/mariadb106-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2021/08/08 21:22:12 nia Exp $ +@comment $NetBSD: PLIST,v 1.4.2.1 2021/12/14 08:59:19 tm Exp $ bin/aria_chk bin/aria_dump_log bin/aria_ftdump @@ -8,7 +8,6 @@ bin/aria_s3_copy bin/innochecksum ${PLIST.mariabackup}bin/mariabackup ${PLIST.mariabackup}bin/mariadb-backup -bin/mariadb-client-test ${PLIST.embedded}bin/mariadb-client-test-embedded ${PLIST.embedded}bin/mariadb-embedded bin/mariadb-fix-extensions @@ -27,7 +26,6 @@ bin/myisamchk bin/myisamlog bin/myisampack ${PLIST.rocksdb}bin/myrocks_hotbackup -bin/mysql_client_test ${PLIST.embedded}bin/mysql_client_test_embedded ${PLIST.embedded}bin/mysql_embedded bin/mysql_fix_extensions @@ -344,6 +342,7 @@ lib/mysql/plugin/test_versioning.so lib/mysql/plugin/type_mysql_json.so lib/mysql/plugin/type_test.so lib/mysql/plugin/wsrep_info.so +lib/security/pam_user_map.so sbin/mariadbd sbin/mysqld share/doc/mysql/COPYING @@ -352,6 +351,7 @@ share/doc/mysql/INSTALL-BINARY share/doc/mysql/README-wsrep share/doc/mysql/README.md share/doc/mysql/THIRDPARTY +share/examples/mariadb_auth_pam/user_map.conf share/mysql/charsets/Index.xml share/mysql/charsets/README share/mysql/charsets/armscii8.xml |