MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'vuln-update' into 'master'

Browse Source 
Update php84, python312, python-certifi, promote libbrotli

See merge request redox-os/redox!2422
This commit is contained in:
Wildan Mubarok 2026-11-03 21:04:07 +00:00
commit 8f8429ae4f
7 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/dev/php84/recipe.toml
View File

@ -2,8 +2,8 @@
description = "Web-centric programming language" description = "Web-centric programming language"
[source] [source]
tar = "https://www.php.net/distributions/php-8.4.17.tar.xz" tar = "https://www.php.net/distributions/php-8.4.27.tar.xz"
blake3 = "a8478dddd948d4b26e51c5727ac0895440da76e8ad9be947098a4284ca0b7f2a" blake3 = "46a605ee5ddc43d17fddf0364b23e44a85889c29eee47609d4a9aaeccf9952a3"
patches = [ patches = [
"redox.patch" "redox.patch"
] ]

24
recipes/dev/php84/redox.patch
View File

@ -1,7 +1,7 @@
diff -ruwN source/configure source-new/configure diff -ruwN source/configure source-new/configure
--- source/configure 2026-01-14 00:17:10.000000000 +0700 --- source/configure 2026-10-19 14:38:59.000000000 +0000
+++ source-new/configure 2026-01-16 15:56:01.944755811 +0700 +++ source-new/configure 2026-11-02 11:06:50.268448655 +0000
@@ -26007,7 +26007,7 @@ @@ -25911,7 +25911,7 @@
then : then :
ac_cv_lib_curl_curl_easy_perform=yes ac_cv_lib_curl_curl_easy_perform=yes
else case e in #( else case e in #(
@ -10,7 +10,7 @@ diff -ruwN source/configure source-new/configure
esac esac
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \ rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -37728,7 +37728,7 @@ @@ -37632,7 +37632,7 @@
then : then :
php_cv_lib_gd_works=yes php_cv_lib_gd_works=yes
else case e in #( else case e in #(
@ -19,7 +19,7 @@ diff -ruwN source/configure source-new/configure
esac esac
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \ rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -40464,7 +40464,7 @@ @@ -40368,7 +40368,7 @@
LIBS_SAVED=$LIBS LIBS_SAVED=$LIBS
CFLAGS="$CFLAGS $GMP_CFLAGS" CFLAGS="$CFLAGS $GMP_CFLAGS"
LIBS="$LIBS $GMP_LIBS" LIBS="$LIBS $GMP_LIBS"
@ -29,8 +29,8 @@ diff -ruwN source/configure source-new/configure
if test "x$ac_cv_header_gmp_h" = xyes if test "x$ac_cv_header_gmp_h" = xyes
then : then :
diff -ruwN source/ext/phar/Makefile.frag source-new/ext/phar/Makefile.frag diff -ruwN source/ext/phar/Makefile.frag source-new/ext/phar/Makefile.frag
--- source/ext/phar/Makefile.frag 2026-01-14 00:17:10.000000000 +0700 --- source/ext/phar/Makefile.frag 2026-10-19 14:38:59.000000000 +0000
+++ source-new/ext/phar/Makefile.frag 2026-01-16 15:56:01.946130660 +0700 +++ source-new/ext/phar/Makefile.frag 2026-11-02 11:06:50.269448713 +0000
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
-@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc
@ -41,8 +41,8 @@ diff -ruwN source/ext/phar/Makefile.frag source-new/ext/phar/Makefile.frag
$(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH) $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
-@(echo "Generating phar.php"; \ -@(echo "Generating phar.php"; \
diff -ruwN source/ext/posix/posix.c source-new/ext/posix/posix.c diff -ruwN source/ext/posix/posix.c source-new/ext/posix/posix.c
--- source/ext/posix/posix.c 2026-01-14 00:17:10.000000000 +0700 --- source/ext/posix/posix.c 2026-10-19 14:38:59.000000000 +0000
+++ source-new/ext/posix/posix.c 2026-01-16 15:56:01.946290813 +0700 +++ source-new/ext/posix/posix.c 2026-11-02 11:06:50.269448713 +0000
@@ -375,7 +375,7 @@ @@ -375,7 +375,7 @@
ZEND_PARSE_PARAMETERS_NONE(); ZEND_PARSE_PARAMETERS_NONE();
@ -53,8 +53,8 @@ diff -ruwN source/ext/posix/posix.c source-new/ext/posix/posix.c
RETURN_FALSE; RETURN_FALSE;
} }
diff -ruwN source/sapi/fpm/fpm/fpm_status.c source-new/sapi/fpm/fpm/fpm_status.c diff -ruwN source/sapi/fpm/fpm/fpm_status.c source-new/sapi/fpm/fpm/fpm_status.c
--- source/sapi/fpm/fpm/fpm_status.c 2026-01-14 00:17:10.000000000 +0700 --- source/sapi/fpm/fpm/fpm_status.c 2026-10-19 14:38:59.000000000 +0000
+++ source-new/sapi/fpm/fpm/fpm_status.c 2026-01-16 15:57:37.781307156 +0700 +++ source-new/sapi/fpm/fpm/fpm_status.c 2026-11-02 11:06:50.269448713 +0000
@@ -84,6 +84,7 @@ @@ -84,6 +84,7 @@
continue; continue;
} }
@ -73,7 +73,7 @@ diff -ruwN source/sapi/fpm/fpm/fpm_status.c source-new/sapi/fpm/fpm/fpm_status.c
array_init(&fpm_proc_stat); array_init(&fpm_proc_stat);
add_assoc_long(&fpm_proc_stat, "pid", proc_p->pid); add_assoc_long(&fpm_proc_stat, "pid", proc_p->pid);
@@ -573,11 +577,15 @@ @@ -596,11 +600,15 @@
} }
/* prevent NaN */ /* prevent NaN */

4
recipes/dev/python312/recipe.toml
View File

@ -2,8 +2,8 @@
description = "Object-oriented interpreted programming language, version 3.12.x" description = "Object-oriented interpreted programming language, version 3.12.x"
[source] [source]
tar = "https://www.python.org/ftp/python/3.12.12/Python-3.12.12.tar.xz" tar = "https://www.python.org/ftp/python/3.12.16/Python-3.12.16.tar.xz"
blake3 = "29636fdae3e0ee8d0fe585e528c9376fe43876f5f3f0f7892140567946fd907b" blake3 = "64f6bad790874696e4b6cbcf02d5e1d6ec668044857fca97e82d9f894abc1817"
patches = [ patches = [
"redox.patch" "redox.patch"
] ]

20
recipes/dev/python312/redox.patch
View File

@ -1,6 +1,6 @@
diff -ruwN source/configure source-new/configure diff -ruwN source/configure source-new/configure
--- source/configure 2025-10-09 18:07:00.000000000 +0700 --- source/configure 2026-10-25 18:24:37.000000000 +0000
+++ source-new/configure 2025-12-09 22:14:30.781035339 +0700 +++ source-new/configure 2026-11-02 11:01:28.809597992 +0000
@@ -4283,6 +4283,9 @@ @@ -4283,6 +4283,9 @@
*-*-wasi) *-*-wasi)
ac_sys_system=WASI ac_sys_system=WASI
@ -92,8 +92,8 @@ diff -ruwN source/configure source-new/configure
Darwin/*) Darwin/*)
LINKFORSHARED="$extra_undefs -framework CoreFoundation" LINKFORSHARED="$extra_undefs -framework CoreFoundation"
diff -ruwN source/Include/pyport.h source-new/Include/pyport.h diff -ruwN source/Include/pyport.h source-new/Include/pyport.h
--- source/Include/pyport.h 2025-10-09 18:07:00.000000000 +0700 --- source/Include/pyport.h 2026-10-25 18:24:37.000000000 +0000
+++ source-new/Include/pyport.h 2025-12-09 22:14:30.781035339 +0700 +++ source-new/Include/pyport.h 2026-11-02 11:01:28.809597992 +0000
@@ -684,7 +684,7 @@ @@ -684,7 +684,7 @@
# error "Py_TRACE_REFS ABI is not compatible with release and debug ABI" # error "Py_TRACE_REFS ABI is not compatible with release and debug ABI"
#endif #endif
@ -104,8 +104,8 @@ diff -ruwN source/Include/pyport.h source-new/Include/pyport.h
// See _Py_GetLocaleEncoding(), PyUnicode_DecodeLocale() // See _Py_GetLocaleEncoding(), PyUnicode_DecodeLocale()
// and PyUnicode_EncodeLocale(). // and PyUnicode_EncodeLocale().
diff -ruwN source/Modules/_cryptmodule.c source-new/Modules/_cryptmodule.c diff -ruwN source/Modules/_cryptmodule.c source-new/Modules/_cryptmodule.c
--- source/Modules/_cryptmodule.c 2025-10-09 18:07:00.000000000 +0700 --- source/Modules/_cryptmodule.c 2026-10-25 18:24:37.000000000 +0000
+++ source-new/Modules/_cryptmodule.c 2025-12-09 22:14:30.781035339 +0700 +++ source-new/Modules/_cryptmodule.c 2026-11-02 11:01:28.810598051 +0000
@@ -38,13 +38,7 @@ @@ -38,13 +38,7 @@
/*[clinic end generated code: output=0512284a03d2803c input=0e8edec9c364352b]*/ /*[clinic end generated code: output=0512284a03d2803c input=0e8edec9c364352b]*/
{ {
@ -121,8 +121,8 @@ diff -ruwN source/Modules/_cryptmodule.c source-new/Modules/_cryptmodule.c
return PyErr_SetFromErrno(PyExc_OSError); return PyErr_SetFromErrno(PyExc_OSError);
} }
diff -ruwN source/Modules/fcntlmodule.c source-new/Modules/fcntlmodule.c diff -ruwN source/Modules/fcntlmodule.c source-new/Modules/fcntlmodule.c
--- source/Modules/fcntlmodule.c 2025-10-09 11:07:00.000000000 +0000 --- source/Modules/fcntlmodule.c 2026-10-25 18:24:37.000000000 +0000
+++ source-new/Modules/fcntlmodule.c 2026-10-15 10:21:56.351900218 +0000 +++ source-new/Modules/fcntlmodule.c 2026-11-02 11:01:28.810598051 +0000
@@ -159,7 +159,7 @@ @@ -159,7 +159,7 @@
in their unsigned long ioctl codes this will break and need in their unsigned long ioctl codes this will break and need
special casing based on the platform being built on. special casing based on the platform being built on.
@ -133,8 +133,8 @@ diff -ruwN source/Modules/fcntlmodule.c source-new/Modules/fcntlmodule.c
Py_buffer pstr; Py_buffer pstr;
char *str; char *str;
diff -ruwN source/Modules/resource.c source-new/Modules/resource.c diff -ruwN source/Modules/resource.c source-new/Modules/resource.c
--- source/Modules/resource.c 2025-10-09 18:07:00.000000000 +0700 --- source/Modules/resource.c 2026-10-25 18:24:37.000000000 +0000
+++ source-new/Modules/resource.c 2025-12-09 22:14:30.781035339 +0700 +++ source-new/Modules/resource.c 2026-11-02 11:01:28.810598051 +0000
@@ -216,7 +216,7 @@ @@ -216,7 +216,7 @@
{ {
struct rlimit rl; struct rlimit rl;

5
recipes/wip/libs/other/libbrotli/recipe.toml → recipes/libs/libbrotli/recipe.toml
View File

@ -1,10 +1,9 @@
#TODO not compiled or tested
# build instructions: https://github.com/google/brotli#cmake
[source] [source]
git = "https://github.com/google/brotli" git = "https://github.com/google/brotli"
patches = [ "redox.patch" ] patches = [ "redox.patch" ]
branch = "v1.2" rev = "v1.2.1"
shallow_clone = true shallow_clone = true
[build] [build]
template = "cmake" template = "cmake"
cmakeflags = [ cmakeflags = [

0
recipes/wip/libs/other/libbrotli/redox.patch → recipes/libs/libbrotli/redox.patch
View File

2
recipes/wip/dev/python/python-certifi/recipe.toml
View File

@ -1,7 +1,7 @@
# TODO compiles but needs testing # TODO compiles but needs testing
[source] [source]
git = "https://github.com/certifi/python-certifi" git = "https://github.com/certifi/python-certifi"
rev = "2026.06.17" rev = "2026.10.23"
shallow_clone = true shallow_clone = true
[build] [build]