summaryrefslogtreecommitdiff
path: root/aports/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
diff options
context:
space:
mode:
authorPÁLI Gábor János <pali.gabor@gmail.com>2023-08-03 10:10:44 +0200
committerPÁLI Gábor János <pali.gabor@gmail.com>2023-09-16 17:58:03 +0200
commit89279d87c5d3e0ea330be1f927e3f3bc59dbc2a7 (patch)
tree353bc9a026d0140151e760efbc4f6a6a6b24a020 /aports/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
parent084335e136581edc28137b152cc559778224570e (diff)
downloadfreebsd-wifibox-alpine-89279d87c5d3e0ea330be1f927e3f3bc59dbc2a7.zip
Update to Linux 6.1 and Alpine 3.18
- Update base-layout to 3.4.3 - Update busybox to 1.36.1 - Update iptables to 1.8.9 - Update linux-lts to 6.1.53 - Update to openrc to 0.48 - Update rtl8821ce to snapshot of 20230915 - Replace rtwB88 with a third-party driver - Update rtw89 to snapshot of 20230913 - Import wpa_supplicant fixes from Arch Linux
Diffstat (limited to 'aports/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch')
-rw-r--r--aports/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/aports/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch b/aports/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
deleted file mode 100644
index e647d8d..0000000
--- a/aports/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 03293c16e509501ce7ec952900413138475f125d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 25 Jul 2014 15:28:33 +0200
-Subject: [PATCH] Add flag for not following symlinks when recursing
-
-function old new delta
-.rodata 7934 7967 +33
-diff_longopts 253 270 +17
-packed_usage 1704 1720 +16
-diff_main 1665 1662 -3
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 3/1 up/down: 66/-3) Total: 63 bytes
----
- editors/diff.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/editors/diff.c b/editors/diff.c
-index 280091756..42a36e2d4 100644
---- a/editors/diff.c
-+++ b/editors/diff.c
-@@ -113,6 +113,9 @@
- //usage: "\n -N Treat absent files as empty"
- //usage: "\n -q Output only whether files differ"
- //usage: "\n -r Recurse"
-+//usage: IF_LONG_OPTS(
-+//usage: "\n --no-dereference Don't follow symlinks"
-+//usage: )
- //usage: "\n -S Start with FILE when comparing directories"
- //usage: "\n -T Make tabs line up by prefixing a tab when necessary"
- //usage: "\n -s Report when two files are the same"
-@@ -154,6 +157,7 @@ enum { /* Commandline flags */
- FLAG_p, /* not implemented */
- FLAG_B,
- FLAG_E, /* not implemented */
-+ FLAG_no_deref,
- };
- #define FLAG(x) (1 << FLAG_##x)
-
-@@ -867,7 +871,8 @@ static void diffdir(char *p[2], const char *s_start)
- * Using list.len to specify its length,
- * add_to_dirlist will remove it. */
- list[i].len = strlen(p[i]);
-- recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS,
-+ recursive_action(p[i], ACTION_RECURSE |
-+ ((option_mask32 & FLAG(no_deref)) ? 0 : ACTION_FOLLOWLINKS),
- add_to_dirlist, skip_dir, &list[i]);
- /* Sort dl alphabetically.
- * GNU diff does this ignoring any number of trailing dots.
-@@ -964,6 +969,7 @@ static const char diff_longopts[] ALIGN1 =
- "report-identical-files\0" No_argument "s"
- "starting-file\0" Required_argument "S"
- "minimal\0" No_argument "d"
-+ "no-dereference\0" No_argument "\xff"
- ;
- # define GETOPT32 getopt32long
- # define LONGOPTS ,diff_longopts