diff options
| -rw-r--r-- | main/busybox/0001-modprobe-fix-modprobe-r-and-parsing-of-etc-modprobe..patch | 33 | ||||
| -rw-r--r-- | main/busybox/APKBUILD | 6 |
2 files changed, 38 insertions, 1 deletions
diff --git a/main/busybox/0001-modprobe-fix-modprobe-r-and-parsing-of-etc-modprobe..patch b/main/busybox/0001-modprobe-fix-modprobe-r-and-parsing-of-etc-modprobe..patch new file mode 100644 index 0000000000..8a9bfd28f5 --- /dev/null +++ b/main/busybox/0001-modprobe-fix-modprobe-r-and-parsing-of-etc-modprobe..patch @@ -0,0 +1,33 @@ +From d8937cf61895636eb05e373c377b5b1904d51d44 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 16 Jan 2015 12:01:48 +0100 +Subject: [PATCH] modprobe: fix modprobe -r and parsing of /etc/modprobe.d + +This fixes a regression introduced with commit 78854520 (modprobe: +revert checking for /, stop doing basename() on modprobe args, +2015-01-01) that broke modprobe options stored in /etc/modprobe.conf and +/etc/modprobe.d/*.conf. + +This also fixes modprobe -r + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + modutils/modprobe.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modutils/modprobe.c b/modutils/modprobe.c +index ce8b0b8..0e8aa9e 100644 +--- a/modutils/modprobe.c ++++ b/modutils/modprobe.c +@@ -425,7 +425,7 @@ static int do_modprobe(struct module_entry *m) + + rc = 0; + fn = llist_pop(&m->deps); /* we leak it */ +- m2 = get_or_add_modentry(fn); ++ m2 = get_or_add_modentry(bb_get_last_path_component_nostrip(fn)); + + if (option_mask32 & OPT_REMOVE) { + /* modprobe -r */ +-- +2.2.2 + diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index bfdebea1eb..7284d56442 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.23.0 -pkgrel=3 +pkgrel=4 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -25,6 +25,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 busybox-1.23.0-ash.patch busybox-1.23.0-modprobe.patch busybox-1.23.0-vi.patch + 0001-modprobe-fix-modprobe-r-and-parsing-of-etc-modprobe..patch 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch @@ -127,6 +128,7 @@ c5a8dbc8696db6da9c4624b0e11d8fba bb-app-location.patch 31bbf1c3957a939a4508528055a300ec busybox-1.23.0-ash.patch 345f21ccf074904aa591206fc056285d busybox-1.23.0-modprobe.patch 539be43937fdb198c111b077b0771f3b busybox-1.23.0-vi.patch +1252e8853d1f49041cd1bd3cae65c568 0001-modprobe-fix-modprobe-r-and-parsing-of-etc-modprobe..patch 04eeda8c49d4688e6dec02451f8b6aae 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch e1c183cbe1ca18a0fa0d9597314076c9 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch 239dbe5dae5d36bbf73548b2749a22b1 0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch @@ -147,6 +149,7 @@ a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef busybox-uname- fed81c2c8d2cda7d710e2825c549a0fe42fcb58fd342866729c37e9789d5c9e5 busybox-1.23.0-ash.patch e59ce711b44bb0fdc7adb5bed648287ce4a3212ac1e4afd94bdf5bd6ae0fb590 busybox-1.23.0-modprobe.patch 24595c896674c282c7ab264355d4a7dfb819e86d12cbdc2e7d101689027cffe1 busybox-1.23.0-vi.patch +93e0548812ac9e8f3ee49fd7830ecbde26b69f6f509a71dbc322e18dd349afb8 0001-modprobe-fix-modprobe-r-and-parsing-of-etc-modprobe..patch 2e9d56335ca39e944b9abd9ecc91d0e47a3fe3434f8b7ec3f526bc8fa0895ada 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch 53563c6dc4db13004d0b37f7bf1748e861b5a5c4244c1d34f102c23b689420c5 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch ac2cd5fed91bfaec22ed1f2766396d0feb29b9b96f20b2c12d5d8ac8769afae9 0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch @@ -167,6 +170,7 @@ eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d4 e70fc7b37f18b14638f3526ae1730bb178c190d6bb6c931beadbc5ef3d883dee9b994624af62641ca75edc50cae0e1259f3d52ffcf0d3cb78ceac90000df8962 busybox-1.23.0-ash.patch 13088f5d2e2b2da8155697d6e1787815a49bc1b353650fa596d99be966c836a967f774725d8258508239f041d5c6f74a55abe407f917a51b2f5b72d75b0c2e5a busybox-1.23.0-modprobe.patch b9099407a17ab29b30e9aa3cc30f1b0d05115cf14b49fcfb41167a6f2c77eafd7455f07e9b2ccaa5770cfa45e6458c3931d618c1330ed3ec4e8b613575db3d19 busybox-1.23.0-vi.patch +ae82177d70618e19a533408f7e0ac8388e32cbc73fb737ff658a2d8f722819d8a8d3a34fdf5307fa613847164d1f65ea943167fa9ee982b70bcc644fadc9d86a 0001-modprobe-fix-modprobe-r-and-parsing-of-etc-modprobe..patch f2ed7bf994766a20ceecb28bea8c66307b6b66cdd7099408b1f29a529786ce07e55824b21256321708663e00d6fe9428480b0d3e121b67d6ebd8a8a87b1486d1 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch b1a1cc2ada657a3d3364c8c96853575d73784e769cd8768c170c27a3e59abd2beace75dff6d5047c4391725e961d93149f9c3f45ed75fb1c582bf18b818282c9 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch 6781b10ca078296b243373d2c3f2bca2507a9df18a6b06d051e9ce84ed31a238aef3b2bb085daf12b145550be68c07c854272bd78a6f77da9197779b9c7cd9e9 0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch |