From c01b9c8d1084204182ef019dd6a59f4fccc342aa Mon Sep 17 00:00:00 2001 From: auronandace Date: Fri, 16 Oct 2026 11:34:03 +0100 Subject: [PATCH] remove no_rlimit patch from patch package --- .../{02_no_chown.patch => 01_no_chown.patch} | 0 recipes/dev/patch/01_no_rlimit.patch | 35 ------------------- ...{03_renameat2.patch => 02_renameat2.patch} | 0 recipes/dev/patch/recipe.toml | 5 ++- 4 files changed, 2 insertions(+), 38 deletions(-) rename recipes/dev/patch/{02_no_chown.patch => 01_no_chown.patch} (100%) delete mode 100644 recipes/dev/patch/01_no_rlimit.patch rename recipes/dev/patch/{03_renameat2.patch => 02_renameat2.patch} (100%) diff --git a/recipes/dev/patch/02_no_chown.patch b/recipes/dev/patch/01_no_chown.patch similarity index 100% rename from recipes/dev/patch/02_no_chown.patch rename to recipes/dev/patch/01_no_chown.patch diff --git a/recipes/dev/patch/01_no_rlimit.patch b/recipes/dev/patch/01_no_rlimit.patch deleted file mode 100644 index c44b9a960..000000000 --- a/recipes/dev/patch/01_no_rlimit.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ru source/lib/getdtablesize.c source-new/lib/getdtablesize.c ---- source/lib/getdtablesize.c 2015-03-06 16:31:45.000000000 -0800 -+++ source-new/lib/getdtablesize.c 2017-08-08 19:33:33.993874985 -0700 -@@ -106,15 +106,6 @@ - int - getdtablesize (void) - { -- struct rlimit lim; -- -- if (getrlimit (RLIMIT_NOFILE, &lim) == 0 -- && 0 <= lim.rlim_cur && lim.rlim_cur <= INT_MAX -- && lim.rlim_cur != RLIM_INFINITY -- && lim.rlim_cur != RLIM_SAVED_CUR -- && lim.rlim_cur != RLIM_SAVED_MAX) -- return lim.rlim_cur; -- - return INT_MAX; - } - -Only in source-new/lib: getdtablesize.c.orig -diff -ru source/src/safe.c source-new/src/safe.c ---- source/src/safe.c 2015-03-06 16:34:20.000000000 -0800 -+++ source-new/src/safe.c 2017-08-08 19:33:53.447430811 -0700 -@@ -92,11 +92,7 @@ - - static void init_dirfd_cache (void) - { -- struct rlimit nofile; -- - max_cached_fds = 8; -- if (getrlimit (RLIMIT_NOFILE, &nofile) == 0) -- max_cached_fds = MAX (nofile.rlim_cur / 4, max_cached_fds); - - cached_dirfds = hash_initialize (max_cached_fds, - NULL, diff --git a/recipes/dev/patch/03_renameat2.patch b/recipes/dev/patch/02_renameat2.patch similarity index 100% rename from recipes/dev/patch/03_renameat2.patch rename to recipes/dev/patch/02_renameat2.patch diff --git a/recipes/dev/patch/recipe.toml b/recipes/dev/patch/recipe.toml index 348734e50..b8d107d09 100644 --- a/recipes/dev/patch/recipe.toml +++ b/recipes/dev/patch/recipe.toml @@ -2,9 +2,8 @@ tar = "https://ftp.gnu.org/gnu/patch/patch-2.7.6.tar.xz" blake3 = "d46d14c12aa4ea51e356bf92091c368fd871e1d770b94bc29027886737aecd5f" patches = [ - "01_no_rlimit.patch", - "02_no_chown.patch", - "03_renameat2.patch", + "01_no_chown.patch", + "02_renameat2.patch", ] script = """ wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"