main/busybox: move dnsd, inetd and fakeidentd to extras

4 files changed, 11 insertions, 10 deletions

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index ce5548c83f..230269a33c 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.26.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -193,8 +193,8 @@ c37d1583cfb32e7aa077e7f4ea121dd3b2e3cf989a3dca2793126bcd89eb6d8eb6fae94808556580
 2adfc6c71cfcc5df12edef13228c92b34c7782615e60effc97e6e7a9aa7e015c24c7b3950a8a9a2bf3ba5efd43a08ad45b16b35b03c90275807380e0600cb70d  fix-tests.patch
 f26e090f5de0096ba5c4d46989ebe0ab5fa64c8bf54cd37ddec302fddfde23eac914858d86cc52bf3b5780a8e81ea2612ef6e713df2828e52c606f86a6816f39  location-for-cpio.patch
 a9b1403c844c51934637215307dd9e2adb9458921047acff0d86dcf229b6e0027f4b2c6cdaa25a58407aad9d098fb5685d58eb5ff8d2aa3de4912cdea21fe54c  acpid.logrotate
-8d6497242bc4b3d08afa5b3e80cf62b8b392818d4d5f9202681b2bebe4d0c9958841a937608233f744a6036676f0101116a54a2a57d3628306340b4a95c8a7d0  busyboxconfig
-9b7b2aa51b72eff97eb8f7eae42fefb3dc5801def9a7484948bd097e0232f245320c8225ff8605be1c298bed7e2ca5dccebf9e4204b541c84de7a5dd56d7d379  busyboxconfig-extras
+2b3f72c67e806748707a750201313b085aea5a3e34cfebe27841ce2b3e2dcfad741866fb0c1f0f3f09f4089e640a33290eec0f448ae58a1a8239374ec954b541  busyboxconfig
+48f68b4ab229d453802bdc53a32b028790f08e8d20e1673c19ec9fe2bb4023f7ec253959ec0e53413302febe68b8c235e000214a1db5fbd0b49fd068a30ac312  busyboxconfig-extras
 c1dd56509277c59751907a27f067f1622191ddfd498acfe390d83136d36a41f2bdfc2fd4daf35af77219a66fb00fea20483f34112afd5df2ccd9f36ab548e66f  bbsuid.c
 a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02  dad.if-up
 4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2  nologin.c"
diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade
index 8ed47aa574..4d7eb32aa2 100644
--- a/main/busybox/busybox.post-upgrade
+++ b/main/busybox/busybox.post-upgrade
@@ -14,7 +14,8 @@ done
 
 # remove links of programs moved to busybox-extras
 for link in /usr/bin/telnet /usr/sbin/httpd /usr/bin/ftpget /usr/bin/ftpput \
-	/usr/sbin/ftpd /usr/bin/tftp; do
+	/usr/sbin/ftpd /usr/bin/tftp /usr/sbin/fakeidentd /usr/sbin/dnsd \
+	/usr/sbin/inetd ; do
 	if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox" ]; then
 		rm "$link"
 		echo "NOTE: $link has been moved to the package 'busybox-extras'"
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 0d6a6b41b8..8cabf22712 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -798,7 +798,7 @@ CONFIG_ARPING=y
 CONFIG_BRCTL=y
 CONFIG_FEATURE_BRCTL_FANCY=y
 CONFIG_FEATURE_BRCTL_SHOW=y
-CONFIG_DNSD=y
+# CONFIG_DNSD is not set
 CONFIG_ETHER_WAKE=y
 # CONFIG_FTPD is not set
 # CONFIG_FEATURE_FTPD_WRITE is not set
@@ -837,7 +837,7 @@ CONFIG_FEATURE_IFUPDOWN_IPV4=y
 CONFIG_FEATURE_IFUPDOWN_IPV6=y
 # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
 CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
-CONFIG_INETD=y
+# CONFIG_INETD is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
@@ -862,7 +862,7 @@ CONFIG_FEATURE_IP_RARE_PROTOCOLS=y
 CONFIG_IPCALC=y
 CONFIG_FEATURE_IPCALC_FANCY=y
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_FAKEIDENTD=y
+# CONFIG_FAKEIDENTD is not set
 CONFIG_NAMEIF=y
 CONFIG_FEATURE_NAMEIF_EXTENDED=y
 CONFIG_NBDCLIENT=y
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index 6d376d2098..8e0af09cf9 100644
--- a/main/busybox/busyboxconfig-extras
+++ b/main/busybox/busyboxconfig-extras
@@ -774,7 +774,7 @@ CONFIG_READAHEAD=y
 # CONFIG_BRCTL is not set
 # CONFIG_FEATURE_BRCTL_FANCY is not set
 # CONFIG_FEATURE_BRCTL_SHOW is not set
-# CONFIG_DNSD is not set
+CONFIG_DNSD=y
 # CONFIG_ETHER_WAKE is not set
 CONFIG_FTPD=y
 CONFIG_FEATURE_FTPD_WRITE=y
@@ -813,7 +813,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
 # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
 # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-# CONFIG_INETD is not set
+CONFIG_INETD=y
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
@@ -838,7 +838,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR=""
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_FAKEIDENTD is not set
+CONFIG_FAKEIDENTD=y
 # CONFIG_NAMEIF is not set
 # CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 # CONFIG_NBDCLIENT is not set