aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-12-11 08:15:59 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-12-11 08:18:03 +0000
commit0c62e94f64d016b67e8dec8334d379c7cb1c4095 (patch)
tree07da842ed73d515db78c5c92e64a6f50d850057c
parent883eee9a1a293f9d546858045c49fa859ae330ac (diff)
downloadaports-0c62e94f64d016b67e8dec8334d379c7cb1c4095.tar.gz
aports-0c62e94f64d016b67e8dec8334d379c7cb1c4095.tar.bz2
aports-0c62e94f64d016b67e8dec8334d379c7cb1c4095.tar.xz
main/busybox: fix ipv6 only
disable PPREFER_IPV4_ADDRESS which breaks ipv6-only and is considered harmful. See https://bugs.busybox.net/show_bug.cgi?id=12381 fixes #10937
-rw-r--r--main/busybox/APKBUILD4
-rw-r--r--main/busybox/busyboxconfig2
2 files changed, 3 insertions, 3 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 6a8f499479..a94231c181 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.31.1
-pkgrel=3
+pkgrel=4
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@@ -216,7 +216,7 @@ b0f956e98ed1b670dc27f835441407d32395d371599780cf87a5fb2eee43ad2f77c8c484d20f08b1
d8926f0e4ed7d2fe5af89ff2a944d781b45b109c9edf1ef2591e7bce2a8bbadd7c8ca814cb3c928ae09027d9603434fe70496f308d701f3d42260ebd1e9e9b29 0013-testsuite-fix-cpio-tests.patch
9bb4d16ca418b6fd3c0b6dc867c92920e66ddb0c98040373d1166608284d2755b8d6eed0022bfddfcc07f5df93974fb7ed79402511a9728eb6c95ce05c37cfeb busybox-bc.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
-09fc854f2fef753d37f5ed5f60b10c5dd2d98eb1b123d3dd9a1358a753b869cc2e3409b359774d60d491c88129928ed12e2438bdce70948689e5c51c33c9d17a busyboxconfig
+254f7e06d4ea9cb5770bc0433daf0ae412097c90acbcaa1a1915a0ecd766280ba020ef33675dacf9f106255ab80d1b0662468862677b8524e1e897c8180146e5 busyboxconfig
5f9739b9d0c1ba5d77e3153c373593a1bcb813cf466f951b00a2a040262e5077fb13c1a7aa17d67d1533a473bfcacc1a22833b7f491b4dde9dcb5638ad585f9a busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 9fe0e75364..63dd9c6e7f 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -840,7 +840,7 @@ CONFIG_WATCHDOG=y
#
CONFIG_FEATURE_IPV6=y
CONFIG_FEATURE_UNIX_LOCAL=y
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
CONFIG_VERBOSE_RESOLUTION_ERRORS=y
# CONFIG_FEATURE_TLS_SHA1 is not set
CONFIG_ARP=y