Merge pull request #1334 from hadfl/pkgupd

package updates

build/clamav/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=clamav
-VER=1.1.0
+VER=1.1.1
 PKG=ooce/system/clamav
 SUMMARY="Clam Anti-virus"
 DESC="$PROG is an open-source antivirus engine for detecting trojans, "

build/clamav/patches/libsocket.patch

@@ -98,7 +98,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/clamscan/CMakeLists.txt a/cla
 diff -wpruN --no-dereference '--exclude=*.orig' a~/clamsubmit/CMakeLists.txt a/clamsubmit/CMakeLists.txt
 --- a~/clamsubmit/CMakeLists.txt	1970-01-01 00:00:00
 +++ a/clamsubmit/CMakeLists.txt	1970-01-01 00:00:00
-@@ -42,6 +42,9 @@ if(APPLE)
+@@ -44,6 +44,9 @@ if(APPLE)
              ${APPLE_CORE_FOUNDATION}
              ${APPLE_SECURITY} )
  endif()

build/isc-bind9/build-916.sh

@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=bind
-VER=9.16.42
+VER=9.16.43
 PKG=ooce/network/bind-916
 SUMMARY="ISC BIND DNS Server & Tools"
 DESC="Server & Client Utilities for DNS"

build/isc-bind9/build-918.sh

@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=bind
-VER=9.18.17
+VER=9.18.18
 PKG=ooce/network/bind-918
 SUMMARY="ISC BIND DNS Server & Tools"
 DESC="Server & Client Utilities for DNS"

build/mariadb/build-1011.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=mariadb
-VER=10.11.4
+VER=10.11.5
 PKG=ooce/database/mariadb-1011
 SUMMARY="MariaDB"
 DESC="A community-developed, commercially supported fork of the "

build/mariadb/build-104.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=mariadb
-VER=10.4.30
+VER=10.4.31
 PKG=ooce/database/mariadb-104
 SUMMARY="MariaDB"
 DESC="A community-developed, commercially supported fork of the "

build/mariadb/build-105.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=mariadb
-VER=10.5.21
+VER=10.5.22
 PKG=ooce/database/mariadb-105
 SUMMARY="MariaDB"
 DESC="A community-developed, commercially supported fork of the "

build/mariadb/build-106.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=mariadb
-VER=10.6.14
+VER=10.6.15
 PKG=ooce/database/mariadb-106
 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
-@@ -7108,18 +7108,18 @@ int handler::ha_external_lock(THD *thd,
+@@ -7123,18 +7123,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.
      }
    }
 
-@@ -7619,7 +7619,7 @@ int handler::ha_write_row(const uchar *b
+@@ -7634,7 +7634,7 @@ int handler::ha_write_row(const uchar *b
        DBUG_RETURN(error);
    }
 
@@ -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);
 
-@@ -7679,7 +7679,7 @@ int handler::ha_update_row(const uchar *
+@@ -7694,7 +7694,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);
 
-@@ -7758,7 +7758,7 @@ int handler::ha_delete_row(const uchar *
+@@ -7773,7 +7773,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);
 
-@@ -7815,7 +7815,7 @@ int handler::ha_delete_row(const uchar *
+@@ -7830,7 +7830,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);
-@@ -7842,7 +7842,7 @@ int handler::ha_direct_delete_rows(ha_ro
+@@ -7857,7 +7857,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
-@@ -3850,7 +3850,7 @@ sp_instr_stmt::exec_core(THD *thd, uint
+@@ -3847,7 +3847,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
-@@ -7480,7 +7480,7 @@ inline int handler::ha_read_first_row(uc
+@@ -7509,7 +7509,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); })
-@@ -7491,7 +7491,7 @@ inline int handler::ha_write_tmp_row(uch
+@@ -7520,7 +7520,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); })
-@@ -7502,7 +7502,7 @@ inline int handler::ha_delete_tmp_row(uc
+@@ -7531,7 +7531,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;
@@ -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);
 
-@@ -7800,7 +7800,7 @@ static void wsrep_prepare_for_autocommit
+@@ -7817,7 +7817,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);
 
-@@ -8008,7 +8008,7 @@ void mysql_parse(THD *thd, char *rawbuf,
+@@ -8025,7 +8025,7 @@ void mysql_parse(THD *thd, char *rawbuf,
            lex->set_trg_event_type_for_tables();
            MYSQL_QUERY_EXEC_START(thd->query(),
                                   thd->thread_id,

build/mariadb/patches-1011/disable_dbug_docs.patch

@@ -0,0 +1,14 @@
+groff 1.23.0 fails to build user.ps; skip build since we are not shipping it anyway
+
+diff -wpruN --no-dereference '--exclude=*.orig' a~/dbug/CMakeLists.txt a/dbug/CMakeLists.txt
+--- a~/dbug/CMakeLists.txt	1970-01-01 00:00:00
++++ a/dbug/CMakeLists.txt	1970-01-01 00:00:00
+@@ -30,7 +30,7 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED C
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
+
+-IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode AND NOT RPM AND NOT DEB)
++IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode AND NOT RPM AND NOT DEB AND NOT CMAKE_HOST_SOLARIS)
+   FIND_PROGRAM(GROFF groff)
+   FIND_PROGRAM(NROFF nroff)
+   MARK_AS_ADVANCED(GROFF)

build/mariadb/patches-1011/missing_concurrency.patch

@@ -1,7 +1,7 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/sql/mysqld.cc a/sql/mysqld.cc
 --- a~/sql/mysqld.cc	1970-01-01 00:00:00
 +++ a/sql/mysqld.cc	1970-01-01 00:00:00
-@@ -446,7 +446,7 @@ Atomic_counter<uint32_t> THD_count::coun
+@@ -452,7 +452,7 @@ Atomic_counter<uint32_t> THD_count::coun
  bool shutdown_wait_for_slaves;
  Atomic_counter<uint32_t> slave_open_temp_tables;
  ulong thread_created;

build/mariadb/patches-1011/series

@@ -3,3 +3,4 @@ missing_concurrency.patch
 04-dtrace.patch
 05-no-pie.patch
 08-dtrace-invalid-conversion.patch
+disable_dbug_docs.patch

build/mariadb/patches-104/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
-@@ -6527,18 +6527,18 @@ int handler::ha_external_lock(THD *thd,
+@@ -6541,18 +6541,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.
      }
    }
 
-@@ -6810,7 +6810,7 @@ int handler::ha_write_row(const uchar *b
+@@ -6824,7 +6824,7 @@ int handler::ha_write_row(const uchar *b
    DBUG_ENTER("handler::ha_write_row");
    DEBUG_SYNC_C("ha_write_row_start");
 
@@ -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);
 
-@@ -6870,7 +6870,7 @@ int handler::ha_update_row(const uchar *
+@@ -6884,7 +6884,7 @@ int handler::ha_update_row(const uchar *
    DBUG_ASSERT(new_data == table->record[0]);
    DBUG_ASSERT(old_data == table->record[1]);
 
@@ -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);
 
-@@ -6961,7 +6961,7 @@ int handler::ha_delete_row(const uchar *
+@@ -6975,7 +6975,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);
 
-@@ -7016,7 +7016,7 @@ int handler::ha_direct_update_rows(ha_ro
+@@ -7030,7 +7030,7 @@ int handler::ha_direct_update_rows(ha_ro
  {
    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);
-@@ -7043,7 +7043,7 @@ int handler::ha_direct_delete_rows(ha_ro
+@@ -7057,7 +7057,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());
 
@@ -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
-@@ -6762,7 +6762,7 @@ inline int handler::ha_read_first_row(uc
+@@ -6769,7 +6769,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, m_psi, PSI_TABLE_WRITE_ROW, MAX_KEY, 0,
                  { error= write_row(buf); })
-@@ -6773,7 +6773,7 @@ inline int handler::ha_write_tmp_row(uch
+@@ -6780,7 +6780,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, m_psi, PSI_TABLE_DELETE_ROW, MAX_KEY, 0,
                  { error= delete_row(buf); })
-@@ -6784,7 +6784,7 @@ inline int handler::ha_delete_tmp_row(uc
+@@ -6791,7 +6791,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;
@@ -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);
 
-@@ -7770,7 +7770,7 @@ static void wsrep_prepare_for_autocommit
+@@ -7782,7 +7782,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);
 
-@@ -7989,7 +7989,7 @@ void mysql_parse(THD *thd, char *rawbuf,
+@@ -8001,7 +8001,7 @@ void mysql_parse(THD *thd, char *rawbuf,
            lex->set_trg_event_type_for_tables();
            MYSQL_QUERY_EXEC_START(thd->query(),
                                   thd->thread_id,

build/mariadb/patches-104/disable_dbug_docs.patch

@@ -0,0 +1,14 @@
+groff 1.23.0 fails to build user.ps; skip build since we are not shipping it anyway
+
+diff -wpruN --no-dereference '--exclude=*.orig' a~/dbug/CMakeLists.txt a/dbug/CMakeLists.txt
+--- a~/dbug/CMakeLists.txt	1970-01-01 00:00:00
++++ a/dbug/CMakeLists.txt	1970-01-01 00:00:00
+@@ -29,7 +29,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
+
+-IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode AND NOT RPM AND NOT DEB)
++IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode AND NOT RPM AND NOT DEB AND NOT CMAKE_HOST_SOLARIS)
+   FIND_PROGRAM(GROFF groff)
+   FIND_PROGRAM(NROFF nroff)
+   MARK_AS_ADVANCED(GROFF)

build/mariadb/patches-104/openssl3b.patch

@@ -148,7 +148,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/mysys_ssl/my_md5.cc a/mysys_s
 diff -wpruN --no-dereference '--exclude=*.orig' a~/storage/innobase/handler/ha_innodb.cc a/storage/innobase/handler/ha_innodb.cc
 --- a~/storage/innobase/handler/ha_innodb.cc	1970-01-01 00:00:00
 +++ a/storage/innobase/handler/ha_innodb.cc	1970-01-01 00:00:00
-@@ -8777,7 +8777,7 @@ wsrep_calc_row_hash(
+@@ -8804,7 +8804,7 @@ wsrep_calc_row_hash(
  	ulint		len;
  	const byte*	ptr;
 
@@ -157,7 +157,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/storage/innobase/handler/ha_i
  	my_md5_init(ctx);
 
  	for (uint i = 0; i < table->s->fields; i++) {
-@@ -8835,6 +8835,7 @@ wsrep_calc_row_hash(
+@@ -8862,6 +8862,7 @@ wsrep_calc_row_hash(
  	}
 
  	my_md5_result(ctx, digest);

build/mariadb/patches-104/series

@@ -7,3 +7,4 @@ cfi.patch
 openssl3.patch
 openssl3b.patch
 memcntl.patch
+disable_dbug_docs.patch