Merge remote-tracking branch 'upstream/master'

update  sync lean20171011

include/target.mk

@@ -16,7 +16,8 @@ DEVICE_TYPE?=router
 DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd \
 iptables-mod-nat-extra kmod-nf-nathelper kmod-nf-nathelper-extra kmod-macvlan block-mount \
 default-settings ipset-lists luci luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \
-luci-app-filetransfer luci-app-shadowsocksr-pro luci-app-usb-printer luci-app-vsftpd luci-app-sfe
+luci-app-filetransfer luci-app-shadowsocksr-pro luci-app-usb-printer luci-app-vsftpd luci-app-sfe \
+luci-app-pptp-server luci-app-ipsec-vpnd
 # For nas targets
 DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm
 # For router targets

package/lean/autocore/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=autocore
 PKG_VERSION:=1
-PKG_RELEASE:=3
+PKG_RELEASE:=6
 
 
 include $(INCLUDE_DIR)/package.mk
@@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/autocore
   TITLE:=x86/x64 auto core loadbalance script.
   MAINTAINER:=Lean
-  DEPENDS:=@TARGET_x86 +bc
+  DEPENDS:=@TARGET_x86 +bc +lm-sensors
 endef
 
 define Package/autocore/description

package/lean/autocore/files/autocore

@@ -23,6 +23,12 @@ start()
   do
       echo $cc > $fileRps  
   done
+  
+  a=$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq)
+  b=$(echo -n ' x ')
+  c=$(cat /proc/cpuinfo | grep 'processor' | wc -l)
+  f=${a}${b}${c}
+  echo $f > /tmp/sysinfo/model
 }
 
 

package/lean/automount/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=automount
 PKG_VERSION:=1
-PKG_RELEASE:=18
+PKG_RELEASE:=19
 PKG_ARCH:=all
 
 include $(INCLUDE_DIR)/package.mk

package/lean/automount/files/15-automount

@@ -14,6 +14,7 @@ if [ $basename != "block" ] && [ -z "${device##sd*}" ] && [ $skip -eq 1 ]; then
         case "$ACTION" in
                 add)
                         mkdir -p /mnt/$mntpnt
+                        chmod 777 /mnt/$mntpnt
                         # Try to be gentle on solid state devices
                         mount -o rw,noatime,discard /dev/$device /mnt/$mntpnt
                 ;;

package/lean/luci-app-adbyby-plus/Makefile

@@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +coreutils +coreutils-nohup +dnsmasq-full
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-adbyby-plus
 PKG_VERSION:=2.0
-PKG_RELEASE:=21
+PKG_RELEASE:=22
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh

@@ -5,9 +5,9 @@ update_source=$(uci get adbyby.@adbyby[0].update_source 2>/dev/null)
 rm -f /usr/share/adbyby/data/*.bak
 
 if [ $update_source -eq 1 ]; then
-  wget -t 1 -T 10 -O /tmp/lazy.txt http://update.adbyby.com/rule3/lazy.jpg
+  wget-ssl -t 1 -T 10 -O /tmp/lazy.txt http://update.adbyby.com/rule3/lazy.jpg
-  wget -t 1 -T 10 -O /tmp/video.txt http://update.adbyby.com/rule3/video.jpg
+  wget-ssl -t 1 -T 10 -O /tmp/video.txt http://update.adbyby.com/rule3/video.jpg
-  wget -t 1 -T 10 -O /tmp/user.action http://update.adbyby.com/rule3/user.action
+  wget-ssl -t 1 -T 10 -O /tmp/user.action http://update.adbyby.com/rule3/user.action
 fi
 
 [ ! -s "/tmp/lazy.txt" ] && wget-ssl --no-check-certificate -O /tmp/lazy.txt https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt

package/lean/luci-app-shadowsocksr-pro/Makefile

@@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for Shadowsocksr
 LUCI_DEPENDS:=+iptables-mod-tproxy +kmod-ipt-tproxy +ip +ipset-lists +shadowsocksr-libev-alt +pdnsd-alt +coreutils +coreutils-base64 +coreutils-nohup +dnsmasq-full
 LUCI_PKGARCH:=all
 PKG_VERSION:=2.0
-PKG_RELEASE:=17
+PKG_RELEASE:=18
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

package/lean/luci-app-shadowsocksr-pro/luasrc/model/cbi/shadowsocksr.lua

@@ -122,6 +122,8 @@ protocol:value("auth_chain_a")
 protocol:value("auth_chain_b")
 protocol:value("auth_chain_c")
 protocol:value("auth_chain_d")
+protocol:value("auth_chain_e")
+protocol:value("auth_chain_f")
 
 obfs = s:taboption("main",ListValue, "obfs", translate("Obfs Param"))
 obfs:value("plain")
@@ -143,8 +145,6 @@ obfs_param.rmempty = true
 obfs_param.datatype = "host"
 obfs_param:depends("plugin_param", "1")
 
-
-
 s:tab("list",  translate("User-defined GFW-List"))
 gfwlist = s:taboption("list", TextValue, "conf")
 gfwlist.description = translate("<br />（!）Note: When the domain name is entered and will automatically merge with the online GFW-List. Please manually update the GFW-List list after applying.")

package/lean/shadowsocksR-libev-full/Makefile

@@ -7,7 +7,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz
 PKG_SOURCE_URL:=https://github.com/shadowsocksrr/shadowsocksr-libev.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9a2365ce6774dddd5561322881aef726c7990639
+PKG_SOURCE_VERSION:=91c72165d4e7ae92eba2d678812a8d11a037932d
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_MAINTAINER:=breakwa11
 

target/linux/x86/Makefile

@@ -19,8 +19,10 @@ KERNELNAME:=bzImage
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs wpad kmod-usb-hid kmod-usb-net-asix kmod-usb-net-asix-ax88179 \
+DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs wpad kmod-usb-hid kmod-usb-net-asix kmod-usb-net-asix-ax88179 \
-kmod-ath5k kmod-ath9k kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-vmxnet3 htop lm-sensors
+kmod-ath5k kmod-ath9k kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-vmxnet3 htop lm-sensors \
+autocore automount autosamba ath10k-firmware-qca988x brcmfmac-firmware-43602a1-pcie \
+alsa-utils kmod-ac97 kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-intel kmod-sound-hda-codec-via kmod-sound-via82xx kmod-usb-audio
 
 $(eval $(call BuildTarget))