diff --git a/include/target.mk b/include/target.mk index 932d16c307..86c5e6bd5e 100644 --- a/include/target.mk +++ b/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 diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index d10232be9f..31d4553437 100644 --- a/package/lean/autocore/Makefile +++ b/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 diff --git a/package/lean/autocore/files/autocore b/package/lean/autocore/files/autocore index 216b362294..0b75d5d16c 100755 --- a/package/lean/autocore/files/autocore +++ b/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 } diff --git a/package/lean/automount/Makefile b/package/lean/automount/Makefile index 3d56204199..8881a060d0 100644 --- a/package/lean/automount/Makefile +++ b/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 diff --git a/package/lean/automount/files/15-automount b/package/lean/automount/files/15-automount index 1948d75a0b..dd518c4ecb 100755 --- a/package/lean/automount/files/15-automount +++ b/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 ;; diff --git a/package/lean/luci-app-adbyby-plus/Makefile b/package/lean/luci-app-adbyby-plus/Makefile index d0125d1112..4f45f5c056 100644 --- a/package/lean/luci-app-adbyby-plus/Makefile +++ b/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 diff --git a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh index 83b4a79829..c9030aea7a 100755 --- a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh +++ b/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 -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/lazy.txt http://update.adbyby.com/rule3/lazy.jpg + wget-ssl -t 1 -T 10 -O /tmp/video.txt http://update.adbyby.com/rule3/video.jpg + 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 diff --git a/package/lean/luci-app-shadowsocksr-pro/Makefile b/package/lean/luci-app-shadowsocksr-pro/Makefile index d7d807984f..d5b2b15432 100644 --- a/package/lean/luci-app-shadowsocksr-pro/Makefile +++ b/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 diff --git a/package/lean/luci-app-shadowsocksr-pro/luasrc/model/cbi/shadowsocksr.lua b/package/lean/luci-app-shadowsocksr-pro/luasrc/model/cbi/shadowsocksr.lua index 6a43954454..bac488c56b 100644 --- a/package/lean/luci-app-shadowsocksr-pro/luasrc/model/cbi/shadowsocksr.lua +++ b/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("
（!）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.") diff --git a/package/lean/shadowsocksR-libev-full/Makefile b/package/lean/shadowsocksR-libev-full/Makefile index 4b40b2cb7e..7deedc0686 100644 --- a/package/lean/shadowsocksR-libev-full/Makefile +++ b/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 diff --git a/package/lean/shadowsocksR-libev-full/snapshot/luci 000.png b/package/lean/shadowsocksR-libev-full/snapshot/luci 000.png deleted file mode 100644 index d9d80a9d81..0000000000 Binary files a/package/lean/shadowsocksR-libev-full/snapshot/luci 000.png and /dev/null differ diff --git a/package/lean/shadowsocksR-libev-full/snapshot/luci 001.png b/package/lean/shadowsocksR-libev-full/snapshot/luci 001.png deleted file mode 100644 index 1992ce24ac..0000000000 Binary files a/package/lean/shadowsocksR-libev-full/snapshot/luci 001.png and /dev/null differ diff --git a/package/lean/shadowsocksR-libev-full/snapshot/luci 002.png b/package/lean/shadowsocksR-libev-full/snapshot/luci 002.png deleted file mode 100644 index 314cfe2fd2..0000000000 Binary files a/package/lean/shadowsocksR-libev-full/snapshot/luci 002.png and /dev/null differ diff --git a/package/lean/shadowsocksR-libev-full/snapshot/luci 003.png b/package/lean/shadowsocksR-libev-full/snapshot/luci 003.png deleted file mode 100644 index 6efd09e3ad..0000000000 Binary files a/package/lean/shadowsocksR-libev-full/snapshot/luci 003.png and /dev/null differ diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 87bb5fbf6b..1af29cfdbc 100644 --- a/target/linux/x86/Makefile +++ b/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 \ -kmod-ath5k kmod-ath9k kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-vmxnet3 htop lm-sensors +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 \ +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))