Merge pull request #1876 from mlichvar/chrony-update-2.2

chrony: update to 2.2
This commit is contained in:
Steven Barth 2015-10-20 13:36:53 +02:00
commit cf13856040
4 changed files with 5 additions and 12 deletions

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=chrony PKG_NAME:=chrony
PKG_VERSION:=2.1.1 PKG_VERSION:=2.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://download.tuxfamily.org/chrony/ PKG_SOURCE_URL:=http://download.tuxfamily.org/chrony/
PKG_MD5SUM:=15e470a51ab6e09e65bc0a2fbc5299af PKG_MD5SUM:=17bc77d3d2ce942675f9600b60452717
PKG_MAINTAINER:=Miroslav Lichvar <mlichvar0@gmail.com> PKG_MAINTAINER:=Miroslav Lichvar <mlichvar0@gmail.com>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
@ -41,7 +41,6 @@ endef
define Package/chrony/conffiles define Package/chrony/conffiles
/etc/chrony/chrony.conf /etc/chrony/chrony.conf
/etc/chrony/chrony.keys
/etc/config/chrony /etc/config/chrony
endef endef
@ -51,6 +50,7 @@ CONFIGURE_ARGS+= \
--host-system=Linux \ --host-system=Linux \
--sysconfdir=/etc/chrony \ --sysconfdir=/etc/chrony \
--prefix=/usr \ --prefix=/usr \
--chronysockdir=/var/run/chrony \
--disable-readline \ --disable-readline \
--disable-rtc \ --disable-rtc \
--disable-asyncdns \ --disable-asyncdns \
@ -71,7 +71,6 @@ define Package/chrony/install
$(INSTALL_BIN) ./files/chronyd.init $(1)/etc/init.d/chronyd $(INSTALL_BIN) ./files/chronyd.init $(1)/etc/init.d/chronyd
$(INSTALL_CONF) ./files/chrony.config $(1)/etc/config/chrony $(INSTALL_CONF) ./files/chrony.config $(1)/etc/config/chrony
$(INSTALL_CONF) ./files/chrony.conf $(1)/etc/chrony/chrony.conf $(INSTALL_CONF) ./files/chrony.conf $(1)/etc/chrony/chrony.conf
$(INSTALL_CONF) ./files/chrony.keys $(1)/etc/chrony/chrony.keys
endef endef
$(eval $(call BuildPackage,chrony)) $(eval $(call BuildPackage,chrony))

View file

@ -5,8 +5,3 @@ logchange 0.5
# Don't log client accesses # Don't log client accesses
noclientlog noclientlog
# Password config for chronyc
keyfile /etc/chrony/chrony.keys
commandkey 1
generatecommandkey

View file

@ -2,5 +2,5 @@ COMMAND=/usr/bin/chronyc
[ -x $COMMAND ] || exit 0 [ -x $COMMAND ] || exit 0
[ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && $COMMAND -a online [ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && $COMMAND online
[ "$ACTION" = "ifdown" -a "$INTERFACE" = "wan" ] && $COMMAND -a offline [ "$ACTION" = "ifdown" -a "$INTERFACE" = "wan" ] && $COMMAND offline

View file

@ -1 +0,0 @@
# Keys for NTP authentication and chronyc commands