Merge branch 'openwrt-22.03' of https://github.com/openwrt/packages i…

…nto 22.03

net/apfree-wifidog/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apfree-wifidog
-PKG_VERSION:=7.06.2008
+PKG_VERSION:=7.07.2018
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/liudf0716/$(PKG_NAME)/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=dc9a2bbd86138d7a2afd6d00ddb05844c44eaf0f847c8b7c3997076a46bd4004
+PKG_HASH:=228770ed320133c7ba0f5f27b35c61a45293a1127529f530c44f8810c1f5965e
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Dengfeng Liu <[email protected]>

net/apfree-wifidog/files/wifidogx.conf

@@ -14,25 +14,38 @@ config wifidogx 'common'
 	option enable_dns_forward 1
 
 config group 'wechat'
-        option g_type '1'
-        list domain_name 'open.weixin.qq.com'
-        list domain_name 'api.weixin.qq.com'
+        option g_type '3'
+		list wildcard_domain '.weixin.qq.com'
+        option g_desc '微信泛域名'
+
+config group 'wechat2'
+		option g_type '1'
 		list domain_name 'weixin.qq.com'
-        option g_desc '微信'
+		option g_desc '微信域名'
 
 config group 'dingtalk'
-        option g_type '1'
-        list domain_name 'oapi.dingtalk.com'
-        list domain_name 'open-dev.dingtalk.com'
-        list domain_name 'dingtalk.com'
+        option g_type '3'
+        list wildcard_domain '.dingtalk.com'
         option g_desc '钉钉'
 
+config group 'dingtalk2'
+		option g_type '1'
+		list domain_name 'dingtalk.com'
+		option g_desc '钉钉域名'
+
 config group 'alipay'
+		option g_type '3'
+		list wildcard_domain '.alipay.com'
+		list wildcard_domain '.alipayobjects.com'
+		list wildcard_domain '.alipaydev.com'
+		option g_desc '支付宝'
+
+config group 'alipay2'
 		option g_type '1'
 		list domain_name 'alipay.com'
 		list domain_name 'alipayobjects.com'
 		list domain_name 'alipaydev.com'
-		option g_desc '支付宝'
+		option g_desc '支付宝域名'
 
 config group 'macdemo'
         option g_type '2'

net/apfree-wifidog/files/wifidogx.init

@@ -26,9 +26,11 @@ prepare_wifidog_conf() {
 		'apple_cna:bool:0' \
 		'channel_path:string' \
 		'trusted_domains:list(host)' \
+		'trusted_wildcard_domains:list(string)' \
 		'trusted_macs:list(string)' \
 		'app_white_list:list(string)' \
 		'mac_white_list:list(string)' \
+		'wildcard_white_list:list(string)' \
 		'enable_dns_forward:bool:1' \
 		'enable_websocket:bool:1' \
 		'js_filter:bool:1' 
@@ -72,6 +74,16 @@ prepare_wifidog_conf() {
 		done
 	fi
 
+	if [ ! -z "$wildcard_white_list" ]; then
+		# iterate wildcard_white_list and find the corresponding domain according to the item
+		for group in $wildcard_white_list; do
+			group_wildcard_list=$(uci get wifidogx.$group.wildcard_domain)
+			if [ ! -z "$group_wildcard_list" ]; then
+				trusted_wildcard_domains="$trusted_wildcard_domains $group_wildcard_list"
+			fi
+		done
+	fi
+
 	# set above variables to config file
 	echo "GatewayID $gateway_id" > ${CONFIGFILE}
 	echo "GatewayInterface $gateway_interface" >> ${CONFIGFILE}
@@ -97,6 +109,11 @@ prepare_wifidog_conf() {
 		trusted_macs=$(echo $trusted_macs | tr ' ' ',')
 		echo "TrustedMACList $trusted_macs" >> ${CONFIGFILE}
 	fi
+	# if has trusted_wildcard_domains, add it to config file
+	if [ ! -z "$trusted_wildcard_domains" ]; then
+		trusted_wildcard_domains=$(echo $trusted_wildcard_domains | tr ' ' ',')
+		echo "TrustedPanDomains $trusted_wildcard_domains" >> ${CONFIGFILE}
+	fi
 }
 
 start_service() {

net/openssh/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_VERSION:=9.7p1
+PKG_VERSION:=9.8p1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 		https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
-PKG_HASH:=490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd
+PKG_HASH:=dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3
 
 PKG_LICENSE:=BSD ISC
 PKG_LICENSE_FILES:=LICENCE
@@ -179,7 +179,8 @@ CONFIGURE_ARGS += \
 	--without-kerberos5 \
 	--with-stackprotect \
 	--with$(if $(CONFIG_OPENSSL_ENGINE),,out)-ssl-engine \
-	--with$(if $(CONFIG_OPENSSH_LIBFIDO2),,out)-security-key-builtin
+	--with$(if $(CONFIG_OPENSSH_LIBFIDO2),,out)-security-key-builtin \
+	--with-cflags-after=-fzero-call-used-regs=skip
 
 ifeq ($(BUILD_VARIANT),with-pam)
 CONFIGURE_ARGS += \
@@ -235,6 +236,8 @@ define Package/openssh-server/install
 	$(INSTALL_BIN) ./files/sshd.failsafe $(1)/lib/preinit/99_10_failsafe_sshd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/sshd-session $(1)/usr/lib/
 endef
 
 define Package/openssh-server-pam/install