From ce4cb8e51d8d4b24267653250c3f7310d208bfaa Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 31 Jan 2021 16:15:54 -0800 Subject: [PATCH] busybox: remove useless busybox patches The first two are useless as /bin/sh can execute those scripts just fine. Shellcheck reports no problems. Telnetd patch is useless as telnet is no longer used in OpenWrt. Signed-off-by: Rosen Penev --- package/utils/busybox/patches/100-trylink_bash.patch | 8 -------- .../busybox/patches/101-gen_build_files_bash.patch | 8 -------- package/utils/busybox/patches/240-telnetd_intr.patch | 10 ---------- 3 files changed, 26 deletions(-) delete mode 100644 package/utils/busybox/patches/100-trylink_bash.patch delete mode 100644 package/utils/busybox/patches/101-gen_build_files_bash.patch delete mode 100644 package/utils/busybox/patches/240-telnetd_intr.patch diff --git a/package/utils/busybox/patches/100-trylink_bash.patch b/package/utils/busybox/patches/100-trylink_bash.patch deleted file mode 100644 index f9571fcbc8..0000000000 --- a/package/utils/busybox/patches/100-trylink_bash.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/scripts/trylink -+++ b/scripts/trylink -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/usr/bin/env bash - - debug=false - diff --git a/package/utils/busybox/patches/101-gen_build_files_bash.patch b/package/utils/busybox/patches/101-gen_build_files_bash.patch deleted file mode 100644 index d258fb8bc4..0000000000 --- a/package/utils/busybox/patches/101-gen_build_files_bash.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/scripts/gen_build_files.sh -+++ b/scripts/gen_build_files.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/usr/bin/env bash - - # Note: was using sed OPTS CMD -- FILES - # but users complain that many sed implementations diff --git a/package/utils/busybox/patches/240-telnetd_intr.patch b/package/utils/busybox/patches/240-telnetd_intr.patch deleted file mode 100644 index 773ba44db5..0000000000 --- a/package/utils/busybox/patches/240-telnetd_intr.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/networking/telnetd.c -+++ b/networking/telnetd.c -@@ -509,6 +509,7 @@ make_new_session( - - /* Restore default signal handling ASAP */ - bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL); -+ signal(SIGINT, SIG_DFL); - - pid = getpid(); - -- 2.30.2