diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/bdwgc.local.patch | 12 | ||||
| -rw-r--r-- | patches/bdwgc_pre.local.patch | 4 | ||||
| -rw-r--r-- | patches/ed-1.21_pre.local.patch (renamed from patches/ed-1.20.2_pre.local.patch) | 0 | ||||
| -rw-r--r-- | patches/file-5.45.local.patch | 12 | ||||
| -rw-r--r-- | patches/file-5.46_pre.local.patch (renamed from patches/file-5.45_pre.local.patch) | 0 | ||||
| -rw-r--r-- | patches/file_host-5.46_pre.local.patch (renamed from patches/file_host-5.45_pre.local.patch) | 0 | ||||
| -rw-r--r-- | patches/flac-1.5.0_pre.local.patch (renamed from patches/libflac-1.4.3_pre.local.patch) | 0 | ||||
| -rw-r--r-- | patches/gnutls-3.8.5.local.patch | 12 | ||||
| -rw-r--r-- | patches/gnutls-3.8.8.local.patch | 30 | ||||
| -rw-r--r-- | patches/gnutls-3.8.8_pre.local.patch (renamed from patches/gnutls-3.8.5_pre.local.patch) | 0 | ||||
| -rw-r--r-- | patches/libarchive-3.7.8_pre.local.patch (renamed from patches/libarchive-3.7.6_pre.local.patch) | 0 | ||||
| -rw-r--r-- | patches/libsndfile-1.2.2.local.patch (renamed from patches/libsndfile-1.2.0.local.patch) | 0 | ||||
| -rw-r--r-- | patches/libssh-0.10.6.local.patch | 10 | ||||
| -rw-r--r-- | patches/libssh-0.11.1_pre.local.patch | 44 | ||||
| -rw-r--r-- | patches/libtasn1-4.20.0_pre.local.patch (renamed from patches/libtasn1-4.19.0_pre.local.patch) | 30 | ||||
| -rw-r--r-- | patches/libxslt-1.1.43.local.patch (renamed from patches/libxslt-1.1.39.local.patch) | 0 | ||||
| -rw-r--r-- | patches/libxslt-1.1.43_pre.local.patch (renamed from patches/libxslt-1.1.39_pre.local.patch) | 0 | ||||
| -rw-r--r-- | patches/lighttpd-1.4.77.local.patch | 19 | ||||
| -rw-r--r-- | patches/lighttpd-1.4.77_pre.local.patch (renamed from patches/lighttpd-1.4.76_pre.local.patch) | 0 | ||||
| -rw-r--r-- | patches/tcsh-6.24.15.local.patch (renamed from patches/tcsh-6.24.12.local.patch) | 118 | ||||
| -rw-r--r-- | patches/utf8proc_pre.local.patch | 9 | ||||
| -rw-r--r-- | patches/wget-1.25.0.local.patch (renamed from patches/wget-1.24.5.local.patch) | 0 | ||||
| l--------- | patches/wget_minipix-1.24.5.local.patch | 1 | ||||
| l--------- | patches/wget_minipix-1.25.0.local.patch | 1 | ||||
| -rw-r--r-- | patches/zstd-1.5.6.local.patch (renamed from patches/zstd-1.5.5.local.patch) | 0 |
25 files changed, 179 insertions, 123 deletions
diff --git a/patches/bdwgc.local.patch b/patches/bdwgc.local.patch index 5af86b0a..71367bf6 100644 --- a/patches/bdwgc.local.patch +++ b/patches/bdwgc.local.patch @@ -33,8 +33,8 @@ diff -ru bdwgc.orig/include/private/gcconfig.h bdwgc/include/private/gcconfig.h # define mach_type_known #elif (defined(__i386__) || defined(i386) || defined(__X86__)) \ && (defined(ANY_BSD) || defined(DARWIN) || defined(EMBOX) \ -- || defined(LINUX) || defined(QNX)) -+ || defined(LINUX) || defined(QNX) || defined(MIDIPIX)) +- || defined(LINUX) || defined(QNX) || defined(SERENITY)) ++ || defined(LINUX) || defined(QNX) || defined(SERENITY) || defined(MIDIPIX)) # define I386 # define mach_type_known #elif (defined(__ia64) || defined(__ia64__)) && defined(LINUX) @@ -42,8 +42,8 @@ diff -ru bdwgc.orig/include/private/gcconfig.h bdwgc/include/private/gcconfig.h #elif (defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) \ || defined(__X86_64__)) \ && (defined(ANY_BSD) || defined(COSMO) || defined(DARWIN) \ -- || defined(LINUX) || defined(QNX)) -+ || defined(LINUX) || defined(QNX) || defined(MIDIPIX)) +- || defined(LINUX) || defined(QNX) || defined(SERENITY)) ++ || defined(LINUX) || defined(QNX) || defined(SERENITY) || defined(MIDIPIX)) # define X86_64 # define mach_type_known #endif @@ -65,8 +65,8 @@ diff -ru bdwgc.orig/include/private/gcconfig.h bdwgc/include/private/gcconfig.h #if defined(AIX) || defined(ANY_BSD) || defined(BSD) || defined(COSMO) \ || defined(DARWIN) || defined(DGUX) || defined(HAIKU) || defined(HPUX) \ || defined(HURD) || defined(IRIX5) || defined(LINUX) || defined(OSF1) \ -- || defined(QNX) || defined(SVR4) -+ || defined(QNX) || defined(SVR4) || defined(MIDIPIX) +- || defined(QNX) || defined(SERENITY) || defined(SVR4) ++ || defined(QNX) || defined(SERENITY) || defined(SVR4) || defined(MIDIPIX) # define UNIX_LIKE /* Basic Unix-like system calls work. */ #endif diff --git a/patches/bdwgc_pre.local.patch b/patches/bdwgc_pre.local.patch index 20213127..b1c7ea50 100644 --- a/patches/bdwgc_pre.local.patch +++ b/patches/bdwgc_pre.local.patch @@ -4,8 +4,8 @@ *-*-aix* | *-*-android* | *-*-cygwin* | *-*-darwin* | *-*-dragonfly* | \ *-*-freebsd* | *-*-haiku* | *-*-hpux11* | *-*-irix* | \ *-*-kfreebsd*-gnu | *-*-gnu* | *-*-*linux* | *-*-msys* | *-*-nacl* | \ -- *-*-netbsd* | *-*-openbsd* | *-*-osf* | *-*-solaris*) -+ *-*-netbsd* | *-*-openbsd* | *-*-osf* | *-*-solaris* | *-*-midipix*) +- *-*-netbsd* | *-*-openbsd* | *-*-osf* | *-*-serenity* | *-*-solaris*) ++ *-*-netbsd* | *-*-openbsd* | *-*-osf* | *-*-serenity* | *-*-solaris* | *-*-midipix*) AC_DEFINE(GC_THREADS) AC_DEFINE([_REENTRANT], [1], [Required define if using POSIX threads.]) diff --git a/patches/ed-1.20.2_pre.local.patch b/patches/ed-1.21_pre.local.patch index 624c9d12..624c9d12 100644 --- a/patches/ed-1.20.2_pre.local.patch +++ b/patches/ed-1.21_pre.local.patch diff --git a/patches/file-5.45.local.patch b/patches/file-5.45.local.patch deleted file mode 100644 index b9772ca1..00000000 --- a/patches/file-5.45.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru file-5.45.orig/magic/Magdir/images file-5.45/magic/Magdir/images ---- file-5.45.orig/magic/Magdir/images 2023-07-27 20:04:45.000000000 +0200 -+++ file-5.45/magic/Magdir/images 2024-09-09 11:02:19.317463825 +0200 -@@ -3610,7 +3610,7 @@ - - # Microsoft Paint graphic - # http://www.fileformat.info/format/mspaint/egff.htm --0 string DanM icrosoft Paint image data (version 1.x) -+0 string DanM Microsoft Paint image data (version 1.x) - >4 uleshort x (%d - >>6 uleshort x x %d) - 0 string LinS Microsoft Paint image data (version 2.0) diff --git a/patches/file-5.45_pre.local.patch b/patches/file-5.46_pre.local.patch index c3cbd39d..c3cbd39d 100644 --- a/patches/file-5.45_pre.local.patch +++ b/patches/file-5.46_pre.local.patch diff --git a/patches/file_host-5.45_pre.local.patch b/patches/file_host-5.46_pre.local.patch index c3cbd39d..c3cbd39d 100644 --- a/patches/file_host-5.45_pre.local.patch +++ b/patches/file_host-5.46_pre.local.patch diff --git a/patches/libflac-1.4.3_pre.local.patch b/patches/flac-1.5.0_pre.local.patch index b0aee98f..b0aee98f 100644 --- a/patches/libflac-1.4.3_pre.local.patch +++ b/patches/flac-1.5.0_pre.local.patch diff --git a/patches/gnutls-3.8.5.local.patch b/patches/gnutls-3.8.5.local.patch deleted file mode 100644 index 968143cf..00000000 --- a/patches/gnutls-3.8.5.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru gnutls-3.6.14.orig/lib/system/sockets.c gnutls-3.6.14/lib/system/sockets.c ---- gnutls-3.6.14.orig/lib/system/sockets.c 2020-06-01 11:48:13.000000000 +0200 -+++ gnutls-3.6.14/lib/system/sockets.c 2020-06-28 22:12:02.485455741 +0200 -@@ -117,7 +117,7 @@ - system_writev(gnutls_transport_ptr_t ptr, const giovec_t * iovec, - int iovec_cnt) - { -- return _system_writev(ptr, iovec, iovec_cnt, 0); -+ return writev(GNUTLS_POINTER_TO_INT(ptr), (struct iovec *) iovec, iovec_cnt); - } - - #endif diff --git a/patches/gnutls-3.8.8.local.patch b/patches/gnutls-3.8.8.local.patch new file mode 100644 index 00000000..85b6b8f7 --- /dev/null +++ b/patches/gnutls-3.8.8.local.patch @@ -0,0 +1,30 @@ +diff -ru gnutls-3.8.8.orig/lib/algorithms/groups.c gnutls-3.8.8/lib/algorithms/groups.c +--- gnutls-3.8.8.orig/lib/algorithms/groups.c 2024-10-30 05:41:21.000000000 +0100 ++++ gnutls-3.8.8/lib/algorithms/groups.c 2024-11-13 19:12:22.032377871 +0100 +@@ -90,7 +90,13 @@ + .tls_id = 25, + .pk = GNUTLS_PK_ECDSA, + }, +- group_x25519, ++ { ++ .name = "X25519", ++ .id = GNUTLS_GROUP_X25519, ++ .curve = GNUTLS_ECC_CURVE_X25519, ++ .tls_id = 29, ++ .pk = GNUTLS_PK_ECDH_X25519, ++ }, + #ifdef ENABLE_GOST + /* draft-smyshlyaev-tls12-gost-suites-06, Section 6 */ + { +diff -ru gnutls-3.8.8.orig/lib/system/sockets.c gnutls-3.8.8/lib/system/sockets.c +--- gnutls-3.8.8.orig/lib/system/sockets.c 2024-06-03 01:16:18.000000000 +0200 ++++ gnutls-3.8.8/lib/system/sockets.c 2024-11-13 19:02:28.738122921 +0100 +@@ -161,7 +161,7 @@ + ssize_t system_writev(gnutls_transport_ptr_t ptr, const giovec_t *iovec, + int iovec_cnt) + { +- return _system_writev(ptr, iovec, iovec_cnt, 0); ++ return writev(GNUTLS_POINTER_TO_INT(ptr), (struct iovec *) iovec, iovec_cnt); + } + + #endif diff --git a/patches/gnutls-3.8.5_pre.local.patch b/patches/gnutls-3.8.8_pre.local.patch index b214ccc0..b214ccc0 100644 --- a/patches/gnutls-3.8.5_pre.local.patch +++ b/patches/gnutls-3.8.8_pre.local.patch diff --git a/patches/libarchive-3.7.6_pre.local.patch b/patches/libarchive-3.7.8_pre.local.patch index f8f71eb5..f8f71eb5 100644 --- a/patches/libarchive-3.7.6_pre.local.patch +++ b/patches/libarchive-3.7.8_pre.local.patch diff --git a/patches/libsndfile-1.2.0.local.patch b/patches/libsndfile-1.2.2.local.patch index 708ae2c7..708ae2c7 100644 --- a/patches/libsndfile-1.2.0.local.patch +++ b/patches/libsndfile-1.2.2.local.patch diff --git a/patches/libssh-0.10.6.local.patch b/patches/libssh-0.10.6.local.patch deleted file mode 100644 index e2525540..00000000 --- a/patches/libssh-0.10.6.local.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -ru libssh-0.10.6.orig/libssh.pc.cmake libssh-0.10.6/libssh.pc.cmake ---- libssh-0.10.6.orig/libssh.pc.cmake 2022-11-18 16:16:47.000000000 +0100 -+++ libssh-0.10.6/libssh.pc.cmake 2023-12-19 14:32:21.461084477 +0100 -@@ -6,5 +6,5 @@ - Name: @PROJECT_NAME@ - Description: The SSH Library - Version: @PROJECT_VERSION@ --Libs: -L${libdir} -lssh -+Libs: -lssh - Cflags: -I${includedir} diff --git a/patches/libssh-0.11.1_pre.local.patch b/patches/libssh-0.11.1_pre.local.patch new file mode 100644 index 00000000..0bb9b840 --- /dev/null +++ b/patches/libssh-0.11.1_pre.local.patch @@ -0,0 +1,44 @@ +diff -ru libssh-0.11.1.orig/CMakeLists.txt libssh-0.11.1/CMakeLists.txt +--- libssh-0.11.1.orig/CMakeLists.txt 2024-08-29 15:15:05.000000000 +0200 ++++ libssh-0.11.1/CMakeLists.txt 2024-12-22 20:13:00.884204019 +0100 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.12.0) ++cmake_minimum_required(VERSION 3.7.0) + + # Specify search path for CMake modules to be loaded by include() + # and find_package() +@@ -75,13 +75,6 @@ + endif (NOT NACL_FOUND) + endif (WITH_NACL) + +-# Disable symbol versioning in non UNIX platforms +-if (UNIX) +- find_package(ABIMap 0.3.1) +-else (UNIX) +- set(WITH_SYMBOL_VERSIONING OFF) +-endif (UNIX) +- + # config.h checks + include(ConfigureChecks.cmake) + configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +diff -ru libssh-0.11.1.orig/libssh.pc.cmake libssh-0.11.1/libssh.pc.cmake +--- libssh-0.11.1.orig/libssh.pc.cmake 2024-01-12 14:12:29.000000000 +0100 ++++ libssh-0.11.1/libssh.pc.cmake 2024-12-22 20:16:30.103523223 +0100 +@@ -6,5 +6,5 @@ + Name: @PROJECT_NAME@ + Description: The SSH Library + Version: @PROJECT_VERSION@ +-Libs: -L${libdir} -lssh ++Libs: -lssh + Cflags: -I${includedir} +diff -ru libssh-0.11.1.orig/src/threads/libgcrypt.c libssh-0.11.1/src/threads/libgcrypt.c +--- libssh-0.11.1.orig/src/threads/libgcrypt.c 2024-01-02 16:48:48.000000000 +0100 ++++ libssh-0.11.1/src/threads/libgcrypt.c 2024-12-22 20:13:00.884204019 +0100 +@@ -26,7 +26,6 @@ + + #if (GCRYPT_VERSION_NUMBER >= 0x010600) + /* libgcrypt >= 1.6 does not support custom callbacks */ +-GCRY_THREAD_OPTION_PTHREAD_IMPL; + + int crypto_thread_init(struct ssh_threads_callbacks_struct *user_callbacks) + { diff --git a/patches/libtasn1-4.19.0_pre.local.patch b/patches/libtasn1-4.20.0_pre.local.patch index 9f7f4eda..ba81c70e 100644 --- a/patches/libtasn1-4.19.0_pre.local.patch +++ b/patches/libtasn1-4.20.0_pre.local.patch @@ -1,8 +1,8 @@ -diff -ru libtasn1-4.17.0.orig/configure libtasn1-4.17.0/configure ---- libtasn1-4.17.0.orig/configure 2021-05-13 19:09:31.000000000 +0200 -+++ libtasn1-4.17.0/configure 2021-12-07 16:59:10.538374562 +0100 -@@ -12844,6 +12844,16 @@ - dynamic_linker='GNU/Linux ld.so' +diff -ru libtasn1-4.20.0.orig/configure libtasn1-4.20.0/configure +--- libtasn1-4.20.0.orig/configure 2025-02-01 18:11:54.000000000 +0100 ++++ libtasn1-4.20.0/configure 2025-02-22 12:59:57.084712503 +0100 +@@ -14827,6 +14827,16 @@ + hardcode_libdir_flag_spec='-L$libdir' ;; +midipix*) @@ -15,18 +15,18 @@ diff -ru libtasn1-4.17.0.orig/configure libtasn1-4.17.0/configure + shlibpath_var=LD_LIBRARY_PATH + ;; + - netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no -diff -ru libtasn1-4.17.0.orig/Makefile.in libtasn1-4.17.0/Makefile.in ---- libtasn1-4.17.0.orig/Makefile.in 2021-05-13 19:09:33.000000000 +0200 -+++ libtasn1-4.17.0/Makefile.in 2021-12-07 17:00:22.742376855 +0100 -@@ -564,7 +564,7 @@ + # This must be glibc/ELF. + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor +diff -ru libtasn1-4.20.0.orig/Makefile.in libtasn1-4.20.0/Makefile.in +--- libtasn1-4.20.0.orig/Makefile.in 2025-02-01 18:11:54.000000000 +0100 ++++ libtasn1-4.20.0/Makefile.in 2025-02-22 13:00:37.817521139 +0100 +@@ -1578,7 +1578,7 @@ windows/test-tree/test-tree.vcproj windows/libtasn14win.mk \ - cfg.mk maint.mk CONTRIBUTING.md README.md \ + cfg.mk maint.mk CONTRIBUTING.md README.md COPYING.LESSERv2 \ $(top_srcdir)/.version --SUBDIRS = lib src fuzz tests $(am__append_1) -+SUBDIRS = lib src fuzz $(am__append_1) +-SUBDIRS = lib src $(am__append_1) fuzz tests ++SUBDIRS = lib src $(am__append_1) fuzz @CODE_COVERAGE_ENABLED_TRUE@GITIGNOREFILES := $(GITIGNOREFILES) $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) @CODE_COVERAGE_ENABLED_TRUE@code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V)) @CODE_COVERAGE_ENABLED_TRUE@code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY)) diff --git a/patches/libxslt-1.1.39.local.patch b/patches/libxslt-1.1.43.local.patch index ccafaf1e..ccafaf1e 100644 --- a/patches/libxslt-1.1.39.local.patch +++ b/patches/libxslt-1.1.43.local.patch diff --git a/patches/libxslt-1.1.39_pre.local.patch b/patches/libxslt-1.1.43_pre.local.patch index 08be2163..08be2163 100644 --- a/patches/libxslt-1.1.39_pre.local.patch +++ b/patches/libxslt-1.1.43_pre.local.patch diff --git a/patches/lighttpd-1.4.77.local.patch b/patches/lighttpd-1.4.77.local.patch new file mode 100644 index 00000000..3acc57ed --- /dev/null +++ b/patches/lighttpd-1.4.77.local.patch @@ -0,0 +1,19 @@ +diff -ru lighttpd-1.4.77.orig/src/mod_openssl.c lighttpd-1.4.77/src/mod_openssl.c +--- lighttpd-1.4.77.orig/src/mod_openssl.c 2025-01-10 05:12:08.000000000 +0100 ++++ lighttpd-1.4.77/src/mod_openssl.c 2025-02-22 13:20:20.502779996 +0100 +@@ -3020,15 +3020,7 @@ + "X25519:P-256:P-384:X448"; + #endif + +- #if (defined(BORINGSSL_API_VERSION) && BORINGSSL_API_VERSION >= 19) \ +- || (defined(LIBRESSL_VERSION_NUMBER) \ +- && LIBRESSL_VERSION_NUMBER >= 0x2050100fL) \ +- || OPENSSL_VERSION_NUMBER >= 0x10101000L + int rc = SSL_CTX_set1_groups_list(s->ssl_ctx, groups); +- #elif (defined(BORINGSSL_API_VERSION && BORINGSSL_API_VERSION >= 3) \ +- || OPENSSL_VERSION_NUMBER >= 0x10100000L +- int rc = SSL_CTX_set1_curves_list(s->ssl_ctx, groups); +- #endif + if (1 != rc) { + log_error(srv->errh, __FILE__, __LINE__, + "SSL: Unable to config groups %s", groups); diff --git a/patches/lighttpd-1.4.76_pre.local.patch b/patches/lighttpd-1.4.77_pre.local.patch index 55360673..55360673 100644 --- a/patches/lighttpd-1.4.76_pre.local.patch +++ b/patches/lighttpd-1.4.77_pre.local.patch diff --git a/patches/tcsh-6.24.12.local.patch b/patches/tcsh-6.24.15.local.patch index 2e9fbd26..bc8b1735 100644 --- a/patches/tcsh-6.24.12.local.patch +++ b/patches/tcsh-6.24.15.local.patch @@ -1,7 +1,19 @@ -diff -ru tcsh-6.24.07.orig/configure tcsh-6.24.07/configure ---- tcsh-6.24.07.orig/configure 2022-12-21 20:44:53.000000000 +0100 -+++ tcsh-6.24.07/configure 2022-12-27 12:27:29.897963800 +0100 -@@ -6171,6 +6171,10 @@ +diff -Nru tcsh-6.24.14.orig/config_f.h tcsh-6.24.14/config_f.h +--- tcsh-6.24.14.orig/config_f.h 2024-11-26 19:31:51.000000000 +0100 ++++ tcsh-6.24.14/config_f.h 2024-12-22 19:13:25.290832110 +0100 +@@ -147,7 +147,7 @@ + * This can be much slower and no memory statistics will be + * provided. + */ +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) || !defined(HAVE_WORKING_SBRK) ++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) || defined(__midipix__) || !defined(HAVE_WORKING_SBRK) + # define SYSMALLOC + #else + # undef SYSMALLOC +diff -Nru tcsh-6.24.14.orig/configure tcsh-6.24.14/configure +--- tcsh-6.24.14.orig/configure 2024-11-26 19:31:51.000000000 +0100 ++++ tcsh-6.24.14/configure 2024-12-22 19:13:25.290832110 +0100 +@@ -6089,6 +6089,10 @@ *-qnx6*) : tcsh_config_file=qnx6 ;; #( @@ -12,31 +24,31 @@ diff -ru tcsh-6.24.07.orig/configure tcsh-6.24.07/configure *) : as_fn_error $? "Tcsh can't guess the configuration file name for \`${host}' systems. ---- tcsh-6.24.10/Makefile.in.orig 2023-04-14 13:52:38.000000000 +0200 -+++ tcsh-6.24.10/Makefile.in 2024-01-13 10:48:11.122576967 +0100 -@@ -431,6 +431,7 @@ - #CC= cc -h0,ansi,novector,float0 +diff -Nru tcsh-6.24.14.orig/ed.inputl.c tcsh-6.24.14/ed.inputl.c +--- tcsh-6.24.14.orig/ed.inputl.c 2024-11-26 19:31:51.000000000 +0100 ++++ tcsh-6.24.14/ed.inputl.c 2024-12-22 19:13:25.290832110 +0100 +@@ -34,6 +34,8 @@ + #include "ed.defns.h" /* for the function names */ + #include "tw.h" /* for twenex stuff */ + ++#include <wchar.h> ++ + #define OKCMD INT_MAX + + /* ed.inputl -- routines to get a single line from the input. */ +diff -Nru tcsh-6.24.14.orig/Makefile.in tcsh-6.24.14/Makefile.in +--- tcsh-6.24.14.orig/Makefile.in 2024-11-26 19:31:51.000000000 +0100 ++++ tcsh-6.24.14/Makefile.in 2024-12-22 19:16:54.096716085 +0100 +@@ -432,7 +432,7 @@ #CC= lcc -wa CC_FOR_GETHOST = @CC_FOR_GETHOST@ -+CPPFLAGS_FOR_GETHOST=-I. -I$(srcdir) + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +-CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ ++CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -I. -I$(srcdir) + LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ ED= ed AS= as - RM= rm -@@ -506,11 +507,11 @@ - # emxbind tcsh - - gethost.${SUF}: gethost.c sh.err.h tc.const.h sh.h -- ${CC_FOR_GETHOST} ${CF} ${CPPFLAGS} ${CFLAGS} $(srcdir)/gethost.c -+ ${CC_FOR_GETHOST} ${CF} ${CPPFLAGS_FOR_GETHOST} ${CFLAGS_FOR_GETHOST} $(srcdir)/gethost.c - - gethost: gethost.${SUF} - rm -f gethost -- ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} gethost.${SUF} -+ ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS_FOR_GETHOST} ${CFLAGS_FOR_GETHOST} ${LDFLAGS_FOR_GETHOST} gethost.${SUF} - - tc.defs.c: gethost host.defs - @rm -f $@.tmp -@@ -595,7 +596,7 @@ +@@ -598,7 +598,7 @@ @echo '/* Do not edit this file, make creates it. */' > $@.tmp @echo '#ifndef _h_tc_const' >> $@.tmp @echo '#define _h_tc_const' >> $@.tmp @@ -44,22 +56,22 @@ diff -ru tcsh-6.24.07.orig/configure tcsh-6.24.07/configure + ${CPP} $(CFLAGS) $(CPPFLAGS) ${DFLAGS} ${EXTRAFLAGS} -D_h_tc_const\ $(srcdir)/tc.const.c | \ sed -n -e 's/^\(Char STR[a-zA-Z0-9_]*\) *\[ *\].*/extern \1[];/p' | \ - LC_COLLATE=C sort >> $@.tmp -diff -ru tcsh-6.23.02.orig/config_f.h tcsh-6.23.02/config_f.h ---- tcsh-6.23.02.orig/config_f.h 2022-01-03 09:03:03.000000000 +0100 -+++ tcsh-6.23.02/config_f.h 2022-02-01 11:36:23.327968800 +0100 -@@ -149,7 +149,7 @@ - * This can be much slower and no memory statistics will be - * provided. - */ --#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) || !defined(HAVE_WORKING_SBRK) -+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) || defined(__midipix__) || !defined(HAVE_WORKING_SBRK) - # define SYSMALLOC - #else - # undef SYSMALLOC -diff -Nru tcsh-6.22.00.orig/config/midipix tcsh-6.22.00/config/midipix ---- tcsh-6.22.00.orig/system/midipix 1970-01-01 01:00:00.000000000 +0100 -+++ tcsh-6.22.00/system/midipix 2020-08-21 19:12:56.066600827 +0200 + LC_ALL=C sort >> $@.tmp +diff -Nru tcsh-6.24.14.orig/sh.h tcsh-6.24.14/sh.h +--- tcsh-6.24.14.orig/sh.h 2024-11-26 19:31:51.000000000 +0100 ++++ tcsh-6.24.14/sh.h 2024-12-22 19:13:25.290832110 +0100 +@@ -341,7 +341,7 @@ + #endif /* POSIX && !WINNT_NATIVE */ + #include <limits.h> + +-#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) ++#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(__midipix__) + # if !defined(pyr) && !defined(stellar) + # include <time.h> + # ifdef _MINIX +diff -Nru tcsh-6.24.14.orig/system/midipix tcsh-6.24.14/system/midipix +--- tcsh-6.24.14.orig/system/midipix 1970-01-01 01:00:00.000000000 +0100 ++++ tcsh-6.24.14/system/midipix 2024-12-22 19:13:25.290832110 +0100 @@ -0,0 +1,138 @@ +/* + * config.h -- configure various defines for tcsh @@ -199,27 +211,3 @@ diff -Nru tcsh-6.22.00.orig/config/midipix tcsh-6.22.00/config/midipix +#define HAVE_SLASHSLASH 1 + +#endif /* _h_config */ -diff -Nru tcsh-6.22.00.orig/ed.inputl.c tcsh-6.22.00/ed.inputl.c ---- tcsh-6.22.00.orig/ed.inputl.c 2019-11-28 17:00:05.000000000 +0100 -+++ tcsh-6.22.00/ed.inputl.c 2020-08-21 19:22:12.899460169 +0200 -@@ -34,6 +34,8 @@ - #include "ed.defns.h" /* for the function names */ - #include "tw.h" /* for twenex stuff */ - -+#include <wchar.h> -+ - #define OKCMD INT_MAX - - /* ed.inputl -- routines to get a single line from the input. */ -diff -Nru tcsh-6.22.00.orig/sh.h tcsh-6.22.00/sh.h ---- tcsh-6.22.00.orig/sh.h 2019-11-28 17:00:05.000000000 +0100 -+++ tcsh-6.22.00/sh.h 2020-08-21 19:10:44.030604961 +0200 -@@ -337,7 +337,7 @@ - #endif /* POSIX && !WINNT_NATIVE */ - #include <limits.h> - --#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) -+#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(__midipix__) - # if !defined(pyr) && !defined(stellar) - # include <time.h> - # ifdef _MINIX diff --git a/patches/utf8proc_pre.local.patch b/patches/utf8proc_pre.local.patch new file mode 100644 index 00000000..b7139aa5 --- /dev/null +++ b/patches/utf8proc_pre.local.patch @@ -0,0 +1,9 @@ +diff -ru utf8proc.orig/CMakeLists.txt utf8proc/CMakeLists.txt +--- utf8proc.orig/CMakeLists.txt 2024-12-30 15:46:09.247803997 +0100 ++++ utf8proc/CMakeLists.txt 2024-12-30 15:47:14.637465265 +0100 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.10) ++cmake_minimum_required (VERSION 3.7) + + include (utils.cmake) + diff --git a/patches/wget-1.24.5.local.patch b/patches/wget-1.25.0.local.patch index 0fb393c4..0fb393c4 100644 --- a/patches/wget-1.24.5.local.patch +++ b/patches/wget-1.25.0.local.patch diff --git a/patches/wget_minipix-1.24.5.local.patch b/patches/wget_minipix-1.24.5.local.patch deleted file mode 120000 index 23954a74..00000000 --- a/patches/wget_minipix-1.24.5.local.patch +++ /dev/null @@ -1 +0,0 @@ -wget-1.24.5.local.patch
\ No newline at end of file diff --git a/patches/wget_minipix-1.25.0.local.patch b/patches/wget_minipix-1.25.0.local.patch new file mode 120000 index 00000000..433350f7 --- /dev/null +++ b/patches/wget_minipix-1.25.0.local.patch @@ -0,0 +1 @@ +wget-1.25.0.local.patch
\ No newline at end of file diff --git a/patches/zstd-1.5.5.local.patch b/patches/zstd-1.5.6.local.patch index 3075a43f..3075a43f 100644 --- a/patches/zstd-1.5.5.local.patch +++ b/patches/zstd-1.5.6.local.patch |