update 2022-05-20 23:45:13

hysteria/Makefile

@@ -10,7 +10,7 @@ PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/HyNetwork/hysteria/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=76efcf563100dbf89fe52ed5bda4e032f6cc38fc11b9f8a409fe5caaff2e5230
+PKG_HASH:=d2cb7a3f1b9ae3ac258928fb0d74e19e2066ad164492116c934b4585e0a4a94d
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILE:=LICENSE

luci-app-amlogic/Makefile

@@ -16,7 +16,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-amlogic
-PKG_VERSION:=3.1.94
+PKG_VERSION:=3.1.95
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0 License

luci-app-amlogic/luasrc/view/amlogic/other_install.htm

@@ -9,7 +9,8 @@
 				<option value="0"><%:Select List%></option>
 				<option value="11"><%:[s905d] Phicomm N1%></option>
 				<option value="12"><%:[s905d] Phicomm N1 (DMA thresh)%></option>
-				<option value="13"><%:[s905x] HG680P & B860H%></option>
+				<option value="13"><%:[s905x] HG680P%></option>
+				<option value="13"><%:[s905x] B860H%></option>
 				<option value="14"><%:[s905w] X96-Mini & TX3-Mini%></option>
 				<option value="21"><%:[s912] Octopus Planet%></option>
 				<option value="31"><%:[s905x2] X96 Max 4G%></option>

luci-app-amlogic/po/zh-cn/amlogic.po

@@ -104,8 +104,11 @@ msgstr "[s905d] 斐讯-N1"
 msgid "[s905d] Phicomm N1 (DMA thresh)"
 msgstr "[s905d] 斐讯-N1 (流控)"
 
-msgid "[s905x] HG680P & B860H"
-msgstr "[s905x] 烽火HG680 & 中兴B860H"
+msgid "[s905x] HG680P"
+msgstr "[s905x] 烽火HG680"
+
+msgid "[s905x] B860H"
+msgstr "[s905x] 中兴B860H"
 
 msgid "[s905w] X96-Mini & TX3-Mini"
 msgstr "[s905w] X96-Mini & TX3-Mini"

luci-app-amlogic/root/usr/sbin/openwrt-install-amlogic

@@ -111,8 +111,9 @@ else
 # Amlogic GXL Family
 11:Phicomm N1:s905d:meson-gxl-s905d-phicomm-n1.dtb:u-boot-n1.bin:NA:/lib/u-boot/u-boot-2015-phicomm-n1.bin:4C@1512Mhz,2GB Mem,1Gb Nic,brcm43455 wifi
 12:Phicomm N1 (DMA thresh):s905d:meson-gxl-s905d-phicomm-n1-thresh.dtb:u-boot-n1.bin:NA:/lib/u-boot/u-boot-2015-phicomm-n1.bin:Same as above, when ethmac flow control is off 
-13:hg680p & b860h:s905x:meson-gxl-s905x-p212.dtb:u-boot-p212.bin:NA:NA:4C@1512Mhz,1Gb Nic
+13:hg680p:s905x:meson-gxl-s905x-p212.dtb:u-boot-p212.bin:NA:NA:4C@1512Mhz,1Gb Nic
 14:X96-Mini & TX3-Mini:s905w:meson-gxl-s905w-tx3-mini.dtb:u-boot-s905x-s912.bin:NA:NA:4C@1512Mhz,100M Nic
+15:b860h:s905x:meson-gxl-s905x-b680h.dtb:u-boot-p212.bin:NA:NA:4C@1512Mhz,1Gb Nic
 
 # Amlogic GXM Family
 21:Octopus Planet:s912:meson-gxm-octopus-planet.dtb:u-boot-zyxq.bin:NA:NA:4C@1512Mhz+4C@1000Mhz,2GB Mem,1Gb Nic

my-default-settings/files/etc/uci-defaults/99-default-settings

@@ -26,13 +26,15 @@ sed -i '/profile.d/d' /lib/upgrade/keep.d/base-files
 
 echo $(uci -q get uhttpd.main.index_page) | grep -q "cgi-bin/luci" ||
 	uci -q add_list uhttpd.main.index_page='cgi-bin/luci' && uci commit uhttpd
-	
+
 grep -q "return 301" /etc/nginx/conf.d/luci.locations || {
 echo '
 location ~* ^/cgi-bin/(.*) {
 		return 307 $scheme://$http_host/$1$is_args$args;
 }
 
+[ -f /etc/dnsmasq.d ] || sed -i "/\/etc\/dnsmasq.d/d" /etc/dnsmasq.conf
+
 location = / {
 		return 301 $scheme://$http_host/luci/;
 }