aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2022-09-09 12:11:49 +0000
committerBernard Spil <brnrd@FreeBSD.org>2022-09-09 13:41:58 +0000
commit30d30a469e336ee45bd9986f1a5f2a6ba312f4f1 (patch)
tree0ebd58fafbd91bb95d95d5f501bc0ca126777f7d
parent7fd13bd9c3efff5e790888cd35710ef99f887a57 (diff)
downloadports-30d30a469e336ee45bd9986f1a5f2a6ba312f4f1.tar.gz
ports-30d30a469e336ee45bd9986f1a5f2a6ba312f4f1.zip
databases/mariadb104-server: Security update to 10.4.26
PR: 266133 Security: 36d10af7-248d-11ed-856e-d4c9ef517024 MFH: 2022Q3 (cherry picked from commit e4c42089352c6a270b78d2e02aecf0a4e23f76d0)
-rw-r--r--databases/mariadb104-server/Makefile4
-rw-r--r--databases/mariadb104-server/distinfo6
-rw-r--r--databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt9
3 files changed, 9 insertions, 10 deletions
diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
index b33ce9e274f9..9a0ca2bea4fb 100644
--- a/databases/mariadb104-server/Makefile
+++ b/databases/mariadb104-server/Makefile
@@ -1,7 +1,5 @@
-# Created by: Bernard Spil <brnrd@FreeBSD.org>
-
PORTNAME?= mariadb
-PORTVERSION= 10.4.25
+PORTVERSION= 10.4.26
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \
diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo
index 822ff7862035..eb6c6bf25d99 100644
--- a/databases/mariadb104-server/distinfo
+++ b/databases/mariadb104-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653396574
-SHA256 (mariadb-10.4.25.tar.gz) = ff963c4e11bc06b775f66f2b1ddef184996208fb4b23cfdb50d95fb02eaa7ef8
-SIZE (mariadb-10.4.25.tar.gz) = 88680777
+TIMESTAMP = 1662364240
+SHA256 (mariadb-10.4.26.tar.gz) = 715ac7e23afc3b8a559c6cc998cdb1973d90f621b2bdd7603e2c6e53860b2ddf
+SIZE (mariadb-10.4.26.tar.gz) = 96095606
diff --git a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
index 8f6733715ad3..1a5220149b95 100644
--- a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
+++ b/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libmariadb/libmariadb/CMakeLists.txt.orig 2022-02-10 19:42:57 UTC
+--- libmariadb/libmariadb/CMakeLists.txt.orig 2022-08-10 10:25:18 UTC
+++ libmariadb/libmariadb/CMakeLists.txt
-@@ -459,6 +459,7 @@ IF(NOT WIN32)
+@@ -464,6 +464,7 @@ IF(NOT WIN32)
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}")
ENDIF()
@@ -8,11 +8,12 @@
INSTALL(TARGETS mariadbclient
COMPONENT Development
DESTINATION ${INSTALL_LIBDIR})
-@@ -470,6 +471,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTA
+@@ -480,6 +481,8 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTA
COMPONENT SharedLibraries NAMELINK_SKIP)
INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
COMPONENT Development NAMELINK_ONLY)
+ENDIF()
++
+ ENDIF()
IF(MSVC)
- # On Windows, install PDB