Merge pull request coolsnowwolf#75 from coolsnowwolf/master

20200716 更新
xayane · Jul 16, 2020 · 7fb39e1 · 7fb39e1
2 parents 8b87293 + fc0516e
commit 7fb39e1
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/package/lean/gmediarender/Makefile b/package/lean/gmediarender/Makefile
@@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/nls.mk
 define Package/gmediarender
   SECTION:=multimedia
   CATEGORY:=Multimedia
-  DEPENDS:= +gstreamer1 +libgstreamer1 +glib2 +libupnp
+  DEPENDS:= +gstreamer1 +libgstreamer1 +gstreamer1-libs +glib2 +libupnp
   TITLE:=A Headless UPnP Renderer
 endef
 

diff --git a/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn b/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+openvpn_port="$(uci -q get openvpn.myvpn.port)"
+[ -z "$openvpn_port" ] && openvpn_port=1194
+
 uci -q batch <<-EOF >/dev/null
 	delete network.vpn0
 	set network.vpn0=interface
@@ -14,7 +17,7 @@ uci -q batch <<-EOF >/dev/null
 	set firewall.openvpn.target='ACCEPT'
 	set firewall.openvpn.src='wan'
 	set firewall.openvpn.proto='tcp udp'
-	set firewall.openvpn.dest_port='1194'
+	set firewall.openvpn.dest_port="$openvpn_port"
 
 	delete firewall.vpn
 	set firewall.vpn=zone

diff --git a/package/lean/luci-app-xlnetacc/root/etc/hotplug.d/iface/95-xlnetacc b/package/lean/luci-app-xlnetacc/root/etc/hotplug.d/iface/95-xlnetacc
@@ -5,9 +5,9 @@
 
 case "$ACTION" in
 	ifup)
-		/etc/init.d/xlnetacc start
+		/etc/init.d/xlnetacc restart
 		;;
 	ifdown)
-		/etc/init.d/xlnetacc stop
+		#/etc/init.d/xlnetacc stop
 		;;
 esac
diff --git a/package/lean/vlmcsd/Makefile b/package/lean/vlmcsd/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vlmcsd
-PKG_VERSION:=svn1112
+PKG_VERSION:=svn1113
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=fuyumi <280604399@qq.com>
@@ -10,7 +10,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/Wind4/vlmcsd.git
-PKG_SOURCE_VERSION:=cd488aeb85aedefe1cb4db02c632397d78a9de88
+PKG_SOURCE_VERSION:=e599080486478e219cd065e141d6de050a450c27
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz

diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile
@@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wireguard
 
-PKG_VERSION:=1.0.20200623
+PKG_VERSION:=1.0.20200712
 PKG_RELEASE:=1
 
 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/
-PKG_HASH:=130937724515799edf05ff8216bc837df8acda879428f3a7f96a3287758f9445
+PKG_HASH:=e15b3d4eb2cf186920a6ed13685187d6b846e59eb383c291913628682965ac95
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING

diff --git a/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4_info b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4_info
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set_rpi_info() {
+	case "$(board_name)" in
+	raspberrypi,4-model-b)
+		sed -i 's/VHT80/VHT40/g' /lib/wifi/mac80211.sh
+		;;
+	esac
+}
+
+boot_hook_add preinit_main set_rpi_info