diff --git a/README.md b/README.md index 180c61f3a7..5c4ff3d2ed 100755 --- a/README.md +++ b/README.md @@ -46,7 +46,8 @@ luci-app-smstool source: [f8q8/luci-app-smstool-master](https://github.com/f8q8/ luci-app-airwhu source: [KyleRicardo/luci-app-airwhu](https://github.com/KyleRicardo/luci-app-airwhu).
Packages Lienol: [Lienol/openwrt-package](https://github.com/Lienol/openwrt-package).
luci-app-bbr-mod source: [ntlf9t/luci-app-bbr-mod](https://github.com/ntlf9t/luci-app-bbr-mod).
-Package Openwrt-BBR: [anshi233/Openwrt-BBR](https://github.com/anshi233/Openwrt-BBR). +Package Openwrt-BBR: [anshi233/Openwrt-BBR](https://github.com/anshi233/Openwrt-BBR).
+simple-obfs source: [aa65535/openwrt-simple-obfs](https://github.com/aa65535/openwrt-simple-obfs). # License ### [GPL v3](https://www.gnu.org/licenses/gpl-3.0.html). diff --git a/package/cnsztl/openwrt-simple-obfs/Makefile b/package/cnsztl/openwrt-simple-obfs/Makefile new file mode 100644 index 0000000000..4160144639 --- /dev/null +++ b/package/cnsztl/openwrt-simple-obfs/Makefile @@ -0,0 +1,83 @@ +# +# Copyright (C) 2017-2018 Jian Chang +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=simple-obfs +PKG_VERSION:=0.0.5 +PKG_RELEASE:=4 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/shadowsocks/simple-obfs.git +PKG_SOURCE_VERSION:=6261a92ad48ce912237fcc89be2048b5aca11b1c +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz + +PKG_LICENSE:=GPLv3 +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=Jian Chang + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) + +PKG_INSTALL:=1 +PKG_FIXUP:=autoreconf +PKG_USE_MIPS16:=0 +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_DEPENDS:=libev + +PKG_CONFIG_DEPENDS:= CONFIG_SIMPLE_OBFS_STATIC_LINK + +include $(INCLUDE_DIR)/package.mk + +define Package/simple-obfs + SECTION:=net + CATEGORY:=Network + TITLE:=Simple-obfs + URL:=https://github.com/shadowsocks/simple-obfs + DEPENDS:=+libpthread +!SIMPLE_OBFS_STATIC_LINK:libev +endef + +Package/simple-obfs-server = $(Package/simple-obfs) + +define Package/simple-obfs-server/config +menu "Simple-obfs Compile Configuration" + depends on PACKAGE_simple-obfs || PACKAGE_simple-obfs-server + config SIMPLE_OBFS_STATIC_LINK + bool "enable static link libraries." + default n +endmenu +endef + +define Package/simple-obfs/description +Simple-obfs is a simple obfusacting tool, designed as plugin server of shadowsocks. +endef + +Package/simple-obfs-server/description = $(Package/simple-obfs/description) + +CONFIGURE_ARGS += \ + --disable-ssp \ + --disable-documentation \ + --disable-assert + +ifeq ($(CONFIG_SIMPLE_OBFS_STATIC_LINK),y) + CONFIGURE_ARGS += \ + --with-ev="$(STAGING_DIR)/usr" \ + LDFLAGS="-Wl,-static -static -static-libgcc" +endif + +define Package/simple-obfs/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/obfs-local $(1)/usr/bin +endef + +define Package/simple-obfs-server/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/obfs-server $(1)/usr/bin +endef + +$(eval $(call BuildPackage,simple-obfs)) +$(eval $(call BuildPackage,simple-obfs-server)) diff --git a/package/jsda/luci-app-ssr-plus-jsda/Makefile b/package/jsda/luci-app-ssr-plus-jsda/Makefile index ec3075c11d..381518faec 100644 --- a/package/jsda/luci-app-ssr-plus-jsda/Makefile +++ b/package/jsda/luci-app-ssr-plus-jsda/Makefile @@ -47,6 +47,10 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Socks bool "Include Shadowsocks Socks and Tunnel" default n +config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Simple_Obfs + bool "Include Shadowsocks Simple Obfs Plugin" + default n + config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS bool "ChinaDNS" default n @@ -71,17 +75,18 @@ define Package/luci-app-ssr-plus-jsda TITLE:=SS/SSR/V2Ray LuCI interface PKGARCH:=all DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +bash +pdnsd-alt +wget +unzip \ - +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \ - +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \ - +PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \ - +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-server \ - +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Server:shadowsocks-libev-ss-server \ - +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Socks:shadowsocksr-libev-ssr-local \ - +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Socks:shadowsocks-libev-ss-local \ - +PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS:openwrt_chinadns \ - +PACKAGE_$(PKG_NAME)_INCLUDE_dnscrypt_proxy:dnscrypt-proxy-full \ - +PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder:openwrt-dnsforwarder \ - +PACKAGE_$(PKG_NAME)_INCLUDE_haproxy:haproxy + +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \ + +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \ + +PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \ + +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-server \ + +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Server:shadowsocks-libev-ss-server \ + +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Simple_Obfs:simple_obfs \ + +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Socks:shadowsocksr-libev-ssr-local \ + +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Socks:shadowsocks-libev-ss-local \ + +PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS:openwrt_chinadns \ + +PACKAGE_$(PKG_NAME)_INCLUDE_dnscrypt_proxy:dnscrypt-proxy-full \ + +PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder:openwrt-dnsforwarder \ + +PACKAGE_$(PKG_NAME)_INCLUDE_haproxy:haproxy endef define Build/Prepare