uci: fix luci firewall rules display error

package/lean/luci-app-cifsd/po/zh-cn/cifsd.po

@@ -70,7 +70,7 @@ msgstr "仅监听指定的接口，未指定则监听 lan"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:51
 msgid "Name"
-msgstr "共享名"
+msgstr "名称"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:16
 #: applications/luci-app-cifsd/luasrc/controller/cifsd.lua:10

package/lean/luci-app-samba4/po/zh-cn/samba4.po

@@ -100,7 +100,7 @@ msgstr "继承所有者"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:57
 msgid "Name"
-msgstr "共享名"
+msgstr "名称"
 
 #: applications/luci-app-samba4/luasrc/controller/samba4.lua:12
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:3

package/lean/luci-app-samba4/po/zh-tw/samba4.po

@@ -100,7 +100,7 @@ msgstr "繼承所有者"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:57
 msgid "Name"
-msgstr "共享名"
+msgstr "名称"
 
 #: applications/luci-app-samba4/luasrc/controller/samba4.lua:12
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:3

package/system/uci/Makefile

@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uci
-PKG_RELEASE:=3
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE=2020-04-24
-PKG_SOURCE_VERSION:=ec8d3233948603485e1b97384113fac9f1bab5d6
-PKG_MIRROR_HASH:=b3cdc66a8ec4f05a102ce5520a3f8ff69ca4a49930c5bb01065467ef68f0808b
+PKG_SOURCE_DATE=2018-08-11
+PKG_SOURCE_VERSION:=4c8b4d6efc8302b508d261573351fffb75bd98c2
+PKG_MIRROR_HASH:=c1f0f565921c71ff9231508c7c249baacad4c3ae1a3fade25c37bcb2bf7a7b5f
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
@@ -35,7 +35,6 @@ define Package/libuci
   CATEGORY:=Libraries
   TITLE:=C library for the Unified Configuration Interface (UCI)
   DEPENDS:=+libubox
-  ABI_VERSION:=20130104
 endef
 
 define Package/uci

package/system/uci/files/lib/config/uci.sh

@@ -85,15 +85,6 @@ uci_set() {
 	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE"
 }
 
-uci_add_list() {
-	local PACKAGE="$1"
-	local CONFIG="$2"
-	local OPTION="$3"
-	local VALUE="$4"
-
-	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} add_list "$PACKAGE.$CONFIG.$OPTION=$VALUE"
-}
-
 uci_get_state() {
 	uci_get "$1" "$2" "$3" "$4" "/var/state"
 }
@@ -117,7 +108,7 @@ uci_add() {
 	local CONFIG="$3"
 
 	if [ -z "$CONFIG" ]; then
-		export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} add "$PACKAGE" "$TYPE")"
+		export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci add "$PACKAGE" "$TYPE")"
 	else
 		/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG=$TYPE"
 		export ${NO_EXPORT:+-n} CONFIG_SECTION="$CONFIG"
@@ -141,15 +132,6 @@ uci_remove() {
 	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del "$PACKAGE.$CONFIG${OPTION:+.$OPTION}"
 }
 
-uci_remove_list() {
-	local PACKAGE="$1"
-	local CONFIG="$2"
-	local OPTION="$3"
-	local VALUE="$4"
-
-	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del_list "$PACKAGE.$CONFIG.$OPTION=$VALUE"
-}
-
 uci_commit() {
 	local PACKAGE="$1"
 	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit $PACKAGE

target/linux/ipq40xx/base-files/etc/board.d/02_network

@@ -116,12 +116,7 @@ ipq40xx_setup_macs()
 	8dev,habanero-dvk)
 		label_mac=$(mtd_get_mac_binary "ART" 0x1006)
 		;;
-	asus,rt-acrh17)
-		CI_UBIPART=UBI_DEV
-		wan_mac=$(mtd_get_mac_binary_ubi Factory 0x1006)
-		lan_mac=$(macaddr_add "$wan_mac" 1)
-		label_mac=$wan_mac
-		;;
+	asus,rt-acrh17|\
 	asus,rt-ac58u)
 		CI_UBIPART=UBI_DEV
 		wan_mac=$(mtd_get_mac_binary_ubi Factory 0x1006)

target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh

@@ -7,6 +7,12 @@ preinit_set_mac_address() {
 		ip link set dev eth0 address $(macaddr_add "$base_mac" +1)
 		ip link set dev eth1 address $(macaddr_add "$base_mac" +3)
 		;;
+	asus,rt-acrh17|\
+	asus,rt-ac58u)
+		CI_UBIPART=UBI_DEV
+		base_mac=$(mtd_get_mac_binary_ubi Factory 4102)
+		ip link set dev eth0 address $(macaddr_add "$base_mac" +1)
+		;;
 	ezviz,cs-w3-wd1200g-eup)
 		ip link set dev eth0 address $(mtd_get_mac_binary "ART" 0x6)
 		ip link set dev eth1 address $(mtd_get_mac_binary "ART" 0x0)