Attachment 224766 Details for Bug 255701 – Update to MariaDB 10.3.29

[patch] Update to MariaDB 10.3.29

mariadb10329.patch (text/plain), 3.73 KB, created by Dani I. on 2021-05-08 08:37:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dani I.

Created: 2021-05-08 08:37:04 UTC

Size: 3.73 KB

patch

obsolete

>--- databases/mariadb103-client/Makefile
>+++ databases/mariadb103-client/Makefile
>@@ -1,7 +1,6 @@
> # Created by: Bernard Spil <brnrd@FreeBSD.org>
> 
> PORTNAME=	mariadb
>-PORTREVISION=	1
> PKGNAMESUFFIX=	103-client
> 
> COMMENT=	Multithreaded SQL database (client)
>--- databases/mariadb103-client/files/patch-CMakeLists.txt
>+++ databases/mariadb103-client/files/patch-CMakeLists.txt
>@@ -1,12 +1,11 @@
>---- CMakeLists.txt.orig	2019-05-13 18:13:05 UTC
>-+++ CMakeLists.txt
>-@@ -491,14 +491,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
>+--- CMakeLists.txt.orig	2021-05-08 08:36:42.000000000 +0200
>++++ CMakeLists.txt	2021-05-08 08:40:29.000000000 +0200
>+@@ -517,13 +517,15 @@
>    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
>  )
>  
> +IF(FALSE)
>- INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
>-                       EXCEPTIONS-CLIENT COMPONENT Readme)
>+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
> +ENDIF()
>  
>  # MDEV-6526 these files are not installed anymore
>--- databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- libmariadb/cmake/ConnectorName.cmake.orig	2021-04-02 09:49:25 UTC
>-+++ libmariadb/cmake/ConnectorName.cmake
>-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
>-     SET(MACHINE_NAME "x64")
>-   ELSE()
>-     SET(MACHINE_NAME "32")
>--  END()
>-+  ENDIF()
>- ENDIF()
>- 
>- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
>--- databases/mariadb103-server/Makefile
>+++ databases/mariadb103-server/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Bernard Spil <brnrd@FreeBSD.org>
> 
> PORTNAME?=	mariadb
>-PORTVERSION=	10.3.28
>+PORTVERSION=	10.3.29
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
>--- databases/mariadb103-server/distinfo
>+++ databases/mariadb103-server/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1614533978
>-SHA256 (mariadb-10.3.28.tar.gz) = e8c912cae2e5800d0da364cc23437907ed4be767f2cbdf198cf3afc03db6a6a3
>-SIZE (mariadb-10.3.28.tar.gz) = 73040177
>+TIMESTAMP = 1620455361
>+SHA256 (mariadb-10.3.29.tar.gz) = 304a9e94c50636b591ac7cbfe459cb341d345c4bd0ef5e45fb9a692268e6db38
>+SIZE (mariadb-10.3.29.tar.gz) = 73261682
>--- databases/mariadb103-server/files/patch-CMakeLists.txt
>+++ databases/mariadb103-server/files/patch-CMakeLists.txt
>@@ -1,12 +1,11 @@
>---- CMakeLists.txt.orig	2019-05-13 18:13:05 UTC
>-+++ CMakeLists.txt
>-@@ -491,14 +491,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
>+--- CMakeLists.txt.orig	2021-05-08 08:36:42.000000000 +0200
>++++ CMakeLists.txt	2021-05-08 08:40:29.000000000 +0200
>+@@ -517,13 +517,15 @@
>    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
>  )
>  
> +IF(FALSE)
>- INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
>-                       EXCEPTIONS-CLIENT COMPONENT Readme)
>+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
> +ENDIF()
>  
>  # MDEV-6526 these files are not installed anymore
>--- databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- libmariadb/cmake/ConnectorName.cmake.orig	2021-04-02 09:49:25 UTC
>-+++ libmariadb/cmake/ConnectorName.cmake
>-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
>-     SET(MACHINE_NAME "x64")
>-   ELSE()
>-     SET(MACHINE_NAME "32")
>--  END()
>-+  ENDIF()
>- ENDIF()
>- 
>- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
>--- databases/mariadb103-server/pkg-plist
>+++ databases/mariadb103-server/pkg-plist
>@@ -260,7 +260,6 @@ man/man8/mysqld.8.gz
> %%DATADIR%%/mysql_system_tables_data.sql
> %%DATADIR%%/mysql_test_data_timezone.sql
> %%DATADIR%%/mysql_test_db.sql
>-%%DATADIR%%/mysql_to_mariadb.sql
> %%DATADIR%%/mysqld_multi.server
> %%DATADIR%%/charsets/Index.xml
> %%DATADIR%%/charsets/README

Actions: View | Diff

Attachments on bug 255701: 224766