summaryrefslogtreecommitdiffhomepage
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/bochs-2.8.local.patch (renamed from patches/bochs-2.7.local.patch)12
-rw-r--r--patches/ed-1.20.2_pre.local.patch (renamed from patches/ed-1.20_pre.local.patch)0
-rw-r--r--patches/libarchive-3.7.4_pre.local.patch (renamed from patches/libarchive-3.7.3_pre.local.patch)0
-rw-r--r--patches/libpng-1.6.39.local.patch11
-rw-r--r--patches/libressl-3.9.2.local.patch (renamed from patches/libressl-3.9.1.local.patch)2
-rw-r--r--patches/lighttpd-1.4.73_pre.local.patch12
-rw-r--r--patches/lighttpd-1.4.76.local.patch (renamed from patches/lighttpd-1.4.73.local.patch)0
-rw-r--r--patches/lighttpd-1.4.76_pre.local.patch23
-rw-r--r--patches/mandoc-1.14.6.local.patch109
-rw-r--r--patches/mblaze.local.patch28
-rw-r--r--patches/openssh-9.7p1.local.patch (renamed from patches/openssh-9.5p1.local.patch)0
-rw-r--r--patches/tcsh-6.24.12.local.patch (renamed from patches/tcsh-6.24.10.local.patch)0
-rw-r--r--patches/yabasic-2.83.0.local.patch40
13 files changed, 52 insertions, 185 deletions
diff --git a/patches/bochs-2.7.local.patch b/patches/bochs-2.8.local.patch
index 32dad626..1cc13e8a 100644
--- a/patches/bochs-2.7.local.patch
+++ b/patches/bochs-2.8.local.patch
@@ -1,15 +1,3 @@
-diff -ru bochs-2.6.11.orig/cpu/icache.h bochs-2.6.11/cpu/icache.h
---- bochs-2.6.11.orig/cpu/icache.h 2019-12-09 17:44:36.435957000 +0100
-+++ bochs-2.6.11/cpu/icache.h 2021-07-18 13:10:35.350797475 +0200
-@@ -28,7 +28,7 @@
-
- class bxPageWriteStampTable
- {
-- const Bit32u PHY_MEM_PAGES = 1024*1024;
-+ #define PHY_MEM_PAGES (1024*1024)
- Bit32u *fineGranularityMapping;
-
- public:
diff -ru bochs-2.6.9.orig/main.cc bochs-2.6.9/main.cc
--- bochs-2.6.9.orig/main.cc 2017-02-18 17:28:04.318635000 +0100
+++ bochs-2.6.9/main.cc 2021-07-18 01:15:37.859411673 +0200
diff --git a/patches/ed-1.20_pre.local.patch b/patches/ed-1.20.2_pre.local.patch
index 624c9d12..624c9d12 100644
--- a/patches/ed-1.20_pre.local.patch
+++ b/patches/ed-1.20.2_pre.local.patch
diff --git a/patches/libarchive-3.7.3_pre.local.patch b/patches/libarchive-3.7.4_pre.local.patch
index f8f71eb5..f8f71eb5 100644
--- a/patches/libarchive-3.7.3_pre.local.patch
+++ b/patches/libarchive-3.7.4_pre.local.patch
diff --git a/patches/libpng-1.6.39.local.patch b/patches/libpng-1.6.39.local.patch
deleted file mode 100644
index 008d2cef..00000000
--- a/patches/libpng-1.6.39.local.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpng-1.6.39/Makefile.in.orig 2022-11-20 22:53:23.000000000 +0100
-+++ libpng-1.6.39/Makefile.in 2023-03-27 07:06:20.935851632 +0200
-@@ -2317,7 +2317,7 @@
- rm -f $@ $*.tf[12]
- test -d scripts || mkdir scripts || test -d scripts
- $(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)\
-- $(CPPFLAGS) $(SYMBOL_CFLAGS) $< > $*.tf1
-+ $(CFLAGS) $(CPPFLAGS) $(SYMBOL_CFLAGS) $< > $*.tf1
- $(AWK) -f "${srcdir}/scripts/dfn.awk" out="$*.tf2" $*.tf1 1>&2
- rm -f $*.tf1
- mv $*.tf2 $@
diff --git a/patches/libressl-3.9.1.local.patch b/patches/libressl-3.9.2.local.patch
index 8235cc0c..11e45d19 100644
--- a/patches/libressl-3.9.1.local.patch
+++ b/patches/libressl-3.9.2.local.patch
@@ -13,7 +13,7 @@ diff -ru libressl-3.7.1.orig/crypto/compat/arc4random_linux.h libressl-3.7.1/cry
static inline void
_getentropy_fail(void)
{
-+ fprintf(stderr, "Couldn't obtain randomness from getentropy\n");
++ fprintf(stderr, "rebuild psxscl with devurandom patch\n");
raise(SIGKILL);
}
diff --git a/patches/lighttpd-1.4.73_pre.local.patch b/patches/lighttpd-1.4.73_pre.local.patch
deleted file mode 100644
index 004f3b3e..00000000
--- a/patches/lighttpd-1.4.73_pre.local.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru lighttpd-1.4.70.orig/src/Makefile.in lighttpd-1.4.70/src/Makefile.in
---- lighttpd-1.4.70.orig/src/Makefile.in 2023-05-10 09:21:16.000000000 +0200
-+++ lighttpd-1.4.70/src/Makefile.in 2023-05-21 14:12:46.984527740 +0200
-@@ -1469,7 +1469,7 @@
- @NO_RDYNAMIC_TRUE@common_ldflags = -avoid-version -no-undefined
- @NO_RDYNAMIC_TRUE@liblightcomp_la_SOURCES = $(common_src)
- @NO_RDYNAMIC_TRUE@liblightcomp_la_CFLAGS = $(AM_CFLAGS) $(LIBEV_CFLAGS)
--@NO_RDYNAMIC_TRUE@liblightcomp_la_LDFLAGS = $(common_ldflags) --export-all-symbols
-+@NO_RDYNAMIC_TRUE@liblightcomp_la_LDFLAGS = $(common_ldflags)
- @NO_RDYNAMIC_TRUE@liblightcomp_la_LIBADD = $(PCRE_LIB) $(CRYPTO_LIB) $(FAM_LIBS) $(LIBEV_LIBS) $(ATTR_LIB) $(WS2_32_LIB)
- @NO_RDYNAMIC_FALSE@common_libadd =
- @NO_RDYNAMIC_TRUE@common_libadd = liblightcomp.la
diff --git a/patches/lighttpd-1.4.73.local.patch b/patches/lighttpd-1.4.76.local.patch
index 50a2ce94..50a2ce94 100644
--- a/patches/lighttpd-1.4.73.local.patch
+++ b/patches/lighttpd-1.4.76.local.patch
diff --git a/patches/lighttpd-1.4.76_pre.local.patch b/patches/lighttpd-1.4.76_pre.local.patch
new file mode 100644
index 00000000..55360673
--- /dev/null
+++ b/patches/lighttpd-1.4.76_pre.local.patch
@@ -0,0 +1,23 @@
+diff -ru lighttpd-1.4.76.orig/configure.ac lighttpd-1.4.76/configure.ac
+--- lighttpd-1.4.76.orig/configure.ac 2024-04-11 07:30:19.000000000 +0200
++++ lighttpd-1.4.76/configure.ac 2024-04-18 12:53:43.846262167 +0200
+@@ -61,7 +61,6 @@
+
+ dnl Checks for programs.
+ AC_PROG_CC
+-AC_PROG_CC_C99
+ AX_PROG_CC_FOR_BUILD
+ LT_PATH_LD
+ AC_PROG_INSTALL
+diff -ru lighttpd-1.4.76.orig/src/Makefile.am lighttpd-1.4.76/src/Makefile.am
+--- lighttpd-1.4.76.orig/src/Makefile.am 2024-04-11 07:30:19.000000000 +0200
++++ lighttpd-1.4.76/src/Makefile.am 2024-04-18 12:45:07.642508927 +0200
+@@ -107,7 +107,7 @@
+ lib_LTLIBRARIES += liblightcomp.la
+ liblightcomp_la_SOURCES=$(common_src)
+ liblightcomp_la_CFLAGS=$(AM_CFLAGS) $(LIBEV_CFLAGS)
+-liblightcomp_la_LDFLAGS = $(common_ldflags) --export-all-symbols
++liblightcomp_la_LDFLAGS = $(common_ldflags)
+ liblightcomp_la_LIBADD = $(PCRE_LIB) $(CRYPTO_LIB) $(FAM_LIBS) $(LIBEV_LIBS) $(ATTR_LIB) $(WS2_32_LIB)
+ common_libadd = liblightcomp.la
+ if !LIGHTTPD_STATIC
diff --git a/patches/mandoc-1.14.6.local.patch b/patches/mandoc-1.14.6.local.patch
deleted file mode 100644
index ebd3dace..00000000
--- a/patches/mandoc-1.14.6.local.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -ru mandoc-1.14.6.orig/Makefile mandoc-1.14.6/Makefile
---- mandoc-1.14.6.orig/Makefile 2021-09-23 20:03:23.000000000 +0200
-+++ mandoc-1.14.6/Makefile 2024-02-26 15:20:48.758788836 +0100
-@@ -369,11 +369,40 @@
-
- # === USER CONFIGURATION ===============================================
-
--include Makefile.local
-+MANDOC_COBJS = compat_fts.o compat_ohash.o compat_progname.o compat_recallocarray.o compat_strtonum.o
-+SOELIM_COBJS = compat_progname.o compat_stringlist.o
-+PREFIX =
-+BINDIR = /bin
-+SBINDIR = /sbin
-+BIN_FROM_SBIN = ../bin
-+INCLUDEDIR = /include/mandoc
-+LIBDIR = /lib/mandoc
-+MANDIR = /man
-+WWWPREFIX = /var/www
-+HTDOCDIR = /var/www/htdocs
-+CGIBINDIR = /var/www/cgi-bin
-+BINM_APROPOS = apropos
-+BINM_CATMAN = catman
-+BINM_MAKEWHATIS = makewhatis
-+BINM_MAN = man
-+BINM_SOELIM = soelim
-+BINM_WHATIS = whatis
-+MANM_MAN = man
-+MANM_MANCONF = man.conf
-+MANM_MDOC = mdoc
-+MANM_ROFF = roff
-+MANM_EQN = eqn
-+MANM_TBL = tbl
-+INSTALL = install
-+INSTALL_PROGRAM = install -m 0555
-+INSTALL_LIB = install -m 0444
-+INSTALL_MAN = install -m 0444
-+INSTALL_DATA = install -m 0444
-+LN = ln -f
-
- # === DEPENDENCY HANDLING ==============================================
-
--all: mandoc man demandoc soelim $(BUILD_TARGETS) Makefile.local
-+all: mandoc man demandoc soelim $(BUILD_TARGETS)
-
- install: base-install $(INSTALL_TARGETS)
-
-diff -ruN mandoc-1.14.6.orig/config.h mandoc-1.14.6/config.h
---- mandoc-1.14.6.orig/config.h 1970-01-01 01:00:00.000000000 +0100
-+++ mandoc-1.14.6/config.h 2024-02-26 14:41:39.744045181 +0100
-@@ -0,0 +1,59 @@
-+#ifdef __cplusplus
-+#error "Do not use C++. See the INSTALL file."
-+#endif
-+
-+#include <sys/types.h>
-+
-+#define MAN_CONF_FILE "/etc/man.conf"
-+#define MANPATH_BASE "/usr/share/man:/usr/X11R6/man"
-+#define MANPATH_DEFAULT "/share/man"
-+#define OSENUM MANDOC_OS_OTHER
-+#define OSNAME "Midipix"
-+#define UTF8_LOCALE "en_US.UTF-8"
-+#define EFTYPE EINVAL
-+
-+#define HAVE_DIRENT_NAMLEN 0
-+#define HAVE_ENDIAN 1
-+#define HAVE_ERR 1
-+#define HAVE_FTS 1
-+#define HAVE_FTS_COMPARE_CONST 0
-+#define HAVE_GETLINE 1
-+#define HAVE_GETSUBOPT 1
-+#define HAVE_ISBLANK 1
-+#define HAVE_LESS_T 0
-+#define HAVE_MKDTEMP 1
-+#define HAVE_MKSTEMPS 1
-+#define HAVE_NTOHL 1
-+#define HAVE_PLEDGE 0
-+#define HAVE_PROGNAME 0
-+#define HAVE_REALLOCARRAY 1
-+#define HAVE_RECALLOCARRAY 0
-+#define HAVE_REWB_BSD 0
-+#define HAVE_REWB_SYSV 1
-+#define HAVE_SANDBOX_INIT 0
-+#define HAVE_STRCASESTR 1
-+#define HAVE_STRINGLIST 0
-+#define HAVE_STRLCAT 1
-+#define HAVE_STRLCPY 1
-+#define HAVE_STRNDUP 1
-+#define HAVE_STRPTIME 1
-+#define HAVE_STRSEP 1
-+#define HAVE_STRTONUM 0
-+#define HAVE_SYS_ENDIAN 0
-+#define HAVE_VASPRINTF 1
-+#define HAVE_WCHAR 1
-+#define HAVE_OHASH 0
-+#define NEED_XPG4_2 0
-+
-+#define BINM_APROPOS "apropos"
-+#define BINM_CATMAN "catman"
-+#define BINM_MAKEWHATIS "makewhatis"
-+#define BINM_MAN "man"
-+#define BINM_SOELIM "soelim"
-+#define BINM_WHATIS "whatis"
-+#define BINM_PAGER "less"
-+
-+extern const char *getprogname(void);
-+extern void setprogname(const char *);
-+extern void *recallocarray(void *, size_t, size_t, size_t);
-+extern long long strtonum(const char *, long long, long long, const char **);
diff --git a/patches/mblaze.local.patch b/patches/mblaze.local.patch
new file mode 100644
index 00000000..b4840212
--- /dev/null
+++ b/patches/mblaze.local.patch
@@ -0,0 +1,28 @@
+diff -ru mblaze.orig/GNUmakefile mblaze/GNUmakefile
+--- mblaze.orig/GNUmakefile 2024-05-03 20:18:24.555511858 +0200
++++ mblaze/GNUmakefile 2024-05-04 14:37:13.290044003 +0200
+@@ -1,7 +1,7 @@
+ CFLAGS?=-g -O2 -fstack-protector-strong -D_FORTIFY_SOURCE=2
+ override CFLAGS:=-Wall -Wno-switch -Wextra $(CFLAGS)
+ LDFLAGS?=-fstack-protector-strong
+-LDLIBS=-lrt
++LDLIBS=-liconv
+
+ OS := $(shell uname)
+
+diff -ru mblaze.orig/seq.c mblaze/seq.c
+--- mblaze.orig/seq.c 2024-05-03 20:09:12.020066998 +0200
++++ mblaze/seq.c 2024-05-04 14:37:58.023375461 +0200
+@@ -207,12 +207,7 @@
+ d = 0;
+ b = a;
+ } else {
+- errno = 0;
+ d = strtol(a, &b, 10);
+- if (errno != 0) {
+- perror("strtol");
+- exit(2);
+- }
+ }
+
+ *out = base + d;
diff --git a/patches/openssh-9.5p1.local.patch b/patches/openssh-9.7p1.local.patch
index 8e995354..8e995354 100644
--- a/patches/openssh-9.5p1.local.patch
+++ b/patches/openssh-9.7p1.local.patch
diff --git a/patches/tcsh-6.24.10.local.patch b/patches/tcsh-6.24.12.local.patch
index 2e9fbd26..2e9fbd26 100644
--- a/patches/tcsh-6.24.10.local.patch
+++ b/patches/tcsh-6.24.12.local.patch
diff --git a/patches/yabasic-2.83.0.local.patch b/patches/yabasic-2.83.0.local.patch
deleted file mode 100644
index 8dee7982..00000000
--- a/patches/yabasic-2.83.0.local.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru yabasic-2.83.0.orig/configure yabasic-2.83.0/configure
---- yabasic-2.83.0.orig/configure 2019-06-15 16:58:01.081213787 +0200
-+++ yabasic-2.83.0/configure 2019-06-15 16:58:27.697212954 +0200
-@@ -13304,7 +13304,7 @@
- return 0;
- }
- _ACEOF
--for ac_lib in '' curses; do
-+for ac_lib in '' ncurses; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
-Only in yabasic-2.83.0: configure.orig
-diff -ru yabasic-2.83.0.orig/graphic.c yabasic-2.83.0/graphic.c
---- yabasic-2.83.0.orig/graphic.c 2019-05-16 06:01:06.000000000 +0200
-+++ yabasic-2.83.0/graphic.c 2019-06-15 17:03:51.116903177 +0200
-@@ -19,7 +19,11 @@
- #include "yabasic.h" /* all prototypes and structures */
- #endif
- #ifdef UNIX
-+#ifdef HAVE_NCURSES_H
-+#include <ncurses.h>
-+#elif HAVE_CURSES_H
- #include <curses.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-diff -ru yabasic-2.83.0.orig/whereami.c yabasic-2.83.0/whereami.c
---- yabasic-2.83.0.orig/whereami.c 2019-03-10 16:36:25.000000000 +0100
-+++ yabasic-2.83.0/whereami.c 2019-06-15 17:08:39.723539493 +0200
-@@ -164,7 +164,7 @@
- return length;
- }
-
--#elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) || (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
-+#elif defined(__linux__) || defined(__midipix__) || defined(__CYGWIN__) || defined(__sun) || (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
-
- #include <stdio.h>
- #include <stdlib.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 05:28:49 +0000