Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package updates #1540

Merged
merged 5 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/ffmpeg/patches/clang-no-mimpure-text.patch
Original file line number Diff line number Diff line change
@@ -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)'
Expand Down
1 change: 1 addition & 0 deletions build/ffmpeg/patches/series
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
clang-no-mimpure-text.patch
stdbit-detection.patch
15 changes: 15 additions & 0 deletions build/ffmpeg/patches/stdbit-detection.patch
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion build/go/build-122.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion build/go/build-123.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
8 changes: 2 additions & 6 deletions build/mariadb/build-1011.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions build/mariadb/build-105.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions build/mariadb/build-106.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]}"
Expand Down
7 changes: 2 additions & 5 deletions build/mariadb/build-114.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions build/mariadb/patches-1011/05-no-pie.patch
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
16 changes: 8 additions & 8 deletions build/mariadb/patches-1011/08-dtrace-invalid-conversion.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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)
{
Expand Down
15 changes: 15 additions & 0 deletions build/mariadb/patches-1011/pam-illumos.patch
Original file line number Diff line number Diff line change
@@ -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;
1 change: 1 addition & 0 deletions build/mariadb/patches-1011/series
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ missing_concurrency.patch
05-no-pie.patch
08-dtrace-invalid-conversion.patch
disable_dbug_docs.patch
pam-illumos.patch
4 changes: 2 additions & 2 deletions build/mariadb/patches-105/05-no-pie.patch
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
14 changes: 7 additions & 7 deletions build/mariadb/patches-105/08-dtrace-invalid-conversion.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
15 changes: 15 additions & 0 deletions build/mariadb/patches-105/pam-illumos.patch
Original file line number Diff line number Diff line change
@@ -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;
1 change: 1 addition & 0 deletions build/mariadb/patches-105/series
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ missing_concurrency.patch
08-dtrace-invalid-conversion.patch
cfi.patch
disable_dbug_docs.patch
pam-illumos.patch
4 changes: 2 additions & 2 deletions build/mariadb/patches-106/05-no-pie.patch
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
Loading
Loading