v4.36.6

380_armv5_packge/4.36.6/md5sum.txt

@@ -0,0 +1 @@
+0b51ac27e40d6ace2cfccf1f340092e2

380_armv5_packge/config.json.js

@@ -0,0 +1,9 @@
+{
+"build_date":"2022-10-11_21:50:14",
+"description":"科学上网",
+"home_url":"Main_Ss_Content.asp",
+"md5":"0b51ac27e40d6ace2cfccf1f340092e2",
+"name":"shadowsocks",
+"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.36.6/shadowsocks.tar.gz",
+"version":"4.36.6"
+}

380_armv5_packge/latest.txt

@@ -1 +1 @@
-4.36.5
+4.36.6

README.md

@@ -1,19 +1,22 @@
-# Shadowsocks ONLY on 380 ARM （安全，好用）
-support v2ray and xray binary update 
+# Shadowsocks ONLY on koolshare Merlin 380 ARM （安全，好用）
+This project will update bin and package for [**fancyss_arm380**](https://github.com/hq450/fancyss_history_package/tree/master/legacy/fancyss_arm380) 
+
+add and support new features 
 fixed many historical legacy issues 
-this project will update bin and package for [armv7 Merlin-Koolshare](https://github.com/hq450/fancyss/tree/master/fancyss_arm) 
 
 除插件原有功能外，另外
 
-* 支持xray, vless, xtls, trojan, trojan-go 等协议及更新，
+* 支持xray, vless, xtls, trojan, trojan-go, NaiveProxy 等协议及更新，
 * 支持ss + v2ray plugin，
 * 支持混合节点订阅，
 * 支持同时订阅多个链接，回车隔开，
 * 支持ss:https:// vless:https:// trojan:https:// trojan-go:https://格式订阅和导入，
 * 支持smartDNS (不熟悉配置请勿选择)，
 * 支持在线更新
 
-目前xray已经可以完全替代v2ray了，xray支持vmess，vless和trojan。 
+目前xray已经可以完全替代v2ray了，xray支持vmess，vless和trojan。
+
+NaiveProxy 使用下来也还不错，延迟很低，速度也很快。
 
 离线安装包仅能在koolshare 梅林 arm 380平台，且linux内核为2.6.36.4的armv7架构的机器上使用！
 

shadowsocks/install.sh

@@ -49,7 +49,7 @@ if [ -n "$MOUNTED" ];then
 fi
 
 echo_date 清理旧文件
-TARGET_BIN="base64_encode cdns chinadns chinadns1 chinadns-ng client_linux_arm5 dns2socks dnsmasq haproxy haveged httping https_dns_proxy jq koolbox koolgame pdu resolveip rss-local rss-redir smartdns speederv1 speederv2 ss-local ss-redir ss-tunnel trojan-go udp2raw v2ray v2ray-plugin obfs-local xray"
+TARGET_BIN="base64_encode cdns chinadns chinadns1 chinadns-ng client_linux_arm5 dns2socks dnsmasq haproxy haveged httping https_dns_proxy jq koolbox koolgame pdu resolveip rss-local rss-redir smartdns speederv1 speederv2 ss-local ss-redir ss-tunnel trojan-go naive udp2raw v2ray v2ray-plugin obfs-local xray"
 rm -rf /koolshare/ss/*
 rm -rf /koolshare/scripts/ss_*
 rm -rf /koolshare/webs/Main_Ss*

shadowsocks/res/ss-menu.js

@@ -275,7 +275,7 @@ function LoadingSSProgress(seconds) {
  document.getElementById("LoadingBar").style.visibility = "visible";
  if (action == 0) {
  document.getElementById("loading_block3").innerHTML = "科学上网功能关闭中 ..."
- $("#loading_block2").html("<li><font color='#ffcc00'><a href='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/hq450/fancyss' target='_blank'></font>插件工作有问题？请到<em>GITHUB</em>提交issue...</font></li>");
+ $("#loading_block2").html("<li><font color='#ffcc00'><a href='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/cary-sas/v2ray_bin' target='_blank'></font>插件工作有问题？请到<em>GITHUB</em>提交issue...</font></li>");
  } else if (action == 1) {
  document.getElementById("loading_block3").innerHTML = "gfwlist模式启用中 ..."
  $("#loading_block2").html("<li><font color='#ffcc00'>此期间请勿访问屏蔽网址，以免污染DNS进入缓存</font></li><li><font color='#ffcc00'>尝试不同的DNS解析方案，可以达到最佳的效果哦...</font></li><li><font color='#ffcc00'>请等待日志显示完毕，并出现自动关闭按钮！</font></li><li><font color='#ffcc00'>在此期间请不要刷新本页面，不然可能导致问题！</font></li>");
@@ -436,15 +436,15 @@ function openssHint(itemNum) {
  width = "500px";
  statusmenu = "此处显示你的SS插件当前的版本号，当前版本：<% dbus_get_def("ss_basic_version_local", "未知"); %>,如果需要回滚SS版本，请参考以下操作步骤：";
  statusmenu += "</br></br><font color='#CC0066'>1&nbsp;&nbsp;</font>进入<a href='Tools_Shell.asp' target='_blank'><u><font color='#00F'>webshell</font></u></a>或者其他telnet,ssh等能输入命令的工具";
- statusmenu += "</br><font color='#CC0066'>2&nbsp;&nbsp;</font>请依次输入以下命令，等待上一条命令执行完后再运行下一条(这里以回滚4.1.7为例)：";
+ statusmenu += "</br><font color='#CC0066'>2&nbsp;&nbsp;</font>请依次输入以下命令，等待上一条命令执行完后再运行下一条(这里以回滚4.35.6为例)：";
  statusmenu += "</br></br>&nbsp;&nbsp;&nbsp;&nbsp;cd /tmp";
- statusmenu += "</br>&nbsp;&nbsp;&nbsp;&nbsp;wget --no-check-certificate https://raw.githubusercontent.com/hq450/fancyss_history_package/master/fancyss_arm/shadowsocks_4.1.7.tar.gz";
+ statusmenu += "</br>&nbsp;&nbsp;&nbsp;&nbsp;curl -LJO https://raw.githubusercontent.com/cary-sas/v2ray_bin/main/380_armv5_packge/4.35.6/shadowsocks.tar.gz";
  statusmenu += "</br>&nbsp;&nbsp;&nbsp;&nbsp;mv shadowsocks_4.1.7.tar.gz shadowsocks.tar.gz";
  statusmenu += "</br>&nbsp;&nbsp;&nbsp;&nbsp;tar -zxvf /tmp/shadowsocks.tar.gz";
  statusmenu += "</br>&nbsp;&nbsp;&nbsp;&nbsp;chmod +x /tmp/shadowsocks/install.sh";
  statusmenu += "</br>&nbsp;&nbsp;&nbsp;&nbsp;sh /tmp/shadowsocks/install.sh";
  statusmenu += "</br></br>最后一条命令输入完后不会有任何打印信息。";
- statusmenu += "</br>回滚其它版本号，请参考<a href='https://github.com/hq450/fancyss_history_package/tree/master/fancyss_arm' target='_blank'><u><font color='#00F'>版本历史列表</font></u></a>";
+ statusmenu += "</br>回滚其它版本号，请参考<a href='https://github.com/cary-sas/v2ray_bin/blob/main/380_armv5_packge' target='_blank'><u><font color='#00F'>版本历史列表</font></u></a>";
  _caption = "shadowsocks for merlin 版本";
  } else if (itemNum == 13) {
  statusmenu = "&nbsp;&nbsp;&nbsp;&nbsp;SSR表示shadowwocksR-libev，相比较原版shadowwocksR-libev，其提供了强大的协议混淆插件，让你避开gfw的侦测。"

shadowsocks/scripts/ss_online_update.sh

@@ -1483,7 +1483,7 @@ get_oneline_rule_now(){
 
  if [ "$ss_basic_online_links_goss" == "1" ];then
  open_socks_23456
- socksopen_b=`netstat -nlp|grep -w 23456|grep -E "local|v2ray|xray|trojan-go"`
+ socksopen_b=`netstat -nlp|grep -w 23456|grep -E "local|v2ray|xray|trojan-go|naive"`
  if [ -n "$socksopen_b" ];then
  echo_date "使用$(get_type_name $ss_basic_type)提供的socks代理网络下载..."
  curl -k --connect-timeout 8 -s -L --socks5-hostname 127.0.0.1:23456 $ssr_subscribe_link > /tmp/ssr_subscribe_file.txt

shadowsocks/scripts/ss_pack.sh

@@ -16,7 +16,7 @@ mkdir shadowsocks/webs
 mkdir shadowsocks/res
 
 TARGET_FOLDER=/tmp/shadowsocks
-TARGET_BIN="base64_encode cdns chinadns chinadns1 chinadns-ng client_linux_arm5 dns2socks dnsmasq haproxy haveged httping https_dns_proxy jq koolbox koolgame pdu resolveip rss-local rss-redir smartdns speederv1 speederv2 ss-local ss-redir ss-tunnel trojan-go udp2raw v2ray v2ray-plugin obfs-local xray"
+TARGET_BIN="base64_encode cdns chinadns chinadns1 chinadns-ng client_linux_arm5 dns2socks dnsmasq haproxy haveged httping https_dns_proxy jq koolbox koolgame pdu resolveip rss-local rss-redir smartdns speederv1 speederv2 ss-local ss-redir ss-tunnel trojan-go naive udp2raw v2ray v2ray-plugin obfs-local xray"
 cp /koolshare/scripts/ss_install.sh $TARGET_FOLDER/install.sh
 cp /koolshare/scripts/uninstall_shadowsocks.sh $TARGET_FOLDER/uninstall.sh
 cp /koolshare/scripts/ss_* $TARGET_FOLDER/scripts/

shadowsocks/scripts/ss_proc_status.sh

@@ -67,6 +67,7 @@ get_dns_name() {
 echo_version(){
  echo_date
  SOFVERSION=`cat /koolshare/ss/version`
+ ##---------------------------v2ray-----------------------
  if [ -z "$ss_basic_v2ray_version" ];then
  ss_basic_v2ray_version_tmp=`/koolshare/bin/v2ray -version 2>/dev/null | head -n 1 | cut -d " " -f2`
  if [ -n "$ss_basic_v2ray_version_tmp" ];then
@@ -76,16 +77,6 @@ echo_version(){
  ss_basic_v2ray_version="null"
  fi
  fi
-
- if [ -z "$ss_basic_v2ray_date" ];then
- ss_basic_v2ray_date_tmp=`/koolshare/bin/v2ray -version 2>/dev/null | head -n 1 | cut -d " " -f5`
- if [ -n "$ss_basic_v2ray_date_tmp" ];then
- ss_basic_v2ray_date="$ss_basic_v2ray_date_tmp"
- dbus set ss_basic_v2ray_date="$ss_basic_v2ray_date_tmp"
- else
- ss_basic_v2ray_date="null"
- fi
- fi
 
  ##---------------------------xray-----------------------
  if [ -z "$ss_basic_xray_version" ];then
@@ -98,13 +89,14 @@ echo_version(){
  fi
  fi
 
- if [ -z "$ss_basic_xray_date" ];then
- ss_basic_xray_date_tmp=`/koolshare/bin/xray -version 2>/dev/null | head -n 1 | cut -d " " -f6`
- if [ -n "$ss_basic_xray_date_tmp" ];then
- ss_basic_xray_date="$ss_basic_xray_date_tmp"
- dbus set ss_basic_xray_date="$ss_basic_xray_date_tmp"
+ ##---------------------------naive-----------------------
+ if [ -z "$ss_basic_naive_version" ];then
+ ss_basic_naive_version_tmp=`/koolshare/bin/naive -version 2>/dev/null | head -n 1 | cut -d " " -f2`
+ if [ -n "$ss_basic_naive_version_tmp" ];then
+ ss_basic_naive_version="$ss_basic_naive_version_tmp"
+ dbus set ss_basic_naive_version="$ss_basic_naive_version_tmp"
  else
- ss_basic_xray_date="null"
+ ss_basic_naive_version="null"
  fi
  fi
 
@@ -125,9 +117,10 @@ echo_version(){
  echo "chinadns2 2.0.0 2017年12月09日编译"
  echo "ChinaDNS-NG 1.0-beta.25 2019年08月31日编译"
  echo "client_linux_arm5 20210922 kcptun"
- echo "v2ray $ss_basic_v2ray_version  $ss_basic_v2ray_date"
- echo "xray $ss_basic_xray_version  $ss_basic_xray_date"
+ echo "v2ray $ss_basic_v2ray_version " 
+ echo "xray $ss_basic_xray_version " 
  echo "trojan-go 0.10.6 2021年9月14日编译"
+ echo "naive $ss_basic_naive_version "
  echo -----------------------------------------------------------
 }
 
@@ -151,7 +144,8 @@ check_status(){
  HAPROXY=`pidof haproxy`
  V2RAY=`pidof v2ray`
  XRAY=`pidof xray`
- trojango=`pidof trojan-go`
+ TROJANGO=`pidof trojan-go`
+ NAIVE=`pidof naive`
  HDP=`pidof https_dns_proxy`
  DMQ=`pidof dnsmasq`
  SMD=$(pidof smartdns)
@@ -195,7 +189,14 @@ check_status(){
  echo -----------------------------------------------------------
  echo "程序 状态 PID"
  [ -n "$XRAY" ] && echo "xray 工作中 pid：$XRAY" || echo "xray 未运行" 
- [ -n "$trojango" ] && echo "trojan-go 工作中 pid：$trojango" || echo "trojan-go 未运行" 
+ [ -n "$TROJANGO" ] && echo "trojan-go 工作中 pid：$TROJANGO" || echo "trojan-go 未运行" 
+ elif [ "$ss_basic_type" == "5" ];then
+ echo_version
+ echo
+ echo ② 检测当前相关进程工作状态：（你正在使用NaiveProxy,选择的模式是$(get_mode_name $ss_basic_mode),国外DNS解析方案是：$(get_dns_name $ss_foreign_dns)）
+ echo -----------------------------------------------------------
+ echo "程序 状态 PID"
+ [ -n "$NAIVE" ] && echo "naiveproxy 工作中 pid：$NAIVE" || echo "naiveproxy 未运行" 
  fi
 
  if [ -z "$ss_basic_koolgame_udp" ];then

shadowsocks/scripts/ss_rule_update.sh

@@ -6,7 +6,7 @@
 eval `dbus export ss`
 source /koolshare/scripts/base.sh
 alias echo_date='echo 【$(TZ=UTC-8 date -R +%Y年%m月%d日\ %X)】:'
-socksopen_b=`netstat -nlp|grep -w 23456|grep -E "local|v2ray|xray|trojan-go"`
+socksopen_b=`netstat -nlp|grep -w 23456|grep -E "local|v2ray|xray|trojan-go|naive"`
 if [ -n "$socksopen_b" ] && [ "$ss_basic_online_links_goss" == "1" ];then
  echo_date "代理有开启，将使用代理网络..."
  alias curlxx='curl --connect-timeout 8 --socks5-hostname 127.0.0.1:23456 '
@@ -172,7 +172,7 @@ change_cru(){
  sed -i '/ssupdate/d' /var/spool/cron/crontabs/* >/dev/null 2>&1
  if [ "1" == "$ss_basic_rule_update" ]; then
  echo_date 应用ss规则定时更新任务：每天"$ss_basic_rule_update_time"自动检测更新规则.
- cru a ssupdate "0 $ss_basic_rule_update_time * * * /bin/sh /koolshare/scripts/ss_rule_update.sh"
+ cru a ssupdate "15 $ss_basic_rule_update_time * * * /bin/sh /koolshare/scripts/ss_rule_update.sh"
  else
  echo_date ss规则定时更新任务未启用！
  fi

shadowsocks/scripts/ss_update.sh

@@ -8,10 +8,9 @@ source $KSROOT/scripts/base.sh
 
 eval `dbus export ss`
 alias echo_date='echo 【$(TZ=UTC-8 date -R +%Y年%m月%d日\ %X)】:'
-#main_url="https://raw.githubusercontent.com/hq450/fancyss/master/fancyss_arm"
 main_url="https://raw.githubusercontent.com/cary-sas/v2ray_bin/main/380_armv5_packge"
 backup_url=""
-socksopen_b=`netstat -nlp | grep -w 23456|grep -E "local|v2ray|xray|trojan-go"`
+socksopen_b=`netstat -nlp | grep -w 23456|grep -E "local|v2ray|xray|trojan-go|naive"`
 if [ -n "$socksopen_b" ] && [ "$ss_basic_online_links_goss" == "1" ];then
  echo_date "代理有开启，将使用代理网络..."
  alias curlxx='curl --connect-timeout 8 --socks5-hostname 127.0.0.1:23456 '