Commit e83d4f9c authored by Sören Tempel's avatar Sören Tempel

main/busybox: use the same network options in both config files

The busyboxconfig-extras configuration file didn't enable a few network
options which are enabled in the busyboxconfig configuration file. Most
importantly, support for IPv6 was disabled. The other options don't seem
as important to me but I enabled them for consistency anyhow.

Fixes #9590
parent 4e26bd32
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox pkgname=busybox
pkgver=1.29.3 pkgver=1.29.3
pkgrel=8 pkgrel=9
pkgdesc="Size optimized toolbox of many common UNIX utilities" pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net url=http://busybox.net
arch="all" arch="all"
...@@ -218,7 +218,7 @@ c26e846dc4576a94c376132644ea26755f8cc531fa03b975f2f7e874e2fcbaaca3804ba46849c29b ...@@ -218,7 +218,7 @@ c26e846dc4576a94c376132644ea26755f8cc531fa03b975f2f7e874e2fcbaaca3804ba46849c29b
a2787a3ecaf6746dadef62166e8ee6ecaa166147e5ad8b917c5838536057c875bab5f9cf40c3e05eba74d575484ac662929ac3799d58432d3a99ac46f364f302 0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch a2787a3ecaf6746dadef62166e8ee6ecaa166147e5ad8b917c5838536057c875bab5f9cf40c3e05eba74d575484ac662929ac3799d58432d3a99ac46f364f302 0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
924ff0dac14b4f7213618bd1503ae1b251fea9c3ce11dd87a6ad23ac4fca9b3f765afefdc50f39613579f56b200547320977ec815f87f2c69e20b5aeb484116c busyboxconfig 924ff0dac14b4f7213618bd1503ae1b251fea9c3ce11dd87a6ad23ac4fca9b3f765afefdc50f39613579f56b200547320977ec815f87f2c69e20b5aeb484116c busyboxconfig
1dc5c94708fc4d4129015c0cdd64fbe0edd2794bb10422ac2686db8a4ef06182d306ec89560d0310190c1ed86b8422c13594d2cc2b9281c8895145d5a233cc0c busyboxconfig-extras 74ab7aa1bad3d572869aa5dffae1e3c87d0d24159db5dc8b5521fc652dd32f904d973abd6adf43f21624d53b0844cd66ba93f02f962133a9c432f2ac7bfb42b3 busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c 0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
061f7417c1cbf0424a5fab77e2f5912aa1593f39b33ea294af4c03518ca712d793a77ea82ff1f36e9cb98751d9faacb9d0240cdf0894efd8f26c13c28a692404 nologin.c 061f7417c1cbf0424a5fab77e2f5912aa1593f39b33ea294af4c03518ca712d793a77ea82ff1f36e9cb98751d9faacb9d0240cdf0894efd8f26c13c28a692404 nologin.c
......
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Busybox version: 1.29.2 # Busybox version: 1.29.3
# Sat Aug 4 15:12:47 2018 # Tue Jan 15 19:53:35 2019
# #
CONFIG_HAVE_DOT_CONFIG=y CONFIG_HAVE_DOT_CONFIG=y
...@@ -205,6 +205,7 @@ CONFIG_GZIP_FAST=0 ...@@ -205,6 +205,7 @@ CONFIG_GZIP_FAST=0
# CONFIG_COMM is not set # CONFIG_COMM is not set
# CONFIG_CP is not set # CONFIG_CP is not set
# CONFIG_FEATURE_CP_LONG_OPTIONS is not set # CONFIG_FEATURE_CP_LONG_OPTIONS is not set
# CONFIG_FEATURE_CP_REFLINK is not set
# CONFIG_CUT is not set # CONFIG_CUT is not set
# CONFIG_DATE is not set # CONFIG_DATE is not set
# CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_ISOFMT is not set
...@@ -800,10 +801,10 @@ CONFIG_READAHEAD=y ...@@ -800,10 +801,10 @@ CONFIG_READAHEAD=y
# #
# Networking Utilities # Networking Utilities
# #
# CONFIG_FEATURE_IPV6 is not set CONFIG_FEATURE_IPV6=y
# CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_UNIX_LOCAL=y
# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set CONFIG_VERBOSE_RESOLUTION_ERRORS=y
# CONFIG_ARP is not set # CONFIG_ARP is not set
# CONFIG_ARPING is not set # CONFIG_ARPING is not set
# CONFIG_BRCTL is not set # CONFIG_BRCTL is not set
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment