diff --git a/package/ctcgfw/openwrt-simple-obfs/Makefile b/package/ctcgfw/openwrt-simple-obfs/Makefile index 4649f65155..e5b0c9b365 100644 --- a/package/ctcgfw/openwrt-simple-obfs/Makefile +++ b/package/ctcgfw/openwrt-simple-obfs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2017-2018 Jian Chang +# Copyright (C) 2017-2019 Jian Chang # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/openwrt-v2ray-plugin/Makefile b/package/ctcgfw/openwrt-v2ray-plugin/Makefile index 83396ff5d0..bda22d9c58 100644 --- a/package/ctcgfw/openwrt-v2ray-plugin/Makefile +++ b/package/ctcgfw/openwrt-v2ray-plugin/Makefile @@ -1,7 +1,7 @@ # -# Copyright (C) 2018-2019 chenhw2 +# Copyright (C) 2020 SharerMax # -# This is free software, licensed under the GNU General Public License v3. +# This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # @@ -9,48 +9,31 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-plugin PKG_VERSION:=1.3.0 -PKG_RELEASE:=20200205 -PKG_MAINTAINER:=chenhw2 +PKG_RELEASE:=1 +PKG_MAINTAINER:=ShareMax +PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-plugin-$(PKG_VERSION) -# OpenWrt ARCH: arm, i386, x86_64, mips, mipsel -# Golang ARCH: arm[5-7], 386, amd64, mips, mipsle -PKG_ARCH:=$(ARCH) -BIN_ARCH:=$(ARCH) -ifeq ($(ARCH),mips) - BIN_ARCH:=mips_sf -endif -ifeq ($(ARCH),mipsel) - PKG_ARCH:=mips - BIN_ARCH:=mipsle_sf -endif -ifeq ($(ARCH),i386) - PKG_ARCH:=386 - BIN_ARCH:=386 -endif -ifeq ($(ARCH),x86_64) - PKG_ARCH:=amd64 - BIN_ARCH:=amd64 -endif -ifeq ($(ARCH),arm) - BIN_ARCH:=arm7 -endif -ifeq ($(ARCH),aarch64) - PKG_ARCH:=arm64 - BIN_ARCH:=arm64 -endif +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/shadowsocks/v2ray-plugin/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=dfb86cd8d9be86e665c4b86b68cd7037e4310de001656eef01ec9aeea71edd10 + +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=madeye + +GO_PKG:=github.com/shadowsocks/v2ray-plugin -PKG_SOURCE:=v2ray-plugin-linux-$(PKG_ARCH)-v$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/shadowsocks/v2ray-plugin/releases/download/v$(PKG_VERSION)/ -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=skip include $(INCLUDE_DIR)/package.mk +include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk + define Package/v2ray-plugin SECTION:=net CATEGORY:=Network TITLE:=SIP003 plugin for shadowsocks, based on v2ray URL:=https://github.com/shadowsocks/v2ray-plugin + DEPENDS:=$(GO_ARCH_DEPENDS) +ca-certificates endef define Package/v2ray-plugin/description @@ -58,16 +41,16 @@ define Package/v2ray-plugin/description endef define Build/Prepare - gzip -dc "$(DL_DIR)/$(PKG_SOURCE)" | tar -C $(PKG_BUILD_DIR)/ -xf - + $(call Build/Prepare/Default) endef define Build/Compile - echo "$(PKG_NAME)Compile Skiped!" + $(call GoPackage/Build/Compile) endef define Package/v2ray-plugin/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/v2ray-plugin_linux_$(BIN_ARCH) $(1)/usr/bin/v2ray-plugin + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/v2ray-plugin $(1)/usr/bin/v2ray-plugin endef - +$(eval $(call GoBinPackage,v2ray-plugin)) $(eval $(call BuildPackage,v2ray-plugin)) diff --git a/package/lean/antfs-mount/Makefile b/package/lean/antfs-mount/Makefile new file mode 100644 index 0000000000..48ffc6f1cc --- /dev/null +++ b/package/lean/antfs-mount/Makefile @@ -0,0 +1,28 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=antfs-mount +PKG_RELEASE:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/antfs-mount + SECTION:=utils + CATEGORY:=Utilities + SUBMENU:=Filesystem + TITLE:=NTFS mount script for AVM NTFS driver + PKGARCH:=all + DEPENDS:=+kmod-fs-antfs +endef + +define Build/Configure +endef + +define Build/Compile +endef + +define Package/antfs-mount/install + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) ./files/mount.ntfs $(1)/sbin +endef + +$(eval $(call BuildPackage,antfs-mount)) diff --git a/package/lean/antfs-mount/files/mount.ntfs b/package/lean/antfs-mount/files/mount.ntfs new file mode 100644 index 0000000000..2043bca0ac --- /dev/null +++ b/package/lean/antfs-mount/files/mount.ntfs @@ -0,0 +1,2 @@ +#!/bin/sh +mount -t antfs $@ diff --git a/package/lean/automount/Makefile b/package/lean/automount/Makefile index 93d756caff..cb76823bc1 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:=26 +PKG_RELEASE:=28 PKG_ARCH:=all include $(INCLUDE_DIR)/package.mk @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk define Package/automount TITLE:=Mount autoconfig hotplug script. MAINTAINER:=Lean - DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +kmod-fs-vfat +kmod-fs-ext4 +kmod-fs-exfat +ntfs-3g + DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +kmod-fs-vfat +kmod-fs-ext4 +kmod-fs-exfat +antfs-mount endef define Package/automount/description diff --git a/package/lean/automount/files/15-automount b/package/lean/automount/files/15-automount index dd518c4ecb..dc052bdd38 100755 --- a/package/lean/automount/files/15-automount +++ b/package/lean/automount/files/15-automount @@ -10,18 +10,18 @@ skip=`block info | sed 's/\(.*\): .*/\1/' | grep -q $device ; echo $?` path=$DEVPATH if [ $basename != "block" ] && [ -z "${device##sd*}" ] && [ $skip -eq 1 ]; then - mntpnt=$device - 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 - ;; - remove) - # Once the device is removed, the /dev entry disappear. We need mountpoint - mountpoint=`mount |grep /dev/$device | sed 's/.* on \(.*\) type.*/\1/'` - umount -l $mountpoint - ;; - esac -fi \ No newline at end of file + mntpnt=$device + 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 + ;; + remove) + # Once the device is removed, the /dev entry disappear. We need mountpoint + mountpoint=`mount |grep /dev/$device | sed 's/.* on \(.*\) type.*/\1/'` + umount -l $mountpoint + ;; + esac +fi diff --git a/package/lean/automount/files/zzz-move-automount b/package/lean/automount/files/zzz-move-automount index fbe094cbdd..a399aa2b38 100755 --- a/package/lean/automount/files/zzz-move-automount +++ b/package/lean/automount/files/zzz-move-automount @@ -2,6 +2,3 @@ sleep 15 mv /etc/15-automount /etc/hotplug.d/block/ - - - diff --git a/package/lean/luci-app-ssr-plus/po/zh_Hans/luci-app-ssr-plus.po b/package/lean/luci-app-ssr-plus/po/zh_Hans/luci-app-ssr-plus.po index b95ea2ec50..9f8a3d4385 100644 --- a/package/lean/luci-app-ssr-plus/po/zh_Hans/luci-app-ssr-plus.po +++ b/package/lean/luci-app-ssr-plus/po/zh_Hans/luci-app-ssr-plus.po @@ -782,6 +782,12 @@ msgstr "二进制文件：/usr/bin/kcptun-client" msgid "chacha20-poly1305" msgstr "" +msgid "Plugin" +msgstr "插件" + +msgid "Plugin Opts" +msgstr "插件参数" + #~ msgid "ShadowSocksR Client" #~ msgstr "ShadowSocksR 客户端"