aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-01-15 09:32:06 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-01-15 11:36:22 +0100
commite5c984f68aabb28de623a7e3ada5a223c2b66d77 (patch)
tree6125f534e00875a49acba1c28aaa843dd7353e92
parent8d6c01f17f4285e0142442bb8afcce72f4bd280b (diff)
downloadalpine_aports-e5c984f68aabb28de623a7e3ada5a223c2b66d77.tar.bz2
alpine_aports-e5c984f68aabb28de623a7e3ada5a223c2b66d77.tar.xz
alpine_aports-e5c984f68aabb28de623a7e3ada5a223c2b66d77.zip
main/busybox: enable FEATURE_NSLOOKUP_BIG
The small nslookup does not work with musl, so lets enable the musl compatible variant. ref: https://github.com/gliderlabs/docker-alpine/issues/476 (cherry picked from commit cfb652d1dcab0273eb4c35a213173150e642b133)
-rw-r--r--main/busybox/APKBUILD4
-rw-r--r--main/busybox/busyboxconfig4
2 files changed, 4 insertions, 4 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index dcba06802e..b437dfe1d6 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,7 +3,7 @@
3# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 3# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
4pkgname=busybox 4pkgname=busybox
5pkgver=1.31.1 5pkgver=1.31.1
6pkgrel=8 6pkgrel=9
7pkgdesc="Size optimized toolbox of many common UNIX utilities" 7pkgdesc="Size optimized toolbox of many common UNIX utilities"
8url="https://busybox.net/" 8url="https://busybox.net/"
9arch="all" 9arch="all"
@@ -226,7 +226,7 @@ b0f956e98ed1b670dc27f835441407d32395d371599780cf87a5fb2eee43ad2f77c8c484d20f08b1
226d8926f0e4ed7d2fe5af89ff2a944d781b45b109c9edf1ef2591e7bce2a8bbadd7c8ca814cb3c928ae09027d9603434fe70496f308d701f3d42260ebd1e9e9b29 0013-testsuite-fix-cpio-tests.patch 226d8926f0e4ed7d2fe5af89ff2a944d781b45b109c9edf1ef2591e7bce2a8bbadd7c8ca814cb3c928ae09027d9603434fe70496f308d701f3d42260ebd1e9e9b29 0013-testsuite-fix-cpio-tests.patch
2279bb4d16ca418b6fd3c0b6dc867c92920e66ddb0c98040373d1166608284d2755b8d6eed0022bfddfcc07f5df93974fb7ed79402511a9728eb6c95ce05c37cfeb busybox-bc.patch 2279bb4d16ca418b6fd3c0b6dc867c92920e66ddb0c98040373d1166608284d2755b8d6eed0022bfddfcc07f5df93974fb7ed79402511a9728eb6c95ce05c37cfeb busybox-bc.patch
228aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate 228aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
229254f7e06d4ea9cb5770bc0433daf0ae412097c90acbcaa1a1915a0ecd766280ba020ef33675dacf9f106255ab80d1b0662468862677b8524e1e897c8180146e5 busyboxconfig 2294d4562d6cfc20f97dc7ce6326a79447b94007d5986c88c269910d16a71382c069e6ec30ea9468c1206360649d588309ca97af27da6cb8fa5338e55f21e005692 busyboxconfig
2305f9739b9d0c1ba5d77e3153c373593a1bcb813cf466f951b00a2a040262e5077fb13c1a7aa17d67d1533a473bfcacc1a22833b7f491b4dde9dcb5638ad585f9a busyboxconfig-extras 2305f9739b9d0c1ba5d77e3153c373593a1bcb813cf466f951b00a2a040262e5077fb13c1a7aa17d67d1533a473bfcacc1a22833b7f491b4dde9dcb5638ad585f9a busyboxconfig-extras
2310becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c 2310becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
232b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up 232b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 63dd9c6e7f..53e00e266f 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -925,8 +925,8 @@ CONFIG_NETSTAT=y
925CONFIG_FEATURE_NETSTAT_WIDE=y 925CONFIG_FEATURE_NETSTAT_WIDE=y
926CONFIG_FEATURE_NETSTAT_PRG=y 926CONFIG_FEATURE_NETSTAT_PRG=y
927CONFIG_NSLOOKUP=y 927CONFIG_NSLOOKUP=y
928# CONFIG_FEATURE_NSLOOKUP_BIG is not set 928CONFIG_FEATURE_NSLOOKUP_BIG=y
929# CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS is not set 929CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y
930CONFIG_NTPD=y 930CONFIG_NTPD=y
931CONFIG_FEATURE_NTPD_SERVER=y 931CONFIG_FEATURE_NTPD_SERVER=y
932CONFIG_FEATURE_NTPD_CONF=y 932CONFIG_FEATURE_NTPD_CONF=y