diff --git a/aliyundrive-webdav/Makefile b/aliyundrive-webdav/Makefile index c44f0f008..d28304444 100644 --- a/aliyundrive-webdav/Makefile +++ b/aliyundrive-webdav/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aliyundrive-webdav -PKG_VERSION:=1.2.3 -PKG_RELEASE:=$(AUTORELESE) +PKG_VERSION:=1.2.4 +PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=MIT PKG_MAINTAINER:=messense @@ -29,14 +29,14 @@ PKG_HASH:=skip include $(INCLUDE_DIR)/package.mk define Package/aliyundrive-webdav - SECTION:=multimedia - CATEGORY:=Multimedia - TITLE:=WebDAV server for AliyunDrive - URL:=https://github.com/messense/aliyundrive-webdav + SECTION:=multimedia + CATEGORY:=Multimedia + TITLE:=WebDAV server for AliyunDrive + URL:=https://github.com/messense/aliyundrive-webdav endef define Package/aliyundrive-webdav/description -WebDAV server for AliyunDrive. + WebDAV server for AliyunDrive. endef define Package/aliyundrive-webdav/conffiles diff --git a/chinadns-ng/Makefile b/chinadns-ng/Makefile index 7a896b09b..8b18e6546 100644 --- a/chinadns-ng/Makefile +++ b/chinadns-ng/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=chinadns-ng PKG_VERSION:=1.0-beta.25 -PKG_RELEASE:=$(AUTORELESE) +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng.git diff --git a/luci-app-aliyundrive-webdav/Makefile b/luci-app-aliyundrive-webdav/Makefile index 9f55b3f56..3e8bfdae6 100644 --- a/luci-app-aliyundrive-webdav/Makefile +++ b/luci-app-aliyundrive-webdav/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-aliyundrive-webdav -PKG_VERSION:=1.2.3 +PKG_VERSION:=1.2.4 PKG_RELEASE:=1 PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) diff --git a/luci-app-mosdns/root/etc/init.d/mosdns b/luci-app-mosdns/root/etc/init.d/mosdns index a271222a3..980a5a242 100755 --- a/luci-app-mosdns/root/etc/init.d/mosdns +++ b/luci-app-mosdns/root/etc/init.d/mosdns @@ -53,7 +53,6 @@ reload_service() { } setcron() { - chmod 755 /etc/mosdns/mosupdater.sh [ "$(tail -n1 /etc/crontabs/root | wc -l)" -eq 0 ] && [ -n "$(cat /etc/crontabs/root 2>/dev/null)" ] && echo >>/etc/crontabs/root grep -q "mosupdater.sh" "$CRON_FILE" && { [ "$(uci -q get mosdns.mosdns.geo_auto_update)" -eq 1 ] && echo "0 $(uci -q get mosdns.mosdns.geo_update_day_time) * * $(uci -q get mosdns.mosdns.geo_update_week_time) /etc/mosdns/mosupdater.sh" >>$CRON_FILE diff --git a/luci-app-mosdns/root/etc/mosdns/dns.sh b/luci-app-mosdns/root/etc/mosdns/dns.sh index 668632b6a..b1c205e72 100755 --- a/luci-app-mosdns/root/etc/mosdns/dns.sh +++ b/luci-app-mosdns/root/etc/mosdns/dns.sh @@ -2,7 +2,7 @@ source /etc/mosdns/library.sh if [ "$(ifconfig | grep -c wan)" = 0 ]; then - echo "119.29.29.29" + bakdns "$1" exit 0 fi @@ -11,5 +11,5 @@ if [[ "$(getdns 0)" =~ ^127\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then elif [[ "$(getdns "$1")" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then getdns "$1" else - echo "119.29.29.29" + bakdns "$1" fi diff --git a/luci-app-mosdns/root/etc/mosdns/library.sh b/luci-app-mosdns/root/etc/mosdns/library.sh index bd52fcbd1..309c3d84a 100755 --- a/luci-app-mosdns/root/etc/mosdns/library.sh +++ b/luci-app-mosdns/root/etc/mosdns/library.sh @@ -1,28 +1,37 @@ #!/bin/echo Warning:this is a library should be sourced! -pid() { - pgrep -f "$1" -} - -getdat() { - if exist curl; then - curl -fSLo "$TMPDIR/$1" "https://gh.404delivr.workers.dev/https://github.com/QiuSimons/openwrt-mos/raw/master/luci-app-mosdns/root/etc/mosdns/$1" - else - wget "https://gh.404delivr.workers.dev/https://github.com/QiuSimons/openwrt-mos/raw/master/luci-app-mosdns/root/etc/mosdns/$1" -nv -O "$TMPDIR/$1" - fi -} - -getdns() { - if [ "$2" == "inactive" ]; then - ubus call network.interface.wan status | jsonfilter -e "@['inactive']['dns-server'][$1]" - else - ubus call network.interface.wan status | jsonfilter -e "@['dns-server'][$1]" +bakdns() { + if [ "$1" == "0" ]; then + echo "119.29.29.29" + elif [ "$1" == "1" ]; then + echo "101.226.4.6" fi } exist() { - command -v "$1" >/dev/null &>/dev/null + command -v "$1" >/dev/null &>/dev/null } +getdat() { + if exist curl; then + curl -fSLo "$TMPDIR/$1" "https://gh.404delivr.workers.dev/https://github.com/QiuSimons/openwrt-mos/raw/master/luci-app-mosdns/root/etc/mosdns/$1" + else + wget "https://gh.404delivr.workers.dev/https://github.com/QiuSimons/openwrt-mos/raw/master/luci-app-mosdns/root/etc/mosdns/$1" -nv -O "$TMPDIR/$1" + fi +} + +getdns() { + if [ "$2" == "inactive" ]; then + ubus call network.interface.wan status | jsonfilter -e "@['inactive']['dns-server'][$1]" + else + ubus call network.interface.wan status | jsonfilter -e "@['dns-server'][$1]" + fi +} + +pid() { + pgrep -f "$1" +} + + L_exist() { if [ "$1" == "ssrp" ]; then uci get shadowsocksr.@global[0].global_server &>/dev/null diff --git a/qttools/Makefile b/qttools/Makefile index 2359ecfe3..aa6e4b930 100644 --- a/qttools/Makefile +++ b/qttools/Makefile @@ -10,7 +10,7 @@ PKG_NAME:=qttools PKG_BASE:=5.15 PKG_BUGFIX:=2 PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX) -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-everywhere-src-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:= \ @@ -27,7 +27,7 @@ PKG_BUILD_DEPENDS:=qtbase include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) +define Package/qttools SECTION:=libs CATEGORY:=Libraries SUBMENU:=Qt5 @@ -48,4 +48,4 @@ define Build/InstallDev $(MAKE) -C $(PKG_BUILD_DIR) install endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,qttools)) diff --git a/shadowsocks-rust/Makefile b/shadowsocks-rust/Makefile index 99744cb45..5dd0db534 100644 --- a/shadowsocks-rust/Makefile +++ b/shadowsocks-rust/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadowsocks-rust -PKG_VERSION:=1.13.1 +PKG_VERSION:=1.13.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION)