main/busybox: fix depmod regression

introduced with the rebase of depmod patch

10 files changed, 50 insertions, 41 deletions

diff --git a/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch b/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
index 03a503c070..9534101692 100644
--- a/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
+++ b/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
@@ -1,4 +1,4 @@
-From 249ef5277e15bd9f6728275a4d21ffdcd7877dc4 Mon Sep 17 00:00:00 2001
+From 62748c093b0fcf79880b330eea82c84e64daae59 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Sun, 25 Oct 2015 22:21:41 +0200
 Subject: [PATCH 07/15] depmod: support generating kmod binary index files
@@ -16,11 +16,11 @@ the code size a little bit.
 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
 ---
  modutils/Config.src |  10 ++
- modutils/depmod.c   | 277 ++++++++++++++++++++++++++++++++++++++++++----------
+ modutils/depmod.c   | 279 ++++++++++++++++++++++++++++++++++++++++++----------
  modutils/modprobe.c |  15 ---
  modutils/modutils.c |  27 ++++-
  modutils/modutils.h |  15 +++
- 5 files changed, 278 insertions(+), 66 deletions(-)
+ 5 files changed, 280 insertions(+), 66 deletions(-)
 
 diff --git a/modutils/Config.src b/modutils/Config.src
 index 0b11832..09db515 100644
@@ -44,7 +44,7 @@ index 0b11832..09db515 100644
  	bool "Support for module.symbols file"
  	default y
 diff --git a/modutils/depmod.c b/modutils/depmod.c
-index e5f0e3d..c35a584 100644
+index e5f0e3d..b73c1e5 100644
 --- a/modutils/depmod.c
 +++ b/modutils/depmod.c
 @@ -2,7 +2,7 @@
@@ -299,7 +299,16 @@ index e5f0e3d..c35a584 100644
  int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int depmod_main(int argc UNUSED_PARAM, char **argv)
  {
-@@ -198,53 +368,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
+@@ -166,6 +336,8 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
+ 	unsigned i;
+ 	int tmp;
+ 
++	INIT_G();
++
+ 	getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL);
+ 	argv += optind;
+ 
+@@ -198,53 +370,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
  	}
  
  	/* Generate dependency and alias files */
diff --git a/main/busybox/0008-login-move-check_securetty-to-libbb.patch b/main/busybox/0008-login-move-check_securetty-to-libbb.patch
index 8acb38f458..c470623a9e 100644
--- a/main/busybox/0008-login-move-check_securetty-to-libbb.patch
+++ b/main/busybox/0008-login-move-check_securetty-to-libbb.patch
@@ -1,4 +1,4 @@
-From b6d861d6ffaf3b367096c057a5f633dea8a8907d Mon Sep 17 00:00:00 2001
+From 76769ad16cfe28984fe31ec595a7435c8a10d15c Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Thu, 5 Nov 2015 16:27:34 +0200
 Subject: [PATCH 08/15] login: move check_securetty to libbb
diff --git a/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch b/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
index 504a1bcc44..529e52200f 100644
--- a/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
+++ b/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
@@ -1,4 +1,4 @@
-From 7161cc4e35dff5a21aff1f7b5d3edd7d7dcbacbd Mon Sep 17 00:00:00 2001
+From 8d3fc4e28975b6789d6ccbf9b12bc3bb811dfc2d Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Thu, 5 Nov 2015 16:27:35 +0200
 Subject: [PATCH 09/15] libbb: allow_blank argument for
diff --git a/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch b/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch
index 5f67bbbed1..9de531c37e 100644
--- a/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch
+++ b/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch
@@ -1,4 +1,4 @@
-From fea67b57ed920fafe595affb2954111c2bb67054 Mon Sep 17 00:00:00 2001
+From 8b337b84dec2765d9fc9a0b2be6341e4bd7e1fcb Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Thu, 5 Nov 2015 16:27:36 +0200
 Subject: [PATCH 10/15] su: FEATURE_SU_NULLOK_SECURE
diff --git a/main/busybox/0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch b/main/busybox/0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
index 1491616321..519613a2d8 100644
--- a/main/busybox/0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
+++ b/main/busybox/0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
@@ -1,4 +1,4 @@
-From f284457f4400ee31469a6fde1468088fc1858eb0 Mon Sep 17 00:00:00 2001
+From 55df9f8c24c2ed9c03d5761b45f0916d4bcfc88b Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
 Date: Thu, 23 Jun 2016 10:42:40 +0200
 Subject: [PATCH 11/15] df: use f_frsize instead of f_bsize for correct sizes
diff --git a/main/busybox/0012-gzip-fix-compression-level-bug.-Closes-9131.patch b/main/busybox/0012-gzip-fix-compression-level-bug.-Closes-9131.patch
index 4818724028..be01eabd5b 100644
--- a/main/busybox/0012-gzip-fix-compression-level-bug.-Closes-9131.patch
+++ b/main/busybox/0012-gzip-fix-compression-level-bug.-Closes-9131.patch
@@ -1,4 +1,4 @@
-From 900a96dee4932db22dbb7ab12a5fc6f2108b01b7 Mon Sep 17 00:00:00 2001
+From 7402d19bc155f74b39a19d5478375dbfe95a76c6 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
 Date: Wed, 3 Aug 2016 13:23:57 +0200
 Subject: [PATCH 12/15] gzip: fix compression level bug. Closes 9131
diff --git a/main/busybox/0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch b/main/busybox/0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
index 5454815680..75bf231ed5 100644
--- a/main/busybox/0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
+++ b/main/busybox/0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
@@ -1,4 +1,4 @@
-From 678563e106ce8416266de16c309494a051f331f6 Mon Sep 17 00:00:00 2001
+From 789325996ab38d1b8be5c2d204b536c355105844 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Thu, 4 Aug 2016 12:26:56 +0200
 Subject: [PATCH 13/15] ntpd: postpone hostname resolution if fails on startup
diff --git a/main/busybox/0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch b/main/busybox/0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
index 24dc0e890c..0dafec292a 100644
--- a/main/busybox/0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
+++ b/main/busybox/0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
@@ -1,4 +1,4 @@
-From c87fd50857e07450e8868730293f2af7063d263a Mon Sep 17 00:00:00 2001
+From 431610ad7ea53d2f9f1bf926e1d353d533bdb27f Mon Sep 17 00:00:00 2001
 From: Miroslav Lichvar <mlichvar@redhat.com>
 Date: Mon, 1 Aug 2016 20:24:24 +0200
 Subject: [PATCH 14/15] ntpd: respond only to client and symmetric active
diff --git a/main/busybox/0015-diff-add-support-for-no-dereference.patch b/main/busybox/0015-diff-add-support-for-no-dereference.patch
index 22b088ef70..06c97413e8 100644
--- a/main/busybox/0015-diff-add-support-for-no-dereference.patch
+++ b/main/busybox/0015-diff-add-support-for-no-dereference.patch
@@ -1,4 +1,4 @@
-From 2a6b675f7bdf6eaf512620c43980abe91a20de28 Mon Sep 17 00:00:00 2001
+From 6621d1956090bbef82d2efd6940983f0a82fb762 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
 Date: Fri, 25 Jul 2014 15:28:33 +0200
 Subject: [PATCH 15/15] diff: add support for --no-dereference
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index d0666d0b26..2d81309cfc 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.25.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -151,15 +151,15 @@ d6ca0a022af2f68746297b3673ca0467  0002-set-applet-location-to-correspond-to-upst
 c0ee8629bb7f2c75e6da39431b736572  0004-ping-make-ping-work-without-root-privileges.patch
 50505c0b575943c85b396bbf0dad73b3  0005-fbsplash-support-console-switching.patch
 b4a95d78733e08c3b960b60e70a5b965  0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
-f3127ef3a4c2556e450a8d5af629d555  0007-depmod-support-generating-kmod-binary-index-files.patch
-309801ed120b4a48d3da8df509679e3b  0008-login-move-check_securetty-to-libbb.patch
-fbaa10f5a9f1dee17e9f106bcf7c476a  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
-7a6be7fc37d858ceebe78f1170292d61  0010-su-FEATURE_SU_NULLOK_SECURE.patch
-860021f9fb7f28c5e99973be70c6959a  0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
-a3beeb8c62d14f8c56d97e226bbeb180  0012-gzip-fix-compression-level-bug.-Closes-9131.patch
-4de903bcbc4a0f9cea00ad7397f13084  0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
-a6c50952f8eecb4dc8ad961c18c99908  0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
-bc228dbf77eab3a5b7b982f603722177  0015-diff-add-support-for-no-dereference.patch
+c03e2940828e8c2bc9494aee74422bd3  0007-depmod-support-generating-kmod-binary-index-files.patch
+17a39b0672afe6a626cd0ea81623ab00  0008-login-move-check_securetty-to-libbb.patch
+5fb24a9688a638e6bea5921bcc565bb6  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
+208869f8a34ef531437c4ece55115a78  0010-su-FEATURE_SU_NULLOK_SECURE.patch
+5fab4d6b3461a399d66a42f9385c6ad5  0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
+f5cd203e6e7acb8b0296e370621aaf63  0012-gzip-fix-compression-level-bug.-Closes-9131.patch
+f39e2d23f00d9a94a08d5159bd285ea5  0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
+bcfa838ecc36ea8f2012a27561d6910d  0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
+83c0e05df23b2327e6e71fa93e911154  0015-diff-add-support-for-no-dereference.patch
 4046b78ee6a25259954797d73b94f4bd  acpid.logrotate
 468cf612bd9e06a60fdf41e88a915270  busyboxconfig
 378058009a1d6b1e321617b32b933e28  bbsuid.c
@@ -171,15 +171,15 @@ sha256sums="5a0fe06885ee1b805fb459ab6aaa023fe4f2eccee4fb8c0fd9a6c17c0daca2fc  bu
 b9766d28fa8dcee8ffcbc00795c1b2edea82d99ef7a39b024876c54d258a6b59  0004-ping-make-ping-work-without-root-privileges.patch
 fc8bad08a5f43e32ac2f9c169a441567266dd551f9b2b82c6f227445a745413a  0005-fbsplash-support-console-switching.patch
 8fe309313982fbe560cc3bdb3c61395bb22945942f1ebe768a5b0377f35e50a6  0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
-8407ae754eb03c42a93c56fe2f248f4fc74301975923eb6b36e84b79cff658b0  0007-depmod-support-generating-kmod-binary-index-files.patch
-23170f53ffb93bdaf555719f2233058803ae333a0176070dc0c38bb6fb1b35db  0008-login-move-check_securetty-to-libbb.patch
-d2e1896b39c50988397a5ccc35074860fb0f032a837c47569530b505fc5d51eb  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
-1d1ce2ea21668ea619b3cf48dd9bb8c9620ac0f73bad1679fc78a8e352dee6b6  0010-su-FEATURE_SU_NULLOK_SECURE.patch
-748766cbc5df632ab659245e2e3e8082b8ba064a9701d6ecc7dc149b31e0e2e1  0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
-1025555ca503fd38cd98cea4b2049b3af32723950e4ff7ecdb0e2c67db7190ec  0012-gzip-fix-compression-level-bug.-Closes-9131.patch
-9b70547101e717b677838cefdb65071dbecde335a860c332406adb70261d6e1b  0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
-f01c371de9a8cf7970220f9f72436199e70cdf68bb6a0ce640fa0e972699f078  0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
-8941ba9517694c10bb9c4bda30cd88a7ea6e82aa93a41b2561405315ab6b96b5  0015-diff-add-support-for-no-dereference.patch
+e1e3f6efaba68a12a481bdb6ad4826fa10d1a3af5c6693c4066d12fb3c7ba676  0007-depmod-support-generating-kmod-binary-index-files.patch
+4d5e3691b7d0e0c33c0ba1be48db65d1978a78fefb4c0bc5d0757c8c087093b0  0008-login-move-check_securetty-to-libbb.patch
+a063e8a8acae6c42a8b47316279dc28b44e2d59aa924a6295cade00a08284a3a  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
+28573f6d49bd8be27beb535581b3b227489f43955d68669bea868128dfdb84cb  0010-su-FEATURE_SU_NULLOK_SECURE.patch
+243520c9ba069d7b58f440ce890357eca464c77f62a152eba6173f5de3968441  0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
+a90db1bb2d84f64982aba785f15871d7e2c73f1e9651536fbdafdca7f0a44bd4  0012-gzip-fix-compression-level-bug.-Closes-9131.patch
+30aaba169312101b45ee113cd3daa4ca5bfdee76298cb73c692a890484888e23  0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
+0c4d7b8ea3844c0f771361deb52e7553f4cf198d3d591ed476fa43be56107a8e  0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
+cbe87aa26c161892f82cd319222c1a21768eabcd5b706c8b582a988e981aca10  0015-diff-add-support-for-no-dereference.patch
 f7cbeb5a5a47395ad30454ce8262abcd3e91c33ef803c2ae31a9258d7142dd48  acpid.logrotate
 2d8ab0c6ac5610adaf8fd1c094da32727f23fda69434e1ab9cc115744cfa712b  busyboxconfig
 52bd2c7c44779f910eedd2fea73ec0de520add400894cc132276587e25c73e39  bbsuid.c
@@ -191,15 +191,15 @@ sha512sums="4122a457709a19f697547f1f84fb37da6ae85dd22afefcb49f551b2c6386838e07bf
 91033878d9e5efa8b1e5cebb6b18ea9a87af68b9939ac9441f791c8493b144dff46bafcc9c8d2ff3f8bc3b2c4891faad8fddf3e7335417c099b4b3051cbe9ba4  0004-ping-make-ping-work-without-root-privileges.patch
 d69050a60588669b5a7719b63d13d6ecbcb5748cd7d80d0066c22c2571e3136964437c2263f33bbf1d2d17011cdbe972cc05ff753e669d8fc20844fcc211f1b8  0005-fbsplash-support-console-switching.patch
 3b31d019441c2a555c5ac01c4c0a3636c7fa5000b992a487729f6fa6929d836417b81118ea422fcb6cb8509b783ab244faf8c04e132c24400a202f8c4c087334  0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
-e0efce50a6bd89d04a5c0a579206f5069d2bcf8b694e9673c3c1792023d64250e156e9cfdd1de0de5399e3c4306a79eaf5ea5f4c9dd07e830e5ff0d85efab317  0007-depmod-support-generating-kmod-binary-index-files.patch
-c9829ee74246a0acbccd3679f01b20399c7ea0e0c1b07edd21f4f2a26daa37f0746bba504dee2654a4f4003fbbd417017fbb3840565cb137b9c7d85e6a7a027b  0008-login-move-check_securetty-to-libbb.patch
-db4f00959f44c1a85df3b4a1e1c87cdce3927929cbcd4627d8fe448413fbff44641be12f39189dc3d1fe91f44b5c083fb553aff0f32018821aa2fbad3e5a3d6a  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
-cf244528fa204455c16cfcf0b092dc4ea07dad26a0ab96accd261afa8178d41edc8606f35d76cd1b0b24ae303c4b3f846c486f914468db344c64347d6a7c5b9c  0010-su-FEATURE_SU_NULLOK_SECURE.patch
-2e4d8345bf12c8b1f59958cbdb3bc0fc7d439cf54c1f3582a5b04b407c1c1fb414aafaa8d44c26e22bd76eb7e44429bebd7b3696e737ca4792c7ac23cf4004a3  0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
-beef81211dfb16d3bc54654eab4d32df5cf5b4c23ec911ba39517760177a02223cdaef1177b54a0d8589e0b517d476d25f5decc5023558478d982d1e3008752b  0012-gzip-fix-compression-level-bug.-Closes-9131.patch
-3437629d5cca10d736e40604b77ae1a51561f40b0f8a7a662be7af8c1ba69c947a14f4788845ff1689483863d7fbc4a2bf7cc25ab034dff9c02df886f6b54e64  0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
-a175d4641954ae533a3ef30d62285d36ea890071efd52173ce6ed215bc7b834374fd96c787ba5de17302b71feb510f7eabe26055ae759783e93955778e495531  0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
-1851e83a23c0fdd2cb692e5bcb00830030a70e367b9926054295b78d38977a9fd1f8a88997c23f0425047bf4ef3e9bf6e309073497c118c049d15b27676aeca1  0015-diff-add-support-for-no-dereference.patch
+c0ae0f753b7024bd24637ce2225dc0be3d4f5fe91a52824662bc030b9ae6adce6cb92baa633fa4c14b4fd225501d9dd1feec4f5b9b42212af4787325958a2388  0007-depmod-support-generating-kmod-binary-index-files.patch
+a0f02c60f47035ddde11795f6dbf51194d2e516a88dec787ef00e7c79627dce79957e397690b6c75d2a0eccff50bffcb7ce362fefe34d505b7da559877855e42  0008-login-move-check_securetty-to-libbb.patch
+af7f538953f7ff7ef527e41fbf9e8f345049d33a138d5d20942d3ee2615abc303ca59cb62cb99e3e6fcbfd27975da8220d90e44aafec3de991b6cdfba2c27ce1  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
+00a2e73fd2af72ba798b5a914a01314b161ff2dce2ec6c3cb01a1816e065a20b3110c1558a2fcd4c76cd78223033737592ee1cdcabcc6d35b944ee9010fc1a83  0010-su-FEATURE_SU_NULLOK_SECURE.patch
+c1d9742d0045c6d62e731bee50ce3bfdc338601d0d61571271e8a24431d2ba1e3ee522346871fc50011d4047fcdb1eed5a4321e5364eb4e42dd4b65e698dce4c  0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
+c31cb5b26f3fe6aa1e8c34ff78029de43d0e5a4ea261b38bc4142f80323e36b27ffc7e48e46b649cb39876065313c1a56f11abdabdf19d3d736d096c07e0d5ac  0012-gzip-fix-compression-level-bug.-Closes-9131.patch
+d7a4ee28e0bf924b372ecb2f8da67f566f3c9e78199d81085e83dfb9fc9f5655fb8d6d904285d09bfee07d5e93b50603ea5f04e37e0feaaf01375170f158b829  0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
+1e188dfa8c74c9e01f98edab42271260bf6b181b083ef81b76bd3af34ddbca5884a0fe7c3d0352855d0754015d0c0d8da0f1390f5db808b1237153a183a90681  0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
+e04ebc53049be29e5ac0c90dd789b2d275c10175629787f729c06aa323ef688b2ed266961d4f841bae90d00ff4ee454de48d6b92f84f0e5c8729d6c55d9650cd  0015-diff-add-support-for-no-dereference.patch
 dadb4c953ebc755b88ee95c1489feb0c2d352f6e44abc716166024e6eea11ab9d10c84fad62c081775834d205cb04aa1be3c994676c88f4284495c54b9188e8b  acpid.logrotate
 1820adcd6b8759cf568e4b8fb78b22d8f67e1b33f2252fd05a1edd2d65aa7294769c802fdf50edf102675d0a13f8423727ade40ce5bf741ef95225c86675259c  busyboxconfig
 c1dd56509277c59751907a27f067f1622191ddfd498acfe390d83136d36a41f2bdfc2fd4daf35af77219a66fb00fea20483f34112afd5df2ccd9f36ab548e66f  bbsuid.c