From 10416af13b378fefc9986cae3e28e656cc15fbf4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 30 Apr 2022 16:49:35 +0800 Subject: [PATCH] update 04-30 16:49:35 --- adguardhome/Makefile | 2 +- luci-app-adguardhome/Makefile | 1 + luci-app-mosdns/root/etc/init.d/mosdns | 2 +- smartdns/Makefile | 21 +++++------ smartdns/conf/custom.conf | 48 -------------------------- smartdns/conf/smartdns.conf | 28 --------------- 6 files changed, 14 insertions(+), 88 deletions(-) delete mode 100644 smartdns/conf/custom.conf delete mode 100644 smartdns/conf/smartdns.conf diff --git a/adguardhome/Makefile b/adguardhome/Makefile index 7cd4efa9e..300e6c8e4 100644 --- a/adguardhome/Makefile +++ b/adguardhome/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome PKG_VERSION:=0.108.0-b.7 -PKG_RELEASE:=57 +PKG_RELEASE:= PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=a580149ad67b604a1e3c6e7b3483d856a51c905a diff --git a/luci-app-adguardhome/Makefile b/luci-app-adguardhome/Makefile index db03e8acb..db52e7627 100644 --- a/luci-app-adguardhome/Makefile +++ b/luci-app-adguardhome/Makefile @@ -25,6 +25,7 @@ define Package/luci-app-adguardhome/conffiles /usr/share/AdGuardHome/links.txt /etc/config/AdGuardHome /etc/AdGuardHome.yaml +/etc/AdGuardHome.yaml endef define Package/luci-app-adguardhome/postinst diff --git a/luci-app-mosdns/root/etc/init.d/mosdns b/luci-app-mosdns/root/etc/init.d/mosdns index 600d548b6..3ca62f941 100755 --- a/luci-app-mosdns/root/etc/init.d/mosdns +++ b/luci-app-mosdns/root/etc/init.d/mosdns @@ -2,7 +2,7 @@ # Copyright (C) 2020 IrineSistiana # shellcheck disable=SC2034 -START=91 +START=99 USE_PROCD=1 ##### ONLY CHANGE THIS BLOCK ###### diff --git a/smartdns/Makefile b/smartdns/Makefile index db377f852..db00838a0 100644 --- a/smartdns/Makefile +++ b/smartdns/Makefile @@ -1,17 +1,18 @@ -# SPDX-License-Identifier: GPL-3.0-or-later # -# Copyright (C) 2018-2020 Ruilin Peng (Nick) . +# Copyright (c) 2018-2020 Nick Peng (pymumu@gmail.com) +# This is free software, licensed under the GNU General Public License v3. +# include $(TOPDIR)/rules.mk PKG_NAME:=smartdns PKG_VERSION:=Release36.1 -PKG_RELEASE:=19 +PKG_RELEASE:= -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/pymumu/smartdns/tar.gz/Release$(PKG_VERSION)? -PKG_HASH:=skip -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-Release$(PKG_VERSION) +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://www.github.com/pymumu/smartdns.git +PKG_SOURCE_VERSION:=24661c2419a81e660b11a0e3d35a3bc269cd4bfa +PKG_MIRROR_HASH:=skip PKG_MAINTAINER:=Nick Peng PKG_LICENSE:=GPL-3.0-or-later @@ -21,8 +22,8 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk +MAKE_VARS += VER=$(PKG_VERSION) MAKE_PATH:=src -MAKE_VARS+= VER=$(PKG_VERSION) define Package/smartdns SECTION:=net @@ -51,8 +52,8 @@ define Package/smartdns/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/package/openwrt/files/etc/init.d/smartdns $(1)/etc/init.d/smartdns $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/address.conf $(1)/etc/smartdns/address.conf $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/blacklist-ip.conf $(1)/etc/smartdns/blacklist-ip.conf - $(INSTALL_CONF) $(CURDIR)/conf/custom.conf $(1)/etc/smartdns/custom.conf - $(INSTALL_CONF) $(CURDIR)/conf/smartdns.conf $(1)/etc/config/smartdns + $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/custom.conf $(1)/etc/smartdns/custom.conf + $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/files/etc/config/smartdns $(1)/etc/config/smartdns endef $(eval $(call BuildPackage,smartdns)) diff --git a/smartdns/conf/custom.conf b/smartdns/conf/custom.conf deleted file mode 100644 index e074a3fcd..000000000 --- a/smartdns/conf/custom.conf +++ /dev/null @@ -1,48 +0,0 @@ -# Add custom settings here. - -# set log level -# log-level [level], level=fatal, error, warn, notice, info, debug -# log-level error - -# log-size k,m,g -# log-size 128k - -# log-file /var/log/smartdns.log -# log-num 2 - -# List of hosts that supply bogus NX domain results -# bogus-nxdomain [ip/subnet] - -speed-check-mode tcp:80,ping - -server 101.6.6.6:5353 -server 202.38.93.153:5353 -server 202.141.162.123:5353 -server 202.141.178.13:5353 -server 2001:da8::666 -server 208.67.222.222:5353 -group fq_dns -exclude-default-group -server 208.67.220.220:5353 -group fq_dns -exclude-default-group - -server-tcp 1.0.0.1 -group fq_dns -exclude-default-group -server-tcp 8.8.4.4 -group fq_dns -exclude-default-group -server-tcp 149.112.112.112 -group fq_dns -exclude-default-group -server-tcp 2606:4700:4700::1001 -group fq_dns -exclude-default-group - -server-tls 115.159.131.230 -host-name dns.rubyfish.cn -server-tls dns.rubyfish.cn -server-tls 1.1.1.1 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group -server-tls 2606:4700:4700::1111 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group -server-tls 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group -server-tls 8.8.8.8 -host-name dns.google -group fq_dns -exclude-default-group -server-tls dns.google -group fq_dns -exclude-default-group - -server-https https://202.38.93.153/resolve -host-name neatdns.ustclug.org -http-host neatdns.ustclug.org -server-https https://202.141.178.13/resolve -host-name neatdns.ustclug.org -http-host neatdns.ustclug.org -server-https https://[2001:da8:d800:931::153]/resolve -host-name neatdns.ustclug.org -http-host neatdns.ustclug.org -server-https https://neatdns.ustclug.org/resolve -server-https https://rubyfish.cn/dns-query -server-https https://i.233py.com/dns-query -server-https https://9.9.9.9/dns-query -group fq_dns -exclude-default-group -server-https https://dns9.quad9.net/dns-query -group fq_dns -exclude-default-group -server-https https://146.112.41.2/dns-query -host-name doh.opendns.com -http-host doh.opendns.com -group fq_dns -exclude-default-group -server-https https://doh.opendns.com/dns-query -group fq_dns -exclude-default-group diff --git a/smartdns/conf/smartdns.conf b/smartdns/conf/smartdns.conf deleted file mode 100644 index 3af035694..000000000 --- a/smartdns/conf/smartdns.conf +++ /dev/null @@ -1,28 +0,0 @@ -config smartdns - option server_name 'smartdns' - option dualstack_ip_selection '1' - option prefetch_domain '1' - option serve_expired '1' - option seconddns_no_speed_check '0' - option seconddns_no_dualstack_selection '0' - option seconddns_no_cache '0' - option tcp_server '0' - option seconddns_tcp_server '0' - option coredump '0' - option port '6053' - option ipv6_server '0' - option redirect 'dnsmasq-upstream' - option seconddns_port '5335' - option seconddns_server_group 'fq_dns' - option seconddns_enabled '1' - option seconddns_no_rule_addr '0' - option seconddns_no_rule_nameserver '0' - option seconddns_no_rule_ipset '0' - option seconddns_no_rule_soa '0' - option enabled '0' - option cache_size '20000' - option rr_ttl '3600' - option rr_ttl_min '5' - list old_redirect 'dnsmasq-upstream' - list old_port '6053' - list old_enabled '0'