diff options
Diffstat (limited to 'patches')
-rw-r--r-- | patches/bash-5.2.32_pre.local.patch (renamed from patches/bash-5.2.21_pre.local.patch) | 0 | ||||
l--------- | patches/bash_minipix-5.2.21_pre.local.patch | 1 | ||||
l--------- | patches/bash_minipix-5.2.32_pre.local.patch | 1 | ||||
-rw-r--r-- | patches/coreutils/uptime.patch | 42 | ||||
-rw-r--r-- | patches/fetchmail-6.4.0.beta4.local.patch | 14 | ||||
-rw-r--r-- | patches/fetchmail-6.4.39_pre.local.patch | 30 | ||||
-rw-r--r-- | patches/iperf-3.17.1.local.patch | 32 | ||||
-rw-r--r-- | patches/lighttpd-1.4.76.local.patch | 18 | ||||
-rw-r--r-- | patches/ltris-1.2.2_pre.local.patch | 25 | ||||
-rw-r--r-- | patches/ltris-1.3.2_pre.local.patch | 25 | ||||
-rw-r--r-- | patches/procps_ng-3.3.17.local.patch | 215 | ||||
-rw-r--r-- | patches/procps_ng-4.0.4.local.patch | 124 | ||||
-rw-r--r-- | patches/xpdf-4.03_pre.local.patch | 81 |
13 files changed, 212 insertions, 396 deletions
diff --git a/patches/bash-5.2.21_pre.local.patch b/patches/bash-5.2.32_pre.local.patch index 677e7d9c..677e7d9c 100644 --- a/patches/bash-5.2.21_pre.local.patch +++ b/patches/bash-5.2.32_pre.local.patch diff --git a/patches/bash_minipix-5.2.21_pre.local.patch b/patches/bash_minipix-5.2.21_pre.local.patch deleted file mode 120000 index 41db15fb..00000000 --- a/patches/bash_minipix-5.2.21_pre.local.patch +++ /dev/null @@ -1 +0,0 @@ -bash-5.2.21_pre.local.patch
\ No newline at end of file diff --git a/patches/bash_minipix-5.2.32_pre.local.patch b/patches/bash_minipix-5.2.32_pre.local.patch new file mode 120000 index 00000000..a76a84e8 --- /dev/null +++ b/patches/bash_minipix-5.2.32_pre.local.patch @@ -0,0 +1 @@ +bash-5.2.32_pre.local.patch
\ No newline at end of file diff --git a/patches/coreutils/uptime.patch b/patches/coreutils/uptime.patch deleted file mode 100644 index 2f2edcc0..00000000 --- a/patches/coreutils/uptime.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ru coreutils-9.1.orig/src/uptime.c coreutils-9.1/src/uptime.c ---- coreutils-9.1.orig/src/uptime.c 2022-04-08 13:22:18.000000000 +0200 -+++ coreutils-9.1/src/uptime.c 2023-09-06 12:26:22.909930119 +0200 -@@ -30,6 +30,11 @@ - # include <OS.h> - #endif - -+#ifdef __midipix__ -+#undef sa_handler -+#include <ntapi/ntapi.h> -+#endif -+ - #include "c-strtod.h" - #include "die.h" - #include "error.h" -@@ -59,6 +64,26 @@ - struct tm *tmn; - double avg[3]; - int loads; -+#ifdef __midipix__ -+ ntapi_vtbl *__ntapi; -+ nt_system_time_of_day_information stodi; -+ -+ if((ntapi_init(&__ntapi)) == 0) -+ { -+ char buf[BUFSIZ]; -+ long long nt_time; -+ __ntapi->zw_query_system_information(NT_SYSTEM_TIME_OF_DAY_INFORMATION, &stodi, sizeof(stodi), NULL); -+ nt_time = (stodi.current_time.quad - stodi.boot_time.quad) / 100000ULL; -+ sprintf(buf, "%u.%02u", nt_time / 100, nt_time % 100); -+ { -+ char *end_ptr; -+ double upsecs = c_strtod (buf, &end_ptr); -+ if (buf != end_ptr) -+ uptime = (0 <= upsecs && upsecs < TYPE_MAXIMUM (time_t) -+ ? upsecs : -1); -+ } -+ } -+#endif - #ifdef HAVE_PROC_UPTIME - FILE *fp; - diff --git a/patches/fetchmail-6.4.0.beta4.local.patch b/patches/fetchmail-6.4.0.beta4.local.patch deleted file mode 100644 index 130ab575..00000000 --- a/patches/fetchmail-6.4.0.beta4.local.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru fetchmail-6.4.0.beta4.orig/socket.c fetchmail-6.4.0.beta4/socket.c ---- fetchmail-6.4.0.beta4.orig/socket.c 2018-06-06 01:57:00.000000000 +0200 -+++ fetchmail-6.4.0.beta4/socket.c 2021-09-22 09:50:13.654463039 +0200 -@@ -885,8 +885,8 @@ - return ret; - } - --#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x1010000fL --/* OSSL_proto_version_logic for OpenSSL 1.0.x and LibreSSL */ -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL -+/* OSSL_proto_version_logic for OpenSSL 1.0.x */ - static int OSSL10X_proto_version_logic(int sock, const char **myproto, int *avoid_ssl_versions) - { - if (!*myproto) { diff --git a/patches/fetchmail-6.4.39_pre.local.patch b/patches/fetchmail-6.4.39_pre.local.patch new file mode 100644 index 00000000..bc2f8c74 --- /dev/null +++ b/patches/fetchmail-6.4.39_pre.local.patch @@ -0,0 +1,30 @@ +diff -ru fetchmail-6.4.39.orig/configure fetchmail-6.4.39/configure +--- fetchmail-6.4.39.orig/configure 2024-07-20 11:34:52.000000000 +0200 ++++ fetchmail-6.4.39/configure 2024-08-09 11:53:47.808214122 +0200 +@@ -13349,8 +13349,8 @@ + with_wolfssl="$(${_WOLFSSLCONF} --prefix)" + fi + if "$_WOLFSSLCONF" >/dev/null 2>&1 --version ; then +- wolfCFLAGS="$(${_WOLFSSLCONF} --cflags)" +- wolfLIBS="$(${_WOLFSSLCONF} --libs)" ++ wolfCFLAGS="$($PKG_CONFIG --cflags wolfssl)" ++ wolfLIBS="$($PKG_CONFIG --libs wolfssl)" + elif test -d "${with_wolfssl}/include" -a -d "${with_wolfssl}/lib" ; then + wolfCFLAGS="-I${with_wolfssl}/include" + wolfLIBS="-L${with_wolfssl}/lib -lwolfssl -lpthread" +diff -ru fetchmail-6.4.39.orig/fetchmail.c fetchmail-6.4.39/fetchmail.c +--- fetchmail-6.4.39.orig/fetchmail.c 2024-01-31 20:54:42.000000000 +0100 ++++ fetchmail-6.4.39/fetchmail.c 2024-08-09 11:34:11.836359108 +0200 +@@ -314,9 +314,11 @@ + "Run-time uses SSL library %#lx \"%s\"\n"), + OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + OpenSSL_version_num(), OpenSSL_version(OPENSSL_VERSION)); ++#ifndef USING_WOLFSSL + printf(GT_("OpenSSL: %s\nEngines: %s\n"), + OpenSSL_version(OPENSSL_DIR), + OpenSSL_version(OPENSSL_ENGINES_DIR)); ++#endif + # if !HAVE_DECL_TLS1_3_VERSION || defined(OPENSSL_NO_TLS1_3) + printf(GT_("WARNING: Your SSL/TLS library does not support TLS v1.3.\n")); + # endif +Only in fetchmail-6.4.39: fetchmail.c.orig diff --git a/patches/iperf-3.17.1.local.patch b/patches/iperf-3.17.1.local.patch new file mode 100644 index 00000000..35e28260 --- /dev/null +++ b/patches/iperf-3.17.1.local.patch @@ -0,0 +1,32 @@ +diff -ru iperf-3.17.1.orig/src/iperf_api.h iperf-3.17.1/src/iperf_api.h +--- iperf-3.17.1.orig/src/iperf_api.h 2024-05-13 20:40:55.000000000 +0200 ++++ iperf-3.17.1/src/iperf_api.h 2024-07-02 20:05:03.818580250 +0200 +@@ -44,7 +44,7 @@ + #include <stdatomic.h> + #else + #warning "No <stdatomic.h> available" +-typedef u_int64_t atomic_uint_fast64_t; ++typedef uint64_t atomic_uint_fast64_t; + #endif // HAVE_STDATOMIC_H + + struct iperf_test; +diff -ru iperf-3.17.1.orig/src/main.c iperf-3.17.1/src/main.c +--- iperf-3.17.1.orig/src/main.c 2024-05-13 20:40:55.000000000 +0200 ++++ iperf-3.17.1/src/main.c 2024-07-02 20:04:06.908582670 +0200 +@@ -65,15 +65,6 @@ + * know how to check this on GCC. GCC on CentOS 7 / RHEL 7 is the + * targeted use case for these check. + */ +-#ifndef HAVE_STDATOMIC_H +-#ifdef __GNUC__ +- if (! __atomic_always_lock_free (sizeof (u_int64_t), 0)) { +-#endif // __GNUC__ +- fprintf(stderr, "Warning: Cannot guarantee lock-free operation with 64-bit data types\n"); +-#ifdef __GNUC__ +- } +-#endif // __GNUC__ +-#endif // HAVE_STDATOMIC_H + + // XXX: Setting the process affinity requires root on most systems. + // Is this a feature we really need? +Only in iperf-3.17.1/src: main.c.orig diff --git a/patches/lighttpd-1.4.76.local.patch b/patches/lighttpd-1.4.76.local.patch deleted file mode 100644 index 50a2ce94..00000000 --- a/patches/lighttpd-1.4.76.local.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- lighttpd-1.4.45/src/network.c.orig 2017-01-14 05:05:17.000000000 +0000 -+++ lighttpd-1.4.45/src/network.c 2018-02-17 20:39:33.920000000 +0000 -@@ -53,6 +53,7 @@ - void - network_accept_tcp_nagle_disable (const int fd) - { -+#ifndef __midipix__ - static int noinherit_tcpnodelay = -1; - int opt; - -@@ -70,6 +71,7 @@ - - opt = 1; - (void)setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt)); -+#endif - } - - static handler_t network_server_handle_fdevent(server *srv, void *context, int revents) { diff --git a/patches/ltris-1.2.2_pre.local.patch b/patches/ltris-1.2.2_pre.local.patch deleted file mode 100644 index 9d7be779..00000000 --- a/patches/ltris-1.2.2_pre.local.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru ltris-1.2.2.orig/configure ltris-1.2.2/configure ---- ltris-1.2.2.orig/configure 2020-12-28 12:58:30.000000000 +0100 -+++ ltris-1.2.2/configure 2021-01-12 16:47:35.063828462 +0100 -@@ -9089,8 +9089,8 @@ - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes - else -- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+ SDL_CFLAGS=`$PKG_CONFIG --cflags sdl` -+ SDL_LIBS=`$PKG_CONFIG --libs sdl` - - sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -@@ -9249,8 +9249,8 @@ - - rm -f conf.sdltest - --CFLAGS="$CFLAGS $(sdl-config --cflags)" --LIBS="$LIBS $(sdl-config --libs)" -+CFLAGS="$CFLAGS $(PKG_CONFIG --cflags sdl)" -+LIBS="$LIBS $(PKG_CONFIG --libs sdl)" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lSDL_mixer" >&5 - $as_echo_n "checking for main in -lSDL_mixer... " >&6; } diff --git a/patches/ltris-1.3.2_pre.local.patch b/patches/ltris-1.3.2_pre.local.patch new file mode 100644 index 00000000..21285879 --- /dev/null +++ b/patches/ltris-1.3.2_pre.local.patch @@ -0,0 +1,25 @@ +diff -ru ltris-1.3.2.orig/configure ltris-1.3.2/configure +--- ltris-1.3.2.orig/configure 2024-06-08 11:24:48.000000000 +0200 ++++ ltris-1.3.2/configure 2024-08-09 10:45:55.135090962 +0200 +@@ -7320,8 +7320,8 @@ + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes + else +- SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` +- SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` ++ SDL_CFLAGS=`$PKG_CONFIG --cflags sdl` ++ SDL_LIBS=`$PKG_CONFIG --libs sdl` + + sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +@@ -7514,8 +7514,8 @@ + + else + +- CFLAGS="$CFLAGS $($SDL_CONFIG --cflags)" +- LIBS="$LIBS $($SDL_CONFIG --libs)" ++ CFLAGS="$CFLAGS $($PKG_CONFIG --cflags sdl)" ++ LIBS="$LIBS $($PKG_CONFIG --libs sdl)" + + fi + diff --git a/patches/procps_ng-3.3.17.local.patch b/patches/procps_ng-3.3.17.local.patch deleted file mode 100644 index d4f8119d..00000000 --- a/patches/procps_ng-3.3.17.local.patch +++ /dev/null @@ -1,215 +0,0 @@ -diff -ru procps-3.3.17.orig/lib/nsutils.c procps-3.3.17/lib/nsutils.c ---- procps-3.3.17.orig/lib/nsutils.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/lib/nsutils.c 2022-11-07 00:01:25.779153614 +0100 -@@ -16,7 +16,7 @@ - int i, rc = 0; - - for (i = 0; i < NUM_NS; i++) { -- snprintf(buff, sizeof(buff), "/proc/%i/ns/%s", pid, -+ snprintf(buff, sizeof(buff), "/proc/sysproc/%i/ns/%s", pid, - get_ns_name(i)); - if (stat(buff, &st)) { - if (errno != ENOENT) -diff -ru procps-3.3.17.orig/pidof.c procps-3.3.17/pidof.c ---- procps-3.3.17.orig/pidof.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/pidof.c 2022-11-07 00:01:45.927153736 +0100 -@@ -117,7 +117,7 @@ - ssize_t path_alloc_size; - ssize_t len; - -- snprintf(link, sizeof(link), "/proc/%d/%s", pid, base_name); -+ snprintf(link, sizeof(link), "/proc/sysproc/%d/%s", pid, base_name); - - len = path_alloc_size = 0; - result = NULL; -diff -ru procps-3.3.17.orig/pmap.c procps-3.3.17/pmap.c ---- procps-3.3.17.orig/pmap.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/pmap.c 2022-11-07 00:02:54.791154154 +0100 -@@ -539,11 +539,11 @@ - printf("%u: %s\n", p->tgid, cmdbuf); - - if (x_option || X_option || c_option) { -- snprintf(buf, sizeof buf, "/proc/%u/smaps", p->tgid); -+ snprintf(buf, sizeof buf, "/proc/sysproc/%u/smaps", p->tgid); - if ((fp = fopen(buf, "r")) == NULL) - return 1; - } else { -- snprintf(buf, sizeof buf, "/proc/%u/maps", p->tgid); -+ snprintf(buf, sizeof buf, "/proc/sysproc/%u/maps", p->tgid); - if ((fp = fopen(buf, "r")) == NULL) - return 1; - } -diff -ru procps-3.3.17.orig/proc/devname.c procps-3.3.17/proc/devname.c ---- procps-3.3.17.orig/proc/devname.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/proc/devname.c 2022-11-06 23:54:22.462970842 +0100 -@@ -289,7 +289,7 @@ - struct stat sbuf; - char path[32]; - ssize_t count; -- const int len = snprintf(path, sizeof path, "/proc/%d/%s", pid, name); /* often permission denied */ -+ const int len = snprintf(path, sizeof path, "/proc/sysproc/%d/%s", pid, name); /* often permission denied */ - if(len <= 0 || (size_t)len >= sizeof path) return 0; - count = readlink(path,buf,TTY_NAME_SIZE-1); - if(count <= 0 || count >= TTY_NAME_SIZE-1) return 0; -diff -ru procps-3.3.17.orig/proc/escape.c procps-3.3.17/proc/escape.c ---- procps-3.3.17.orig/proc/escape.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/proc/escape.c 2022-11-04 15:46:20.305190037 +0100 -@@ -21,6 +21,7 @@ - #include <sys/types.h> - #include <string.h> - #include <limits.h> -+#include <langinfo.h> - #include "procps.h" - #include "escape.h" - #include "readproc.h" -diff -ru procps-3.3.17.orig/proc/readproc.c procps-3.3.17/proc/readproc.c ---- procps-3.3.17.orig/proc/readproc.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/proc/readproc.c 2022-11-06 23:57:14.382411315 +0100 -@@ -883,7 +883,7 @@ - // warning: interface may change - int read_cmdline(char *restrict const dst, unsigned sz, unsigned pid) { - char path[PROCPATHLEN]; -- snprintf(path, sizeof(path), "/proc/%u", pid); -+ snprintf(path, sizeof(path), "/proc/sysproc/%u", pid); - return read_unvectored(dst, sz, path, "cmdline", ' '); - } - -@@ -1239,7 +1239,7 @@ - } - p->tgid = strtoul(ent->d_name, NULL, 10); - p->tid = p->tgid; -- snprintf(path, PROCPATHLEN, "/proc/%s", ent->d_name); -+ snprintf(path, PROCPATHLEN, "/proc/sysproc/%s", ent->d_name); - return 1; - } - -@@ -1253,7 +1253,7 @@ - closedir(PT->taskdir); - } - // use "path" as some tmp space -- snprintf(path, PROCPATHLEN, "/proc/%d/task", p->tgid); -+ snprintf(path, PROCPATHLEN, "/proc/sysproc/%d/task", p->tgid); - PT->taskdir = opendir(path); - if(!PT->taskdir) return 0; - PT->taskdir_user = p->tgid; -@@ -1266,7 +1266,7 @@ - t->tid = strtoul(ent->d_name, NULL, 10); - t->tgid = p->tgid; - //t->ppid = p->ppid; // cover for kernel behavior? we want both actually...? -- snprintf(path, PROCPATHLEN, "/proc/%d/task/%s", p->tgid, ent->d_name); -+ snprintf(path, PROCPATHLEN, "/proc/sysproc/%d/task/%s", p->tgid, ent->d_name); - return 1; - } - -@@ -1277,7 +1277,7 @@ - char *restrict const path = PT->path; - pid_t tgid = *(PT->pids)++; - if(likely(tgid)){ -- snprintf(path, PROCPATHLEN, "/proc/%d", tgid); -+ snprintf(path, PROCPATHLEN, "/proc/sysproc/%d", tgid); - p->tgid = tgid; - p->tid = tgid; // they match for leaders - } -@@ -1677,7 +1677,7 @@ - static char path[32]; - struct stat statbuf; - -- snprintf(path, sizeof path, "/proc/%d", pid); -+ snprintf(path, sizeof path, "/proc/sysproc/%d", pid); - if (stat(path, &statbuf)) { - perror("stat"); - return NULL; -diff -ru procps-3.3.17.orig/proc/sysinfo.c procps-3.3.17/proc/sysinfo.c ---- procps-3.3.17.orig/proc/sysinfo.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/proc/sysinfo.c 2022-11-06 23:53:23.999176866 +0100 -@@ -488,7 +488,7 @@ - char c; - - if (!isdigit(ent->d_name[0])) continue; -- snprintf(tbuf, sizeof(tbuf), "/proc/%s/stat", ent->d_name); -+ snprintf(tbuf, sizeof(tbuf), "/proc/sysproc/%s/stat", ent->d_name); - - fd = open(tbuf, O_RDONLY, 0); - if (fd == -1) continue; -diff -ru procps-3.3.17.orig/proc/wchan.c procps-3.3.17/proc/wchan.c ---- procps-3.3.17.orig/proc/wchan.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/proc/wchan.c 2022-11-06 23:55:15.750410595 +0100 -@@ -32,7 +32,7 @@ - ssize_t num; - int fd; - -- snprintf(buf, sizeof buf, "/proc/%d/wchan", pid); -+ snprintf(buf, sizeof buf, "/proc/sysproc/%d/wchan", pid); - fd = open(buf, O_RDONLY); - if (fd==-1) return "?"; - -diff -ru procps-3.3.17.orig/ps/output.c procps-3.3.17/ps/output.c ---- procps-3.3.17.orig/ps/output.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/ps/output.c 2022-11-06 23:59:52.026412271 +0100 -@@ -1229,7 +1229,7 @@ - int fd; - u_int32_t luid; - -- snprintf(filename, sizeof filename, "/proc/%d/loginuid", pp->tgid); -+ snprintf(filename, sizeof filename, "/proc/sysproc/%d/loginuid", pp->tgid); - - if ((fd = open(filename, O_RDONLY, 0)) != -1) { - num_read = read(fd, outbuf, OUTBUF_SIZE - 1); -@@ -1255,7 +1255,7 @@ - char filename[48]; - ssize_t num_read; - -- snprintf(filename, sizeof filename, "/proc/%d/exe", pp->tgid); -+ snprintf(filename, sizeof filename, "/proc/sysproc/%d/exe", pp->tgid); - - num_read = readlink(filename, outbuf, OUTBUF_SIZE-1); - if (num_read > 0) { -@@ -1371,7 +1371,7 @@ - - // wchan file is suitable for testing - //snprintf(filename, sizeof filename, "/proc/%d/wchan", pp->tgid); -- snprintf(filename, sizeof filename, "/proc/%d/attr/current", pp->tgid); -+ snprintf(filename, sizeof filename, "/proc/sysproc/%d/attr/current", pp->tgid); - - if ((fd = open(filename, O_RDONLY, 0)) != -1) { - num_read = read(fd, outbuf, OUTBUF_SIZE-1); -diff -ru procps-3.3.17.orig/pwdx.c procps-3.3.17/pwdx.c ---- procps-3.3.17.orig/pwdx.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/pwdx.c 2022-11-07 00:00:51.339153405 +0100 -@@ -118,7 +118,7 @@ - * the first char is possible - */ - if (argv[i][0] != '/') -- snprintf(buf, buflen, "/proc/%s/cwd", argv[i]); -+ snprintf(buf, buflen, "/proc/sysproc/%s/cwd", argv[i]); - else - snprintf(buf, buflen, "%s/cwd", argv[i]); - -diff -ru procps-3.3.17.orig/skill.c procps-3.3.17/skill.c ---- procps-3.3.17.orig/skill.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/skill.c 2022-11-07 00:00:34.811153304 +0100 -@@ -181,7 +181,7 @@ - if (pid == my_pid || pid == 0) - return; - /* pid (cmd) state ppid pgrp session tty */ -- sprintf(buf, "/proc/%d/stat", pid); -+ sprintf(buf, "/proc/sysproc/%d/stat", pid); - fd = open(buf, O_RDONLY); - if (fd == -1) { - /* process exited maybe */ -diff -ru procps-3.3.17.orig/w.c procps-3.3.17/w.c ---- procps-3.3.17.orig/w.c 2021-02-09 11:11:25.000000000 +0100 -+++ procps-3.3.17/w.c 2022-11-04 15:46:20.305190037 +0100 -@@ -55,11 +55,7 @@ - #include <termios.h> - #include <time.h> - #include <unistd.h> --#ifdef HAVE_UTMPX_H --# include <utmpx.h> --#else --# include <utmp.h> --#endif -+#include <utmp.h> - #include <arpa/inet.h> - - static int ignoreuser = 0; /* for '-u' */ diff --git a/patches/procps_ng-4.0.4.local.patch b/patches/procps_ng-4.0.4.local.patch new file mode 100644 index 00000000..37fb117a --- /dev/null +++ b/patches/procps_ng-4.0.4.local.patch @@ -0,0 +1,124 @@ +diff -ru procps-ng-4.0.4.orig/library/devname.c procps-ng-4.0.4/library/devname.c +--- procps-ng-4.0.4.orig/library/devname.c 2023-07-11 11:09:18.436786212 +0200 ++++ procps-ng-4.0.4/library/devname.c 2024-08-13 11:40:55.012140114 +0200 +@@ -287,7 +287,7 @@ + struct stat sbuf; + char path[32]; + ssize_t count; +- const int len = snprintf(path, sizeof path, "/proc/%d/%s", pid, name); /* often permission denied */ ++ const int len = snprintf(path, sizeof path, "/proc/sysproc/%d/%s", pid, name); /* often permission denied */ + if(len <= 0 || (size_t)len >= sizeof path) return 0; + count = readlink(path,buf,TTY_NAME_SIZE-1); + if(count <= 0 || count >= TTY_NAME_SIZE-1) return 0; +@@ -305,7 +305,7 @@ + char path[32]; + FILE *fp; + char *lf; +- sprintf (path, "/proc/%d/ctty", pid); /* often permission denied */ ++ sprintf (path, "/proc/sysproc/%d/ctty", pid); /* often permission denied */ + fp = fopen (path, "r"); + if (!fp) + return 0; +diff -ru procps-ng-4.0.4.orig/library/readproc.c procps-ng-4.0.4/library/readproc.c +--- procps-ng-4.0.4.orig/library/readproc.c 2023-07-11 11:09:18.436786212 +0200 ++++ procps-ng-4.0.4/library/readproc.c 2024-08-13 11:38:26.689488350 +0200 +@@ -1389,7 +1389,7 @@ + p->tgid = strtoul(ent->d_name, NULL, 10); + if (errno == 0) { + p->tid = p->tgid; +- snprintf(path, PROCPATHLEN, "/proc/%d", p->tgid); ++ snprintf(path, PROCPATHLEN, "/proc/sysproc/%d", p->tgid); + return 1; + } + } +@@ -1408,7 +1408,7 @@ + closedir(PT->taskdir); + } + // use "path" as some tmp space +- snprintf(path, PROCPATHLEN, "/proc/%d/task", p->tgid); ++ snprintf(path, PROCPATHLEN, "/proc/sysproc/%d/task", p->tgid); + PT->taskdir = opendir(path); + if(!PT->taskdir) return 0; + PT->taskdir_user = p->tgid; +@@ -1421,7 +1421,7 @@ + t->tid = strtoul(ent->d_name, NULL, 10); + t->tgid = p->tgid; + //t->ppid = p->ppid; // cover for kernel behavior? we want both actually...? +- snprintf(path, PROCPATHLEN, "/proc/%d/task/%.10s", p->tgid, ent->d_name); ++ snprintf(path, PROCPATHLEN, "/proc/sysproc/%d/task/%.10s", p->tgid, ent->d_name); + return 1; + } + +@@ -1435,7 +1435,7 @@ + char *path = PT->path; + + if (pid) { +- snprintf(path, PROCPATHLEN, "/proc/%d", pid); ++ snprintf(path, PROCPATHLEN, "/proc/sysproc/%d", pid); + p->tid = p->tgid = pid; // this tgid may be a huge fib | + + /* the 'status' directory is the only place where we find the | +diff -ru procps-ng-4.0.4.orig/src/pidof.c procps-ng-4.0.4/src/pidof.c +--- procps-ng-4.0.4.orig/src/pidof.c 2023-08-15 13:02:25.783784823 +0200 ++++ procps-ng-4.0.4/src/pidof.c 2024-08-13 11:31:47.634655407 +0200 +@@ -124,7 +124,7 @@ + ssize_t path_alloc_size; + ssize_t len; + +- snprintf(link, sizeof(link), "/proc/%d/%s", pid, base_name); ++ snprintf(link, sizeof(link), "/proc/sysproc/%d/%s", pid, base_name); + + len = path_alloc_size = 0; + result = NULL; +diff -ru procps-ng-4.0.4.orig/src/pmap.c procps-ng-4.0.4/src/pmap.c +--- procps-ng-4.0.4.orig/src/pmap.c 2023-08-15 12:43:38.772140122 +0200 ++++ procps-ng-4.0.4/src/pmap.c 2024-08-13 11:28:36.375534274 +0200 +@@ -554,11 +554,11 @@ + printf("%u: %s\n", PIDS_VAL(tgid, s_int, p, Pids_info), PIDS_VAL(cmdline, str, p, Pids_info)); + + if (x_option || X_option || c_option) { +- snprintf(buf, sizeof buf, "/proc/%u/smaps", PIDS_VAL(tgid, s_int, p, Pids_info)); ++ snprintf(buf, sizeof buf, "/proc/sysproc/%u/smaps", PIDS_VAL(tgid, s_int, p, Pids_info)); + if ((fp = fopen(buf, "r")) == NULL) + return 1; + } else { +- snprintf(buf, sizeof buf, "/proc/%u/maps", PIDS_VAL(tgid, s_int, p, Pids_info)); ++ snprintf(buf, sizeof buf, "/proc/sysproc/%u/maps", PIDS_VAL(tgid, s_int, p, Pids_info)); + if ((fp = fopen(buf, "r")) == NULL) + return 1; + } +diff -ru procps-ng-4.0.4.orig/src/ps/global.c procps-ng-4.0.4/src/ps/global.c +--- procps-ng-4.0.4.orig/src/ps/global.c 2023-08-16 00:54:03.759538026 +0200 ++++ procps-ng-4.0.4/src/ps/global.c 2024-08-13 11:25:38.536358536 +0200 +@@ -176,7 +176,7 @@ + const char *bsd_v_format = (const char *)0xdeadbeef; + int bsd_c_option = -1; + int bsd_e_option = -1; +-unsigned cached_euid = 0xffffffff; ++uid_t cached_euid = 0xffffffff; + int cached_tty = -1; + char forest_prefix[4 * 32*1024 + 100]; // FIXME + int forest_type = -1; +diff -ru procps-ng-4.0.4.orig/src/pwdx.c procps-ng-4.0.4/src/pwdx.c +--- procps-ng-4.0.4.orig/src/pwdx.c 2023-07-11 11:09:18.464787022 +0200 ++++ procps-ng-4.0.4/src/pwdx.c 2024-08-13 11:31:25.734756041 +0200 +@@ -53,8 +53,8 @@ + long pid; + char *end = NULL; + +- if (!strncmp("/proc/", input, 6)) +- skip = 6; ++ if (!strncmp("/proc/sysproc/", input, 14)) ++ skip = 14; + errno = 0; + pid = strtol(input + skip, &end, 10); + +@@ -122,7 +122,7 @@ + * the first char is possible + */ + if (argv[i][0] != '/') +- snprintf(buf, buflen, "/proc/%s/cwd", argv[i]); ++ snprintf(buf, buflen, "/proc/sysproc/%s/cwd", argv[i]); + else + snprintf(buf, buflen, "%s/cwd", argv[i]); + diff --git a/patches/xpdf-4.03_pre.local.patch b/patches/xpdf-4.03_pre.local.patch deleted file mode 100644 index 4f329f68..00000000 --- a/patches/xpdf-4.03_pre.local.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -ru xpdf-4.03.orig/cmake-config.txt xpdf-4.03/cmake-config.txt ---- xpdf-4.03.orig/cmake-config.txt 2021-01-27 23:23:51.000000000 +0100 -+++ xpdf-4.03/cmake-config.txt 2021-07-21 21:24:10.085991109 +0200 -@@ -208,63 +208,6 @@ - find_package(PNG) - - -- -- --#--- look for Qt --find_package(Qt5Widgets QUIET) --if (Qt5Widgets_FOUND) -- find_package(Qt5Network) -- find_package(Qt5PrintSupport) --else () -- find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork) --endif () --if(Qt5Widgets_FOUND) -- message(STATUS "Qt5 found") -- if (XPDFWIDGET_PRINTING) -- set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5PrintSupport_INCLUDE_DIRS}") -- set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS}") -- set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport) -- else () -- set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}") -- set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS}") -- set(QT_LIBRARIES Qt5::Widgets Qt5::Network) -- endif () -- if (XPDFWIDGET_PRINTING) -- if (APPLE) -- set(EXTRA_QT_LIBRARIES "-framework ApplicationServices") -- elseif (UNIX) -- find_package(Cups) -- if (CUPS_FOUND) -- set(EXTRA_QT_LIBRARIES ${CUPS_LIBRARIES}) -- else () -- set (XPDFWIDGET_PRINTING OFF) -- endif () -- else () -- set(EXTRA_QT_LIBRARIES "") -- endif () -- endif () -- # remove "-fPIE" here because we added "-fPIC" above -- string(REPLACE "-fPIE" "" QT_CFLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") --elseif(QT4_FOUND) -- message(STATUS "Qt4 found") -- if (XPDFWIDGET_PRINTING) -- if (APPLE) -- set(EXTRA_QT_LIBRARIES "-framework ApplicationServices") -- elseif (UNIX) -- find_package(Cups) -- if (CUPS_FOUND) -- set(EXTRA_QT_LIBRARIES ${CUPS_LIBRARIES}) -- else () -- set (XPDFWIDGET_PRINTING OFF) -- endif () -- else () -- set(EXTRA_QT_LIBRARIES "") -- endif () -- endif () --else() -- message(STATUS "No Qt library found") --endif() -- - #--- look for libpaper - find_library(PAPER_LIBRARY - NAMES paper libpaper -diff -ru xpdf-4.02.orig/CMakeLists.txt xpdf-4.02/CMakeLists.txt ---- xpdf-4.02.orig/CMakeLists.txt 2019-09-25 21:54:33.000000000 +0200 -+++ xpdf-4.02/CMakeLists.txt 2020-07-03 18:16:19.639269162 +0200 -@@ -28,10 +28,6 @@ - message(WARNING "Couldn't find libpng -- will not build pdftopng or pdftohtml.") - endif () - --if (NOT QT4_FOUND AND NOT Qt5Widgets_FOUND) -- message(WARNING "Couldn't find Qt4 or Qt5 -- will not build xpdf.") --endif () -- - if (NOT MULTITHREADED) - message(WARNING "Multithreading is disabled -- will not build xpdf.") - endif () |