diff options
32 files changed, 269 insertions, 431 deletions
diff --git a/groups.d/010.host_deps.d/expat_host.package b/groups.d/010.host_deps.d/expat_host.package index 41d5ef27..5a4dfbda 100644 --- a/groups.d/010.host_deps.d/expat_host.package +++ b/groups.d/010.host_deps.d/expat_host.package @@ -1,5 +1,5 @@ -: ${PKG_EXPAT_HOST_SHA256SUM:=cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e}; -: ${PKG_EXPAT_HOST_VERSION:=2.6.0}; +: ${PKG_EXPAT_HOST_SHA256SUM:=ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364}; +: ${PKG_EXPAT_HOST_VERSION:=2.6.2}; : ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.xz}; : ${PKG_EXPAT_HOST_CONFIGURE_ARGS_EXTRA:="--without-docbook"}; : ${PKG_EXPAT_HOST_CONFIGURE_TYPE:="autotools"}; diff --git a/groups.d/010.host_deps.d/file_host.package b/groups.d/010.host_deps.d/file_host.package index 4a0fb614..74108712 100644 --- a/groups.d/010.host_deps.d/file_host.package +++ b/groups.d/010.host_deps.d/file_host.package @@ -1,7 +1,7 @@ : ${PKG_FILE_HOST_SHA256SUM:=fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82}; : ${PKG_FILE_HOST_VERSION:=5.45}; : ${PKG_FILE_HOST_URL:=http://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz}; -: ${PKG_FILE_HOST_CONFIGURE_ARGS_EXTRA:="--disable-xzlib"}; +: ${PKG_FILE_HOST_CONFIGURE_ARGS_EXTRA:="--disable-xzlib --disable-libseccomp"}; ex_pkg_register "file_host" "${RTL_FILEOP_SOURCE_FNAME}" "host_deps"; diff --git a/groups.d/010.host_deps.d/perl_host.package b/groups.d/010.host_deps.d/perl_host.package new file mode 100644 index 00000000..53204211 --- /dev/null +++ b/groups.d/010.host_deps.d/perl_host.package @@ -0,0 +1,11 @@ +: ${PKG_PERL_HOST_SHA256SUM:=e26085af8ac396f62add8a533c3a0ea8c8497d836f0689347ac5abd7b7a4e00a}; +: ${PKG_PERL_HOST_VERSION:=5.36.0}; +: ${PKG_PERL_HOST_URL:=http://www.cpan.org/src/5.0/perl-${PKG_PERL_HOST_VERSION}.tar.gz}; +: ${PKG_PERL_HOST_CONFIGURE:=perl-${PKG_PERL_HOST_VERSION}/Configure}; +: ${PKG_PERL_HOST_CONFIGURE_ARGS:="-Dprefix=${PREFIX} -d -e"}; +: ${PKG_PERL_HOST_IN_TREE:=1}; +: ${PKG_PERL_HOST_DISABLED:=1}; + +ex_pkg_register "perl_host" "${RTL_FILEOP_SOURCE_FNAME}" "host_deps"; + +# vim:filetype=sh textwidth=0 diff --git a/groups.d/211.native_packages_cmdline.d/bas.package b/groups.d/211.native_packages_cmdline.d/bas.package index 95f10e08..13dcd38f 100644 --- a/groups.d/211.native_packages_cmdline.d/bas.package +++ b/groups.d/211.native_packages_cmdline.d/bas.package @@ -1,9 +1,10 @@ : ${PKG_BAS_DEPENDS:="ncurses"}; -: ${PKG_BAS_SHA256SUM:=ec45efa90aaa7f15647fe7898fa0789ba26dc8e10b7ecf8e049b1310f626b884}; -: ${PKG_BAS_VERSION:=2.6}; +: ${PKG_BAS_SHA256SUM:=8cf0b8205502817b205b1d49a32cefe6320697b26ce5b732ce496ef3b9e0c920}; +: ${PKG_BAS_VERSION:=2.7}; : ${PKG_BAS_URL:=www.moria.de/~michael/bas/bas-${PKG_BAS_VERSION}.tar.gz}; : ${PKG_BAS_IN_TREE:=1}; : ${PKG_BAS_FORCE_AUTORECONF:=1}; +: ${PKG_BAS_DISABLED:=1}; ex_pkg_register "bas" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/groups.d/211.native_packages_cmdline.d/bash.package b/groups.d/211.native_packages_cmdline.d/bash.package index d910abf5..f1d8f0a1 100644 --- a/groups.d/211.native_packages_cmdline.d/bash.package +++ b/groups.d/211.native_packages_cmdline.d/bash.package @@ -1,6 +1,6 @@ : ${PKG_BASH_DEPENDS:="ncurses"}; -: ${PKG_BASH_SHA256SUM:=c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8}; -: ${PKG_BASH_VERSION:=5.2.21}; +: ${PKG_BASH_SHA256SUM:=d3ef80d2b67d8cbbe4d3265c63a72c46f9b278ead6e0e06d61801b58f23f50b5}; +: ${PKG_BASH_VERSION:=5.2.32}; : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz}; : ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--without-bash-malloc --with-curses"}; : ${PKG_BASH_MAKEFLAGS_PARALLELISE:="-j1"}; diff --git a/groups.d/211.native_packages_cmdline.d/profanity.package b/groups.d/211.native_packages_cmdline.d/profanity.package index c2d3b1ec..a746ffbb 100644 --- a/groups.d/211.native_packages_cmdline.d/profanity.package +++ b/groups.d/211.native_packages_cmdline.d/profanity.package @@ -1,7 +1,7 @@ : ${PKG_PROFANITY_DEPENDS:="libffi libstrophe libgcrypt libz glib gpgme ncursesw curl readline sqlite3"}; : ${PKG_PROFANITY_SHA256SUM:=23f7b2e5c6cf85913b9e7a228802bca9ecb1d1cf3bf8f8f285e9676176a24902}; : ${PKG_PROFANITY_VERSION:=0.9.5}; -: ${PKG_PROFANITY_URL:=https://profanity-im.github.io/profanity-${PKG_PROFANITY_VERSION}.tar.gz}; +: ${PKG_PROFANITY_URL:=https://profanity-im.github.io/tarballs/profanity-${PKG_PROFANITY_VERSION}.tar.gz}; : ${PKG_PROFANITY_CONFIGURE_ARGS_EXTRA:="--disable-python-plugins --disable-icons-and-clipboard --disable-notifications --disable-pgp"}; ex_pkg_register "profanity" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/groups.d/211.native_packages_cmdline.d/tree.package b/groups.d/211.native_packages_cmdline.d/tree.package index 963631cf..39276d6b 100644 --- a/groups.d/211.native_packages_cmdline.d/tree.package +++ b/groups.d/211.native_packages_cmdline.d/tree.package @@ -1,6 +1,6 @@ : ${PKG_TREE_SHA256SUM:=d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5}; : ${PKG_TREE_VERSION:=2.1.1}; -: ${PKG_TREE_URL:=http://mama.indstate.edu/users/ice/tree/src/tree-${PKG_TREE_VERSION}.tgz}; +: ${PKG_TREE_URL:=https://fossies.org/linux/misc/tree-${PKG_TREE_VERSION}.tgz}; : ${PKG_TREE_CFLAGS_BUILD:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE}"}; : ${PKG_TREE_CFLAGS_BUILD_EXTRA:="-std=c99"}; : ${PKG_TREE_IN_TREE:=1}; diff --git a/groups.d/221.native_packages_dev.d/algol68g.package b/groups.d/221.native_packages_dev.d/algol68g.package index 38d06662..d8fccbdb 100644 --- a/groups.d/221.native_packages_dev.d/algol68g.package +++ b/groups.d/221.native_packages_dev.d/algol68g.package @@ -1,6 +1,6 @@ : ${PKG_ALGOL68G_SHA256SUM:=bd26e3dd89720ace1b003a43ab10247120b556ca106768fe8c829ee7bed6b435}; : ${PKG_ALGOL68G_VERSION:=3.3.24}; -: ${PKG_ALGOL68G_URL:=https://jmvdveer.home.xs4all.nl/algol68g-${PKG_ALGOL68G_VERSION}.tar.gz} +: ${PKG_ALGOL68G_URL:=https://mirror.midipix.org/algol68g/algol68g-${PKG_ALGOL68G_VERSION}.tar.gz} : ${PKG_ALGOL68G_CONFIGURE_ARGS_EXTRA:="--disable-mathlib --disable-plotutils --disable-postgresql --disable-gsl --disable-curl"}; : ${PKG_ALGOL68G_CFLAGS_CONFIGURE_EXTRA:="--sysroot=${PREFIX_NATIVE} -DHAVE_FLT80=1 -DBUILD_UNIX=1"}; diff --git a/groups.d/221.native_packages_dev.d/perl.package b/groups.d/221.native_packages_dev.d/perl.package index 26f99ea8..c1c4e635 100644 --- a/groups.d/221.native_packages_dev.d/perl.package +++ b/groups.d/221.native_packages_dev.d/perl.package @@ -6,7 +6,7 @@ : ${PKG_PERL_CONFIGURE_ARGS:="-A ccflags=-I${PREFIX_NATIVE}/include -Duseshrplib -Darchname=${DEFAULT_TARGET} -Darchlib=/usr/lib/perl5/${PKG_PERL_VERSION}/${DEFAULT_TARGET} -Dsitearch=/usr/lib/perl5/site_perl/${PKG_PERL_VERSION}/${DEFAULT_TARGET} --sysroot=${PREFIX_NATIVE} --target=${DEFAULT_TARGET}"}; : ${PKG_PERL_CFLAGS_CONFIGURE_EXTRA:="-std=gnu99"}; : ${PKG_PERL_ENV_VARS_EXTRA:="TARGET=${DEFAULT_TARGET}"}; -: ${PKG_PERL_MAKEFLAGS_BUILD:="PERL_ARCHIVE_AFTER=${PREFIX}/tmp/perl-native-${DEFAULT_TARGET}/perl-${PKG_PERL_VERSION}/libperl.so OTHERLDFLAGS=--sysroot=${PREFIX_NATIVE}"}; +: ${PKG_PERL_MAKEFLAGS_BUILD:="PERL_ARCHIVE_AFTER=${BUILD_WORKDIR}/perl-native-${DEFAULT_TARGET}/perl-${PKG_PERL_VERSION}/libperl.so OTHERLDFLAGS=--sysroot=${PREFIX_NATIVE}"}; : ${PKG_PERL_MAKEFLAGS_PARALLELISE:="-j1"}; : ${PKG_PERL_INSTALL_FILES_V2:="+%[_subdir]/libperl.so=lib/libperl.so"}; : ${PKG_PERL_SUBDIR:=perl-${PKG_PERL_VERSION}}; diff --git a/groups.d/231.native_packages_etc.d/expat.package b/groups.d/231.native_packages_etc.d/expat.package index f81c7105..97813510 100644 --- a/groups.d/231.native_packages_etc.d/expat.package +++ b/groups.d/231.native_packages_etc.d/expat.package @@ -1,5 +1,5 @@ -: ${PKG_EXPAT_SHA256SUM:=0c00d2760ad12efef6e26efc8b363c8eb28eb8c8de719e46d5bb67b40ba904a3}; -: ${PKG_EXPAT_VERSION:=2.6.1}; +: ${PKG_EXPAT_SHA256SUM:=ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364}; +: ${PKG_EXPAT_VERSION:=2.6.2}; : ${PKG_EXPAT_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_VERSION}.tar.xz}; : ${PKG_EXPAT_CONFIGURE_ARGS_EXTRA:="--with-getrandom --with-sys-getrandom --without-docbook --without-tests"}; diff --git a/groups.d/231.native_packages_etc.d/gdbm.package b/groups.d/231.native_packages_etc.d/gdbm.package index f5fa2507..e3a48f9b 100644 --- a/groups.d/231.native_packages_etc.d/gdbm.package +++ b/groups.d/231.native_packages_etc.d/gdbm.package @@ -1,8 +1,8 @@ : ${PKG_GDBM_DEPENDS:="ncurses"}; -: ${PKG_GDBM_SHA256SUM:=74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd}; -: ${PKG_GDBM_VERSION:=1.23}; +: ${PKG_GDBM_SHA256SUM:=695e9827fdf763513f133910bc7e6cfdb9187943a4fec943e57449723d2b8dbf}; +: ${PKG_GDBM_VERSION:=1.24}; : ${PKG_GDBM_URL:=https://ftp.gnu.org/gnu/gdbm/gdbm-${PKG_GDBM_VERSION}.tar.gz}; -: ${PKG_GDBM_CONFIGURE_ARGS_EXTRA:=--enable-libgdbm-compat}; +: ${PKG_GDBM_CONFIGURE_ARGS_EXTRA:="--enable-libgdbm-compat"}; ex_pkg_register "gdbm" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/groups.d/231.native_packages_etc.d/ltris.package b/groups.d/231.native_packages_etc.d/ltris.package index 3bfc9be2..810389f8 100644 --- a/groups.d/231.native_packages_etc.d/ltris.package +++ b/groups.d/231.native_packages_etc.d/ltris.package @@ -1,7 +1,7 @@ : ${PKG_LTRIS_DEPENDS:="sdl1"}; -: ${PKG_LTRIS_SHA256SUM:=0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8}; -: ${PKG_LTRIS_VERSION:=1.2.3}; -: ${PKG_LTRIS_URL:=https://sources.voidlinux-ppc.org/ltris-${PKG_LTRIS_VERSION}/ltris-${PKG_LTRIS_VERSION}.tar.gz}; +: ${PKG_LTRIS_SHA256SUM:=ff28c55a18c61f28a86ba7f30f13222dfed0f7fbeb492acd95c97de9c659cec9}; +: ${PKG_LTRIS_VERSION:=1.3.2}; +: ${PKG_LTRIS_URL:=https://mirror.midipix.org/ltris/ltris-${PKG_LTRIS_VERSION}.tar.gz}; : ${PKG_LTRIS_CONFIGURE_ARGS_EXTRA:="--with-sdl-prefix=${PREFIX_NATIVE} SDL_LIBS=-L${PREFIX_NATIVE}/lib SDL_CFLAGS=-I${PREFIX_NATIVE}/include"}; : ${PKG_LTRIS_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/SDL -std=gnu99"}; : ${PKG_LTRIS_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib -L${PREFIX_NATIVE}/lib/w32lib"}; diff --git a/groups.d/231.native_packages_etc.d/procps_ng.package b/groups.d/231.native_packages_etc.d/procps_ng.package index ab4c6201..59757fea 100644 --- a/groups.d/231.native_packages_etc.d/procps_ng.package +++ b/groups.d/231.native_packages_etc.d/procps_ng.package @@ -1,10 +1,10 @@ : ${PKG_PROCPS_NG_DEPENDS:="ncurses ncursesw"}; -: ${PKG_PROCPS_NG_SHA256SUM:=4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4}; -: ${PKG_PROCPS_NG_VERSION:=3.3.17}; -: ${PKG_PROCPS_NG_URL:=http://mirror.internode.on.net/pub/slackware/slackware64/source/a/procps-ng/procps-ng-${PKG_PROCPS_NG_VERSION}.tar.xz}; +: ${PKG_PROCPS_NG_SHA256SUM:=22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e}; +: ${PKG_PROCPS_NG_VERSION:=4.0.4}; +: ${PKG_PROCPS_NG_URL:=https://fossies.org/linux/misc/procps-ng-${PKG_PROCPS_NG_VERSION}.tar.xz}; : ${PKG_PROCPS_NG_CONFIGURE_ARGS_EXTRA:="--disable-kill"}; : ${PKG_PROCPS_NG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw}; -: ${PKG_PROCPS_NG_SUBDIR:=procps-${PKG_PROCPS_NG_VERSION}}; +#: ${PKG_PROCPS_NG_SUBDIR:=procps-${PKG_PROCPS_NG_VERSION}}; : ${PKG_PROCPS_NG_IN_TREE:=1}; : ${PKG_PROCPS_NG_MAKEFLAGS_BUILD:="LIBS=-Wl,-lncurses,-ltinfo"}; : ${PKG_PROCPS_NG_FNAME:=procps_ng-${PKG_PROCPS_NG_VERSION}.tar.xz}; diff --git a/groups.d/231.native_packages_etc.d/rpm.package b/groups.d/231.native_packages_etc.d/rpm.package index 4a58ed49..248ab6cb 100644 --- a/groups.d/231.native_packages_etc.d/rpm.package +++ b/groups.d/231.native_packages_etc.d/rpm.package @@ -1,4 +1,4 @@ -: ${PKG_RPM_DEPENDS:="curl file libarchive libgcrypt libz lua popt xz zstd"}; +: ${PKG_RPM_DEPENDS:="curl file libarchive libgcrypt libz lua popt xz zstd sqlite3"}; : ${PKG_RPM_SHA256SUM:=2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a}; : ${PKG_RPM_VERSION:=4.17.0}; : ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2}; diff --git a/groups.d/231.native_packages_etc.d/xpdf.package b/groups.d/231.native_packages_etc.d/xpdf.package index bdd9fe9e..756dfdaf 100644 --- a/groups.d/231.native_packages_etc.d/xpdf.package +++ b/groups.d/231.native_packages_etc.d/xpdf.package @@ -1,11 +1,12 @@ : ${PKG_XPDF_DEPENDS:="fontconfig libz"}; -: ${PKG_XPDF_SHA256SUM:=0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846}; -: ${PKG_XPDF_VERSION:=4.03}; +: ${PKG_XPDF_SHA256SUM:=92707ed5acb6584fbd73f34091fda91365654ded1f31ba72f0970022cf2a5cea}; +: ${PKG_XPDF_VERSION:=4.05}; : ${PKG_XPDF_URL:=https://dl.xpdfreader.com/xpdf-${PKG_XPDF_VERSION}.tar.gz}; : ${PKG_XPDF_CMAKE_ARGS_EXTRA:=" -DFREETYPE_LIBRARY=${PREFIX_NATIVE}/lib/libfreetype.lib.a -DFREETYPE_INCLUDE_DIR_ft2build=${PREFIX_NATIVE}/include/ft2build - -DFONTCONFIG_LIBRARY=${PREFIX_NATIVE}/lib/libfontconfig.lib.a"}; + -DFONTCONFIG_LIBRARY=${PREFIX_NATIVE}/lib/libfontconfig.lib.a + -DCMAKE_CXX_FLAGS=-std=gnu++0x"}; ex_pkg_register "xpdf" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/groups.d/241.native_packages_inet.d/fetchmail.package b/groups.d/241.native_packages_inet.d/fetchmail.package index 7c8c0335..6ff584b6 100644 --- a/groups.d/241.native_packages_inet.d/fetchmail.package +++ b/groups.d/241.native_packages_inet.d/fetchmail.package @@ -1,8 +1,8 @@ -: ${PKG_FETCHMAIL_DEPENDS:="libressl"}; -: ${PKG_FETCHMAIL_SHA256SUM:=c7500bed3b0bb85722f7cf2d980e74a879ac57b13cfd225d278179d671c0f5e8}; -: ${PKG_FETCHMAIL_VERSION:=6.4.0.beta4}; -: ${PKG_FETCHMAIL_URL:=http://krusty.dt.e-technik.tu-dortmund.de/~ma/fetchmail/fetchmail-${PKG_FETCHMAIL_VERSION}.tar.xz}; -: ${PKG_FETCHMAIL_CONFIGURE_ARGS_EXTRA:="--with-kerberos5=no --with-kerberos=no --with-ssl=${PREFIX_NATIVE}"}; +: ${PKG_FETCHMAIL_DEPENDS:="wolfssl"}; +: ${PKG_FETCHMAIL_SHA256SUM:=75109a1f307b538155fa05f5ef298e8298cb4deae95aed24c16b38d36ff0a186}; +: ${PKG_FETCHMAIL_VERSION:=6.4.39}; +: ${PKG_FETCHMAIL_URL:=https://fossies.org/linux/misc/fetchmail-${PKG_FETCHMAIL_VERSION}.tar.xz}; +: ${PKG_FETCHMAIL_CONFIGURE_ARGS_EXTRA:="PYTHON=${PREFIX}/bin/python3 WOLFSSL_TRUST_FILE=/etc/ssl/cert.pem --with-kerberos5=no --with-kerberos=no --with-wolfssl=${PREFIX_NATIVE}"}; ex_pkg_register "fetchmail" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/groups.d/241.native_packages_inet.d/iperf.package b/groups.d/241.native_packages_inet.d/iperf.package new file mode 100644 index 00000000..3d57230d --- /dev/null +++ b/groups.d/241.native_packages_inet.d/iperf.package @@ -0,0 +1,8 @@ +: ${PKG_IPERF_DEPENDS:="libressl"}; +: ${PKG_IPERF_SHA256SUM:=84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa}; +: ${PKG_IPERF_VERSION:=3.17.1}; +: ${PKG_IPERF_URL:=https://github.com/esnet/iperf/releases/download/${PKG_IPERF_VERSION}/iperf-${PKG_IPERF_VERSION}.tar.gz}; + +ex_pkg_register "iperf" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; + +# vim:filetype=sh textwidth=0 diff --git a/groups.d/251.native_packages_lib.d/wolfssl.package b/groups.d/251.native_packages_lib.d/wolfssl.package index b394bd12..1e459711 100644 --- a/groups.d/251.native_packages_lib.d/wolfssl.package +++ b/groups.d/251.native_packages_lib.d/wolfssl.package @@ -1,8 +1,8 @@ : ${PKG_WOLFSSL_DEPENDS:="libz"}; -: ${PKG_WOLFSSL_SHA256SUM:=2de93e8af588ee856fe67a6d7fce23fc1b226b74d710b0e3946bc8061f6aa18f}; -: ${PKG_WOLFSSL_VERSION:=5.7.0}; +: ${PKG_WOLFSSL_SHA256SUM:=0f2ed82e345b833242705bbc4b08a2a2037a33f7bf9c610efae6464f6b10e305}; +: ${PKG_WOLFSSL_VERSION:=5.7.2}; : ${PKG_WOLFSSL_URL:=https://github.com/wolfSSL/wolfssl/archive/v${PKG_WOLFSSL_VERSION}-stable.tar.gz}; -: ${PKG_WOLFSSL_CONFIGURE_ARGS_EXTRA:="--enable-distro --disable-examples --enable-reproducible-build --enable-ed25519 --enable-ed25519-stream --with-libz=${PREFIX_NATIVE}"}; +: ${PKG_WOLFSSL_CONFIGURE_ARGS_EXTRA:="--disable-option-checking --enable-distro --disable-examples --enable-reproducible-build --enable-ed25519 --enable-ed25519-stream --with-libz=${PREFIX_NATIVE}"}; : ${PKG_WOLFSSL_SUBDIR:=wolfssl-${PKG_WOLFSSL_VERSION}-stable}; : ${PKG_WOLFSSL_INSTALL_FILES_V2:=" +../obj/wolfssl/options.h=include/wolfssl/%[FNAME]"}; diff --git a/groups.d/261.native_packages_x11.d/xterm.package b/groups.d/261.native_packages_x11.d/xterm.package index ada1db40..27eab409 100644 --- a/groups.d/261.native_packages_x11.d/xterm.package +++ b/groups.d/261.native_packages_x11.d/xterm.package @@ -4,6 +4,7 @@ : ${PKG_XTERM_URL:=ftp://ftp.invisible-island.net/xterm/xterm-${PKG_XTERM_VERSION}.tgz}; : ${PKG_XTERM_CONFIGURE_ARGS_EXTRA:="--disable-setuid --disable-setgid --disable-full-tgetent --enable-ansi-color --enable-88-color --enable-256-color --enable-broken-osc --enable-broken-st --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-warnings --enable-tcap-query --enable-logging --enable-dabbrev --enable-freetype --enable-luit --enable-mini-luit --enable-narrowproto --enable-exec-xterm --enable-sixel-graphics --with-utempter"}; : ${PKG_XTERM_ENV_VARS_EXTRA:=LIBS=-lncurses -ltinfo}; +: ${PKG_XTERM_DISABLED:=1}; ex_pkg_register "xterm" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; 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 () |