mirror of
https://github.com/PartialVolume/shredos.x86_64.git
synced 2026-02-20 17:42:10 +00:00
Updated ShredOS to Buildroot 2025.11, kernel 6.18.0
This commit is contained in:
@@ -9,8 +9,8 @@ Terminate them with extreme prejudice.
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
[aduskett@gmail.com: Update for 7.3.0]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Bernd: rebased for 8.1.7]
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
[Bernd: rebased for 8.4.13]
|
||||
---
|
||||
build/php.m4 | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
@@ -19,7 +19,7 @@ diff --git a/build/php.m4 b/build/php.m4
|
||||
index e91ef988..9586c490 100644
|
||||
--- a/build/php.m4
|
||||
+++ b/build/php.m4
|
||||
@@ -1580,8 +1580,6 @@ dnl PHP_CHECK_FUNC_LIB
|
||||
@@ -1462,8 +1462,6 @@ dnl PHP_CHECK_FUNC_LIB
|
||||
dnl
|
||||
AC_DEFUN([PHP_CHECK_FUNC_LIB],[
|
||||
ifelse($2,,:,[
|
||||
@@ -28,7 +28,7 @@ index e91ef988..9586c490 100644
|
||||
unset found
|
||||
AC_CHECK_LIB($2, $1, [found=yes], [
|
||||
AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
|
||||
@@ -1616,8 +1616,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and
|
||||
@@ -1496,8 +1496,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and
|
||||
dnl HAVE_library if found and adds the library to LIBS.
|
||||
dnl
|
||||
AC_DEFUN([PHP_CHECK_FUNC],[
|
||||
|
||||
@@ -15,8 +15,8 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
[Gustavo: update for 5.6.10]
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
[aduskett@gmail.com: Update for 8.0.7]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Bernd: rebased for 7.4.10, 7.4.13 & 8.1.7]
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
[Bernd: rebased for 8.4.13]
|
||||
---
|
||||
build/php.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
@@ -25,10 +25,10 @@ diff --git a/build/php.m4 b/build/php.m4
|
||||
index 9586c490..8b3d47ed 100644
|
||||
--- a/build/php.m4
|
||||
+++ b/build/php.m4
|
||||
@@ -1976,7 +1976,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
|
||||
dnl Check external libs for iconv funcs.
|
||||
if test "$found_iconv" = "no"; then
|
||||
@@ -1839,7 +1839,7 @@
|
||||
|
||||
dnl Check external libs for iconv funcs.
|
||||
AS_VAR_IF([found_iconv], [no], [
|
||||
- for i in $PHP_ICONV /usr/local /usr; do
|
||||
+ for i in $PHP_ICONV; do
|
||||
if test -r $i/include/gnu-libiconv/iconv.h; then
|
||||
|
||||
@@ -12,8 +12,8 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
[Gustavo: update for autoreconf/configure.in]
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
[Aduskett: update for 8.0.7]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Bernd: rebased for 7.4.10, 7.4.13 & 8.1.7]
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
[Bernd: rebased for 8.4.13]
|
||||
---
|
||||
configure.ac | 9 ++-------
|
||||
1 file changed, 2 insertions(+), 7 deletions(-)
|
||||
@@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 0dfab302..6026fb66 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1638,13 +1638,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
|
||||
@@ -1585,13 +1585,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
|
||||
CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
|
||||
CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
|
||||
|
||||
@@ -36,7 +36,7 @@ index 0dfab302..6026fb66 100644
|
||||
+pharcmd=
|
||||
+pharcmd_install=
|
||||
|
||||
all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
|
||||
all_targets="\$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
|
||||
install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -17,6 +17,8 @@ To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure
|
||||
Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
[aduskett@gmail.com: Update for 8.0.7]
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
[Bernd: rebased for 8.4.13]
|
||||
---
|
||||
sapi/apache2handler/config.m4 | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
@@ -25,20 +27,20 @@ diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
|
||||
index 55c16179..68ce66c0 100644
|
||||
--- a/sapi/apache2handler/config.m4
|
||||
+++ b/sapi/apache2handler/config.m4
|
||||
@@ -63,10 +63,12 @@ if test "$PHP_APXS2" != "no"; then
|
||||
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
|
||||
fi
|
||||
@@ -68,10 +68,12 @@
|
||||
AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0],
|
||||
[AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])
|
||||
|
||||
+ APXS_PREFIX='$(INSTALL_ROOT)'/usr
|
||||
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
||||
if test -z `$APXS -q SYSCONFDIR`; then
|
||||
APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)
|
||||
if test -z $($APXS -q SYSCONFDIR); then
|
||||
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
||||
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||||
+ -S PREFIX='$APXS_PREFIX' \
|
||||
-i -n php"
|
||||
else
|
||||
APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
|
||||
@@ -74,6 +76,7 @@ if test "$PHP_APXS2" != "no"; then
|
||||
APXS_SYSCONFDIR='$(INSTALL_ROOT)'$($APXS -q SYSCONFDIR)
|
||||
@@ -79,6 +81,7 @@ if test "$PHP_APXS2" != "no"; then
|
||||
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
||||
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||||
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
|
||||
|
||||
@@ -13,8 +13,8 @@ CFLAGS when opcache is enabled:
|
||||
-DHAVE_SHM_MMAP_FILE
|
||||
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Bernd: rebased for 8.1.7 & 8.3.3]
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
[Bernd: rebased for 8.4.13]
|
||||
---
|
||||
ext/opcache/config.m4 | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
@@ -23,17 +23,20 @@ diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
|
||||
index 5492fd92..10c150ff 100644
|
||||
--- a/ext/opcache/config.m4
|
||||
+++ b/ext/opcache/config.m4
|
||||
@@ -315,10 +315,6 @@ int main() {
|
||||
|
||||
@@ -346,13 +346,6 @@
|
||||
PHP_ADD_EXTENSION_DEP(opcache, date)
|
||||
PHP_ADD_EXTENSION_DEP(opcache, pcre)
|
||||
|
||||
- if test "$have_shm_ipc" != "yes" && test "$have_shm_mmap_posix" != "yes" && test "$have_shm_mmap_anon" != "yes"; then
|
||||
- AC_MSG_ERROR([No supported shared memory caching support was found when configuring opcache. Check config.log for any errors or missing dependencies.])
|
||||
- if test "$php_cv_shm_ipc" != "yes" && test "$php_cv_shm_mmap_posix" != "yes" && test "$php_cv_shm_mmap_anon" != "yes"; then
|
||||
- AC_MSG_FAILURE(m4_text_wrap([
|
||||
- No supported shared memory caching support was found when configuring
|
||||
- opcache.
|
||||
- ]))
|
||||
- fi
|
||||
-
|
||||
if test "$PHP_OPCACHE_JIT" = "yes"; then
|
||||
PHP_ADD_BUILD_DIR([$ext_builddir/jit], 1)
|
||||
PHP_ADD_MAKEFILE_FRAGMENT($ext_srcdir/jit/Makefile.frag)
|
||||
AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [
|
||||
PHP_ADD_BUILD_DIR([
|
||||
$ext_builddir/jit
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
||||
@@ -139,8 +139,10 @@ config BR2_PACKAGE_PHP_EXT_MYSQLI
|
||||
config BR2_PACKAGE_PHP_EXT_PGSQL
|
||||
bool "PostgreSQL"
|
||||
depends on BR2_USE_MMU # postgresql
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_USE_WCHAR # postgresql
|
||||
depends on BR2_ENABLE_LOCALE # postgresql
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql
|
||||
depends on !BR2_STATIC_LIBS # postgresql
|
||||
depends on !BR2_OPTIMIZE_FAST # postgresql
|
||||
select BR2_PACKAGE_POSTGRESQL
|
||||
help
|
||||
@@ -174,8 +176,10 @@ config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
|
||||
config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL
|
||||
bool "PostgreSQL"
|
||||
depends on BR2_USE_MMU # postgresql
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_USE_WCHAR # postgresql
|
||||
depends on BR2_ENABLE_LOCALE # postgresql
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql
|
||||
depends on !BR2_STATIC_LIBS # postgresql
|
||||
depends on !BR2_OPTIMIZE_FAST # postgresql
|
||||
select BR2_PACKAGE_POSTGRESQL
|
||||
help
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www.php.net/downloads.php
|
||||
sha256 58b4cb9019bf70c0cbcdb814c7df79b9065059d14cf7dbf48d971f8e56ae9be7 php-8.3.14.tar.xz
|
||||
# From https://www.php.net/downloads.php?source=Y
|
||||
sha256 a060684f614b8344f9b34c334b6ba8db1177555997edb5b1aceab0a4b807da7e php-8.4.15.tar.xz
|
||||
|
||||
# License file
|
||||
sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PHP_VERSION = 8.3.14
|
||||
PHP_VERSION = 8.4.15
|
||||
PHP_SITE = https://www.php.net/distributions
|
||||
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
|
||||
PHP_INSTALL_STAGING = YES
|
||||
@@ -15,6 +15,9 @@ PHP_LICENSE = PHP-3.01
|
||||
PHP_LICENSE_FILES = LICENSE
|
||||
PHP_CPE_ID_VENDOR = php
|
||||
|
||||
# Only affects the Windows operating system
|
||||
PHP_IGNORE_CVES += CVE-2024-3566
|
||||
|
||||
PHP_CONF_OPTS = \
|
||||
--mandir=/usr/share/man \
|
||||
--infodir=/usr/share/info \
|
||||
@@ -40,6 +43,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
PHP_EXTRA_LIBS += -latomic
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
|
||||
PHP_CONF_ENV += php_cv_func_copy_file_range=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUCONTEXT),y)
|
||||
PHP_DEPENDENCIES += libucontext
|
||||
PHP_EXTRA_LIBS += -lucontext
|
||||
@@ -92,7 +99,7 @@ endif
|
||||
|
||||
# php has some assembly function that is not present in Thumb mode:
|
||||
# Error: selected processor does not support `umlal r2,r1,r0,r3' in Thumb mode
|
||||
# so, we desactivate Thumb mode
|
||||
# so, we deactivate Thumb mode
|
||||
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
|
||||
PHP_CFLAGS += -marm
|
||||
endif
|
||||
@@ -256,10 +263,10 @@ PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PCRE2_JIT),y)
|
||||
PHP_CONF_OPTS += --with-pcre-jit=yes
|
||||
PHP_CONF_ENV += ac_cv_have_pcre2_jit=yes
|
||||
PHP_CONF_ENV += php_cv_have_pcre2_jit=yes
|
||||
else
|
||||
PHP_CONF_OPTS += --with-pcre-jit=no
|
||||
PHP_CONF_ENV += ac_cv_have_pcre2_jit=no
|
||||
PHP_CONF_ENV += php_cv_have_pcre2_jit=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y)
|
||||
@@ -379,5 +386,12 @@ HOST_PHP_DEPENDENCIES = \
|
||||
host-pcre2 \
|
||||
host-pkgconf
|
||||
|
||||
# PHP can't be AUTORECONFed the standard way unfortunately
|
||||
HOST_PHP_DEPENDENCIES += host-autoconf host-automake host-libtool
|
||||
define HOST_PHP_BUILDCONF
|
||||
cd $(@D) ; $(HOST_MAKE_ENV) ./buildconf --force
|
||||
endef
|
||||
HOST_PHP_PRE_CONFIGURE_HOOKS += HOST_PHP_BUILDCONF
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user