diff --git a/build/ffmpeg/patches/clang-no-mimpure-text.patch b/build/ffmpeg/patches/clang-no-mimpure-text.patch index e91dc58fa..d19f1c85f 100644 --- a/build/ffmpeg/patches/clang-no-mimpure-text.patch +++ b/build/ffmpeg/patches/clang-no-mimpure-text.patch @@ -1,7 +1,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure --- a~/configure 1970-01-01 00:00:00 +++ a/configure 1970-01-01 00:00:00 -@@ -5692,7 +5692,7 @@ case $target_os in +@@ -5735,7 +5735,7 @@ case $target_os in ;; sunos) SHFLAGS='-shared -Wl,-h,$$(@F)' diff --git a/build/ffmpeg/patches/series b/build/ffmpeg/patches/series index ae4920dab..ca0b5bcd9 100644 --- a/build/ffmpeg/patches/series +++ b/build/ffmpeg/patches/series @@ -1 +1,2 @@ clang-no-mimpure-text.patch +stdbit-detection.patch diff --git a/build/ffmpeg/patches/stdbit-detection.patch b/build/ffmpeg/patches/stdbit-detection.patch new file mode 100644 index 000000000..7d20e5d78 --- /dev/null +++ b/build/ffmpeg/patches/stdbit-detection.patch @@ -0,0 +1,15 @@ +__STDC_VERSION_STDBIT_H__ is set unconditionally in the stdbit.h header, so the feature gets detected +even when built with the default std=c17. however, the declarations are not exposed. + +diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure +--- a~/configure 1970-01-01 00:00:00 ++++ a/configure 1970-01-01 00:00:00 +@@ -7789,7 +7789,7 @@ if disabled stdatomic; then + fi + + check_builtin stdbit "stdbit.h assert.h" \ +- 'static_assert(__STDC_VERSION_STDBIT_H__ >= 202311L, "Compiler lacks stdbit.h")' || \ ++ 'static_assert(__STDC_VERSION_STDBIT_H__ >= 202311L && __STDC_VERSION__ >= 202311L, "Compiler lacks stdbit.h")' || \ + add_cppflags '-I\$(SRC_PATH)/compat/stdbit' + + # Check if requested libraries were found. diff --git a/build/go/build-122.sh b/build/go/build-122.sh index e1306fd2d..c8d074199 100755 --- a/build/go/build-122.sh +++ b/build/go/build-122.sh @@ -18,7 +18,7 @@ PROG=go PKG=ooce/developer/go-122 -VER=1.22.8 +VER=1.22.9 SUMMARY="The Go Programming Language" DESC="An open source programming language that makes it easy to build simple, " DESC+="reliable, and efficient software." diff --git a/build/go/build-123.sh b/build/go/build-123.sh index d6738e7b9..c16fb1cb8 100755 --- a/build/go/build-123.sh +++ b/build/go/build-123.sh @@ -18,7 +18,7 @@ PROG=go PKG=ooce/developer/go-123 -VER=1.23.2 +VER=1.23.3 SUMMARY="The Go Programming Language" DESC="An open source programming language that makes it easy to build simple, " DESC+="reliable, and efficient software." diff --git a/build/mariadb/build-1011.sh b/build/mariadb/build-1011.sh index 68f6d31aa..b5eb05343 100755 --- a/build/mariadb/build-1011.sh +++ b/build/mariadb/build-1011.sh @@ -17,17 +17,12 @@ . ../../lib/build.sh PROG=mariadb -VER=10.11.9 +VER=10.11.10 PKG=ooce/database/mariadb-1011 SUMMARY="MariaDB" DESC="A community-developed, commercially supported fork of the " DESC+="MySQL relational database management system" -# does not yet build with gcc 14 -((GCCVER > 13)) && set_gccver 13 - -min_rel 151042 - MAJVER=${VER%.*} sMAJVER=${MAJVER//./} set_patchdir patches-$sMAJVER @@ -57,6 +52,7 @@ XFORM_ARGS=" -DUSER=mysql -DGROUP=mysql " +CPPFLAGS+=" -I/usr/include/ncurses -DOOCEVER=$RELVER" CFLAGS+=" -O3 -I$OPREFIX/include -I/usr/include/gssapi" CXXFLAGS[i386]="$CFLAGS ${CFLAGS[i386]} -R$OPREFIX/lib" CXXFLAGS[amd64]="$CFLAGS ${CFLAGS[amd64]} -R$OPREFIX/lib/amd64" diff --git a/build/mariadb/build-105.sh b/build/mariadb/build-105.sh index bf1d0d8ac..56ca53ad8 100755 --- a/build/mariadb/build-105.sh +++ b/build/mariadb/build-105.sh @@ -17,15 +17,12 @@ . ../../lib/build.sh PROG=mariadb -VER=10.5.26 +VER=10.5.27 PKG=ooce/database/mariadb-105 SUMMARY="MariaDB" DESC="A community-developed, commercially supported fork of the " DESC+="MySQL relational database management system" -# does not yet build with gcc 14 -((GCCVER > 13)) && set_gccver 13 - MAJVER=${VER%.*} sMAJVER=${MAJVER//./} set_patchdir patches-$sMAJVER @@ -55,6 +52,7 @@ XFORM_ARGS=" -DUSER=mysql -DGROUP=mysql " +CPPFLAGS+=" -I/usr/include/ncurses -DOOCEVER=$RELVER" CFLAGS+=" -O3 -I$OPREFIX/include -I/usr/include/gssapi" CXXFLAGS[i386]="$CFLAGS ${CFLAGS[i386]} -R$OPREFIX/lib" CXXFLAGS[amd64]="$CFLAGS ${CFLAGS[amd64]} -R$OPREFIX/lib/amd64" diff --git a/build/mariadb/build-106.sh b/build/mariadb/build-106.sh index e53e0daf6..6b18d7350 100755 --- a/build/mariadb/build-106.sh +++ b/build/mariadb/build-106.sh @@ -17,15 +17,12 @@ . ../../lib/build.sh PROG=mariadb -VER=10.6.19 +VER=10.6.20 PKG=ooce/database/mariadb-106 SUMMARY="MariaDB" DESC="A community-developed, commercially supported fork of the " DESC+="MySQL relational database management system" -# does not yet build with gcc 14 -((GCCVER > 13)) && set_gccver 13 - MAJVER=${VER%.*} sMAJVER=${MAJVER//./} set_patchdir patches-$sMAJVER @@ -55,6 +52,7 @@ XFORM_ARGS=" -DUSER=mysql -DGROUP=mysql " +CPPFLAGS+=" -I/usr/include/ncurses -DOOCEVER=$RELVER" CFLAGS+=" -O3 -I$OPREFIX/include -I/usr/include/gssapi" CXXFLAGS[i386]="$CFLAGS ${CFLAGS[i386]} -R$OPREFIX/${LIBDIRS[i386]}" CXXFLAGS[amd64]="$CFLAGS ${CFLAGS[amd64]} -R$OPREFIX/${LIBDIRS[amd64]}" diff --git a/build/mariadb/build-114.sh b/build/mariadb/build-114.sh index 25545b903..0639e5de9 100755 --- a/build/mariadb/build-114.sh +++ b/build/mariadb/build-114.sh @@ -17,15 +17,12 @@ . ../../lib/build.sh PROG=mariadb -VER=11.4.3 +VER=11.4.4 PKG=ooce/database/mariadb-114 SUMMARY="MariaDB" DESC="A community-developed, commercially supported fork of the " DESC+="MySQL relational database management system" -# does not yet build with gcc 14 -((GCCVER > 13)) && set_gccver 13 - MAJVER=${VER%.*} sMAJVER=${MAJVER//./} set_patchdir patches-$sMAJVER @@ -55,7 +52,7 @@ XFORM_ARGS=" -DUSER=mysql -DGROUP=mysql " -CPPFLAGS+=" -DOOCEVER=$RELVER" +CPPFLAGS+=" -I/usr/include/ncurses -DOOCEVER=$RELVER" CFLAGS+=" -O3 -I$OPREFIX/include -I/usr/include/gssapi" CXXFLAGS[i386]="$CFLAGS ${CFLAGS[i386]} -R$OPREFIX/lib" CXXFLAGS[amd64]="$CFLAGS ${CFLAGS[amd64]} -R$OPREFIX/lib/amd64" diff --git a/build/mariadb/patches-1011/05-no-pie.patch b/build/mariadb/patches-1011/05-no-pie.patch index 98a3740fb..16f6e2177 100644 --- a/build/mariadb/patches-1011/05-no-pie.patch +++ b/build/mariadb/patches-1011/05-no-pie.patch @@ -1,9 +1,9 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/CMakeLists.txt a/CMakeLists.txt --- a~/CMakeLists.txt 1970-01-01 00:00:00 +++ a/CMakeLists.txt 1970-01-01 00:00:00 -@@ -266,8 +266,8 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-fno-omi +@@ -275,8 +275,8 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-fno-omi OPTION(SECURITY_HARDENED "Use security-enhancing compiler features (stack protector, relro, etc)" ON) - IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN AND NOT WITH_GPROF) + IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN AND NOT WITH_GPROF AND NOT WITH_MSAN) # security-enhancing flags - MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") - MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now") diff --git a/build/mariadb/patches-1011/08-dtrace-invalid-conversion.patch b/build/mariadb/patches-1011/08-dtrace-invalid-conversion.patch index e71e42824..08151c015 100644 --- a/build/mariadb/patches-1011/08-dtrace-invalid-conversion.patch +++ b/build/mariadb/patches-1011/08-dtrace-invalid-conversion.patch @@ -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 -@@ -7673,7 +7673,7 @@ inline int handler::ha_read_first_row(uc +@@ -7715,7 +7715,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); }) -@@ -7684,7 +7684,7 @@ inline int handler::ha_write_tmp_row(uch +@@ -7726,7 +7726,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); }) -@@ -7695,7 +7695,7 @@ inline int handler::ha_delete_tmp_row(uc +@@ -7737,7 +7737,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 -@@ -1860,7 +1860,7 @@ dispatch_command_return dispatch_command +@@ -1871,7 +1871,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(); -@@ -1946,7 +1946,7 @@ dispatch_command_return dispatch_command +@@ -1957,7 +1957,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); -@@ -7927,7 +7927,7 @@ static void wsrep_prepare_for_autocommit +@@ -7956,7 +7956,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); -@@ -8136,7 +8136,7 @@ void mysql_parse(THD *thd, char *rawbuf, +@@ -8165,7 +8165,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 -@@ -5267,7 +5267,7 @@ bool Prepared_statement::execute(String +@@ -5268,7 +5268,7 @@ bool Prepared_statement::execute(String if (query_cache_send_result_to_client(thd, thd->query(), thd->query_length()) <= 0) { diff --git a/build/mariadb/patches-1011/pam-illumos.patch b/build/mariadb/patches-1011/pam-illumos.patch new file mode 100644 index 000000000..0fe8429ef --- /dev/null +++ b/build/mariadb/patches-1011/pam-illumos.patch @@ -0,0 +1,15 @@ +see: https://www.illumos.org/issues/15657 +void **item is not const in illumos before r151051 + +diff -wpruN --no-dereference '--exclude=*.orig' a~/plugin/auth_pam/auth_pam_base.c a/plugin/auth_pam/auth_pam_base.c +--- a~/plugin/auth_pam/auth_pam_base.c 1970-01-01 00:00:00 ++++ a/plugin/auth_pam/auth_pam_base.c 1970-01-01 00:00:00 +@@ -128,7 +128,7 @@ static int conv(int n, const struct pam_ + + #define DO(X) if ((status = (X)) != PAM_SUCCESS) goto end + +-#if defined(SOLARIS) || defined(__sun) ++#if (defined(SOLARIS) || defined(__sun)) && OOCEVER < 151051 + typedef void** pam_get_item_3_arg; + #else + typedef const void** pam_get_item_3_arg; diff --git a/build/mariadb/patches-1011/series b/build/mariadb/patches-1011/series index e354f7469..98c5c1889 100644 --- a/build/mariadb/patches-1011/series +++ b/build/mariadb/patches-1011/series @@ -3,3 +3,4 @@ missing_concurrency.patch 05-no-pie.patch 08-dtrace-invalid-conversion.patch disable_dbug_docs.patch +pam-illumos.patch diff --git a/build/mariadb/patches-105/05-no-pie.patch b/build/mariadb/patches-105/05-no-pie.patch index e7fc99a01..66750a34f 100644 --- a/build/mariadb/patches-105/05-no-pie.patch +++ b/build/mariadb/patches-105/05-no-pie.patch @@ -1,9 +1,9 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/CMakeLists.txt a/CMakeLists.txt --- a~/CMakeLists.txt 1970-01-01 00:00:00 +++ a/CMakeLists.txt 1970-01-01 00:00:00 -@@ -259,8 +259,8 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-fno-omi +@@ -272,8 +272,8 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-fno-omi OPTION(SECURITY_HARDENED "Use security-enhancing compiler features (stack protector, relro, etc)" ON) - IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN AND NOT WITH_GPROF) + IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN AND NOT WITH_GPROF AND NOT WITH_MSAN) # security-enhancing flags - MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") - MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now") diff --git a/build/mariadb/patches-105/08-dtrace-invalid-conversion.patch b/build/mariadb/patches-105/08-dtrace-invalid-conversion.patch index 9df61e97a..f1e0424a0 100644 --- a/build/mariadb/patches-105/08-dtrace-invalid-conversion.patch +++ b/build/mariadb/patches-105/08-dtrace-invalid-conversion.patch @@ -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 -@@ -7298,7 +7298,7 @@ inline int handler::ha_read_first_row(uc +@@ -7314,7 +7314,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); }) -@@ -7309,7 +7309,7 @@ inline int handler::ha_write_tmp_row(uch +@@ -7325,7 +7325,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); }) -@@ -7320,7 +7320,7 @@ inline int handler::ha_delete_tmp_row(uc +@@ -7336,7 +7336,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 -@@ -1856,7 +1856,7 @@ bool dispatch_command(enum enum_server_c +@@ -1855,7 +1855,7 @@ bool dispatch_command(enum enum_server_c 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(); -@@ -1944,7 +1944,7 @@ bool dispatch_command(enum enum_server_c +@@ -1943,7 +1943,7 @@ bool dispatch_command(enum enum_server_c /* 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); -@@ -7993,7 +7993,7 @@ static void wsrep_prepare_for_autocommit +@@ -8007,7 +8007,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); -@@ -8214,7 +8214,7 @@ void mysql_parse(THD *thd, char *rawbuf, +@@ -8228,7 +8228,7 @@ void mysql_parse(THD *thd, char *rawbuf, lex->set_trg_event_type_for_tables(); MYSQL_QUERY_EXEC_START(thd->query(), thd->thread_id, diff --git a/build/mariadb/patches-105/pam-illumos.patch b/build/mariadb/patches-105/pam-illumos.patch new file mode 100644 index 000000000..0fe8429ef --- /dev/null +++ b/build/mariadb/patches-105/pam-illumos.patch @@ -0,0 +1,15 @@ +see: https://www.illumos.org/issues/15657 +void **item is not const in illumos before r151051 + +diff -wpruN --no-dereference '--exclude=*.orig' a~/plugin/auth_pam/auth_pam_base.c a/plugin/auth_pam/auth_pam_base.c +--- a~/plugin/auth_pam/auth_pam_base.c 1970-01-01 00:00:00 ++++ a/plugin/auth_pam/auth_pam_base.c 1970-01-01 00:00:00 +@@ -128,7 +128,7 @@ static int conv(int n, const struct pam_ + + #define DO(X) if ((status = (X)) != PAM_SUCCESS) goto end + +-#if defined(SOLARIS) || defined(__sun) ++#if (defined(SOLARIS) || defined(__sun)) && OOCEVER < 151051 + typedef void** pam_get_item_3_arg; + #else + typedef const void** pam_get_item_3_arg; diff --git a/build/mariadb/patches-105/series b/build/mariadb/patches-105/series index e91047331..f03e93586 100644 --- a/build/mariadb/patches-105/series +++ b/build/mariadb/patches-105/series @@ -4,3 +4,4 @@ missing_concurrency.patch 08-dtrace-invalid-conversion.patch cfi.patch disable_dbug_docs.patch +pam-illumos.patch diff --git a/build/mariadb/patches-106/05-no-pie.patch b/build/mariadb/patches-106/05-no-pie.patch index 532501467..2d56ffec3 100644 --- a/build/mariadb/patches-106/05-no-pie.patch +++ b/build/mariadb/patches-106/05-no-pie.patch @@ -1,9 +1,9 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/CMakeLists.txt a/CMakeLists.txt --- a~/CMakeLists.txt 1970-01-01 00:00:00 +++ a/CMakeLists.txt 1970-01-01 00:00:00 -@@ -265,8 +265,8 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-fno-omi +@@ -274,8 +274,8 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-fno-omi OPTION(SECURITY_HARDENED "Use security-enhancing compiler features (stack protector, relro, etc)" ON) - IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN AND NOT WITH_GPROF) + IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN AND NOT WITH_GPROF AND NOT WITH_MSAN) # security-enhancing flags - MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") - MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now") diff --git a/build/mariadb/patches-106/08-dtrace-invalid-conversion.patch b/build/mariadb/patches-106/08-dtrace-invalid-conversion.patch index e463bd8ee..3b4a4adf6 100644 --- a/build/mariadb/patches-106/08-dtrace-invalid-conversion.patch +++ b/build/mariadb/patches-106/08-dtrace-invalid-conversion.patch @@ -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 -@@ -7660,7 +7660,7 @@ inline int handler::ha_read_first_row(uc +@@ -7702,7 +7702,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); }) -@@ -7671,7 +7671,7 @@ inline int handler::ha_write_tmp_row(uch +@@ -7713,7 +7713,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); }) -@@ -7682,7 +7682,7 @@ inline int handler::ha_delete_tmp_row(uc +@@ -7724,7 +7724,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 -@@ -1862,7 +1862,7 @@ dispatch_command_return dispatch_command +@@ -1873,7 +1873,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(); -@@ -1948,7 +1948,7 @@ dispatch_command_return dispatch_command +@@ -1959,7 +1959,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); -@@ -7948,7 +7948,7 @@ static void wsrep_prepare_for_autocommit +@@ -7977,7 +7977,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); -@@ -8156,7 +8156,7 @@ void mysql_parse(THD *thd, char *rawbuf, +@@ -8185,7 +8185,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 -@@ -5258,7 +5258,7 @@ bool Prepared_statement::execute(String +@@ -5259,7 +5259,7 @@ bool Prepared_statement::execute(String if (query_cache_send_result_to_client(thd, thd->query(), thd->query_length()) <= 0) { diff --git a/build/mariadb/patches-106/pam-illumos.patch b/build/mariadb/patches-106/pam-illumos.patch new file mode 100644 index 000000000..0fe8429ef --- /dev/null +++ b/build/mariadb/patches-106/pam-illumos.patch @@ -0,0 +1,15 @@ +see: https://www.illumos.org/issues/15657 +void **item is not const in illumos before r151051 + +diff -wpruN --no-dereference '--exclude=*.orig' a~/plugin/auth_pam/auth_pam_base.c a/plugin/auth_pam/auth_pam_base.c +--- a~/plugin/auth_pam/auth_pam_base.c 1970-01-01 00:00:00 ++++ a/plugin/auth_pam/auth_pam_base.c 1970-01-01 00:00:00 +@@ -128,7 +128,7 @@ static int conv(int n, const struct pam_ + + #define DO(X) if ((status = (X)) != PAM_SUCCESS) goto end + +-#if defined(SOLARIS) || defined(__sun) ++#if (defined(SOLARIS) || defined(__sun)) && OOCEVER < 151051 + typedef void** pam_get_item_3_arg; + #else + typedef const void** pam_get_item_3_arg; diff --git a/build/mariadb/patches-106/series b/build/mariadb/patches-106/series index e354f7469..98c5c1889 100644 --- a/build/mariadb/patches-106/series +++ b/build/mariadb/patches-106/series @@ -3,3 +3,4 @@ missing_concurrency.patch 05-no-pie.patch 08-dtrace-invalid-conversion.patch disable_dbug_docs.patch +pam-illumos.patch diff --git a/build/mariadb/patches-114/05-no-pie.patch b/build/mariadb/patches-114/05-no-pie.patch index ef0ab3d27..fdbb1df03 100644 --- a/build/mariadb/patches-114/05-no-pie.patch +++ b/build/mariadb/patches-114/05-no-pie.patch @@ -1,9 +1,9 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/CMakeLists.txt a/CMakeLists.txt --- a~/CMakeLists.txt 1970-01-01 00:00:00 +++ a/CMakeLists.txt 1970-01-01 00:00:00 -@@ -267,8 +267,8 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-fno-omi +@@ -276,8 +276,8 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-fno-omi OPTION(SECURITY_HARDENED "Use security-enhancing compiler features (stack protector, relro, etc)" ON) - IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN AND NOT WITH_GPROF) + IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN AND NOT WITH_GPROF AND NOT WITH_MSAN) # security-enhancing flags - MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") - MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now") diff --git a/build/mariadb/patches-114/08-dtrace-invalid-conversion.patch b/build/mariadb/patches-114/08-dtrace-invalid-conversion.patch index c1673f7a6..a24fd5cd7 100644 --- a/build/mariadb/patches-114/08-dtrace-invalid-conversion.patch +++ b/build/mariadb/patches-114/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 -@@ -7433,18 +7433,18 @@ int handler::ha_external_lock(THD *thd, +@@ -7455,18 +7455,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. } } -@@ -7955,7 +7955,7 @@ int handler::ha_write_row(const uchar *b +@@ -7977,7 +7977,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); -@@ -8006,7 +8006,7 @@ int handler::ha_update_row(const uchar * +@@ -8028,7 +8028,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); -@@ -8083,7 +8083,7 @@ int handler::ha_delete_row(const uchar * +@@ -8105,7 +8105,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); -@@ -8140,7 +8140,7 @@ int handler::ha_delete_row(const uchar * +@@ -8162,7 +8162,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); -@@ -8167,7 +8167,7 @@ int handler::ha_direct_delete_rows(ha_ro +@@ -8189,7 +8189,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/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 -@@ -7832,7 +7832,7 @@ inline int handler::ha_read_first_row(uc +@@ -7874,7 +7874,7 @@ inline int handler::ha_read_first_row(uc inline int handler::ha_write_tmp_row(uchar *buf) { int error; @@ -95,7 +95,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); }) -@@ -7843,7 +7843,7 @@ inline int handler::ha_write_tmp_row(uch +@@ -7885,7 +7885,7 @@ inline int handler::ha_write_tmp_row(uch inline int handler::ha_delete_tmp_row(uchar *buf) { int error; @@ -104,7 +104,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); }) -@@ -7854,7 +7854,7 @@ inline int handler::ha_delete_tmp_row(uc +@@ -7896,7 +7896,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; @@ -128,7 +128,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 -@@ -1859,7 +1859,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, @@ -137,7 +137,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(); -@@ -1945,7 +1945,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, @@ -146,7 +146,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); -@@ -7646,7 +7646,7 @@ static void wsrep_prepare_for_autocommit +@@ -7675,7 +7675,7 @@ static void wsrep_prepare_for_autocommit /* DTRACE begin */ MYSQL_QUERY_START(rawbuf, thd->thread_id, @@ -155,7 +155,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); -@@ -7855,7 +7855,7 @@ void mysql_parse(THD *thd, char *rawbuf, +@@ -7884,7 +7884,7 @@ void mysql_parse(THD *thd, char *rawbuf, lex->set_trg_event_type_for_tables(); MYSQL_QUERY_EXEC_START(thd->query(), thd->thread_id, @@ -167,7 +167,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 -@@ -5061,7 +5061,7 @@ bool Prepared_statement::execute(String +@@ -5062,7 +5062,7 @@ bool Prepared_statement::execute(String if (query_cache_send_result_to_client(thd, thd->query(), thd->query_length()) <= 0) { diff --git a/build/postgresql/build-12.sh b/build/postgresql/build-12.sh index 85bc18951..25ddb9809 100755 --- a/build/postgresql/build-12.sh +++ b/build/postgresql/build-12.sh @@ -23,9 +23,6 @@ VER=12.20 SUMMARY="PostgreSQL 12" DESC="The World's Most Advanced Open Source Relational Database" -# does not yet build with gcc 14 -((GCCVER > 13)) && set_gccver 13 - SKIP_LICENCES=postgresql MAJVER=${VER%.*} # M.m diff --git a/build/postgresql/build-13.sh b/build/postgresql/build-13.sh index 7d2b1c501..60f94e241 100755 --- a/build/postgresql/build-13.sh +++ b/build/postgresql/build-13.sh @@ -23,9 +23,6 @@ VER=13.16 SUMMARY="PostgreSQL 13" DESC="The World's Most Advanced Open Source Relational Database" -# does not yet build with gcc 14 -((GCCVER > 13)) && set_gccver 13 - SKIP_LICENCES=postgresql MAJVER=${VER%.*} # M.m diff --git a/build/postgresql/build-14.sh b/build/postgresql/build-14.sh index 437d373a0..cc1b5216e 100755 --- a/build/postgresql/build-14.sh +++ b/build/postgresql/build-14.sh @@ -28,22 +28,8 @@ SKIP_LICENCES=postgresql # We want to populate the clang-related environment variables # and set PATH to point to the correct llvm/clang version for # the postgres JIT code, but we want to build with gcc. -if ((DEFAULT_CLANG_VER > 15)); then - # We need version 15 as beginning with version 16 the LLVMBuildLoad - # symbol is removed and postgresql references that symbol. When - # postgresql support the so called opaque pointers API we can switch - # to a newer version of clang again. - set_clangver 15 -else - set_clangver -fi - -# does not yet build with gcc 14 -if ((GCCVER > 13)); then - BASEPATH=$PATH set_gccver 13 -else - BASEPATH=$PATH set_gccver $DEFAULT_GCC_VER -fi +set_clangver +BASEPATH=$PATH set_gccver $DEFAULT_GCC_VER MAJVER=${VER%.*} # M.m sMAJVER=${MAJVER//./} # Mm diff --git a/build/postgresql/build-15.sh b/build/postgresql/build-15.sh index 01c96b5fa..044e4db05 100755 --- a/build/postgresql/build-15.sh +++ b/build/postgresql/build-15.sh @@ -28,15 +28,7 @@ SKIP_LICENCES=postgresql # We want to populate the clang-related environment variables # and set PATH to point to the correct llvm/clang version for # the postgres JIT code, but we want to build with gcc. -if ((DEFAULT_CLANG_VER > 15)); then - # We need version 15 as beginning with version 16 the LLVMBuildLoad - # symbol is removed and postgresql references that symbol. When - # postgresql support the so called opaque pointers API we can switch - # to a newer version of clang again. - set_clangver 15 -else - set_clangver -fi +set_clangver BASEPATH=$PATH set_gccver $DEFAULT_GCC_VER MAJVER=${VER%.*} # M.m diff --git a/build/postgresql/build-16.sh b/build/postgresql/build-16.sh index 3c728b6fd..365738713 100755 --- a/build/postgresql/build-16.sh +++ b/build/postgresql/build-16.sh @@ -36,15 +36,7 @@ BUILD_DEPENDS_IPS="=ooce/library/icu4c@$ICUVER" # We want to populate the clang-related environment variables # and set PATH to point to the correct llvm/clang version for # the postgres JIT code, but we want to build with gcc. -if ((DEFAULT_CLANG_VER > 15)); then - # We need version 15 as beginning with version 16 the LLVMBuildLoad - # symbol is removed and postgresql references that symbol. When - # postgresql support the so called opaque pointers API we can switch - # to a newer version of clang again. - set_clangver 15 -else - set_clangver -fi +set_clangver BASEPATH=$PATH set_gccver $DEFAULT_GCC_VER MAJVER=${VER%.*} # M.m diff --git a/build/postgresql/patches-12/gcc14.patch b/build/postgresql/patches-12/gcc14.patch new file mode 100644 index 000000000..4074e3458 --- /dev/null +++ b/build/postgresql/patches-12/gcc14.patch @@ -0,0 +1,30 @@ +diff -wpruN --no-dereference '--exclude=*.orig' a~/src/backend/port/sysv_shmem.c a/src/backend/port/sysv_shmem.c +--- a~/src/backend/port/sysv_shmem.c 1970-01-01 00:00:00 ++++ a/src/backend/port/sysv_shmem.c 1970-01-01 00:00:00 +@@ -288,7 +288,7 @@ static void + IpcMemoryDetach(int status, Datum shmaddr) + { + /* Detach System V shared memory block. */ +- if (shmdt(DatumGetPointer(shmaddr)) < 0) ++ if (shmdt((void *) DatumGetPointer(shmaddr)) < 0) + elog(LOG, "shmdt(%p) failed: %m", DatumGetPointer(shmaddr)); + } + +@@ -322,7 +322,7 @@ PGSharedMemoryIsInUse(unsigned long id1, + IpcMemoryState state; + + state = PGSharedMemoryAttach((IpcMemoryId) id2, NULL, &memAddress); +- if (memAddress && shmdt(memAddress) < 0) ++ if (memAddress && shmdt((void *) memAddress) < 0) + elog(LOG, "shmdt(%p) failed: %m", memAddress); + switch (state) + { +@@ -753,7 +753,7 @@ PGSharedMemoryCreate(Size size, int port + break; + } + +- if (oldhdr && shmdt(oldhdr) < 0) ++ if (oldhdr && shmdt((void *) oldhdr) < 0) + elog(LOG, "shmdt(%p) failed: %m", oldhdr); + } + diff --git a/build/postgresql/patches-12/series b/build/postgresql/patches-12/series index c57c02dbf..f26ebf48a 100644 --- a/build/postgresql/patches-12/series +++ b/build/postgresql/patches-12/series @@ -1 +1,2 @@ dism.patch +gcc14.patch diff --git a/build/postgresql/patches-13/gcc14.patch b/build/postgresql/patches-13/gcc14.patch new file mode 100644 index 000000000..9050edbb3 --- /dev/null +++ b/build/postgresql/patches-13/gcc14.patch @@ -0,0 +1,30 @@ +diff -wpruN --no-dereference '--exclude=*.orig' a~/src/backend/port/sysv_shmem.c a/src/backend/port/sysv_shmem.c +--- a~/src/backend/port/sysv_shmem.c 1970-01-01 00:00:00 ++++ a/src/backend/port/sysv_shmem.c 1970-01-01 00:00:00 +@@ -288,7 +288,7 @@ static void + IpcMemoryDetach(int status, Datum shmaddr) + { + /* Detach System V shared memory block. */ +- if (shmdt(DatumGetPointer(shmaddr)) < 0) ++ if (shmdt((void *) DatumGetPointer(shmaddr)) < 0) + elog(LOG, "shmdt(%p) failed: %m", DatumGetPointer(shmaddr)); + } + +@@ -322,7 +322,7 @@ PGSharedMemoryIsInUse(unsigned long id1, + IpcMemoryState state; + + state = PGSharedMemoryAttach((IpcMemoryId) id2, NULL, &memAddress); +- if (memAddress && shmdt(memAddress) < 0) ++ if (memAddress && shmdt((void *) memAddress) < 0) + elog(LOG, "shmdt(%p) failed: %m", memAddress); + switch (state) + { +@@ -762,7 +762,7 @@ PGSharedMemoryCreate(Size size, + break; + } + +- if (oldhdr && shmdt(oldhdr) < 0) ++ if (oldhdr && shmdt((void *) oldhdr) < 0) + elog(LOG, "shmdt(%p) failed: %m", oldhdr); + } + diff --git a/build/postgresql/patches-13/series b/build/postgresql/patches-13/series index c57c02dbf..f26ebf48a 100644 --- a/build/postgresql/patches-13/series +++ b/build/postgresql/patches-13/series @@ -1 +1,2 @@ dism.patch +gcc14.patch diff --git a/build/postgresql/patches-14/gcc14.patch b/build/postgresql/patches-14/gcc14.patch new file mode 100644 index 000000000..d69b07e9b --- /dev/null +++ b/build/postgresql/patches-14/gcc14.patch @@ -0,0 +1,30 @@ +diff -wpruN --no-dereference '--exclude=*.orig' a~/src/backend/port/sysv_shmem.c a/src/backend/port/sysv_shmem.c +--- a~/src/backend/port/sysv_shmem.c 1970-01-01 00:00:00 ++++ a/src/backend/port/sysv_shmem.c 1970-01-01 00:00:00 +@@ -289,7 +289,7 @@ static void + IpcMemoryDetach(int status, Datum shmaddr) + { + /* Detach System V shared memory block. */ +- if (shmdt(DatumGetPointer(shmaddr)) < 0) ++ if (shmdt((void *) DatumGetPointer(shmaddr)) < 0) + elog(LOG, "shmdt(%p) failed: %m", DatumGetPointer(shmaddr)); + } + +@@ -323,7 +323,7 @@ PGSharedMemoryIsInUse(unsigned long id1, + IpcMemoryState state; + + state = PGSharedMemoryAttach((IpcMemoryId) id2, NULL, &memAddress); +- if (memAddress && shmdt(memAddress) < 0) ++ if (memAddress && shmdt((void *) memAddress) < 0) + elog(LOG, "shmdt(%p) failed: %m", memAddress); + switch (state) + { +@@ -790,7 +790,7 @@ PGSharedMemoryCreate(Size size, + break; + } + +- if (oldhdr && shmdt(oldhdr) < 0) ++ if (oldhdr && shmdt((void *) oldhdr) < 0) + elog(LOG, "shmdt(%p) failed: %m", oldhdr); + } + diff --git a/build/postgresql/patches-14/series b/build/postgresql/patches-14/series index c57c02dbf..f26ebf48a 100644 --- a/build/postgresql/patches-14/series +++ b/build/postgresql/patches-14/series @@ -1 +1,2 @@ dism.patch +gcc14.patch diff --git a/build/squid/build.sh b/build/squid/build.sh index 293d3bbe2..06c585753 100755 --- a/build/squid/build.sh +++ b/build/squid/build.sh @@ -18,7 +18,7 @@ . ../../lib/build.sh PROG=squid -VER=6.9 +VER=6.12 PKG=ooce/network/proxy/squid SUMMARY="Squid WEB Proxy" DESC="Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, " @@ -32,9 +32,6 @@ LOGPATH=$VARPATH/logs RUNPATH=$VARPATH/run PIDFILE=$RUNPATH/squid.pid -# does not yet build with gcc 14 -((GCCVER > 13)) && set_gccver 13 - set_arch 64 XFORM_ARGS=" diff --git a/build/squid/patches/ac_squid-util.m4.patch b/build/squid/patches/ac_squid-util.m4.patch deleted file mode 100644 index 9d2b32bde..000000000 --- a/build/squid/patches/ac_squid-util.m4.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/squid-6.7/acinclude/squid-util.m4 b/squid-6.7/acinclude/squid-util.m4 -index 60ecd50..1f7849a 100644 ---- src/acinclude/squid-util.m4.orig -+++ src/acinclude/squid-util.m4 -@@ -224,6 +224,7 @@ AC_DEFUN([SQUID_AUTO_LIB],[ - AS_CASE(["$withval"],[yes|no],,[ - AS_IF([test ! -d "$withval"],AC_MSG_ERROR([--with-$1 path does not point to a directory])) - m4_translit([with_$1], [-+.], [___])=yes -+ AS_IF([test -d "$withval/amd64"],[$3_PATH+="-L$withval/amd64"]) - AS_IF([test -d "$withval/lib64"],[$3_PATH+="-L$withval/lib64"]) - AS_IF([test -d "$withval/lib"],[$3_PATH+="-L$withval/lib"]) - AS_IF([test -d "$withval/include"],[$3_CFLAGS+="-I$withval/include"]) -@@ -236,6 +237,7 @@ AC_DEFUN([SQUID_OPTIONAL_LIB],[ - AS_CASE(["$withval"],[yes|no],,[ - AS_IF([test ! -d "$withval"],AC_MSG_ERROR([--with-$1 path does not point to a directory])) - m4_translit([with_$1], [-+.], [___])=yes -+ AS_IF([test -d "$withval/amd64"],[$3_PATH+="-L$withval/amd64"]) - AS_IF([test -d "$withval/lib64"],[$3_PATH+="-L$withval/lib64"]) - AS_IF([test -d "$withval/lib"],[$3_PATH+="-L$withval/lib"]) - AS_IF([test -d "$withval/include"],[$3_CFLAGS+="-I$withval/include"]) diff --git a/build/squid/patches/configure.ac.patch b/build/squid/patches/configure.ac.patch deleted file mode 100644 index 9f6aa8be3..000000000 --- a/build/squid/patches/configure.ac.patch +++ /dev/null @@ -1,16 +0,0 @@ -use 64-bit libraries - ---- src/configure.ac.orig 2024-02-08 10:22:02.770828532 +0100 -+++ src/configure.ac 2024-02-08 10:22:46.518281824 +0100 -@@ -1257,9 +1257,9 @@ AS_IF([test "x$with_mit_krb5" != "xno" - - # Get libs, etc - AC_MSG_NOTICE([Use krb5-config to get CXXFLAGS and LIBS]) - LIB_KRB5_CFLAGS="`$ac_krb5_config --cflags krb5 2>/dev/null`" -- LIB_KRB5_LIBS="`$ac_krb5_config --libs krb5 2>/dev/null`" -+ LIB_KRB5_LIBS="`$ac_krb5_config --libs krb5 2>/dev/null`"/amd64 - LIB_KRB5_CFLAGS="`$ac_krb5_config --cflags gssapi 2>/dev/null` $LIB_KRB5_CFLAGS" -- LIB_KRB5_LIBS="`$ac_krb5_config --libs gssapi 2>/dev/null` $LIB_KRB5_LIBS" -+ LIB_KRB5_LIBS="`$ac_krb5_config --libs gssapi 2>/dev/null` $LIB_KRB5_LIBS"/amd64 - ],[ - ## For some OS pkg-config is broken or unavailable. - ## Detect libraries the hard way. diff --git a/build/squid/patches/series b/build/squid/patches/series deleted file mode 100644 index 40dc65281..000000000 --- a/build/squid/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -ac_squid-util.m4.patch -configure.ac.patch diff --git a/doc/packages.md b/doc/packages.md index f33e5f3d2..812e9178e 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -34,10 +34,10 @@ | ooce/compress/pigz | 2.8 | https://zlib.net/pigz/ | [omniosorg](https://github.com/omniosorg) | ooce/database/bdb | 5.3.28 | http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html | [omniosorg](https://github.com/omniosorg) | ooce/database/lmdb | 0.9.31 | https://github.com/LMDB/lmdb/tags https://symas.com/lmdb/ | [omniosorg](https://github.com/omniosorg) -| ooce/database/mariadb-105 | 10.5.26 | https://downloads.mariadb.org/mariadb/+releases/ | [omniosorg](https://github.com/omniosorg) -| ooce/database/mariadb-106 | 10.6.19 | https://downloads.mariadb.org/mariadb/+releases/ | [omniosorg](https://github.com/omniosorg) -| ooce/database/mariadb-1011 | 10.11.9 | https://downloads.mariadb.org/mariadb/+releases/ | [omniosorg](https://github.com/omniosorg) -| ooce/database/mariadb-114 | 11.4.3 | https://downloads.mariadb.org/mariadb/+releases/ | [omniosorg](https://github.com/omniosorg) +| ooce/database/mariadb-105 | 10.5.27 | https://downloads.mariadb.org/mariadb/+releases/ | [omniosorg](https://github.com/omniosorg) +| ooce/database/mariadb-106 | 10.6.20 | https://downloads.mariadb.org/mariadb/+releases/ | [omniosorg](https://github.com/omniosorg) +| ooce/database/mariadb-1011 | 10.11.10 | https://downloads.mariadb.org/mariadb/+releases/ | [omniosorg](https://github.com/omniosorg) +| ooce/database/mariadb-114 | 11.4.4 | https://downloads.mariadb.org/mariadb/+releases/ | [omniosorg](https://github.com/omniosorg) | ooce/database/postgresql-12 | 12.20 | https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg) | ooce/database/postgresql-13 | 13.16 | https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg) | ooce/database/postgresql-14 | 14.13 | https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg) @@ -67,8 +67,8 @@ | ooce/developer/freepascal | 3.2.2 | https://sourceforge.net/projects/freepascal/files/Source/ https://www.freepascal.org/ | [omniosorg](https://github.com/omniosorg) | ooce/developer/gdb | 15.2 | https://ftp.gnu.org/gnu/gdb/ | [omniosorg](https://github.com/omniosorg) | ooce/developer/git-absorb | 0.6.15 | https://github.com/tummychow/git-absorb/releases| [omniosorg](https://github.com/omniosorg) -| ooce/developer/go-122 | 1.22.8 | https://golang.org/dl/ | [omniosorg](https://github.com/omniosorg) -| ooce/developer/go-123 | 1.23.2 | https://golang.org/dl/ | [omniosorg](https://github.com/omniosorg) +| ooce/developer/go-122 | 1.22.9 | https://golang.org/dl/ | [omniosorg](https://github.com/omniosorg) +| ooce/developer/go-123 | 1.23.3 | https://golang.org/dl/ | [omniosorg](https://github.com/omniosorg) | ooce/developer/gperf | 3.1 | https://ftp.gnu.org/pub/gnu/gperf/ | [omniosorg](https://github.com/omniosorg) | ooce/developer/llvm-13 | 13.0.1 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) | ooce/developer/llvm-15 | 15.0.7 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) @@ -177,7 +177,7 @@ | ooce/network/rclone | 1.68.1 | https://github.com/rclone/rclone/releases/ | [omniosorg](https://github.com/omniosorg) | ooce/network/sic | 1.3 | https://tools.suckless.org/sic/ | [r7st](https://github.com/r7st) | ooce/network/smtp/postfix | 3.9.0 | https://high5.nl/mirrors/postfix-release/index.html | [omniosorg](https://github.com/omniosorg) -| ooce/network/proxy/squid | 6.9 | http://www.squid-cache.org/Versions/v6/ | [cgrzemba](https://github.com/cgrzemba) +| ooce/network/proxy/squid | 6.12 | http://www.squid-cache.org/Versions/v6/ | [cgrzemba](https://github.com/cgrzemba) | ooce/network/tailscale | 1.76.3 | https://github.com/nshalman/tailscale/releases https://www.tailscale.com/ | [nshalman](https://github.com/nshalman) | ooce/network/tcpdump | 4.99.5 | https://www.tcpdump.org/release/ | [omniosorg](https://github.com/omniosorg) | ooce/network/unbound | 1.22.0 | https://nlnetlabs.nl/downloads/unbound/ | [omniosorg](https://github.com/omniosorg)