mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

sync (#582)

Browse source
This commit is contained in:
suyuan 2024-12-26 20:20:58 +08:00 • committed by GitHub
commit 11f2983ea1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bcm27xx-utils/Makefile
View file

@ -3,13 +3,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=bcm27xx-utils PKG_NAME:=bcm27xx-utils
PKG_VERSION:=2024-04-24 PKG_VERSION:=2024.10.25
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/raspberrypi/utils.git PKG_SOURCE_URL:=https://github.com/raspberrypi/utils.git
PKG_SOURCE_VERSION:=451b9881b72cb994c102724b5a7d9b93f97dc315 PKG_SOURCE_VERSION:=6a2a6becebbc38fde34a94386457ac8210f9119b
PKG_MIRROR_HASH:=b453976171187e0ffe7cacfdcab36cec6b5d02db8b6d978cb9afbbcafcfcff9d PKG_MIRROR_HASH:=a775c7ffb9fac2d798ec8e0a4c7707eb7133cbc9c4418a1cf9434f87c42c01bb
PKG_FLAGS:=nonshared PKG_FLAGS:=nonshared
PKG_BUILD_FLAGS:=no-lto PKG_BUILD_FLAGS:=no-lto
@ -46,6 +46,8 @@ define Package/bcm27xx-utils/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/eepflash.sh $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/eepflash.sh $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/eepmake $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/eepmake $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kdtc $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/otpset $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/otpset $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/overlaycheck $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/overlaycheck $(1)/usr/bin

3
omr-bypass/files/etc/init.d/omr-bypass-nft
View file

@ -919,7 +919,7 @@ start_service() {
[ "$(uci -q get xray.main.enabled)" = "1" ] && _xray_rules_config [ "$(uci -q get xray.main.enabled)" = "1" ] && _xray_rules_config
uci batch <<-EOF uci -q batch <<-EOF
set firewall.omr_bypass=include set firewall.omr_bypass=include
set firewall.omr_bypass.enabled='1' set firewall.omr_bypass.enabled='1'
set firewall.omr_bypass.type='script' set firewall.omr_bypass.type='script'
@ -1022,7 +1022,6 @@ stop_service() {
config_foreach _delete_firewall_rules ipset config_foreach _delete_firewall_rules ipset
uci -q commit firewall uci -q commit firewall
fw4 -q restart fw4 -q restart
exit 0
} }
service_triggers() { service_triggers() {

4
openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
View file

@ -182,9 +182,9 @@ if [ "$NBCPU" -gt 1 ] && [ -z "$(uci -q get openvpn.omr2)" ]; then
set openvpn.omr$c.disable_dco=1 set openvpn.omr$c.disable_dco=1
set openvpn.omr$c.ping_restart=60 set openvpn.omr$c.ping_restart=60
set openvpn.omr$c.tun_mtu=1420 set openvpn.omr$c.tun_mtu=1420
del_list firewall.zone_vpn.device=tun$((c-1))
add_list firewall.zone_vpn.device=tun$((c-1))
EOF EOF
[ -z "$(uci -q get firewall.zone_vpn.device | grep tun$((c-1)))" ] && add_list firewall.zone_vpn.device=tun$((c-1))
done done
uci -q commit openvpn uci -q commit openvpn
uci -q commit firewall uci -q commit firewall