mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-19 14:56:46 +02:00
531e69840c
Not a lot of big changes in this release, mostly code shrinks and bug fixes here and there. Hence, I don't expect too much breakage. Most patches applied as is and didn't require any changes either. Nonetheless, I rebased the entire patchset and removed patches that were backported. The 0001-modutils-check-ELF-header-before-calling-finit_modul.patch should be superseded by an upstream modutils change which checks that if the loaded module file path ends in .ko and if not attempts to uncompress it first. Thereby preventing compressed modules to be passed to the kernel and causing a weird error to be emitted. Therefore, this patch was removed See: https://git.busybox.net/busybox/commit/?id=af5277f883e8fc2e0236aa9ecc5115ecaffd0ccb
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From ae209ce04c0412d44c00a18fb06e5eaa4cf48dd2 Mon Sep 17 00:00:00 2001
|
|
From: Natanael Copa <ncopa@alpinelinux.org>
|
|
Date: Tue, 27 Dec 2016 19:38:39 +0100
|
|
Subject: [PATCH] app location for cpio, vi and lspci
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Adjust location to where alpine linux installs them
|
|
|
|
---
|
|
archival/cpio.c | 2 +-
|
|
editors/vi.c | 2 +-
|
|
util-linux/lspci.c | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/archival/cpio.c b/archival/cpio.c
|
|
index f0d990048..b973bc836 100644
|
|
--- a/archival/cpio.c
|
|
+++ b/archival/cpio.c
|
|
@@ -53,7 +53,7 @@
|
|
//config: help
|
|
//config: Optionally renumber inodes when creating archives.
|
|
|
|
-//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
|
|
+//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
|
|
//kbuild:lib-$(CONFIG_CPIO) += cpio.o
|
|
|
|
diff --git a/editors/vi.c b/editors/vi.c
|
|
index 34932f60c..3bf40c5ce 100644
|
|
--- a/editors/vi.c
|
|
+++ b/editors/vi.c
|
|
@@ -176,7 +176,7 @@
|
|
//config: Enable more verbose reporting of the results of yank, change,
|
|
//config: delete, undo and substitution commands.
|
|
|
|
-//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP))
|
|
+//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
|
|
//kbuild:lib-$(CONFIG_VI) += vi.o
|
|
|
|
diff --git a/util-linux/lspci.c b/util-linux/lspci.c
|
|
index b38b46be3..d42dd889d 100644
|
|
--- a/util-linux/lspci.c
|
|
+++ b/util-linux/lspci.c
|
|
@@ -15,7 +15,7 @@
|
|
//config:
|
|
//config: This version uses sysfs (/sys/bus/pci/devices) only.
|
|
|
|
-//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_BIN, BB_SUID_DROP, lspci))
|
|
+//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_SBIN, BB_SUID_DROP, lspci))
|
|
|
|
//kbuild:lib-$(CONFIG_LSPCI) += lspci.o
|
|
|