head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.8
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.6
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.4
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.2
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.1.0.14
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.12
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.10
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.8
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.6
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.4
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.2
	pkgsrc-2023Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2025.06.06.20.48.34;	author nia;	state Exp;
branches;
next	1.1;
commitid	0nkipeDMNaIO9SXF;

1.1
date	2023.07.10.22.55.49;	author nia;	state Exp;
branches
	1.1.14.1;
next	;
commitid	zZly68CZaYmJgjwE;

1.1.14.1
date	2025.06.09.00.28.10;	author maya;	state Exp;
branches;
next	;
commitid	dIg4q4GVjcqqj9YF;


desc
@@


1.2
log
@mariadb1011: Update to 10.11.13

Fixes for the following security issues:
- CVE-2025-30722
- CVE-2025-30693
- CVE-2023-52970
- CVE-2023-52969
- CVE-2023-52971
@
text
@$NetBSD: patch-storage_rocksdb_rocksdb_Makefile,v 1.1 2023/07/10 22:55:49 nia Exp $

Shell portability.

--- storage/rocksdb/rocksdb/Makefile.orig	2025-06-06 17:55:18.123502674 +0000
+++ storage/rocksdb/rocksdb/Makefile
@@@@ -962,7 +962,7 @@@@ valgrind_check_0:
 	  | grep -E '$(tests-regexp)'					\
 	  | grep -E -v '$(valgrind-exclude-regexp)'					\
 	  | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG --eta --gnu \
-	  '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) \
+	  '(if [ "{}" = "./"* ] ; then $(DRIVER) {}; else {}; fi) \
 	  $(parallel_redir)' \
 
 CLEAN_FILES += t LOG $(TMPD)
@@@@ -2282,7 +2282,7 @@@@ rocksdbjavastatic_javalib:
 	  -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \
 	  $(LIB_OBJECTS) $(COVERAGEFLAGS) \
 	  $(JAVA_COMPRESSIONS) $(JAVA_STATIC_LDFLAGS)
-	cd java/target;if [ "$(DEBUG_LEVEL)" == "0" ]; then \
+	cd java/target;if [ "$(DEBUG_LEVEL)" = "0" ]; then \
 		strip $(STRIPFLAGS) $(ROCKSDBJNILIB); \
 	fi
 
@


1.1
log
@Import mariadb-10.11, the most recent LTS branch.
@
text
@d1 1
a1 1
$NetBSD: patch-storage_rocksdb_rocksdb_Makefile,v 1.1 2021/08/04 15:47:24 nia Exp $
d5 1
a5 1
--- storage/rocksdb/rocksdb/Makefile.orig	2021-02-18 23:22:28.000000000 +0000
d7 1
a7 1
@@@@ -911,7 +911,7 @@@@ valgrind_check_0:
d9 5
a13 5
 	  | grep -E -v '$(valgrind-blacklist-regexp)'					\
 	  | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG $$eta --gnu \
-	  '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) ' \
+	  '(if [ "{}" = "./"* ] ; then $(DRIVER) {}; else {}; fi) ' \
 	  '>& t/valgrind_log-{/}'
d16 1
a16 1
@@@@ -1952,7 +1952,7 @@@@ rocksdbjavastatic: $(java_static_all_lib
d18 1
a18 1
 	  $(java_static_all_libobjects) $(COVERAGEFLAGS) \
d24 1
a24 1
 	cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md
@


1.1.14.1
log
@Pullup ticket #6974 - requested by nia
databases/mariadb1011-client: Security fix
databases/mariadb1011-embedded: Security fix
databases/mariadb1011-server: Security fix

Revisions pulled up:
- databases/mariadb1011-client/Makefile                         1.19
- databases/mariadb1011-client/Makefile.common                  1.18
- databases/mariadb1011-client/PLIST                            1.4
- databases/mariadb1011-client/distinfo                         1.15
- databases/mariadb1011-client/patches/patch-CMakeLists.txt     1.4
- databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake 1.4
- databases/mariadb1011-client/patches/patch-storage_rocksdb_rocksdb_Makefile 1.2
- databases/mariadb1011-embedded/Makefile                       1.14
- databases/mariadb1011-server/Makefile                         1.27

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Fri Jun  6 20:48:34 UTC 2025

   Modified Files:
   	pkgsrc/databases/mariadb1011-client: Makefile Makefile.common PLIST
   	    distinfo
   	pkgsrc/databases/mariadb1011-client/patches: patch-CMakeLists.txt
   	    patch-cmake_libfmt.cmake patch-storage_rocksdb_rocksdb_Makefile
   	pkgsrc/databases/mariadb1011-embedded: Makefile
   	pkgsrc/databases/mariadb1011-server: Makefile

   Log Message:
   mariadb1011: Update to 10.11.13

   Fixes for the following security issues:
   - CVE-2025-30722
   - CVE-2025-30693
   - CVE-2023-52970
   - CVE-2023-52969
   - CVE-2023-52971
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
--- storage/rocksdb/rocksdb/Makefile.orig	2025-06-06 17:55:18.123502674 +0000
d7 1
a7 1
@@@@ -962,7 +962,7 @@@@ valgrind_check_0:
d9 5
a13 5
 	  | grep -E -v '$(valgrind-exclude-regexp)'					\
 	  | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG --eta --gnu \
-	  '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) \
+	  '(if [ "{}" = "./"* ] ; then $(DRIVER) {}; else {}; fi) \
 	  $(parallel_redir)' \
d16 1
a16 1
@@@@ -2282,7 +2282,7 @@@@ rocksdbjavastatic_javalib:
d18 1
a18 1
 	  $(LIB_OBJECTS) $(COVERAGEFLAGS) \
d24 1
a24 1
 
@