From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 28 Oct 2011 00:16:58 +0000 (+0000)
Subject: [backfire] busybox: merge r28613
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=5ec497206a6e5a338688b3773787f06abb029ccc

[backfire] busybox: merge r28613

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28645 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index ef3b37176..38d0bbaf3 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 ea72f2de5..c5aeaf04d 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 1d9db8efb..ac0d6ef01 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