diff options
| -rw-r--r-- | main/busybox/APKBUILD | 6 | ||||
| -rw-r--r-- | main/busybox/busybox.post-upgrade | 2 | ||||
| -rw-r--r-- | main/busybox/busyboxconfig | 10 | ||||
| -rw-r--r-- | main/busybox/busyboxconfig-extras | 21 |
4 files changed, 20 insertions, 19 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index d3999f049f..94ceef6099 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.27.2 -pkgrel=2 +pkgrel=3 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -187,8 +187,8 @@ f4e00eb13fda752df13f300a7ed9b1320ca9f573c4309247f292c8710464d7be8740148f42e4aff1 a09a64b3bce8048c58a68dcd2dd9e63c911009c06195d6bb4e5aecfb5700e479c25b34635c60899127975fae32275ad51846ee75f840d612e00668ce9aba8322 0012-microcom-segfault.patch 524e858b52cb31fb8d24e8c7f18606fff349aeab6a14da9cca3902641f6127980daed73c53586c6e8b41eecda06cdb29c40ff1dde2dc82a318c2649680458921 top-buffer-overflow.patch a9b1403c844c51934637215307dd9e2adb9458921047acff0d86dcf229b6e0027f4b2c6cdaa25a58407aad9d098fb5685d58eb5ff8d2aa3de4912cdea21fe54c acpid.logrotate -b801a6226e2b13642f9df2450d1c35537b8f06a9605d930dd4f1d519fb7342cc023cdf44f0ee0f479321b02c9ec6354767cc714294223f41ddf127e1b04b8af8 busyboxconfig -46533a71c04d2b342a247c9ec7a01679f966c5c97ae45ccf0bb06074be45f3e8ca95db3c842b889aedb6e231d4efa3393ff069ac9eb6e39a43887b6ac4033561 busyboxconfig-extras +02102f0764ffbec86e97ccab99b3a1e55ffa5b25aa2cdc1fe270d5b575610bdb50568574c7cbd05aba91b13151f84f536b44320c180051cbd77cf258e4fc89a4 busyboxconfig +7759d1611ce72f7aa9e4afbd48f410806b3bd59701fe8a570675898c504c0e15f85bacbc1578f87345197844ee6175117d348acc4fe29a742b7ac96b84fe7386 busyboxconfig-extras e84087a453f8c9814951c9ad496cce19f8280b80a8ab6a1c8e21385f1facb17e987adc8d1d72c7cb463c04eb0cadd2bd6fb9b6f6c0067ddd21eeacf91ca42f32 bbsuid.c a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02 dad.if-up 4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2 nologin.c" diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade index 4d7eb32aa2..291ed7a6db 100644 --- a/main/busybox/busybox.post-upgrade +++ b/main/busybox/busybox.post-upgrade @@ -15,7 +15,7 @@ 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 /usr/sbin/fakeidentd /usr/sbin/dnsd \ - /usr/sbin/inetd ; do + /usr/sbin/inetd /usr/sbin/udhcpd; 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 650bc3dad3..9796460718 100644 --- a/main/busybox/busyboxconfig +++ b/main/busybox/busyboxconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.27.2 -# Fri Oct 20 05:53:24 2017 +# Fri Oct 27 21:22:08 2017 # CONFIG_HAVE_DOT_CONFIG=y @@ -937,10 +937,10 @@ CONFIG_UDHCPC6=y CONFIG_FEATURE_UDHCPC6_RFC3646=y CONFIG_FEATURE_UDHCPC6_RFC4704=y CONFIG_FEATURE_UDHCPC6_RFC4833=y -CONFIG_UDHCPD=y -CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y -CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y -CONFIG_DHCPD_LEASES_FILE="/var/lib/udhcpd/udhcpd.leases" +# CONFIG_UDHCPD is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" CONFIG_DUMPLEASES=y # CONFIG_DHCPRELAY is not set CONFIG_UDHCPC=y diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras index 245e28fc74..c460d01442 100644 --- a/main/busybox/busyboxconfig-extras +++ b/main/busybox/busyboxconfig-extras @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.27.0 -# Thu Jul 6 14:05:06 2017 +# Busybox version: 1.27.2 +# Fri Oct 27 21:23:19 2017 # CONFIG_HAVE_DOT_CONFIG=y @@ -10,6 +10,7 @@ CONFIG_HAVE_DOT_CONFIG=y # # CONFIG_DESKTOP is not set # CONFIG_EXTRA_COMPAT is not set +# CONFIG_FEDORA_COMPAT is not set # CONFIG_INCLUDE_SUSv2 is not set # CONFIG_USE_PORTABLE_CODE is not set CONFIG_SHOW_USAGE=y @@ -51,7 +52,6 @@ CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" -CONFIG_FEDORA_COMPAT=n # # Installation Options ("make install" behavior) @@ -917,10 +917,10 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set -# CONFIG_UDHCPD is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -CONFIG_DHCPD_LEASES_FILE="" +CONFIG_UDHCPD=y +CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y +CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y +CONFIG_DHCPD_LEASES_FILE="/var/lib/udhcpd/udhcpd.leases" # CONFIG_DUMPLEASES is not set # CONFIG_DHCPRELAY is not set # CONFIG_UDHCPC is not set @@ -929,9 +929,9 @@ CONFIG_DHCPD_LEASES_FILE="" CONFIG_UDHCPC_DEFAULT_SCRIPT="" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -# CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_FEATURE_UDHCP_8021Q=y +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # @@ -1051,6 +1051,7 @@ CONFIG_BASH_IS_NONE=y # CONFIG_ASH_HELP is not set # CONFIG_ASH_GETOPTS is not set # CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_COMMAND_NOT_FOUND_HOOK is not set # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set |