diff --git a/linkease/Makefile b/linkease/Makefile index a0ba5bf45..c4cb2fbb1 100644 --- a/linkease/Makefile +++ b/linkease/Makefile @@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk PKG_ARCH_LINKEASE:=$(ARCH) PKG_NAME:=linkease -PKG_VERSION:=1.1.9 +PKG_VERSION:=1.2.0 PKG_RELEASE:=$(PKG_ARCH_LINKEASE)-2 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://fw0.koolcenter.com/binary/LinkEase/LinuxStorage/ -PKG_HASH:=0ec441f434357b049ae1d9a71caa1e553ad72f592e3010aeff7b997f1a991e79 +PKG_HASH:=7087773553bfcfe92a3a12d89449eb4ccf60fd7f0e241fa5819f7190f3fe0d8e PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION) diff --git a/luci-app-mosdns/Makefile b/luci-app-mosdns/Makefile index f1d59cc55..902763b91 100644 --- a/luci-app-mosdns/Makefile +++ b/luci-app-mosdns/Makefile @@ -17,6 +17,7 @@ endef define Package/$(PKG_NAME)/postinst #!/bin/sh +[ ! -f /etc/openwrt_release ] && exit 0 [ -n "${IPKG_INSTROOT}" ] || { sysctl -p /etc/sysctl.d/20-mosdns-buffer-increase.conf exit 0 diff --git a/luci-app-mosdns/root/etc/init.d/mosdns b/luci-app-mosdns/root/etc/init.d/mosdns index 5c00c7b4f..2bece2a20 100755 --- a/luci-app-mosdns/root/etc/init.d/mosdns +++ b/luci-app-mosdns/root/etc/init.d/mosdns @@ -20,6 +20,8 @@ # along with this program. If not, see . # +[ ! -f /etc/openwrt_release ] && exit 0 + START=99 USE_PROCD=1 diff --git a/luci-app-oaf/po/zh_Hans/oaf.po b/luci-app-oaf/po/zh_Hans/oaf.po index 951e470fd..8e82be2ab 100755 --- a/luci-app-oaf/po/zh_Hans/oaf.po +++ b/luci-app-oaf/po/zh_Hans/oaf.po @@ -189,12 +189,6 @@ msgstr "网关模式" msgid "Bypass Mode" msgstr "旁路模式" -msgid "Bypass Mode" -msgstr "旁路模式" - -msgid "Current version" -msgstr "当前版本" - msgid "Current version" msgstr "当前版本" diff --git a/oaf/src/app_filter.c b/oaf/src/app_filter.c index 69b61ebe4..909809e8b 100755 --- a/oaf/src/app_filter.c +++ b/oaf/src/app_filter.c @@ -1156,25 +1156,31 @@ int af_send_msg_to_user(char *pbuf, uint16_t len) struct sk_buff *nl_skb; struct nlmsghdr *nlh; int buf_len = OAF_EXTRA_MSG_BUF_LEN + len; - char *msg_buf = kmalloc(buf_len, GFP_KERNEL); + char *msg_buf = NULL; struct af_msg_hdr *hdr = NULL; char *p_data = NULL; int ret; if (len >= MAX_OAF_NL_MSG_LEN) return -1; - memset(msg_buf, 0x0, sizeof(buf_len)); + msg_buf = kmalloc(buf_len, GFP_KERNEL); + if (!msg_buf) + return -1; + + memset(msg_buf, 0x0, buf_len); nl_skb = nlmsg_new(len + sizeof(struct af_msg_hdr), GFP_ATOMIC); if (!nl_skb) { - return -1; + ret = -1; + goto fail; } nlh = nlmsg_put(nl_skb, 0, 0, OAF_NETLINK_ID, len + sizeof(struct af_msg_hdr), 0); if (nlh == NULL) { nlmsg_free(nl_skb); - return -1; + ret = -1; + goto fail; } hdr = (struct af_msg_hdr *)msg_buf; @@ -1184,6 +1190,8 @@ int af_send_msg_to_user(char *pbuf, uint16_t len) memcpy(p_data, pbuf, len); memcpy(nlmsg_data(nlh), msg_buf, len + sizeof(struct af_msg_hdr)); ret = netlink_unicast(oaf_sock, nl_skb, 999, MSG_DONTWAIT); + +fail: kfree(msg_buf); return ret; } diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index b667fc797..0a7312abe 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -12,13 +12,13 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202306301512 +GEOIP_VER:=202307060057 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=56f2f4c43ea40e2c0d314b45851b1db3a63a4005467f21b5fe91cf116c8cfa6a + HASH:=a200767fcf152a4886c8bbfc8e9b8325cb405dd8076f911a7d49edb3ddf20024 endef GEOSITE_VER:=20230705152000