diff --git a/Makefile b/Makefile index c180c40..88ac437 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,19 @@ # # Copyright (C) 2015 OpenWrt-dist # -# This is free software, licensed under the MIT. -# See /LICENSE for more information. +# This is free software, licensed under the GPLv3. +# See /COPYING for more information. # include $(TOPDIR)/rules.mk PKG_NAME:=ChinaDNS -PKG_VERSION:=1.3.1 +PKG_VERSION:=1.3.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/aa65535/openwrt-chinadns/releases/download/v$(PKG_VERSION) -PKG_MD5SUM:=a68bd997f3d69291605f69e93c1514c2 +PKG_MD5SUM:=c529ac231aed4e5874251639f77e92de PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=COPYING @@ -41,14 +41,12 @@ endef define Package/ChinaDNS/conffiles /etc/config/chinadns -/etc/chinadns_iplist.txt /etc/chinadns_chnroute.txt endef define Package/ChinaDNS/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/chinadns.init $(1)/etc/init.d/chinadns - $(INSTALL_CONF) $(PKG_BUILD_DIR)/iplist.txt $(1)/etc/chinadns_iplist.txt $(INSTALL_CONF) $(PKG_BUILD_DIR)/chnroute.txt $(1)/etc/chinadns_chnroute.txt $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DATA) ./files/chinadns.config $(1)/etc/config/chinadns diff --git a/files/chinadns.config b/files/chinadns.config index 0d8a5be..4b5491e 100644 --- a/files/chinadns.config +++ b/files/chinadns.config @@ -1,9 +1,7 @@ config chinadns option enable '1' - option compression '1' option bidirectional '0' option chnroute '/etc/chinadns_chnroute.txt' option port '5353' option server '114.114.114.114,8.8.4.4' - diff --git a/files/chinadns.init b/files/chinadns.init index 23b72df..206e2d2 100644 --- a/files/chinadns.init +++ b/files/chinadns.init @@ -36,13 +36,10 @@ start_chinadns() { [ "$enable" = 1 ] || return 0 append_parm $1 port "-p" append_parm $1 server "-s" - append_parm $1 iplist "-l" append_parm $1 chnroute "-c" - append_bool $1 compression "-m" - append_parm $1 result_delay "-y" append_bool $1 bidirectional "-d" service_start /usr/bin/chinadns \ - $parms + $parms -m return $? }