package updates

build/apache/build-24.sh

@@ -12,13 +12,13 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=apache
 PKG=ooce/server/apache-24
-VER=2.4.62
+VER=2.4.63
 MAJVER=${VER%.*}            # M.m
 sMAJVER=${MAJVER//./}       # Mm
 SUMMARY="Apache httpd $MAJVER"

build/clamav/build.sh

@@ -12,12 +12,12 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=clamav
-VER=1.4.1
+VER=1.4.2
 PKG=ooce/system/clamav
 SUMMARY="Clam Anti-virus"
 DESC="$PROG is an open-source antivirus engine for detecting trojans, "

build/flac/build.sh

@@ -12,12 +12,12 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=flac
-VER=1.4.3
+VER=1.5.0
 PKG=ooce/audio/flac
 SUMMARY="flac"
 DESC="Free Lossless Audio Codec"

build/go/build-123.sh

@@ -18,7 +18,7 @@
 
 PROG=go
 PKG=ooce/developer/go-123
-VER=1.23.5
+VER=1.23.6
 SUMMARY="The Go Programming Language"
 DESC="An open source programming language that makes it easy to build simple, "
 DESC+="reliable, and efficient software."

build/go/build-122.sh → build/go/build-124.sh

@@ -17,8 +17,8 @@
 . ../../lib/build.sh
 
 PROG=go
-PKG=ooce/developer/go-122
-VER=1.22.11
+PKG=ooce/developer/go-124
+VER=1.24.0
 SUMMARY="The Go Programming Language"
 DESC="An open source programming language that makes it easy to build simple, "
 DESC+="reliable, and efficient software."

build/isc-bind9/build-918.sh

@@ -13,12 +13,12 @@
 # }}}
 #
 # Copyright 2017 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=bind
-VER=9.18.32
+VER=9.18.33
 PKG=ooce/network/bind-918
 SUMMARY="ISC BIND DNS Server & Tools"
 DESC="Server & Client Utilities for DNS"

build/isc-bind9/build-920.sh

@@ -13,12 +13,12 @@
 # }}}
 #
 # Copyright 2017 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=bind
-VER=9.20.4
+VER=9.20.5
 PKG=ooce/network/bind-920
 SUMMARY="ISC BIND DNS Server & Tools"
 DESC="Server & Client Utilities for DNS"

build/mariadb/build-1011.sh

@@ -12,12 +12,12 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=mariadb
-VER=10.11.10
+VER=10.11.11
 PKG=ooce/database/mariadb-1011
 SUMMARY="MariaDB"
 DESC="A community-developed, commercially supported fork of the "

build/mariadb/build-105.sh

@@ -12,12 +12,12 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=mariadb
-VER=10.5.27
+VER=10.5.28
 PKG=ooce/database/mariadb-105
 SUMMARY="MariaDB"
 DESC="A community-developed, commercially supported fork of the "

build/mariadb/build-106.sh

@@ -12,12 +12,12 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=mariadb
-VER=10.6.20
+VER=10.6.21
 PKG=ooce/database/mariadb-106
 SUMMARY="MariaDB"
 DESC="A community-developed, commercially supported fork of the "

build/mariadb/build-114.sh

@@ -12,12 +12,12 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=mariadb
-VER=11.4.4
+VER=11.4.5
 PKG=ooce/database/mariadb-114
 SUMMARY="MariaDB"
 DESC="A community-developed, commercially supported fork of the "

build/mariadb/patches-1011/08-dtrace-invalid-conversion.patch

@@ -13,7 +13,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/filesort.cc a/sql/filesor
 diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/handler.cc a/sql/handler.cc
 --- a~/sql/handler.cc	1970-01-01 00:00:00
 +++ a/sql/handler.cc	1970-01-01 00:00:00
-@@ -7211,18 +7211,18 @@ int handler::ha_external_lock(THD *thd,
+@@ -7210,18 +7210,18 @@ int handler::ha_external_lock(THD *thd,
    {
      if (lock_type == F_RDLCK)
      {
@@ -38,7 +38,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/handler.cc a/sql/handler.
      }
    }
 
-@@ -7744,7 +7744,7 @@ int handler::ha_write_row(const uchar *b
+@@ -7743,7 +7743,7 @@ int handler::ha_write_row(const uchar *b
      }
    }
 
@@ -47,7 +47,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/handler.cc a/sql/handler.
    mark_trx_read_write();
    increment_statistics(&SSV::ha_write_count);
 
-@@ -7804,7 +7804,7 @@ int handler::ha_update_row(const uchar *
+@@ -7805,7 +7805,7 @@ int handler::ha_update_row(const uchar *
    if (error)
      return error;
 
@@ -56,7 +56,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/handler.cc a/sql/handler.
    mark_trx_read_write();
    increment_statistics(&SSV::ha_update_count);
 
-@@ -7883,7 +7883,7 @@ int handler::ha_delete_row(const uchar *
+@@ -7886,7 +7886,7 @@ int handler::ha_delete_row(const uchar *
    DBUG_ASSERT(buf == table->record[0] ||
                buf == table->record[1]);
 
@@ -65,7 +65,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/handler.cc a/sql/handler.
    mark_trx_read_write();
    increment_statistics(&SSV::ha_delete_count);
 
-@@ -7942,7 +7942,7 @@ int handler::ha_delete_row(const uchar *
+@@ -7946,7 +7946,7 @@ int handler::ha_delete_row(const uchar *
  int handler::ha_direct_update_rows(ha_rows *update_rows, ha_rows *found_rows)
  {
    int error;
@@ -74,7 +74,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/handler.cc a/sql/handler.
    mark_trx_read_write();
 
    error= direct_update_rows(update_rows, found_rows);
-@@ -7969,7 +7969,7 @@ int handler::ha_direct_delete_rows(ha_ro
+@@ -7973,7 +7973,7 @@ int handler::ha_direct_delete_rows(ha_ro
    /* Ensure we are not using binlog row */
    DBUG_ASSERT(!table->in_use->is_current_stmt_binlog_format_row());
 
@@ -86,7 +86,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/handler.cc a/sql/handler.
 diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sp_head.cc a/sql/sp_head.cc
 --- a~/sql/sp_head.cc	1970-01-01 00:00:00
 +++ a/sql/sp_head.cc	1970-01-01 00:00:00
-@@ -3917,7 +3917,7 @@ sp_instr_stmt::exec_core(THD *thd, uint
+@@ -3929,7 +3929,7 @@ sp_instr_stmt::exec_core(THD *thd, uint
  {
    MYSQL_QUERY_EXEC_START(thd->query(),
                           thd->thread_id,
@@ -98,7 +98,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sp_head.cc a/sql/sp_head.
 diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_class.h a/sql/sql_class.h
 --- a~/sql/sql_class.h	1970-01-01 00:00:00
 +++ a/sql/sql_class.h	1970-01-01 00:00:00
-@@ -7715,7 +7715,7 @@ inline int handler::ha_read_first_row(uc
+@@ -7718,7 +7718,7 @@ inline int handler::ha_read_first_row(uc
  inline int handler::ha_write_tmp_row(uchar *buf)
  {
    int error;
@@ -107,7 +107,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_class.h a/sql/sql_cla
    increment_statistics(&SSV::ha_tmp_write_count);
    TABLE_IO_WAIT(tracker, PSI_TABLE_WRITE_ROW, MAX_KEY, error,
            { error= write_row(buf); })
-@@ -7726,7 +7726,7 @@ inline int handler::ha_write_tmp_row(uch
+@@ -7729,7 +7729,7 @@ inline int handler::ha_write_tmp_row(uch
  inline int handler::ha_delete_tmp_row(uchar *buf)
  {
    int error;
@@ -116,7 +116,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_class.h a/sql/sql_cla
    increment_statistics(&SSV::ha_tmp_delete_count);
    TABLE_IO_WAIT(tracker, PSI_TABLE_DELETE_ROW, MAX_KEY, error,
                  { error= delete_row(buf); })
-@@ -7737,7 +7737,7 @@ inline int handler::ha_delete_tmp_row(uc
+@@ -7740,7 +7740,7 @@ inline int handler::ha_delete_tmp_row(uc
  inline int handler::ha_update_tmp_row(const uchar *old_data, uchar *new_data)
  {
    int error;
@@ -140,7 +140,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_cursor.cc a/sql/sql_c
 diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_parse.cc a/sql/sql_parse.cc
 --- a~/sql/sql_parse.cc	1970-01-01 00:00:00
 +++ a/sql/sql_parse.cc	1970-01-01 00:00:00
-@@ -1871,7 +1871,7 @@ dispatch_command_return dispatch_command
+@@ -1870,7 +1870,7 @@ dispatch_command_return dispatch_command
      if (unlikely(alloc_query(thd, packet, packet_length)))
        break;					// fatal error is set
      MYSQL_QUERY_START(thd->query(), thd->thread_id,
@@ -149,7 +149,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_parse.cc a/sql/sql_pa
                        &thd->security_ctx->priv_user[0],
                        (char *) thd->security_ctx->host_or_ip);
      char *packet_end= thd->query() + thd->query_length();
-@@ -1957,7 +1957,7 @@ dispatch_command_return dispatch_command
+@@ -1956,7 +1956,7 @@ dispatch_command_return dispatch_command
 
        /* DTRACE begin */
        MYSQL_QUERY_START(beginning_of_next_stmt, thd->thread_id,
@@ -158,7 +158,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_parse.cc a/sql/sql_pa
                          &thd->security_ctx->priv_user[0],
                          (char *) thd->security_ctx->host_or_ip);
 
-@@ -7956,7 +7956,7 @@ static void wsrep_prepare_for_autocommit
+@@ -7970,7 +7970,7 @@ static void wsrep_prepare_for_autocommit
 
    /* DTRACE begin */
    MYSQL_QUERY_START(rawbuf, thd->thread_id,
@@ -167,7 +167,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_parse.cc a/sql/sql_pa
                      &thd->security_ctx->priv_user[0],
                      (char *) thd->security_ctx->host_or_ip);
 
-@@ -8165,7 +8165,7 @@ void mysql_parse(THD *thd, char *rawbuf,
+@@ -8179,7 +8179,7 @@ void mysql_parse(THD *thd, char *rawbuf,
            lex->set_trg_event_type_for_tables();
            MYSQL_QUERY_EXEC_START(thd->query(),
                                   thd->thread_id,
@@ -179,7 +179,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_parse.cc a/sql/sql_pa
 diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_prepare.cc a/sql/sql_prepare.cc
 --- a~/sql/sql_prepare.cc	1970-01-01 00:00:00
 +++ a/sql/sql_prepare.cc	1970-01-01 00:00:00
-@@ -5268,7 +5268,7 @@ bool Prepared_statement::execute(String
+@@ -5275,7 +5275,7 @@ bool Prepared_statement::execute(String
      if (query_cache_send_result_to_client(thd, thd->query(),
                                            thd->query_length()) <= 0)
      {
@@ -191,7 +191,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/sql_prepare.cc a/sql/sql_
 diff -wpruN --no-dereference '--exclude=*.orig' a~/storage/csv/ha_tina.cc a/storage/csv/ha_tina.cc
 --- a~/storage/csv/ha_tina.cc	1970-01-01 00:00:00
 +++ a/storage/csv/ha_tina.cc	1970-01-01 00:00:00
-@@ -1244,7 +1244,7 @@ int ha_tina::rnd_next(uchar *buf)
+@@ -1245,7 +1245,7 @@ int ha_tina::rnd_next(uchar *buf)
  {
    int rc;
    DBUG_ENTER("ha_tina::rnd_next");
@@ -200,7 +200,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/storage/csv/ha_tina.cc a/stor
                         TRUE);
 
    if (share->crashed)
-@@ -1299,7 +1299,7 @@ int ha_tina::rnd_pos(uchar * buf, uchar
+@@ -1300,7 +1300,7 @@ int ha_tina::rnd_pos(uchar * buf, uchar
  {
    int rc;
    DBUG_ENTER("ha_tina::rnd_pos");

build/mariadb/patches-1011/assert.patch

@@ -0,0 +1,32 @@
+From ff1f611a0d84b84a06b100a3b6901fc6d8957ff5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <[email protected]>
+Date: Fri, 10 Jan 2025 06:50:50 +0200
+Subject: [PATCH] Avoid assert()
+
+By default, CMAKE_BUILD_TYPE RelWithDebInfo or Release implies -DNDEBUG,
+which disables the assert() macro. MariaDB is deviating from that.
+Let us be explicit to use assert() only in debug builds.
+
+This fixes up 1b8358d9438c01c083fe4c66bcd43d755c3e2d7d
+diff -wpruN --no-dereference '--exclude=*.orig' a~/storage/innobase/include/trx0trx.h a/storage/innobase/include/trx0trx.h
+--- a~/storage/innobase/include/trx0trx.h	1970-01-01 00:00:00
++++ a/storage/innobase/include/trx0trx.h	1970-01-01 00:00:00
+@@ -671,14 +671,14 @@ public:
+   {
+     ut_ad(!mutex_is_owner());
+     mutex.wr_lock();
+-    assert(!mutex_owner.exchange(pthread_self(),
+-                                 std::memory_order_relaxed));
++    ut_d(assert(!mutex_owner.exchange(pthread_self(),
++                                      std::memory_order_relaxed)));
+   }
+   /** Release the mutex */
+   void mutex_unlock()
+   {
+-    assert(mutex_owner.exchange(0, std::memory_order_relaxed) ==
+-           pthread_self());
++    ut_d(assert(mutex_owner.exchange(0, std::memory_order_relaxed) ==
++                pthread_self()));
+     mutex.wr_unlock();
+   }
+ #ifndef SUX_LOCK_GENERIC

build/mariadb/patches-1011/series

@@ -4,3 +4,4 @@ missing_concurrency.patch
 08-dtrace-invalid-conversion.patch
 disable_dbug_docs.patch
 pam-illumos.patch
+assert.patch