From 101f9994b74ec2131be3f3d1fb142301576fbfc4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 28 Oct 2011 00:16:58 +0000 Subject: [PATCH] busybox: merge r28613 SVN-Revision: 28645 --- package/busybox/Makefile | 2 +- package/busybox/config/networking/Config.in | 4 ++-- package/busybox/config/util-linux/Config.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/busybox/Makefile b/package/busybox/Makefile index ef3b371769..38d0bbaf30 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox PKG_VERSION:=1.15.3 -PKG_RELEASE:=3 +PKG_RELEASE:=3.1 PKG_FLAGS:=essential PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index ea72f2de52..c5aeaf04db 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -669,13 +669,13 @@ config BUSYBOX_CONFIG_NSLOOKUP config BUSYBOX_CONFIG_NTPD bool "ntpd" - default n + default y help The NTP client/server daemon. config BUSYBOX_CONFIG_FEATURE_NTPD_SERVER bool "Make ntpd usable as a NTP server" - default n + default y depends on BUSYBOX_CONFIG_NTPD help Make ntpd usable as a NTP server. If you disable this option diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 1d9db8efb7..ac0d6ef01f 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -737,7 +737,7 @@ config BUSYBOX_CONFIG_PIVOT_ROOT config BUSYBOX_CONFIG_RDATE bool "rdate" - default y + default n help The rdate utility allows you to synchronize the date and time of your system clock with the date and time of a remote networked system using -- 2.30.2