OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update-12.16

This commit is contained in:
github-actions[bot] 2021-12-16 20:32:17 +08:00
parent 774731060b
commit f907bde645
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-store/Makefile
View File

@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI based ipk store
LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team
LUCI_DEPENDS:=+curl LUCI_DEPENDS:=+curl
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_VERSION:=0.1.4 PKG_VERSION:=0.1.5
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=jjm2473 <jjm2473@gmail.com> PKG_MAINTAINER:=jjm2473 <jjm2473@gmail.com>

14
luci-app-store/root/bin/is-opkg
View File

@ -35,6 +35,10 @@ opkg_wrap() {
OPKG_CONF_DIR=${OPKG_CONF_DIR} opkg -f ${IS_ROOT}/etc/opkg.conf "$@" OPKG_CONF_DIR=${OPKG_CONF_DIR} opkg -f ${IS_ROOT}/etc/opkg.conf "$@"
} }
fcurl() {
curl --fail --show-error "$@"
}
update() { update() {
if [ -z "${ARCH}" ]; then if [ -z "${ARCH}" ]; then
echo "Get architecture failed" >&2 echo "Get architecture failed" >&2
@ -43,10 +47,12 @@ update() {
return 1 return 1
fi fi
curl -o ${OPKG_CONF_DIR}/meta.conf "${FEEDS_SERVER}/all/meta.conf" && \ fcurl -o ${OPKG_CONF_DIR}/meta.conf "${FEEDS_SERVER}/all/meta.conf" && \
curl -o ${OPKG_CONF_DIR}/all.conf "${FEEDS_SERVER}/all/isfeeds.conf" && \ fcurl -o ${OPKG_CONF_DIR}/all.conf "${FEEDS_SERVER}/all/isfeeds.conf" && \
curl -o ${OPKG_CONF_DIR}/arch.conf "${FEEDS_SERVER}/${ARCH}/isfeeds.conf" && \ fcurl -o ${OPKG_CONF_DIR}/arch.conf "${FEEDS_SERVER}/${ARCH}/isfeeds.conf" || \
opkg -f ${IS_ROOT}/etc/opkg_o.conf --offline-root ${IS_ROOT} update return 1
opkg -f ${IS_ROOT}/etc/opkg_o.conf --offline-root ${IS_ROOT} update
return 0 return 0
} }

20
luci-app-vssr/root/usr/bin/vssr-rules
View File

@ -74,30 +74,30 @@ flush_r() {
} }
ipset_r() { ipset_r() {
ipset -N gmlan hash:net 2>/dev/null ipset -N gmlan hash:net hashsize 4096 maxelem 1000000 2>/dev/null
$IPT -N SS_SPEC_WAN_AC $IPT -N SS_SPEC_WAN_AC
$IPT -I SS_SPEC_WAN_AC -p tcp ! --dport 53 -d $server -j RETURN $IPT -I SS_SPEC_WAN_AC -p tcp ! --dport 53 -d $server -j RETURN
for ip in $LAN_GM_IP; do ipset -! add gmlan $ip; done for ip in $LAN_GM_IP; do ipset -! add gmlan $ip; done
case "$RUNMODE" in case "$RUNMODE" in
router) router)
ipset -! -R <<-EOF || return 1 ipset -! -R <<-EOF || return 1
create ss_spec_wan_ac hash:net create ss_spec_wan_ac hash:net hashsize 4096 maxelem 1000000
$(gen_iplist | sed -e "s/^/add ss_spec_wan_ac /") $(gen_iplist | sed -e "s/^/add ss_spec_wan_ac /")
EOF EOF
ipset -N gfwlist hash:net 2>/dev/null ipset -N gfwlist hash:net hashsize 4096 maxelem 1000000 2>/dev/null
$IPT -A SS_SPEC_WAN_AC -m set --match-set ss_spec_wan_ac dst -j RETURN $IPT -A SS_SPEC_WAN_AC -m set --match-set ss_spec_wan_ac dst -j RETURN
$IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -m set ! --match-set china dst -j SS_SPEC_WAN_FW $IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -m set ! --match-set china dst -j SS_SPEC_WAN_FW
$IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j RETURN $IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j RETURN
$IPT -A SS_SPEC_WAN_AC -j SS_SPEC_WAN_FW $IPT -A SS_SPEC_WAN_AC -j SS_SPEC_WAN_FW
;; ;;
gfw) gfw)
ipset -N gfwlist hash:net 2>/dev/null ipset -N gfwlist hash:net hashsize 4096 maxelem 1000000 2>/dev/null
$IPT -A SS_SPEC_WAN_AC -m set --match-set gfwlist dst -j SS_SPEC_WAN_FW $IPT -A SS_SPEC_WAN_AC -m set --match-set gfwlist dst -j SS_SPEC_WAN_FW
$IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -m set ! --match-set china dst -j SS_SPEC_WAN_FW $IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -m set ! --match-set china dst -j SS_SPEC_WAN_FW
$IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j RETURN $IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j RETURN
;; ;;
oversea) oversea)
ipset -N oversea hash:net 2>/dev/null ipset -N oversea hash:net hashsize 4096 maxelem 1000000 2>/dev/null
$IPT -I SS_SPEC_WAN_AC -m set --match-set oversea dst -j SS_SPEC_WAN_FW $IPT -I SS_SPEC_WAN_AC -m set --match-set oversea dst -j SS_SPEC_WAN_FW
$IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -j SS_SPEC_WAN_FW $IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -j SS_SPEC_WAN_FW
$IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j SS_SPEC_WAN_FW $IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j SS_SPEC_WAN_FW
@ -107,12 +107,12 @@ ipset_r() {
;; ;;
esac esac
ipset -N fplan hash:net 2>/dev/null ipset -N fplan hash:net hashsize 4096 maxelem 1000000 2>/dev/null
for ip in $LAN_FP_IP; do ipset -! add fplan $ip; done for ip in $LAN_FP_IP; do ipset -! add fplan $ip; done
$IPT -I SS_SPEC_WAN_AC -m set --match-set fplan src -j SS_SPEC_WAN_FW $IPT -I SS_SPEC_WAN_AC -m set --match-set fplan src -j SS_SPEC_WAN_FW
ipset -N whitelist hash:net 2>/dev/null ipset -N whitelist hash:net hashsize 4096 maxelem 1000000 2>/dev/null
ipset -N blacklist hash:net 2>/dev/null ipset -N blacklist hash:net hashsize 4096 maxelem 1000000 2>/dev/null
$IPT -I SS_SPEC_WAN_AC -m set --match-set blacklist dst -j SS_SPEC_WAN_FW $IPT -I SS_SPEC_WAN_AC -m set --match-set blacklist dst -j SS_SPEC_WAN_FW
$IPT -I SS_SPEC_WAN_AC -m set --match-set whitelist dst -j RETURN $IPT -I SS_SPEC_WAN_AC -m set --match-set whitelist dst -j RETURN
@ -157,7 +157,7 @@ ac_rule() {
fi fi
IFNAME=$(uci get -P/var/state network.lan.ifname 2>/dev/null) IFNAME=$(uci get -P/var/state network.lan.ifname 2>/dev/null)
ipset -! -R <<-EOF || return 1 ipset -! -R <<-EOF || return 1
create ss_spec_lan_ac hash:net create ss_spec_lan_ac hash:net hashsize 4096 maxelem 1000000
$(for ip in ${LAN_AC_IP:1}; do echo "add ss_spec_lan_ac $ip"; done) $(for ip in ${LAN_AC_IP:1}; do echo "add ss_spec_lan_ac $ip"; done)
EOF EOF
$IPT -I PREROUTING 1 ${IFNAME:+-i $IFNAME} -p tcp $EXT_ARGS $MATCH_SET \ $IPT -I PREROUTING 1 ${IFNAME:+-i $IFNAME} -p tcp $EXT_ARGS $MATCH_SET \
@ -167,7 +167,7 @@ ac_rule() {
-m comment --comment "$TAG" -j SS_SPEC_WAN_AC -m comment --comment "$TAG" -j SS_SPEC_WAN_AC
elif [ "$OUTPUT" = 2 ]; then elif [ "$OUTPUT" = 2 ]; then
ipset -! -R <<-EOF || return 1 ipset -! -R <<-EOF || return 1
create ssr_gen_router hash:net create ssr_gen_router hash:net hashsize 4096 maxelem 1000000
$(gen_spec_iplist | sed -e "s/^/add ssr_gen_router /") $(gen_spec_iplist | sed -e "s/^/add ssr_gen_router /")
EOF EOF
$IPT -N SS_SPEC_ROUTER && $IPT -N SS_SPEC_ROUTER &&