Package Lean: Cleanup Makefile

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
CN_SZTL 2021-01-30 19:06:57 +08:00
parent 31a39f976a
commit 4201dbd9bb
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
68 changed files with 7520 additions and 10780 deletions

View File

@ -41,7 +41,7 @@ define Package/ChinaDNS/description
endef
define Package/ChinaDNS/conffiles
/etc/chinadns_chnroute.txt
/etc/chinadns_chnroute.txt
endef
define Package/ChinaDNS/install

View File

@ -0,0 +1,35 @@
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=brcmfmac-firmware-4366c0-pcie-vendor
PKG_VERSION:=1
PKG_RELEASE:=3
include $(INCLUDE_DIR)/package.mk
define Package/brcmfmac-firmware-4366c0-pcie-vendor
SECTION:=firmware
CATEGORY:=Firmware
TITLE:=Broadcom 4366c0 FullMac PCIe firmware from vendor
CONFLICTS:=brcmfmac-firmware-4366c0-pcie
endef
define Build/Compile
true
endef
define Package/brcmfmac-firmware-4366c0-pcie-vendor/install
$(INSTALL_DIR) $(1)/lib
$(INSTALL_DIR) $(1)/lib/firmware
$(INSTALL_DIR) $(1)/lib/firmware/brcm
$(INSTALL_DATA) ./files/brcmfmac4366c-pcie.bin $(1)/lib/firmware/brcm/brcmfmac4366c-pcie.bin
endef
$(eval $(call BuildPackage,brcmfmac-firmware-4366c0-pcie-vendor))

View File

@ -82,4 +82,4 @@ define Package/gost/install
endef
$(eval $(call GoBinPackage,gost))
$(eval $(call BuildPackage,gost))
$(eval $(call BuildPackage,gost))

View File

@ -80,4 +80,4 @@ define Package/gowebdav/install
endef
$(eval $(call GoBinPackage,gowebdav))
$(eval $(call BuildPackage,gowebdav))
$(eval $(call BuildPackage,gowebdav))

View File

@ -1,42 +0,0 @@
#
# Copyright (C) 2015-2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v3.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=k3wifi
PKG_VERSION:=1
PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
TITLE:=k3wifi
DEPENDS:=@TARGET_bcm53xx_DEVICE_phicomm-k3
URL:=http://www.k3wifi.com/
endef
define Package/$(PKG_NAME)/description
k3wifi fw
endef
define Build/Prepare
endef
define Build/Configure
endef
define Build/Compile
endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/lib
$(INSTALL_DIR) $(1)/lib/firmware
$(INSTALL_DIR) $(1)/lib/firmware/brcm
$(INSTALL_DATA) ./files/lib/firmware/brcm/brcmfmac4366c-pcie.bin $(1)/lib/firmware/brcm/brcmfmac4366c-pcie.bin
endef
$(eval $(call BuildPackage,$(PKG_NAME)))

View File

@ -13,7 +13,7 @@ PKG_LICENSE:=GPLv3.0+
LUCI_TITLE:=LuCI support for Flow Offload / Shortcut-FE
LUCI_DEPENDS:=+pdnsd-alt \
+PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe:kmod-fast-classifier \
+PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe:kmod-fast-classifier-noload \
+PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload:kmod-ipt-offload \
+PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca:kmod-tcp-bbr \
+PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder:dnsforwarder

View File

@ -4,25 +4,30 @@ PKG_NAME:=luci-app-vssr
PKG_VERSION:=1.22
PKG_RELEASE:=20210119
include $(INCLUDE_DIR)/package.mk
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray \
LUCI_TITLE:=LuCI support for PassWall
LUCI_PKGARCH:=all
LUCI_DEPENDS:= \
+bash +coreutils +coreutils-base64 +dnsmasq-full +ip-full +ipset +iptables-mod-tproxy \
+lua +lua-maxminddb +luasocket +pdnsd-alt +shadowsocksr-libev-ssr-check +shadowsocksr-libev-ssr-redir \
+shadowsocks-libev-ss-local +shadowsocksr-libev-ssr-local +shadowsocks-libev-ss-redir +simple-obfs +wget-ssl \
+PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-ssr-server \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \
+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \
+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin:v2ray-plugin \
+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray
define Package/$(PKG_NAME)/config
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin
bool "Include Shadowsocks V2ray Plugin"
default y if i386||x86_64||arm||aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray
bool "Include V2ray"
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
bool "Include Xray"
default y if i386||x86_64||arm||aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan
bool "Include Trojan"
default y if i386||x86_64||arm||aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
bool "Include Kcptun"
default n
@ -30,72 +35,29 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server
bool "Include ShadowsocksR Server"
default y if i386||x86_64||arm||aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan
bool "Include Trojan"
default y if i386||x86_64||arm||aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray
bool "Include V2ray"
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin
bool "Include Shadowsocks V2ray Plugin"
default y if i386||x86_64||arm||aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
bool "Include Xray"
default y if i386||x86_64||arm||aarch64
endef
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server
define Package/luci-app-vssr
SECTION:=luci
CATEGORY:=LuCI
SUBMENU:=3. Applications
TITLE:=A New SS/SSR/V2Ray/Trojan LuCI interface
PKGARCH:=all
DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +bash +pdnsd-alt +wget-ssl +lua +luasocket +lua-maxminddb \
+shadowsocks-libev-ss-local +shadowsocksr-libev-ssr-local +shadowsocks-libev-ss-redir +simple-obfs \
+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin:v2ray-plugin \
+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \
+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \
+PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-server
define Package/$(PKG_NAME)/conffiles
/etc/vssr/
/etc/config/vssr
endef
define Build/Prepare
endef
include $(TOPDIR)/feeds/luci/luci.mk
define Build/Compile
endef
define Package/luci-app-vssr/conffiles
/etc/vssr/
/etc/config/vssr
endef
define Package/luci-app-vssr/install
$(INSTALL_DIR) $(1)/usr/lib/lua/luci
cp -pR ./luasrc/* $(1)/usr/lib/lua/luci
$(INSTALL_DIR) $(1)/
cp -pR ./root/* $(1)/
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
po2lmo ./po/zh-cn/vssr.po $(1)/usr/lib/lua/luci/i18n/vssr.zh-cn.lmo
endef
define Package/luci-app-vssr/postinst
#!/bin/sh
if [ -z "$${IPKG_INSTROOT}" ]; then
( . /etc/uci-defaults/luci-vssr ) && rm -f /etc/uci-defaults/luci-vssr
rm -rf /tmp/luci-indexcache
rm -rf /tmp/luci-modulecache/*
chmod 755 /etc/init.d/vssr >/dev/null 2>&1
/etc/init.d/vssr enable >/dev/null 2>&1
fi
exit 0
endef
define Package/luci-app-vssr/prerm
#!/bin/sh
if [ -z "$${IPKG_INSTROOT}" ]; then
/etc/init.d/vssr disable
/etc/init.d/vssr stop
fi
exit 0
endef
$(eval $(call BuildPackage,luci-app-vssr))
# call BuildPackage - OpenWrt buildroot signature

View File

@ -40,7 +40,7 @@ define Package/mentohust/description
endef
define Package/mentohust/conffiles
/etc/mentohust.conf
/etc/mentohust.conf
endef
define Package/mentohust/install

View File

@ -54,7 +54,7 @@ define Build/Compile
endef
define Package/appfilter/conffiles
/etc/config/appfilter
/etc/config/appfilter
endef
define Package/appfilter/install

View File

@ -5,6 +5,7 @@
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=quickjs

View File

@ -1,80 +1,86 @@
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=UnblockNeteaseMusic-Go
PKG_VERSION:=0.2.7
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/cnsilvan/UnblockNeteaseMusic.git
PKG_MIRROR_HASH:=d513c958d88452b9a521b9b0f896d1d7e2e6089b942aab3307ba4d63ab724598
PKG_SOURCE_VERSION:=935a28125fc7eafaa8273a77352e6262b18efd5e
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/cnsilvan/UnblockNeteaseMusic/tar.gz/$(PKG_VERSION)?
PKG_HASH:=779a45272ee1d88674caaf792883c6f47619f37ec202082d38d15e090a7a2db9
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILE:=LICENSE
PKG_MAINTAINER:=Silvan <cnsilvan@gmail.com>
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_CONFIG_DEPENDS:= \
CONFIG_UNBLOCKNETEASEMUSIC_GO_COMPRESS_GOPROXY \
CONFIG_UNBLOCKNETEASEMUSIC_GO_COMPRESS_UPX
PKG_BUILD_DIR:=$(BUILD_DIR)/$(firstword $(subst -, ,$(PKG_NAME)))-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
GO_PKG:=github.com/cnsilvan/UnblockNeteaseMusic
GO_PKG_BUILD_PKG:=$$(GO_PKG)
GO_PKG_LDFLAGS:=-s -w
COMPILE_TIME:= $(shell TZ=UTC-8 date '+%Y-%m-%d %H:%M:%S')
GO_PKG_LDFLAGS+= \
-X '$(GO_PKG)/version.Version=$(PKG_VERSION)' \
-X '$(GO_PKG)/version.BuildTime=$(COMPILE_TIME)'
-X '$(GO_PKG)/version.BuildTime=$(COMPILE_TIME)' \
-X '$(GO_PKG)/version.ExGoVersionInfo=$(GO_ARM) $(GO_MIPS)$(GO_MIPS64)'
include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
define Package/$(PKG_NAME)/config
config $(PKG_NAME)_INCLUDE_GOPROXY
define Package/UnblockNeteaseMusic-Go/config
config UNBLOCKNETEASEMUSIC_GO_COMPRESS_GOPROXY
bool "Compiling with GOPROXY proxy"
default n
config UNBLOCKNETEASEMUSIC_GO_COMPRESS_UPX
bool "Compress executable files with UPX"
default y
endef
ifeq ($(CONFIG_$(PKG_NAME)_INCLUDE_GOPROXY),y)
export GO111MODULE=on
export GOPROXY=https://goproxy.io
#export GOPROXY=https://mirrors.aliyun.com/goproxy/
ifeq ($(CONFIG_UNBLOCKNETEASEMUSIC_GO_COMPRESS_GOPROXY),y)
export GO111MODULE=on
export GOPROXY=https://goproxy.io
endif
define Package/$(PKG_NAME)
define Package/UnblockNeteaseMusic-Go
SECTION:=multimedia
CATEGORY:=Multimedia
TITLE:=Revive Netease Cloud Music (Golang)
DEPENDS:=$(GO_ARCH_DEPENDS)
URL:=https://github.com/cnsilvan/UnblockNeteaseMusic
endef
define Package/$(PKG_NAME)/description
Revive Netease Cloud Music (Golang)
endef
define Build/Prepare
tar -zxvf $(DL_DIR)/$(PKG_SOURCE) -C $(BUILD_DIR)/$(PKG_NAME) --strip-components 1
endef
define Build/Configure
DEPENDS:=$(GO_ARCH_DEPENDS)
endef
define Build/Compile
$(eval GO_PKG_BUILD_PKG:=$(GO_PKG))
$(call GoPackage/Build/Configure)
$(eval GO_PKG_LDFLAGS+=-X '$(GO_PKG)/version.ExGoVersionInfo=$(GO_ARM) $(GO_MIPS)$(GO_MIPS64)')
$(call GoPackage/Build/Compile)
ifeq ($(CONFIG_GOST_COMPRESS_UPX),y)
$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/UnblockNeteaseMusic
chmod +wx $(GO_PKG_BUILD_BIN_DIR)/UnblockNeteaseMusic
endif
endef
define Package/$(PKG_NAME)/install
define Package/UnblockNeteaseMusic-Go/install
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/UnblockNeteaseMusic $(1)/usr/bin/UnblockNeteaseMusic
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/UnblockNeteaseMusic $(1)/usr/bin/UnblockNeteaseMusic
$(INSTALL_DIR) $(1)/usr/share/UnblockNeteaseMusicGo
$(CP) ./files/* $(1)/usr/share/UnblockNeteaseMusicGo/
endef
$(eval $(call GoBinPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call GoBinPackage,UnblockNeteaseMusic-Go))
$(eval $(call BuildPackage,UnblockNeteaseMusic-Go))

View File

@ -1,59 +1,54 @@
#
# Copyright (C) 2015-2020 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v3.
#
#
include $(TOPDIR)/rules.mk
PKG_NAME:=UnblockNeteaseMusic
PKG_VERSION:=0.25.3
PKG_RELEASE:=5
PKG_LICENSE:=MIT
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git
PKG_MIRROR_HASH:=51422014ed1dd196a12950ac0db2bf88bae6516637440655d0899fac474fbf30
PKG_SOURCE_VERSION:=1193e29a2c8f72c738d2988d5cf5afbb2fee7463
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
SECTION:=multimedia
CATEGORY:=Multimedia
TITLE:=Revive Netease Cloud Music (NodeJS)
DEPENDS:=+node +libopenssl
URL:=https://github.com/nondanee/UnblockNeteaseMusic/releases
PKGARCH:=all
endef
define Package/$(PKG_NAME)/description
Revive Netease Cloud Music (NodeJS)
endef
define Build/Prepare
tar -xzvf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR)
mkdir -p $(PKG_BUILD_DIR)/$(PKG_NAME)
echo -e $(PKG_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)/core_ver
echo -e $(PKG_SOURCE_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)/local_ver
endef
define Build/Configure
endef
define Build/Compile
endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)
cp -pR $(PKG_BUILD_DIR)/$(PKG_NAME)/* $(1)/usr/share/$(PKG_NAME)
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=UnblockNeteaseMusic
PKG_VERSION:=0.25.3
PKG_RELEASE:=6
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git
PKG_SOURCE_DATE:2020-12-22
PKG_SOURCE_VERSION:=b8d5f4b4fe59cef9c021b99f3cf2606d99fa4790
PKG_MIRROR_HASH:=bd7fa102415ae8dbcd22829fce5ad0cd358a0869547c30f10271389e6c698317
PKG_LICENSE:=MIT
PKG_LICENSE_FILE:=LICENSE
include $(INCLUDE_DIR)/package.mk
define Package/UnblockNeteaseMusic
SECTION:=multimedia
CATEGORY:=Multimedia
TITLE:=Revive Netease Cloud Music (NodeJS)
URL:=https://github.com/nondanee/UnblockNeteaseMusic
DEPENDS:=+node +libopenssl
PKGARCH:=all
endef
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
xzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
endef
define Build/Configure
echo -e $(PKG_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/core_ver
echo -e $(PKG_SOURCE_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/local_ver
endef
define Build/Compile
true
endef
define Package/UnblockNeteaseMusic/install
$(INSTALL_DIR) $(1)/usr/share/UnblockNeteaseMusic
$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/* $(1)/usr/share/UnblockNeteaseMusic
endef
$(eval $(call BuildPackage,UnblockNeteaseMusic))

View File

@ -8,57 +8,54 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=adbyby
PKG_VERSION:=2.7
PKG_RELEASE:=20200315
PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
define Package/adbyby
SECTION:=net
CATEGORY:=Network
TITLE:=Powerful adblock module to block ad.
DEPENDS:=@(i386||x86_64||arm||mipsel||mips||aarch64)
DEPENDS:=@(i386||x86_64||arm||aarch64||mipsel||mips)
URL:=http://www.adbyby.com/
endef
define Package/$(PKG_NAME)/description
Adbyby is a powerful adblock module to block ad,just like adblock.
define Package/adbyby/description
Adbyby is a powerful adblock module to block ad,just like adblock.
endef
ifeq ($(ARCH),i386)
ADBYBY_DIR:=x86
endif
ifeq ($(ARCH),x86_64)
ADBYBY_DIR:=amd64
endif
ifeq ($(ARCH),mipsel)
ADBYBY_DIR:=mipsle
endif
ifeq ($(ARCH),mips)
ADBYBY_DIR:=mips
endif
ifeq ($(ARCH),i386)
ADBYBY_DIR:=x86
endif
ifeq ($(ARCH),arm)
ADBYBY_DIR:=armv7
ifeq ($(BOARD),bcm53xx)
ifeq ($(CONFIG_HAS_FPU),)
ADBYBY_DIR:=arm
endif
ifeq ($(BOARD),kirkwood)
ADBYBY_DIR:=arm
endif
endif
endif
ifeq ($(ARCH),aarch64)
ADBYBY_DIR:=armv7
endif
define Build/Prepare
endef
ifeq ($(ARCH),mips)
ADBYBY_DIR:=mips
endif
define Build/Configure
endef
ifeq ($(ARCH),mipsel)
ADBYBY_DIR:=mipsle
endif
define Build/Compile
true
endef
define Package/$(PKG_NAME)/install
define Package/adbyby/install
$(INSTALL_DIR) $(1)/usr/share/adbyby
$(INSTALL_BIN) ./files/adbyby.sh $(1)/usr/share/adbyby/
$(INSTALL_CONF) ./files/adhook.ini $(1)/usr/share/adbyby/
@ -73,4 +70,4 @@ define Package/$(PKG_NAME)/install
$(INSTALL_BIN) ./files/$(ADBYBY_DIR)/adbyby $(1)/usr/share/adbyby/adbyby
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,adbyby))

View File

@ -1,7 +1,7 @@
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# Copyright (C) 2007-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
@ -9,29 +9,24 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=aMule
PKG_VERSION:=2.3.2
PKG_RELEASE:=4
PKG_REV=ae8e867
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REV).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_URL:=https://github.com/amule-project/amule.git
PKG_MIRROR_HASH:=7b1352dd50764844205610173091db146bd0aa02d215278742bc83138ab0852f
PKG_SOURCE_DATE:2021-01-30
PKG_SOURCE_VERSION:=c3a1018329633234ac941055b64a43b9e2df7fad
PKG_MIRROR_HASH:=f03b60e909346c4d984aeb9cf3a115b5b43fa6158ee01ed41b99e7217b436bb7
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libgd libcryptopp
PKG_CONFIG_DEPEDS:= CONFIG_AMULE_CRYPTOPP_STATIC_LINKING
PKG_FIXUP:=autoreconf
PKG_BUILD_DEPENDS:=libcryptopp libgd
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/amule/config
config AMULE_CRYPTOPP_STATIC_LINKING
bool "Link libcryptopp statically"
default n
endef
define Package/amule
SUBMENU:=P2P
SECTION:=net
@ -42,6 +37,14 @@ define Package/amule
$(ICONV_DEPENDS) $(INTL_DEPENDS) +!AMULE_CRYPTOPP_STATIC_LINKING:libcryptopp
endef
define Package/amule/config
config AMULE_CRYPTOPP_STATIC_LINKING
bool "Link libcryptopp statically"
default n
endef
TARGET_LDFLAGS+= -liconv
CONFIGURE_ARGS+= \
--disable-static \
--disable-rpath \
@ -75,36 +78,25 @@ CONFIGURE_ARGS+= \
--without-x \
--disable-debug
TARGET_LDFLAGS += -liconv
MAKE_FLAGS += HOSTCC="$(HOSTCC)"
define Build/Configure
cd $(PKG_BUILD_DIR) && sh ./autogen.sh
cd $(PKG_BUILD_DIR); $(SHELL) autogen.sh
$(call Build/Configure/Default)
endef
ifeq ($(CONFIG_AMULE_CRYPTOPP_STATIC_LINKING),y)
SED_CMD:=sed
else
SED_CMD:=true
endif
define Build/Compile
$(SED_CMD) -i 's;^CRYPTOPP_LIBS.*;CRYPTOPP_LIBS \= "$(STAGING_DIR)/usr/lib/libcryptopp.a";g' \
$(SED) 's;^CRYPTOPP_LIBS.*;CRYPTOPP_LIBS \= "$(STAGING_DIR)/usr/lib/libcryptopp.a";g' \
$(PKG_BUILD_DIR)/src/Makefile
$(MAKE) -C $(PKG_BUILD_DIR) \
HOSTCC="$(HOSTCC)" \
DESTDIR="$(PKG_INSTALL_DIR)" \
all
endif
endef
define Package/amule/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/share/amule/webserver
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/amule{cmd,d} $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/webserver/src/amuleweb $(1)/usr/bin/
$(CP) $(PKG_BUILD_DIR)/src/webserver/default $(1)/usr/share/amule/webserver
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amulecmd $(1)/usr/bin/amulecmd
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amuled $(1)/usr/bin/amuled
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amuleweb $(1)/usr/bin/amuleweb
$(INSTALL_DIR) $(1)/usr/share
$(CP) $(PKG_INSTALL_DIR)/usr/share/amule $(1)/usr/share/
endef
$(eval $(call BuildPackage,amule))

View File

@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,14 @@ MULE_IF_ENABLED([static], [MULE_APPEND([
@@ -91,6 +91,14 @@ MULE_IF_ENABLED([static], [MULE_APPEND([
KDE_CONFIG_OPTIONS
QT_CONFIG_OPTIONS
@ -15,8 +15,8 @@
# Default is yes, because they're most likely compatible.
# However, this is only used when cross-compiling.
AC_ARG_WITH(
@@ -449,6 +457,8 @@ AM_CONDITIONAL(COMPILE_NLS, test x$USE_N
AM_CONDITIONAL(GENERATE_FLEX_HEADER, test x$HAVE_FLEX_EXTENDED = xyes)
@@ -454,6 +462,8 @@ AM_CONDITIONAL(NEED_CORESERVICES, test x
AM_CONDITIONAL(COMPILE_NLS, test x$USE_NLS = xyes)
AM_CONDITIONAL(INSTALL_SKINS, test MULE_IS_ENABLED_ANY([monolithic, amule-gui]))
AM_CONDITIONAL(PLASMAMULE, test MULE_IS_ENABLED([plasmamule]))
+#Dynamic Leech Protection - Bill Lee
@ -552,7 +552,7 @@
source->Safe_Delete();
--- a/src/ExternalConn.cpp
+++ b/src/ExternalConn.cpp
@@ -57,6 +57,9 @@
@@ -55,6 +55,9 @@
#include "kademlia/kademlia/UDPFirewallTester.h"
#include "Statistics.h"
@ -562,7 +562,7 @@
//-------------------- File_Encoder --------------------
@@ -1387,6 +1390,15 @@ CECPacket *CECServerSocket::ProcessReque
@@ -1388,6 +1391,15 @@ CECPacket *CECServerSocket::ProcessReque
}
}
break;
@ -622,7 +622,7 @@
END_EVENT_TABLE()
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,6 +179,13 @@ core_sources = \
@@ -178,6 +178,13 @@ core_sources = \
kademlia/routing/RoutingZone.cpp
@ -638,7 +638,7 @@
amuleDlg.cpp \
--- a/src/Preferences.cpp
+++ b/src/Preferences.cpp
@@ -51,6 +51,11 @@
@@ -49,6 +49,11 @@
#include "UserEvents.h"
@ -650,7 +650,7 @@
#ifndef AMULE_DAEMON
#include <wx/valgen.h>
#include "muuli_wdr.h"
@@ -344,6 +349,19 @@ protected:
@@ -343,6 +348,19 @@ protected:
wxWindow* m_widget;
};
@ -670,7 +670,7 @@
/** Cfg class for wxStrings. */
class Cfg_Str : public Cfg_Tmpl<wxString>
@@ -953,6 +971,11 @@ CPreferences::CPreferences()
@@ -952,6 +970,11 @@ CPreferences::CPreferences()
s_userhash[5] = 14;
s_userhash[14] = 111;
@ -682,7 +682,7 @@
#ifndef CLIENT_GUI
LoadPreferences();
ReloadSharedFolders();
@@ -1062,6 +1085,20 @@ void CPreferences::BuildItemList( const
@@ -1061,6 +1084,20 @@ void CPreferences::BuildItemList( const
NewCfgItem( IDC_NETWORKKAD, (new Cfg_Bool( wxT("/eMule/ConnectToKad"), s_ConnectToKad, true )) );
NewCfgItem( IDC_NETWORKED2K, ( new Cfg_Bool( wxT("/eMule/ConnectToED2K"), s_ConnectToED2K, true ) ));
@ -739,7 +739,7 @@
{
--- a/src/Preferences.h
+++ b/src/Preferences.h
@@ -579,6 +579,11 @@ public:
@@ -580,6 +580,11 @@ public:
// Sleep
static bool GetPreventSleepWhileDownloading() { return s_preventSleepWhileDownloading; }
static void SetPreventSleepWhileDownloading(bool status) { s_preventSleepWhileDownloading = status; }
@ -751,7 +751,7 @@
protected:
static int32 GetRecommendedMaxConnections();
@@ -599,6 +604,11 @@ protected:
@@ -600,6 +605,11 @@ protected:
private:
void LoadPreferences();
void SavePreferences();
@ -763,7 +763,7 @@
protected:
static wxString s_configDir;
@@ -813,6 +823,20 @@ protected:
@@ -815,6 +825,20 @@ protected:
// Stats server
static wxString s_StatsServerName;
static wxString s_StatsServerURL;
@ -820,7 +820,7 @@
#ifdef __DEBUG__
,{ wxTRANSLATE("Debugging"), PreferencesDebug, 25 }
#endif
@@ -1087,6 +1100,21 @@ void PrefsUnifiedDlg::OnButtonIPFilterUp
@@ -1096,6 +1109,21 @@ void PrefsUnifiedDlg::OnButtonIPFilterUp
theApp->ipfilter->Update( CastChild( IDC_IPFILTERURL, wxTextCtrl )->GetValue() );
}
@ -888,7 +888,7 @@
};
--- a/src/TextClient.cpp
+++ b/src/TextClient.cpp
@@ -73,6 +73,7 @@ enum {
@@ -67,6 +67,7 @@ enum {
CMD_ID_RELOAD_SHARED,
CMD_ID_RELOAD_IPFILTER_LOCAL,
CMD_ID_RELOAD_IPFILTER_NET,
@ -896,7 +896,7 @@
CMD_ID_SET_IPFILTER_ON,
CMD_ID_SET_IPFILTER_OFF,
CMD_ID_SET_IPFILTER_CLIENTS_ON,
@@ -106,7 +107,6 @@ enum {
@@ -100,7 +101,6 @@ enum {
CMD_ID_DOWNLOAD,
// IDs for deprecated commands
CMD_ID_SET_IPFILTER
@ -904,7 +904,7 @@
};
// method to create a SearchFile
@@ -240,6 +240,12 @@ int CamulecmdApp::ProcessCommand(int Cmd
@@ -234,6 +234,12 @@ int CamulecmdApp::ProcessCommand(int Cmd
case CMD_ID_DISCONNECT_KAD:
request_list.push_back(new CECPacket(EC_OP_KAD_STOP));
break;
@ -917,7 +917,7 @@
case CMD_ID_RELOAD_SHARED:
request_list.push_back(new CECPacket(EC_OP_SHAREDFILES_RELOAD));
@@ -910,6 +916,9 @@ void CamulecmdApp::OnInitCommandSet()
@@ -904,6 +910,9 @@ void CamulecmdApp::OnInitCommandSet()
tmp2->AddCommand(wxT("Net"), CMD_ID_RELOAD_IPFILTER_NET, wxTRANSLATE("Update IP filtering table from URL."),
wxTRANSLATE("If URL is omitted the URL from the preferences is used."), CMD_PARAM_OPTIONAL);
@ -975,7 +975,7 @@
#include "amule.h" // Interface declarations.
#include <csignal>
@@ -90,6 +89,11 @@
@@ -87,6 +86,11 @@
#include <wx/sysopt.h> // Do_not_auto_remove
#endif
@ -987,7 +987,7 @@
#ifndef AMULE_DAEMON
#ifdef __WXMAC__
#include <CoreFoundation/CFBundle.h> // Do_not_auto_remove
@@ -520,6 +524,11 @@ bool CamuleApp::OnInit()
@@ -517,6 +521,11 @@ bool CamuleApp::OnInit()
uploadqueue = new CUploadQueue();
ipfilter = new CIPFilter();
@ -999,7 +999,7 @@
// Creates all needed listening sockets
wxString msg;
if (!ReinitializeNetwork(&msg)) {
@@ -2062,3 +2071,8 @@ DEFINE_LOCAL_EVENT_TYPE(wxEVT_CORE_SOURC
@@ -2063,3 +2072,8 @@ DEFINE_LOCAL_EVENT_TYPE(wxEVT_CORE_SOURC
DEFINE_LOCAL_EVENT_TYPE(wxEVT_CORE_UDP_DNS_DONE)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_CORE_SERVER_DNS_DONE)
// File_checked_for_headers
@ -1010,7 +1010,7 @@
+#endif
--- a/src/amule.h
+++ b/src/amule.h
@@ -138,6 +138,8 @@ protected:
@@ -134,6 +134,8 @@ protected:
bool m_geometryEnabled;
wxString m_geometryString;
wxString m_logFile;
@ -1019,7 +1019,7 @@
wxString m_appName;
wxString m_PidFile;
@@ -413,6 +415,7 @@ public:
@@ -409,6 +411,7 @@ public:
wxString GetLog(bool reset = false);
wxString GetServerLog(bool reset = false);
void AddServerMessageLine(wxString &msg);
@ -1027,7 +1027,7 @@
DECLARE_EVENT_TABLE()
};
@@ -583,6 +586,8 @@ public:
@@ -573,6 +576,8 @@ public:
virtual int ShowAlert(wxString msg, wxString title, int flags);
@ -1036,7 +1036,7 @@
DECLARE_EVENT_TABLE()
};
@@ -593,3 +598,8 @@ extern CamuleDaemonApp *theApp;
@@ -583,3 +588,8 @@ extern CamuleDaemonApp *theApp;
#endif // AMULE_H
// File_checked_for_headers
@ -1081,7 +1081,7 @@
CPreferences::LoadAllItems( wxConfigBase::Get() );
--- a/src/amuleDlg.cpp
+++ b/src/amuleDlg.cpp
@@ -315,7 +315,7 @@ m_clientSkinNames(CLIENT_SKIN_SIZE)
@@ -311,7 +311,7 @@ m_clientSkinNames(CLIENT_SKIN_SIZE)
wxNotebook* logs_notebook = CastChild( ID_SRVLOG_NOTEBOOK, wxNotebook);
wxNotebook* networks_notebook = CastChild( ID_NETNOTEBOOK, wxNotebook);
@ -1090,7 +1090,7 @@
wxASSERT(networks_notebook->GetPageCount() == 2);
for (uint32 i = 0; i < logs_notebook->GetPageCount(); ++i) {
@@ -507,7 +507,12 @@ void CamuleDlg::OnAboutButton(wxCommandE
@@ -503,7 +503,12 @@ void CamuleDlg::OnAboutButton(wxCommandE
_("Part of aMule is based on \n") <<
_("Kademlia: Peer-to-peer routing based on the XOR metric.\n") <<
_(" Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n") <<
@ -1104,7 +1104,7 @@
if (m_is_safe_state) {
wxMessageBox(msg, _("Message"), wxOK | wxICON_INFORMATION, this);
@@ -659,8 +664,24 @@ void CamuleDlg::AddServerMessageLine(wxS
@@ -655,8 +660,24 @@ void CamuleDlg::AddServerMessageLine(wxS
}
cv->ShowPosition(cv->GetLastPosition()-1);
}
@ -1129,7 +1129,7 @@
void CamuleDlg::ShowConnectionState(bool skinChanged)
{
@@ -1446,7 +1467,9 @@ void CamuleDlg::DoNetworkRearrange()
@@ -1435,7 +1456,9 @@ void CamuleDlg::DoNetworkRearrange()
if (thePrefs::GetNetworkKademlia()) {
logs_notebook->AddPage(m_logpages[3].page, m_logpages[3].name);
}
@ -1152,7 +1152,7 @@
void ResetLog(int id);
void ShowUserCount(const wxString& info = wxEmptyString);
@@ -224,7 +227,7 @@ private:
@@ -222,7 +225,7 @@ private:
WX_DECLARE_STRING_HASH_MAP(wxZipEntry*, ZipCatalog);
ZipCatalog cat;
@ -1163,7 +1163,7 @@
bool LoadGUIPrefs(bool override_pos, bool override_size);
--- a/src/amuled.cpp
+++ b/src/amuled.cpp
@@ -784,4 +784,10 @@ int CamuleDaemonApp::ShowAlert(wxString
@@ -783,4 +783,10 @@ int CamuleDaemonApp::ShowAlert(wxString
return 0; // That's neither yes nor no, ok, cancel
}
@ -1320,7 +1320,7 @@
public final static short EC_TAG_PASSWD_HASH = 0x0001;
--- a/src/muuli_wdr.cpp
+++ b/src/muuli_wdr.cpp
@@ -1768,6 +1768,51 @@ wxSizer *PreferencesServerTab( wxWindow
@@ -1772,6 +1772,51 @@ wxSizer *PreferencesServerTab( wxWindow
return item0;
}
@ -1372,7 +1372,7 @@
wxSizer *PreferencesFilesTab( wxWindow *parent, bool call_fit, bool set_sizer )
{
wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
@@ -2586,6 +2631,42 @@ wxSizer *serverListDlgUp( wxWindow *pare
@@ -2590,6 +2635,42 @@ wxSizer *serverListDlgUp( wxWindow *pare
return item0;
}
@ -1415,7 +1415,7 @@
wxSizer *serverListDlgDown( wxWindow *parent, bool call_fit, bool set_sizer )
{
wxStaticBox *item1 = new wxStaticBox( parent, -1, wxT("") );
@@ -2601,7 +2682,7 @@ wxSizer *serverListDlgDown( wxWindow *pa
@@ -2605,7 +2686,7 @@ wxSizer *serverListDlgDown( wxWindow *pa
wxPanel *item4 = new wxPanel( item3, -1 );
aMuleLog( item4, FALSE );
item3->AddPage( item4, _("aMule Log") );
@ -1424,7 +1424,7 @@
wxPanel *item5 = new wxPanel( item3, -1 );
ServerInfoLog( item5, FALSE );
item3->AddPage( item5, _("Server Info") );
@@ -2613,6 +2694,10 @@ wxSizer *serverListDlgDown( wxWindow *pa
@@ -2617,6 +2698,10 @@ wxSizer *serverListDlgDown( wxWindow *pa
wxPanel *item7 = new wxPanel( item3, -1 );
Kad_Info( item7, FALSE );
item3->AddPage( item7, _("Kad Info") );
@ -1437,19 +1437,19 @@
--- a/src/muuli_wdr.h
+++ b/src/muuli_wdr.h
@@ -335,6 +335,10 @@ wxSizer *transferDlg( wxWindow *parent,
#define ID_BTN_RESET_SERVER 10240
@@ -336,6 +336,10 @@ wxSizer *transferDlg( wxWindow *parent,
#define ID_BTN_RESET_SERVER 10241
wxSizer *ServerInfoLog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+#define ID_DLPINFO 22001
+#define ID_BTN_RESET_DLP 22002
+wxSizer *DLPInfoLog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+
#define ID_LOGVIEW 10241
#define ID_BTN_RESET 10242
#define ID_LOGVIEW 10242
#define ID_BTN_RESET 10243
wxSizer *aMuleLog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
@@ -424,6 +428,21 @@ wxSizer *CoreConnect( wxWindow *parent,
#define ID_DEBUGCATS 10307
@@ -425,6 +429,21 @@ wxSizer *CoreConnect( wxWindow *parent,
#define ID_DEBUGCATS 10308
wxSizer *PreferencesDebug( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+/* Dynamic Leecher Protection */
@ -1468,8 +1468,8 @@
+#endif
+
extern wxSizer *IDC_CURJOB;
#define IDC_CONV_PB_LABEL 10308
#define IDC_CONV_PROZENT 10309
#define IDC_CONV_PB_LABEL 10309
#define IDC_CONV_PROZENT 10310
--- a/src/updownclient.h
+++ b/src/updownclient.h
@@ -408,7 +408,13 @@ public:

View File

@ -1,11 +0,0 @@
--- a/src/UPnPBase.cpp
+++ b/src/UPnPBase.cpp
@@ -828,7 +828,7 @@ m_WanService(NULL)
int ret;
char *ipAddress = NULL;
unsigned short port = 0;
- ret = UpnpInit(ipAddress, udpPort);
+ ret = UpnpInit2(ipAddress, udpPort);
if (ret != UPNP_E_SUCCESS) {
msg << "error(UpnpInit): Error code ";
goto error;

View File

@ -1,7 +1,8 @@
#
# Copyright (C) 2007-2009 OpenWrt.org
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v2.
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
@ -9,13 +10,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=antileech
PKG_VERSION:=2.3.2
PKG_RELEASE:=1
#PKG_SOURCE:=antileech-2.3.1.tar.gz
#PKG_SOURCE_URL:=@SF/amule
#PKG_MD5SUM:=a892a1cc00d03e943e03434d182fe73e
PKG_RELEASE:=2
PKG_FIXUP:=autoreconf
PKG_BUILD_DEPENDS:=libgd
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
@ -29,30 +29,19 @@ define Package/antileech
DEPENDS:=+libc +amule +libwxbase
endef
TARGET_LDFLAGS += \
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
$(CP) ./src/* $(PKG_BUILD_DIR)/
endef
define Build/Configure
sed -i "s:^AC_CHECK_PROG.WXCONFIG,.*::g" $(PKG_BUILD_DIR)/configure.ac
sed -i "s:wx-config --cppflags:$(STAGING_DIR)/usr/bin/wx-config --cppflags:g" $(PKG_BUILD_DIR)/configure.ac
cd $(PKG_BUILD_DIR) && sh ./autogen.sh
$(SED) "s:^AC_CHECK_PROG.WXCONFIG,.*::g" $(PKG_BUILD_DIR)/configure.ac
$(SED) "s:wx-config --cppflags:$(STAGING_DIR)/usr/bin/wx-config --cppflags:g" $(PKG_BUILD_DIR)/configure.ac
cd $(PKG_BUILD_DIR); $(SHELL) ./autogen.sh
$(call Build/Configure/Default)
endef
define Build/Compile
$(MAKE) -k -C $(PKG_BUILD_DIR) \
HOSTCC="$(HOSTCC)" \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
MAKE_FLAGS += HOSTCC="$(HOSTCC)"
define Package/antileech/install
$(INSTALL_DIR) $(1)/usr/share/amule
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/amule/libantiLeech.so $(1)/usr/share/amule
$(CP) $(PKG_INSTALL_DIR)/usr/share/amule/libantiLeech.so* $(1)/usr/share/amule/
endef
$(eval $(call BuildPackage,antileech))

View File

@ -1,7 +1,10 @@
#
# Copyright (C) 2010-2011 OpenWrt.org
# Copyright (C) 2020 Lean <coolsnowwolf@gmail.com>
#
# This is free software, licensed under the GNU General Public License v2.
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
@ -39,13 +42,16 @@ define Package/autocore-x86/description
endef
define Build/Compile
true
endef
define Package/autocore-arm/install
$(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) ./files/arm/index.htm $(1)/etc/index.htm
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) ./files/arm/090-cover-index_htm $(1)/etc/uci-defaults/090-cover-index_htm
$(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) ./files/arm/sbin/cpuinfo $(1)/sbin/cpuinfo
ifneq (, $(findstring $(BOARD), ipq40xx ipq806x))
@ -56,8 +62,10 @@ endef
define Package/autocore-x86/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/x86/autocore $(1)/etc/init.d/autocore
$(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) ./files/x86/index.htm $(1)/etc/index.htm
$(INSTALL_DIR) $(1)/sbin
$(CP) ./files/x86/sbin/* $(1)/sbin
endef

View File

@ -16,15 +16,17 @@ 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 +!TARGET_ramips:kmod-usb-storage-uas +kmod-fs-vfat +kmod-fs-ext4 +kmod-fs-exfat +ntfs-3g
DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +!TARGET_ramips:kmod-usb-storage-uas \
+kmod-fs-vfat +kmod-fs-ext4 +kmod-fs-exfat +ntfs-3g
PKGARCH:=all
endef
define Package/automount/description
A usb autoconfig hotplug script.
A usb autoconfig hotplug script.
endef
define Build/Compile
true
endef
define Package/automount/install

View File

@ -21,10 +21,11 @@ define Package/autosamba
endef
define Package/autosamba/description
A hotplug script to config Samba share automatically.
A hotplug script to config Samba share automatically.
endef
define Build/Compile
true
endef
define Package/autosamba/install

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=csstidy
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://github.com/jow-/csstidy-cpp.git
@ -11,9 +11,11 @@ PKG_MIRROR_HASH:=3210d475f6ae966d4dfcd3e1f7fcbf0ad9507a37878d50de015ffe795c1d160
PKG_LICENSE:=LGPL-2.1
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
HOST_BUILD_PARALLEL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk

View File

@ -1,8 +1,12 @@
#
# Copyright (C) 2016-2017 GitHub
# Copyright (C) 2021 Lean <coolsnowwolf@gmail.com>
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
@ -12,8 +16,6 @@ PKG_RELEASE:=61
PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
define Package/default-settings
@ -25,21 +27,20 @@ define Package/default-settings
endef
define Package/default-settings/description
Language Support Packages.
endef
define Build/Configure
Language Support Packages.
endef
define Build/Compile
true
endef
define Package/default-settings/install
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
$(INSTALL_DIR) $(1)/etc
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_DATA) ./files/openwrt_banner $(1)/etc/openwrt_banner
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) ./files/zzz-default-settings $(1)/etc/uci-defaults/99-default-settings
po2lmo ./i18n/default.zh-cn.po $(1)/usr/lib/lua/luci/i18n/default.zh-cn.lmo
po2lmo ./i18n/more.zh-cn.po $(1)/usr/lib/lua/luci/i18n/more.zh-cn.lmo
endef

View File

@ -1,46 +1,61 @@
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsforwarder
PKG_VERSION:=6.1.15
PKG_RELEASE:=10
PKG_RELEASE:=11
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/1715173329/dnsforwarder.git
PKG_MIRROR_HASH:=d54eab3778475408b4b615fb5cd13d69b6e7ef1d795fc434427e43ede8ca7128
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_DATE:=2018-06-26
PKG_SOURCE_VERSION:=587e61ae4d75dc976f538088b715a3c8ee26c144
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Dennis <openwrt@tossp.com>
PKG_MIRROR_HASH:=7c141040ae384d254d90b3c3ee502d87330c9fdcd201ff29a669336a27b176d4
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILE:=LICENSE
PKG_MAINTAINER:=Dennis <openwrt@tossp.com>
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
define Package/dnsforwarder
SECTION:=net
CATEGORY:=Network
TITLE:=A simple DNS forwarder
URL:=https://github.com/holmium/dnsforwarder
DEPENDS:=+wget-ssl +dnsmasq-full +libpthread +coreutils-base64
DEPENDS:=+coreutils +coreutils-base64 +dnsmasq-full +libpthread +wget-ssl
endef
define Package/$(PKG_NAME)/description
Forwarding queries to customized domains (and their subdomains) to specified servers over a specified protocol (UDP or TCP). non-standard ports are supported.
define Package/dnsforwarder/description
Forwarding queries to customized domains (and their subdomains) to specified servers
over a specified protocol (UDP or TCP). non-standard ports are supported.
endef
CONFIGURE_ARGS += --enable-downloader=wget
CONFIGURE_ARGS+= --enable-downloader=wget
define Package/$(PKG_NAME)/install
define Package/dnsforwarder/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/dnsforwarder $(1)/usr/bin/dnsforwarder
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) files/etc/init.d/dnsforwarder $(1)/etc/init.d/dnsforwarder
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dnsforwarder $(1)/usr/bin/dnsforwarder
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) files/etc/config/dnsforwarder $(1)/etc/config/dnsforwarder
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) files/etc/init.d/dnsforwarder $(1)/etc/init.d/dnsforwarder
$(INSTALL_DIR) $(1)/etc/dnsforwarder
$(INSTALL_CONF) files/etc/dnsforwarder/gfw.txt $(1)/etc/dnsforwarder/gfw.txt
$(INSTALL_DIR) $(1)/usr/share/dnsforwarder
$(INSTALL_BIN) files/usr/share/dnsforwarder/gfwlist.sh $(1)/usr/share/dnsforwarder/gfwlist.sh
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,dnsforwarder))

View File

@ -12,31 +12,28 @@ PKG_RELEASE:=5967.1
include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
define Package/dsmboot
SECTION:=net
CATEGORY:=Network
TITLE:=Synology DSM pxeboot from TFTP
DEPENDS:=
endef
define Package/$(PKG_NAME)/description
DSM 5.2 boot from TFTP
endef
define Build/Prepare
endef
define Build/Configure
define Package/dsmboot/description
DSM 5.2 boot from TFTP
endef
define Build/Compile
true
endef
define Package/$(PKG_NAME)/install
define Package/dsmboot/install
$(INSTALL_DIR) $(1)/root
$(INSTALL_DATA) ./files/* $(1)/root/
$(CP) ./files/dsm.iso $(1)/root/
$(CP) ./files/menu.lst $(1)/root/
$(CP) ./files/pxelinux.0 $(1)/root/
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) ./files/dsmboot $(1)/etc/uci-defaults/yyy-dsmboot
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,dsmboot))

View File

@ -6,52 +6,55 @@ PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
define KernelPackage/$(PKG_NAME)/Default
define KernelPackage/fast-classifier/template
SECTION:=kernel
CATEGORY:=Kernel modules
SUBMENU:=Network Support
DEPENDS:=+kmod-ipt-conntrack +kmod-shortcut-fe
TITLE:=Kernel driver for FAST Classifier
FILES:=$(PKG_BUILD_DIR)/fast-classifier.ko
KCONFIG:=CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y CONFIG_NF_CONNTRACK_MARK=y
PROVIDES:=$(PKG_NAME)
KCONFIG:= \
CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y \
CONFIG_NF_CONNTRACK_MARK=y
DEPENDS:=+kmod-ipt-conntrack +kmod-shortcut-fe
PROVIDES:=fast-classifier
endef
define KernelPackage/$(PKG_NAME)
$(call KernelPackage/$(PKG_NAME)/Default)
define KernelPackage/fast-classifier
$(call KernelPackage/fast-classifier/template)
AUTOLOAD:=$(call AutoLoad,10,fast-classifier)
endef
define KernelPackage/$(PKG_NAME)-noload
$(call KernelPackage/$(PKG_NAME)/Default)
define KernelPackage/fast-classifier-noload
$(call KernelPackage/fast-classifier/template)
TITLE+= (no autoload)
endef
define KernelPackage/$(PKG_NAME)/Default/description
FAST Classifier talks to SFE to make decisions about offloading connections
define KernelPackage/fast-classifier/description/template
FAST Classifier talks to SFE to make decisions about offloading connections
endef
define KernelPackage/$(PKG_NAME)/description
$(call KernelPackage/$(PKG_NAME)/Default/description)
endef
KernelPackage/fast-classifier/description = $(KernelPackage/fast-classifier/description/template)
define KernelPackage/$(PKG_NAME)-noload/description
$(call KernelPackage/$(PKG_NAME)/Default/description)
This package does not load $(PKG_NAME) at boot by default
define KernelPackage/fast-classifier-noload/description
$(call KernelPackage/fast-classifier/description/template)
This package does not load fast-classifier at boot by default
endef
define Package/fast-classifier-example
SECTION:=net
CATEGORY:=Network
TITLE:=Example user space program for fast-classifier
DEPENDS:=+libnl +kmod-fast-classifier
endef
define Package/fast-classifier-example/description
Example user space program that communicates with fast
classifier kernel module
Example user space program that communicates with fast
classifier kernel module
endef
SFE_MAKE_OPTS:=SFE_SUPPORT_IPV6=y
define Build/Compile/kmod
define Build/Compile
+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" $(strip $(SFE_MAKE_OPTS)) \
$(KERNEL_MAKE_FLAGS) \
$(PKG_MAKE_FLAGS) \
@ -59,20 +62,15 @@ define Build/Compile/kmod
CONFIG_FAST_CLASSIFIER=m \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
modules
endef
define Build/Compile/example
ifneq ($(CONFIG_PACKAGE_fast-classifier-example),)
$(TARGET_CC) -o $(PKG_BUILD_DIR)/userspace_fast_classifier \
-I $(PKG_BUILD_DIR) \
-I$(STAGING_DIR)/usr/include/libnl \
-I$(STAGING_DIR)/usr/include/libnl3 \
-lnl-genl-3 -lnl-3 \
$(PKG_BUILD_DIR)/nl_classifier_test.c
endef
define Build/Compile
$(Build/Compile/kmod)
$(if $(CONFIG_PACKAGE_fast-classifier-example),$(Build/Compile/example))
endif
endef
define Build/InstallDev
@ -80,12 +78,11 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/fast-classifier.h $(1)/usr/include/
endef
define Package/fast-classifier-example/install
$(INSTALL_DIR) $(1)/sbin
$(CP) $(PKG_BUILD_DIR)/userspace_fast_classifier $(1)/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/userspace_fast_classifier $(1)/sbin/
endef
$(eval $(call KernelPackage,$(PKG_NAME)))
$(eval $(call KernelPackage,$(PKG_NAME)-noload))
#$(eval $(call BuildPackage,fast-classifier-example))
$(eval $(call KernelPackage,fast-classifier))
$(eval $(call KernelPackage,fast-classifier-noload))
$(eval $(call BuildPackage,fast-classifier-example))

View File

@ -1,26 +1,29 @@
#
# Copyright (C) 2020 coolsnowwolf@gmail.com
# Copyright (C) 2020 Lean <coolsnowwolf@gmail.com>
#
# This is free software, licensed under the GNU General Public License v2.
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=gmediarender
PKG_VERSION:=2020-01-10
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_VERSION:=0.0.8
PKG_RELEASE=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/hzeller/gmrender-resurrect.git
PKG_MIRROR_HASH:=beed710b377845665e90c20ea734ed9fbb9d2105321b43b7d12dc5a142e4f392
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=26d8f7edf5336bc30f7334c6ad459bf7f4f90ff2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_DATE:=2021-01-15
PKG_SOURCE_VERSION:=7cd74525e89a1dcd8869b8f6f67f2565afa59abe
PKG_MIRROR_HASH:=98514528690a6bcf0d6611c12f1dd498e795943085e916501f5442c19d98e162
PKG_FIXUP:=autoreconf
PKG_INSTALL=1
PKG_REMOVE_FILES:=autogen.sh aclocal.m4
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
@ -28,8 +31,8 @@ include $(INCLUDE_DIR)/nls.mk
define Package/gmediarender
SECTION:=multimedia
CATEGORY:=Multimedia
DEPENDS:= +gstreamer1 +libgstreamer1 +gstreamer1-libs +glib2 +libupnp
TITLE:=A Headless UPnP Renderer
DEPENDS:=+glib2 +gstreamer1 +libgstreamer1 +gstreamer1-libs +libupnp
endef
define Package/gmediarender/description
@ -39,13 +42,13 @@ define Package/gmediarender/description
endef
CONFIGURE_ARGS+= \
CFLAGS="$(TARGET_CFLAGS) -std=gnu99" --with-build-cc="$(HOSTCC)" \
CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
--with-build-cc="$(HOSTCC)" \
--prefix="\usr"
define Package/gmediarender/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gmediarender $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,gmediarender))

View File

@ -7,9 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ipset-lists
PKG_VERSION:=20181104
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk
@ -24,17 +22,12 @@ define Package/ipset-lists/conffiles
/etc/gfwlist/china-banned
endef
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
define Build/Compile
true
endef
define Build/Compile/Default
endef
Build/Compile = $(Build/Compile/Default)
define Package/ipset-lists/install
$(CP) -a files/* $(1)/
$(CP) files/* $(1)/
endef
define Package/ipset-lists/postinst

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ipv6helper
PKG_VERSION:=1.0
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=LICENSE
@ -22,21 +22,17 @@ include $(INCLUDE_DIR)/package.mk
define Package/ipv6helper
SECTION:=ipv6
TITLE:=IPv6 Helper and Dynamic Update he.net of ip
DEPENDS:=+luci-proto-ipv6 +wget-ssl +libip6tc +ip6tables +ip6tables-mod-nat \
+kmod-ipt-nat6 +kmod-nf-nat6 +odhcpd-ipv6only +odhcp6c +6in4
PKGARCH:=all
DEPENDS:=+luci-proto-ipv6 +wget-ssl +libip6tc +ip6tables +ip6tables-mod-nat +kmod-ipt-nat6 +kmod-nf-nat6 +odhcpd-ipv6only +odhcp6c +6in4
endef
define Package/ipv6helper/description
IPv6 Helper and Dynamic Update he.net of ip
endef
define Build/Prepare
endef
define Build/Configure
endef
define Build/Compile
true
endef
define Package/ipv6helper/install

View File

@ -1,7 +1,8 @@
#
# Copyright (C) 2009-2012 OpenWrt.org
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v2.
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
@ -9,25 +10,26 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libcryptopp
PKG_VERSION:=8.3.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=cryptopp$(subst .,,$(PKG_VERSION)).zip
PKG_SOURCE_URL:=https://www.cryptopp.com/
PKG_HASH:=db38a15a6b1c337c665e2ebeb731dd0754b05e45504897d0f2fe4ae9f5ee589a
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
UNZIP_CMD:=unzip -q -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
define Package/libcryptopp
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libpthread +libstdcpp
TITLE:=Crypto++ is library for creating C++ programs which use cryptographic algorithms
URL:=https://packages.debian.org/sid/libcrypto++-dev
DEPENDS:=+libpthread +libstdcpp
endef
define Package/package/libcryptopp
@ -36,11 +38,9 @@ define Package/package/libcryptopp
abstract base classes.
endef
UNPACK_CMD=cd $(PKG_BUILD_DIR) && unzip "$(DL_DIR)/$(PKG_SOURCE)"
define Build/Prepare
$(Build/Prepare/Default)
cd $(PKG_BUILD_DIR) && rm -f GNUmakefile GNUmakefile-cross
cd $(PKG_BUILD_DIR); rm -f GNUmakefile GNUmakefile-cross
endef
define Build/InstallDev

View File

@ -4,10 +4,38 @@ PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=183
PKG_RELEASE:=5
define Package/$(PKG_NAME)/conffiles
/etc/config/shadowsocksr
/etc/ssrplus/
endef
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2 \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray
LUCI_TITLE:=SS/SSR/V2Ray/Trojan/NaiveProxy/Socks5/Tun LuCI interface
LUCI_PKGARCH:=all
LUCI_DEPENDS:=+coreutils +coreutils-base64 +dns2socks +dnsmasq-full +ipset +ip-full \
+iptables-mod-tproxy +ipt2socks-alt +lua +libuci-lua +microsocks +pdnsd-alt +tcping \
+resolveip +shadowsocksr-libev-ssr-check +wget-ssl \
+PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
+PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
+PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2:redsocks2 \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-local \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-ssr-local \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-ssr-redir \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-ssr-server \
+PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs:simple-obfs \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \
+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \
+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \
+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray
define Package/$(PKG_NAME)/config
config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
@ -56,37 +84,10 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
default y if i386||x86_64||arm||aarch64
endef
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2 \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray
LUCI_TITLE:=SS/SSR/V2Ray/Trojan/NaiveProxy/Socks5/Tun LuCI interface
LUCI_PKGARCH:=all
LUCI_DEPENDS:=+coreutils +coreutils-base64 +dns2socks +dnsmasq-full +ipset +ip-full \
+iptables-mod-tproxy +ipt2socks-alt +lua +libuci-lua +microsocks +pdnsd-alt +tcping \
+resolveip +shadowsocksr-libev-alt +wget-ssl \
+PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
+PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
+PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2:redsocks2 \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-local \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-ssr-local \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-server \
+PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs:simple-obfs \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \
+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \
+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \
+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray
define Package/$(PKG_NAME)/conffiles
/etc/config/shadowsocksr
/etc/ssrplus/
endef
include $(TOPDIR)/feeds/luci/luci.mk

View File

@ -9,41 +9,27 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-lib-fs
PKG_VERSION:=1.0
PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_INSTALL:=1
PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk
define Package/luci-lib-fs
SUBMENU:=Lua
SECTION:=lang
CATEGORY:=Languages
SUBMENU:=Lua
TITLE:=luci-lib-fs
PKGARCH:=all
URL:=https://github.com/lbthomsen/openwrt-luci
DEPENDS:=+luci +luci-lib-nixio
endef
define Package/luci-lib-fs/description
luci-lib-fs
endef
define Build/Configure
PKGARCH:=all
endef
define Build/Compile
true
endef
define Build/Install
endef
define Package/luci-lib-fs/install
$(INSTALL_DIR) $(1)/usr/lib/lua/luci
$(CP) ./files/*.lua $(1)/usr/lib/lua/luci
$(CP) ./files/fs.lua $(1)/usr/lib/lua/luci/fs.lua
endef
$(eval $(call BuildPackage,luci-lib-fs))

View File

@ -1,18 +0,0 @@
#
# Copyright (C) 2017 TDT AG <development@tdt.de>
#
# This is free software, licensed under the Apache License Version 2.0.
# See https://www.apache.org/licenses/LICENSE-2.0 for more information.
#
include $(TOPDIR)/rules.mk
LUCI_TITLE:=Support for Link Aggregation (Channel Bonding)
LUCI_DEPENDS:=+proto-bonding
LUCI_PKGARCH:=all
PKG_MAINTAINER:=Helge Mader <ma@dev.tdt.de>
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature

View File

@ -1,386 +0,0 @@
--[[
Copyright (C) 2018 TDT AG <development@tdt.de>
This is free software, licensed under the Apache License Version 2.0.
See https://www.apache.org/licenses/LICENSE-2.0 for more information.
]]--
local map, section, net = ...
local ipaddr, netmask, gateway, broadcast
local SYS = require "luci.sys"
local dhcp, slaves, bonding_policy, primary, primary_reselect, min_links, ad_actor_sys_prio, ad_actor_system
local ad_select, lacp_rate, packets_per_slave, lp_interval, tlb_dynamic_lb, fail_over_mac
local num_grat_arp__num_unsol_na, xmit_hash_policy, resend_igmp, all_slaves_active, link_monitoring
local arp_interval, arp_ip_target, arp_all_targets, arp_validate, miimon, downdelay, updelay, use_carrier
local function get_selectable_slaves(field)
m.uci:foreach("network", "interface",
function (section)
if section[".name"] ~= "loopback" then
local network_section_ifname = m.uci:get("network", section['.name'], "ifname")
local in_use = false
m.uci:foreach("network", "interface",
function (section)
if m.uci:get("network", section['.name'], "proto") == "bonding" then
local bonding_section_slaves = m.uci:get("network", section['.name'], "slaves")
if bonding_section_slaves ~= nil then
for this_slave in bonding_section_slaves:gmatch("[%S-]+") do
if network_section_ifname == this_slave:gsub("-", "") and section['.name'] ~= arg[1] then
in_use = true
end
end
end
end
end
)
if in_use == false and network_section_ifname ~= nil then
if network_section_ifname:find("eth") ~= nil then
field:value(network_section_ifname, network_section_ifname)
end
end
end
end
)
end
local function get_selectable_slaves_from_proc(field)
local interfaces = SYS.exec("cat /proc/net/dev | grep 'eth' | awk '\{print \$1\}' | tr ':\n' ' '")
if interfaces ~= nil then
for this_interface in interfaces:gmatch("[%S-]+") do
local in_use = false
m.uci:foreach("network", "interface",
function (section)
if m.uci:get("network", section['.name'], "proto") == "bonding" then
local bonding_section_slaves = m.uci:get("network", section['.name'], "slaves")
if bonding_section_slaves ~= nil then
for this_slave in bonding_section_slaves:gmatch("[%S-]+") do
if this_interface == this_slave and section['.name'] ~= arg[1] then
in_use = true
end
end
end
end
end
)
if in_use == false then
field:value(this_interface, this_interface)
end
end
end
end
ipaddr = section:taboption("general", Value, "ipaddr",
translate("IPv4 address"))
ipaddr.datatype = "ip4addr"
ipaddr.optional = false
ipaddr.rmempty = false
netmask = section:taboption("general", Value, "netmask",
translate("IPv4 netmask"))
netmask.datatype = "ip4addr"
netmask.optional = false
netmask.rmempty = false
netmask:value("255.255.255.0")
netmask:value("255.255.0.0")
netmask:value("255.0.0.0")
-- dhcp = section:taboption("general", Flag, "dhcp",
-- translate("Use DHCP (Client Mode)"),
-- translate("Specifies whether the bonding interface should use DHCP client mode"))
-- dhcp.default = dhcp.disabled
-- dhcp.rmempty = false
slaves = section:taboption("advanced", MultiValue, "slaves",
translate ("Slave Interfaces"),
translate("Specifies which slave interfaces should be attached to this bonding interface"))
slaves.oneline = true
slaves.widget = "checkbox"
get_selectable_slaves_from_proc(slaves)
bonding_policy = section:taboption("advanced", ListValue, "bonding_policy",
translate("Bonding Policy"),
translate("Specifies the mode to be used for this bonding interface"))
bonding_policy.default = "balance-rr"
bonding_policy:value("balance-rr", translate("Round-Robin policy (balance-rr, 0)"))
bonding_policy:value("active-backup", translate("Active-Backup policy (active-backup, 1)"))
bonding_policy:value("balance-xor", translate("XOR policy (balance-xor, 2)"))
bonding_policy:value("broadcast", translate("Broadcast policy (broadcast, 3)"))
bonding_policy:value("802.3ad", translate("IEEE 802.3ad Dynamic link aggregation (802.3ad, 4)"))
bonding_policy:value("balance-tlb", translate("Adaptive transmit load balancing (balance-tlb, 5)"))
bonding_policy:value("balance-alb", translate("Adaptive load balancing (balance-alb, 6)"))
primary = section:taboption("advanced", ListValue, "primary",
translate("Primary Slave"),
translate("Specifies which slave is the primary device. It will always be the active slave while it is available"))
primary.widget = "radio"
primary.orientation = "horizontal"
primary:depends("bonding_policy", "active-backup")
primary:depends("bonding_policy", "balance-tlb")
primary:depends("bonding_policy", "balance-alb")
get_selectable_slaves_from_proc(primary)
primary_reselect = section:taboption("advanced", ListValue, "primary_reselect",
translate("Reselection policy for primary slave"),
translate("Specifies the reselection policy for the primary slave when failure of the active slave or recovery of the primary slave occurs"))
primary_reselect.default = "always"
primary_reselect:value("always", translate("Primary becomes active slave whenever it comes back up (always, 0)"))
primary_reselect:value("better", translate("Primary becomes active slave when it comes back up if speed and duplex better than current slave (better, 1)"))
primary_reselect:value("failure", translate("Only if current active slave fails and the primary slave is up (failure, 2)"))
primary_reselect:depends("bonding_policy", "active-backup")
primary_reselect:depends("bonding_policy", "balance-tlb")
primary_reselect:depends("bonding_policy", "balance-alb")
min_links = section:taboption("advanced", Value, "min_links",
translate("Minimum Number of Links"),
translate("Specifies the minimum number of links that must be active before asserting carrier"))
min_links.datatype = "uinteger"
min_links.default = 0
min_links:depends("bonding_policy", "802.3ad")
ad_actor_sys_prio = section:taboption("advanced", Value, "ad_actor_sys_prio",
translate("System Priority"),
translate("Specifies the system priority"))
ad_actor_sys_prio.datatype = "range(1,65535)"
ad_actor_sys_prio.default = 65535
ad_actor_sys_prio:depends("bonding_policy", "802.3ad")
ad_actor_system = section:taboption("advanced", Value, "ad_actor_system",
translate("MAC Address For The Actor"),
translate("Specifies the mac-address for the actor in protocol packet exchanges (LACPDUs). If empty, masters' mac address defaults to system default"))
ad_actor_system.datatype = "macaddr"
ad_actor_system.default = ""
ad_actor_system:depends("bonding_policy", "802.3ad")
ad_select = section:taboption("advanced", ListValue, "ad_select",
translate("Aggregation Selection Logic"),
translate("Specifies the aggregation selection logic to use"))
ad_select.default = "stable"
ad_select:value("stable", translate("Aggregator: All slaves down or has no slaves (stable, 0)"))
ad_select:value("bandwidth", translate("Aggregator: Slave added/removed or state changes (bandwidth, 1)"))
ad_select:value("count", translate("Aggregator: Chosen by the largest number of ports + slave added/removed or state changes (count, 2)"))
ad_select:depends("bonding_policy", "802.3ad")
lacp_rate = section:taboption("advanced", ListValue, "lacp_rate",
translate("LACPDU Packets"),
translate("Specifies the rate in which the link partner will be asked to transmit LACPDU packets"))
lacp_rate.default = "slow"
lacp_rate:value("slow", translate("Every 30 seconds (slow, 0)"))
lacp_rate:value("fast", translate("Every second (fast, 1)"))
lacp_rate:depends("bonding_policy", "802.3ad")
packets_per_slave = section:taboption("advanced", Value, "packets_per_slave",
translate("Packets To Transmit Before Moving To Next Slave"),
translate("Specifies the number of packets to transmit through a slave before moving to the next one"))
packets_per_slave.datatype = "range(0,65535)"
packets_per_slave.default = 1
packets_per_slave:depends("bonding_policy", "balance-rr")
lp_interval = section:taboption("advanced", Value, "lp_interval",
translate("Interval For Sending Learning Packets"),
translate("Specifies the number of seconds between instances where the bonding driver sends learning packets to each slaves peer switch"))
lp_interval.datatype = "range(1,2147483647)"
lp_interval.default = 1
lp_interval:depends("bonding_policy", "balance-tlb")
lp_interval:depends("bonding_policy", "balance-alb")
tlb_dynamic_lb = section:taboption("advanced", ListValue, "tlb_dynamic_lb",
translate("Enable Dynamic Shuffling Of Flows"),
translate("Specifies whether to shuffle active flows across slaves based on the load"))
tlb_dynamic_lb.default = "1"
tlb_dynamic_lb:value("1", translate("Yes"))
tlb_dynamic_lb:value("0", translate("No"))
tlb_dynamic_lb:depends("bonding_policy", "balance-tlb")
fail_over_mac = section:taboption("advanced", ListValue, "fail_over_mac",
translate("Set same MAC Address to all slaves"),
translate("Specifies whether active-backup mode should set all slaves to the same MAC address at enslavement"))
fail_over_mac.default = "none"
fail_over_mac:value("none", translate("Yes (none, 0)"))
fail_over_mac:value("active", translate("Set to currently active slave (active, 1)"))
fail_over_mac:value("follow", translate("Set to first slave added to the bond (follow, 2)"))
fail_over_mac:depends("bonding_policy", "active-backup")
num_grat_arp__num_unsol_na = section:taboption("advanced", Value, "num_grat_arp__num_unsol_na",
translate("Number of peer notifications after failover event"),
translate("Specifies the number of peer notifications (gratuitous ARPs and unsolicited IPv6 Neighbor Advertisements) to be issued after a failover event"))
num_grat_arp__num_unsol_na.datatype = "range(0,255)"
num_grat_arp__num_unsol_na.default = 1
num_grat_arp__num_unsol_na:depends("bonding_policy", "active-backup")
xmit_hash_policy = section:taboption("advanced", ListValue, "xmit_hash_policy",
translate("Transmit Hash Policy"),
translate("Selects the transmit hash policy to use for slave selection"))
xmit_hash_policy.default = "layer2"
xmit_hash_policy:value("layer2", translate("Use XOR of hardware MAC addresses (layer2)"))
xmit_hash_policy:value("layer2+3", translate("Use XOR of hardware MAC addresses and IP addresses (layer2+3)"))
xmit_hash_policy:value("layer3+4", translate("Use upper layer protocol information (layer3+4)"))
xmit_hash_policy:value("encap2+3", translate("Use XOR of hardware MAC addresses and IP addresses, rely on skb_flow_dissect (encap2+3)"))
xmit_hash_policy:value("encap3+4", translate("Use upper layer protocol information, rely on skb_flow_dissect (encap3+4)"))
xmit_hash_policy:depends("bonding_policy", "balance-rr")
xmit_hash_policy:depends("bonding_policy", "active-backup")
xmit_hash_policy:depends("bonding_policy", "balance-tlb")
xmit_hash_policy:depends("bonding_policy", "balance-alb")
xmit_hash_policy:depends("bonding_policy", "balance-xor")
resend_igmp = section:taboption("advanced", Value, "resend_igmp",
translate("Number of IGMP membership reports"),
translate("Specifies the number of IGMP membership reports to be issued after a failover event in 200ms intervals"))
resend_igmp.datatype = "range(0,255)"
resend_igmp.default = 1
resend_igmp:depends("bonding_policy", "balance-tlb")
resend_igmp:depends("bonding_policy", "balance-alb")
all_slaves_active = section:taboption("advanced", ListValue, "all_slaves_active",
translate("Drop Duplicate Frames"),
translate("Specifies that duplicate frames (received on inactive ports) should be dropped or delivered"))
all_slaves_active.default = "0"
all_slaves_active:value("0", translate("Yes"))
all_slaves_active:value("1", translate("No"))
link_monitoring = section:taboption("advanced", ListValue, "link_monitoring",
translate("Link Monitoring"),
translate("Method of link monitoring"))
link_monitoring.default = "off"
link_monitoring:value("off", translate("Off"))
link_monitoring:value("arp", translate("ARP"))
link_monitoring:value("mii", translate("MII"))
arp_interval = section:taboption("advanced", Value, "arp_interval",
translate("ARP Interval"),
translate("Specifies the ARP link monitoring frequency in milliseconds"))
arp_interval.datatype = "uinteger"
arp_interval.default = 0
arp_interval:depends("link_monitoring", "arp")
arp_ip_target = section:taboption("advanced", DynamicList, "arp_ip_target",
translate("ARP IP Targets"),
translate("Specifies the IP addresses to use for ARP monitoring"))
arp_ip_target.datatype = "ipaddr"
arp_ip_target.cast = "string"
arp_ip_target:depends("link_monitoring", "arp")
arp_all_targets = section:taboption("advanced", ListValue, "arp_all_targets",
translate("ARP mode to consider a slave as being up"),
translate("Specifies the quantity of ARP IP targets that must be reachable"))
arp_all_targets.default = "any"
arp_all_targets:value("any", translate("Consider the slave up when any ARP IP target is reachable (any, 0)"))
arp_all_targets:value("all", translate("Consider the slave up when all ARP IP targets are reachable (all, 1)"))
arp_all_targets:depends({link_monitoring="arp", bonding_policy="active-backup"})
arp_validate = section:taboption("advanced", ListValue, "arp_validate",
translate("ARP Validation"),
translate("Specifies whether ARP probes and replies should be validated or non-ARP traffic should be filtered for link monitoring"))
arp_validate.default = "filter"
arp_validate:value("none", translate("No validation or filtering "))
arp_validate:value("active", translate("Validation only for active slave"))
arp_validate:value("backup", translate("Validation only for backup slaves"))
arp_validate:value("all", translate("Validation for all slaves"))
arp_validate:value("filter", translate("Filtering for all slaves, no validation"))
arp_validate:value("filter_active", translate("Filtering for all slaves, validation only for active slave"))
arp_validate:value("filter_backup", translate("Filtering for all slaves, validation only for backup slaves"))
arp_validate:depends("link_monitoring", "arp")
miimon = section:taboption("advanced", Value, "miimon",
translate("MII Interval"),
translate("Specifies the MII link monitoring frequency in milliseconds"))
miimon.datatype = "uinteger"
miimon.default = 0
miimon:depends("link_monitoring", "mii")
downdelay = section:taboption("advanced", Value, "downdelay",
translate("Down Delay"),
translate("Specifies the time in milliseconds to wait before disabling a slave after a link failure detection"))
downdelay.datatype = "uinteger"
downdelay.default = 0
downdelay:depends("link_monitoring", "mii")
updelay = section:taboption("advanced", Value, "updelay",
translate("Up Delay"),
translate("Specifies the time in milliseconds to wait before enabling a slave after a link recovery detection"))
updelay.datatype = "uinteger"
updelay.default = 0
updelay:depends("link_monitoring", "mii")
use_carrier = section:taboption("advanced", ListValue, "use_carrier",
translate("Method to determine link status"),
translate("Specifies whether or not miimon should use MII or ETHTOOL ioctls vs. netif_carrier_ok()"))
use_carrier.default = "1"
use_carrier:value("0", translate("MII / ETHTOOL ioctls"))
use_carrier:value("1", translate("netif_carrier_ok()"))
use_carrier:depends("link_monitoring", "mii")
-- we use the bondig_policy validate function to check for other required values
-- (e.g. slave interfaces, primary interface, ARP targets, ...) as validate functions
-- are not called for _empty_ fields. bonding_policy will never be empty.
function bonding_policy.validate(self, value, section)
local selected_link_monitoring = link_monitoring:formvalue(section)
local selected_arp_ip_targets = arp_ip_target:formvalue(section)
local selected_policy = bonding_policy:formvalue(section)
local selected_slaves = slaves:formvalue(section)
local selected_primary = primary:formvalue(section)
if selected_link_monitoring == "arp" then
if selected_policy == "802.3ad" or selected_policy == "balance-tlb" or selected_policy == "balance-alb" then
return nil, translate("ARP monitoring is not supported for the selected policy")
end
if #selected_arp_ip_targets == 0 then
return nil, translate("You must select at least one ARP IP target if ARP monitoring is selected")
end
end
if selected_slaves == nil then
return nil, translate("You must select at least one slave interface")
end
if selected_policy == "active-backup" or selected_policy == "balance-tlb" or selected_policy == "balance-alb" then
if selected_primary == nil then
return nil, translate("You must select a primary interface for the selected policy")
else
if (type(selected_slaves) == "table") then
for key,slave_value in pairs(selected_slaves) do
if slave_value == selected_primary then
return value
end
end
else
if selected_slaves == selected_primary then
return value
end
end
end
return nil, translate("You must select a primary interface which is included in selected slave interfaces")
end
return value
end

View File

@ -1,31 +0,0 @@
--[[
Copyright (C) 2018 TDT AG <development@tdt.de>
This is free software, licensed under the Apache License Version 2.0.
See https://www.apache.org/licenses/LICENSE-2.0 for more information.
]]--
local proto = luci.model.network:register_protocol("bonding")
function proto.get_i18n(self)
return luci.i18n.translate("Link Aggregation (Channel Bonding)")
end
function proto.is_installed(self)
return nixio.fs.access("/lib/netifd/proto/bonding.sh")
end
function proto.is_virtual(self)
return true
end
function proto.is_floating(self)
return true
end
function proto.opkg_package(self)
return "bonding"
end

View File

@ -1,398 +0,0 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
msgid "ARP"
msgstr ""
msgid "ARP IP Targets"
msgstr "ARP IP Ziele"
msgid "ARP Interval"
msgstr "ARP Intervall"
msgid "ARP Validation"
msgstr "ARP Überprüfung"
msgid "ARP mode to consider a slave as being up"
msgstr "ARP Methode um ein Slave als UP zu betrachten"
msgid "ARP monitoring is not supported for the selected policy"
msgstr "ARP Monitoring wird für die gewählte Bonding Methode nicht unterstützt"
msgid "Active-Backup policy (active-backup, 1)"
msgstr "Aktiv-Backup (active-backup, 1)"
msgid "Adaptive load balancing (balance-alb, 6)"
msgstr "Adaptives Load Balancing (balance-alb, 6)"
msgid "Adaptive transmit load balancing (balance-tlb, 5)"
msgstr "Adaptives Sende Load Balancing (balance-tlb, 5)"
msgid "Aggregation Selection Logic"
msgstr "Gruppierungslogik"
msgid "Aggregator: All slaves down or has no slaves (stable, 0)"
msgstr "Aggregator: Alle Slaves Down oder keine Slaves vorhanden (stable, 0)"
msgid ""
"Aggregator: Chosen by the largest number of ports + slave added/removed or "
"state changes (count, 2)"
msgstr ""
"Aggregator: Ausgewählt durch die höchsten Portnummern + Slave hinzugefügt/"
"entfernt oder Statuswechsel (count, 2)"
msgid "Aggregator: Slave added/removed or state changes (bandwidth, 1)"
msgstr ""
"Aggregator: Slave hinzugefügt/entfernt oder Statuswechsel (bandwidth, 1)"
msgid "Bonding Policy"
msgstr "Bonding Methode"
msgid "Broadcast policy (broadcast, 3)"
msgstr "Broadcast (broadcast, 3)"
msgid "Consider the slave up when all ARP IP targets are reachable (all, 1)"
msgstr ""
"Slave wird als aktiv angesehen, wenn alle ARP IP Ziele erreichbar sind (all, "
"1)"
msgid "Consider the slave up when any ARP IP target is reachable (any, 0)"
msgstr ""
"Slave wird als aktiv angesehen, wenn irgendein ARP IP Ziel erreichbar ist "
"(any, 0)"
msgid "Down Delay"
msgstr "Down Verzögerung"
msgid "Drop Duplicate Frames"
msgstr "Doppelte Frames verwerfen"
msgid "Enable Dynamic Shuffling Of Flows"
msgstr "Dynamisches Verteilen von Flows aktivieren"
msgid "Every 30 seconds (slow, 0)"
msgstr "Alle 30 Sekunden (slow, 0)"
msgid "Every second (fast, 1)"
msgstr "Jede Sekunde (fast, 1)"
msgid "Filtering for all slaves, no validation"
msgstr "Alle Slaves filtern, keine Überprüfung"
msgid "Filtering for all slaves, validation only for active slave"
msgstr "Alle Slaves filtern, Überprüfung nur für aktive Slaves"
msgid "Filtering for all slaves, validation only for backup slaves"
msgstr "Alle Slaves filtern, Überprüfung nur für Backup Slaves"
msgid "IEEE 802.3ad Dynamic link aggregation (802.3ad, 4)"
msgstr ""
msgid "IPv4 address"
msgstr "IPv4 Adresse"
msgid "IPv4 netmask"
msgstr "IPv4 Netzmaske"
msgid "Interval For Sending Learning Packets"
msgstr "Interval zum Senden von 'Learning Packets'"
msgid "LACPDU Packets"
msgstr "LACPDU Pakete"
msgid "Link Aggregation (Channel Bonding)"
msgstr "Link Aggregation (Kanalbündelung)"
msgid "Link Monitoring"
msgstr "Link Überwachung"
msgid "MAC Address For The Actor"
msgstr "MAC Adresse für den Aktor"
msgid "MII"
msgstr ""
msgid "MII / ETHTOOL ioctls"
msgstr ""
msgid "MII Interval"
msgstr "MII Intervall"
msgid "Method of link monitoring"
msgstr "Art der Link Überwachung"
msgid "Method to determine link status"
msgstr "Methode um Link Status festzustellen"
msgid "Minimum Number of Links"
msgstr "Minimale Anzahl von Links"
msgid "No"
msgstr "Nein"
msgid "No validation or filtering"
msgstr "Keine Überprüfung oder Filterung"
msgid "Number of IGMP membership reports"
msgstr "Anzahl von IGMP Zugehörigkeitsmeldungen"
msgid "Number of peer notifications after failover event"
msgstr "Anzahl von Peer Benachrichtigungen nach einem Failover Ereignis"
msgid "Off"
msgstr "Aus"
msgid ""
"Only if current active slave fails and the primary slave is up (failure, 2)"
msgstr ""
"Nur wenn das derzeit aktive Slave fehlschlägt und das primäre Slave Up ist "
"(failure, 2)"
msgid "Packets To Transmit Before Moving To Next Slave"
msgstr "Zu übertragende Pakete vor Wechsel zum nächsten Slave"
msgid "Primary Slave"
msgstr "Primäres Slave"
msgid ""
"Primary becomes active slave when it comes back up if speed and duplex "
"better than current slave (better, 1)"
msgstr ""
"Primäres Slave wird zum aktiven Slave wenn es wieder Up ist und "
"Geschwindikkeit/Duplex besser als derzeitiges Slave (better, 1)"
msgid "Primary becomes active slave whenever it comes back up (always, 0)"
msgstr ""
"Primäres Slave wird zum aktiven Slave wenn es wieder Up ist (always, 0)"
msgid "Reselection policy for primary slave"
msgstr "Methode zur Neuauswahl des primären Slaves"
msgid "Round-Robin policy (balance-rr, 0)"
msgstr "Round-Robin (balance-rr, 0)"
msgid "Selects the transmit hash policy to use for slave selection"
msgstr "Selektiert die Hash Übertragunsmethode zur Slave Auswahl"
msgid "Set same MAC Address to all slaves"
msgstr "Gleiche MAC Adresse für alle Slaves verwenden"
msgid "Set to currently active slave (active, 1)"
msgstr "Entsprechend dem derzeit aktiven Slave (active, 1)"
msgid "Set to first slave added to the bond (follow, 2)"
msgstr "Entsprechend dem ersten hinzugefügten Slave (follow, 2)"
msgid "Slave Interfaces"
msgstr ""
msgid ""
"Specifies that duplicate frames (received on inactive ports) should be "
"dropped or delivered"
msgstr ""
"Spezifiziert ob doppelte Frames (empfangen auf inaktiven Ports) verworfen "
"oder zugestellt werden"
msgid "Specifies the ARP link monitoring frequency in milliseconds"
msgstr "Häufigkeit des ARP Link Monitorings in Millisekunden"
msgid "Specifies the IP addresses to use for ARP monitoring"
msgstr "Für ARP Monitoring zu verwendende IP Adressen"
msgid "Specifies the MII link monitoring frequency in milliseconds"
msgstr "Häufigkeit des MII Link Monitorings in Millisekunden"
msgid "Specifies the aggregation selection logic to use"
msgstr "Spezifiziert die zu verwendende Gruppierungslogik"
msgid ""
"Specifies the mac-address for the actor in protocol packet exchanges "
"(LACPDUs). If empty, masters' mac address defaults to system default"
msgstr ""
"Selektiert die MAC Adresse für den Aktor für LACPDUs. Wenn nicht angegeben "
"entspricht die Master Mac Adresse der System Voreinstellung"
msgid ""
"Specifies the minimum number of links that must be active before asserting "
"carrier"
msgstr ""
"Spezifiziert die minimale Anzahl aktiver Links bevor Carrier signalisiert "
"wird"
msgid "Specifies the mode to be used for this bonding interface"
msgstr ""
"Spezifizert die zu benutzende Bonding Methode für dieses Bonding Interface"
msgid ""
"Specifies the number of IGMP membership reports to be issued after a "
"failover event in 200ms intervals"
msgstr ""
"Spezifiziert die Anzahl von IGMP Zugehörigkeitsmeldungen nach einem Failover "
"Ereignis in 200ms Intervallen"
msgid ""
"Specifies the number of packets to transmit through a slave before moving to "
"the next one"
msgstr ""
"Spezifiziert die Anzahl der auf einem Slave zu übertragenden Pakete vor "
"Wechsel zum nächsten Slave"
msgid ""
"Specifies the number of peer notifications (gratuitous ARPs and unsolicited "
"IPv6 Neighbor Advertisements) to be issued after a failover event"
msgstr ""
"Spezifiziert die Anzahl der Peer Benachrichtigungen (gratuitous ARPs and "
"unsolicited IPv6 Neighbor Advertisements) nach einem Failover Ereignis"
msgid ""
"Specifies the number of seconds between instances where the bonding driver "
"sends learning packets to each slaves peer switch"
msgstr ""
msgid "Specifies the quantity of ARP IP targets that must be reachable"
msgstr "Spezifizert die Anzahl der ARP IP Ziele die erreichbar sein müssen"
msgid ""
"Specifies the rate in which the link partner will be asked to transmit "
"LACPDU packets"
msgstr ""
"Spezifiziert die Häufigkeit in welcher der Link Partner aufgefordert wird "
"LACPDU Pakete zu senden"
msgid ""
"Specifies the reselection policy for the primary slave when failure of the "
"active slave or recovery of the primary slave occurs"
msgstr ""
"Spezifiziert die Neuauswahl für das primäre Slave wenn ein Ausfall des "
"aktiven Slaves oder ein Recovery des primären Slaves passiert"
msgid "Specifies the system priority"
msgstr "Spezifiziert die System Priorität"
msgid ""
"Specifies the time in milliseconds to wait before disabling a slave after a "
"link failure detection"
msgstr ""
"Spezifizert die Zeit in Millisekunden bevor ein Slave nach Erkennung eines "
"Link Fehlers deaktiviert wird"
msgid ""
"Specifies the time in milliseconds to wait before enabling a slave after a "
"link recovery detection"
msgstr ""
"Spezifizert die Zeit in Millisekunden nach der ein Slave nach Erkennung "
"eines Link Recoveries aktiviert wird"
msgid ""
"Specifies whether ARP probes and replies should be validated or non-ARP "
"traffic should be filtered for link monitoring"
msgstr ""
"Spezifiziert ob ARP Anfragen und Antworten überprüft oder nicht ARP "
"Datenverkehr für das Link Monitoring gefiltert werden sollen"
msgid ""
"Specifies whether active-backup mode should set all slaves to the same MAC "
"address at enslavement"
msgstr ""
"Spezifiziert ob 'active-backup' Modus allen Slaves die gleiche MAC Adresse "
"beim Zusammenschluss zuweisen soll"
msgid ""
"Specifies whether or not miimon should use MII or ETHTOOL ioctls vs. "
"netif_carrier_ok()"
msgstr ""
"Spezifiziert ob 'miimon' MII oder ETHTOOL ioctls verwenden soll oder "
"netif_carrier_ok()"
msgid "Specifies whether the bonding interface should use DHCP client mode"
msgstr ""
"Spezifiziert ob das Bonding Interface im DHCP Client Modus arbeiten soll"
msgid ""
"Specifies whether to shuffle active flows across slaves based on the load"
msgstr ""
"Spezifiziert ob aktiver Datenverkehr über Slaves lastabhängig verteilt "
"werden soll"
msgid ""
"Specifies which slave interfaces should be attached to this bonding interface"
msgstr ""
"Spezifiziert welche Slave Interfaces diesem Bonding Interface zugeordnet "
"werden sollen"
msgid ""
"Specifies which slave is the primary device. It will always be the active "
"slave while it is available"
msgstr ""
"Spezifiziert welches Slave Interface als primäres Slave verwendet werden "
"soll. Es wird immer als aktives Slave verwendet sofern es verfügbar ist."
msgid "System Priority"
msgstr "System Priorität"
msgid "Transmit Hash Policy"
msgstr "Hash Übertragungsmethode"
msgid "Up Delay"
msgstr "Up Verzögerung"
msgid "Use DHCP (Client Mode)"
msgstr "DHCP Client Mode verwenden"
msgid "Use XOR of hardware MAC addresses (layer2)"
msgstr "XOR der Hardware MAC Adressen verwenden (layer2)"
msgid "Use XOR of hardware MAC addresses and IP addresses (layer2+3)"
msgstr "XOR der Hardware MAC und IP Adressen verwenden (layer2+3)"
msgid ""
"Use XOR of hardware MAC addresses and IP addresses, rely on skb_flow_dissect "
"(encap2+3)"
msgstr ""
"XOR der Hardware MAC und IP Adressen basierend auf skb_flow_dissect "
"verwenden (encap2+3)"
msgid "Use upper layer protocol information (layer3+4)"
msgstr "Übergeordnete Protokollschicht Informationen verwenden (layer3+4)"
msgid ""
"Use upper layer protocol information, rely on skb_flow_dissect (encap3+4)"
msgstr ""
"Übergeordnete Protokollschicht Informationen basierend auf skb_flow_dissect "
"verwenden (encap3+4)"
msgid "Validation for all slaves"
msgstr "Validierung für alle Slaves"
msgid "Validation only for active slave"
msgstr "Validierung nur für aktives Slave"
msgid "Validation only for backup slaves"
msgstr "Validierung nur für Backup Slaves"
msgid "XOR policy (balance-xor, 2)"
msgstr ""
msgid "Yes"
msgstr "Ja"
msgid "Yes (none, 0)"
msgstr "Ja (none, 0)"
msgid "You must select a primary interface for the selected policy"
msgstr "Für die gewählte Bonding Methode ist ein Primäres Slave erforderlich"
msgid ""
"You must select a primary interface which is included in selected slave "
"interfaces"
msgstr "Das primäre Interface muss in den selektierten Slaves enthalten sein"
msgid ""
"You must select at least one ARP IP target if ARP monitoring is selected"
msgstr "Es muss mindestens ein ARP IP Ziel für ARP Monitoring definiert werden"
msgid "You must select at least one slave interface"
msgstr "Bitte mindestens ein Slave Interface auswählen"
msgid "netif_carrier_ok()"
msgstr ""

View File

@ -1,345 +0,0 @@
msgid "ARP"
msgstr ""
msgid "ARP IP Targets"
msgstr ""
msgid "ARP Interval"
msgstr ""
msgid "ARP Validation"
msgstr ""
msgid "ARP mode to consider a slave as being up"
msgstr ""
msgid "ARP monitoring is not supported for the selected policy"
msgstr ""
msgid "Active-Backup policy (active-backup, 1)"
msgstr ""
msgid "Adaptive load balancing (balance-alb, 6)"
msgstr ""
msgid "Adaptive transmit load balancing (balance-tlb, 5)"
msgstr ""
msgid "Aggregation Selection Logic"
msgstr ""
msgid "Aggregator: All slaves down or has no slaves (stable, 0)"
msgstr ""
msgid ""
"Aggregator: Chosen by the largest number of ports + slave added/removed or "
"state changes (count, 2)"
msgstr ""
msgid "Aggregator: Slave added/removed or state changes (bandwidth, 1)"
msgstr ""
msgid "Bonding Policy"
msgstr ""
msgid "Broadcast policy (broadcast, 3)"
msgstr ""
msgid "Consider the slave up when all ARP IP targets are reachable (all, 1)"
msgstr ""
msgid "Consider the slave up when any ARP IP target is reachable (any, 0)"
msgstr ""
msgid "Down Delay"
msgstr ""
msgid "Drop Duplicate Frames"
msgstr ""
msgid "Enable Dynamic Shuffling Of Flows"
msgstr ""
msgid "Every 30 seconds (slow, 0)"
msgstr ""
msgid "Every second (fast, 1)"
msgstr ""
msgid "Filtering for all slaves, no validation"
msgstr ""
msgid "Filtering for all slaves, validation only for active slave"
msgstr ""
msgid "Filtering for all slaves, validation only for backup slaves"
msgstr ""
msgid "IEEE 802.3ad Dynamic link aggregation (802.3ad, 4)"
msgstr ""
msgid "IPv4 address"
msgstr ""
msgid "IPv4 netmask"
msgstr ""
msgid "Interval For Sending Learning Packets"
msgstr ""
msgid "LACPDU Packets"
msgstr ""
msgid "Link Aggregation (Channel Bonding)"
msgstr ""
msgid "Link Monitoring"
msgstr ""
msgid "MAC Address For The Actor"
msgstr ""
msgid "MII"
msgstr ""
msgid "MII / ETHTOOL ioctls"
msgstr ""
msgid "MII Interval"
msgstr ""
msgid "Method of link monitoring"
msgstr ""
msgid "Method to determine link status"
msgstr ""
msgid "Minimum Number of Links"
msgstr ""
msgid "No"
msgstr ""
msgid "No validation or filtering"
msgstr ""
msgid "Number of IGMP membership reports"
msgstr ""
msgid "Number of peer notifications after failover event"
msgstr ""
msgid "Off"
msgstr ""
msgid ""
"Only if current active slave fails and the primary slave is up (failure, 2)"
msgstr ""
msgid "Packets To Transmit Before Moving To Next Slave"
msgstr ""
msgid "Primary Slave"
msgstr ""
msgid ""
"Primary becomes active slave when it comes back up if speed and duplex "
"better than current slave (better, 1)"
msgstr ""
msgid "Primary becomes active slave whenever it comes back up (always, 0)"
msgstr ""
msgid "Reselection policy for primary slave"
msgstr ""
msgid "Round-Robin policy (balance-rr, 0)"
msgstr ""
msgid "Selects the transmit hash policy to use for slave selection"
msgstr ""
msgid "Set same MAC Address to all slaves"
msgstr ""
msgid "Set to currently active slave (active, 1)"
msgstr ""
msgid "Set to first slave added to the bond (follow, 2)"
msgstr ""
msgid "Slave Interfaces"
msgstr ""
msgid ""
"Specifies that duplicate frames (received on inactive ports) should be "
"dropped or delivered"
msgstr ""
msgid "Specifies the ARP link monitoring frequency in milliseconds"
msgstr ""
msgid "Specifies the IP addresses to use for ARP monitoring"
msgstr ""
msgid "Specifies the MII link monitoring frequency in milliseconds"
msgstr ""
msgid "Specifies the aggregation selection logic to use"
msgstr ""
msgid ""
"Specifies the mac-address for the actor in protocol packet exchanges "
"(LACPDUs). If empty, masters' mac address defaults to system default"
msgstr ""
msgid ""
"Specifies the minimum number of links that must be active before asserting "
"carrier"
msgstr ""
msgid "Specifies the mode to be used for this bonding interface"
msgstr ""
msgid ""
"Specifies the number of IGMP membership reports to be issued after a "
"failover event in 200ms intervals"
msgstr ""
msgid ""
"Specifies the number of packets to transmit through a slave before moving to "
"the next one"
msgstr ""
msgid ""
"Specifies the number of peer notifications (gratuitous ARPs and unsolicited "
"IPv6 Neighbor Advertisements) to be issued after a failover event"
msgstr ""
msgid ""
"Specifies the number of seconds between instances where the bonding driver "
"sends learning packets to each slaves peer switch"
msgstr ""
msgid "Specifies the quantity of ARP IP targets that must be reachable"
msgstr ""
msgid ""
"Specifies the rate in which the link partner will be asked to transmit "
"LACPDU packets"
msgstr ""
msgid ""
"Specifies the reselection policy for the primary slave when failure of the "
"active slave or recovery of the primary slave occurs"
msgstr ""
msgid "Specifies the system priority"
msgstr ""
msgid ""
"Specifies the time in milliseconds to wait before disabling a slave after a "
"link failure detection"
msgstr ""
msgid ""
"Specifies the time in milliseconds to wait before enabling a slave after a "
"link recovery detection"
msgstr ""
msgid ""
"Specifies whether ARP probes and replies should be validated or non-ARP "
"traffic should be filtered for link monitoring"
msgstr ""
msgid ""
"Specifies whether active-backup mode should set all slaves to the same MAC "
"address at enslavement"
msgstr ""
msgid ""
"Specifies whether or not miimon should use MII or ETHTOOL ioctls vs. "
"netif_carrier_ok()"
msgstr ""
msgid "Specifies whether the bonding interface should use DHCP client mode"
msgstr ""
msgid ""
"Specifies whether to shuffle active flows across slaves based on the load"
msgstr ""
msgid ""
"Specifies which slave interfaces should be attached to this bonding interface"
msgstr ""
msgid ""
"Specifies which slave is the primary device. It will always be the active "
"slave while it is available"
msgstr ""
msgid "System Priority"
msgstr ""
msgid "Transmit Hash Policy"
msgstr ""
msgid "Up Delay"
msgstr ""
msgid "Use DHCP (Client Mode)"
msgstr ""
msgid "Use XOR of hardware MAC addresses (layer2)"
msgstr ""
msgid "Use XOR of hardware MAC addresses and IP addresses (layer2+3)"
msgstr ""
msgid ""
"Use XOR of hardware MAC addresses and IP addresses, rely on skb_flow_dissect "
"(encap2+3)"
msgstr ""
msgid "Use upper layer protocol information (layer3+4)"
msgstr ""
msgid ""
"Use upper layer protocol information, rely on skb_flow_dissect (encap3+4)"
msgstr ""
msgid "Validation for all slaves"
msgstr ""
msgid "Validation only for active slave"
msgstr ""
msgid "Validation only for backup slaves"
msgstr ""
msgid "XOR policy (balance-xor, 2)"
msgstr ""
msgid "Yes"
msgstr ""
msgid "Yes (none, 0)"
msgstr ""
msgid "You must select a primary interface for the selected policy"
msgstr ""
msgid ""
"You must select a primary interface which is included in selected slave "
"interfaces"
msgstr ""
msgid ""
"You must select at least one ARP IP target if ARP monitoring is selected"
msgstr ""
msgid "You must select at least one slave interface"
msgstr ""
msgid "netif_carrier_ok()"
msgstr ""

View File

@ -1,39 +1,49 @@
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=microsocks
PKG_VERSION=1.0
PKG_VERSION=1.0.1
PKG_RELEASE:=1
PKG_MAINTAINER:=lean
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/rofl0r/microsocks.git
PKG_MIRROR_HASH:=94356d864ba39a978becc59cf5cacbc71fdd16c0c9c868aaef006ddf8742a944
PKG_SOURCE_VERSION:=be545814aeca1158ae38e2d6c66b1197679dab63
PKG_SOURCE_DATE:=2020-10-25
PKG_SOURCE_VERSION:=31557857ccce5e4fdd2cfdae7ab640d589aa2b41
PKG_MIRROR_HASH:=fd914984fa8314d73630a31c2daad8d34de85597953669691e0c69d52f6a6010
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=lean
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).$(PKG_RELEASE).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/microsocks
SECTION:=net
CATEGORY:=Network
TITLE:=microsocks for OpenWRT
DEPENDS:=
SUBMENU:=Web Servers/Proxies
TITLE:=tiny, portable SOCKS5 server with very moderate resource usage
URL:=https://github.com/rofl0r/microsocks
DEPENDS:=+libpthread
endef
define Package/microsocks/description
microsocks is a Tiny Proxy in C.
A SOCKS5 service that you can run on your remote boxes to tunnel connections
through them, if for some reason SSH doesn't cut it for you.
endef
define Package/microsocks/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/microsocks $(1)/usr/bin/microsocks
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/microsocks $(1)/usr/bin/microsocks
endef
$(eval $(call BuildPackage,microsocks))

View File

@ -1,55 +1,59 @@
#
# Copyright (C) 2020 - ntop.org and contributors
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=n2n
PKG_SOURCE_URL:=https://github.com/ntop/n2n.git
PKG_MIRROR_HASH:=669435ba412025cef30460741982fe30a152990b26b275c4786bfc628261182d
PKG_SOURCE_VERSION:=99e56e9f3c34c49eeb297971d41150b433489120
PKG_VERSION:=2.8.0_git-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=3
PKG_VERSION:=2.8
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://codeload.github.com/ntop/n2n/tar.gz/$(PKG_VERSION)?
PKG_HASH:=ad9ab95a79dcf6b412c36489f50de54bb54417b5cea854eb54722b6cb8f0fd04
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILE:=LICENSE
PKG_MAINTAINER:=Emanuele Faranda <faranda@ntop.org>
PKG_LICENSE:=GPL3
PKG_BUILD_PARALLEL:=1
# autogen fix
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/n2n/Default
define Package/n2n/template
SECTION:=net
CATEGORY:=Network
SUBMENU:=VPN
TITLE:=N2N Peer-to-peer VPN
URL:=http://www.ntop.org/n2n
SUBMENU:=VPN
endef
define Package/n2n-edge
$(call Package/n2n/Default)
$(call Package/n2n/template)
TITLE+= client (edge node)
DEPENDS+=+kmod-tun +resolveip +libopenssl +libcap +libzstd
endef
define Package/n2n-supernode
$(call Package/n2n/Default)
$(call Package/n2n/template)
TITLE+= server (supernode)
DEPENDS+=+libcap
endef
define Package/n2n-edge/description
The client node for the N2N infrastructure
The client node for the N2N infrastructure
endef
define Package/n2n-supernode/description
The supernode for the N2N infrastructure
The supernode for the N2N infrastructure
endef
define Build/Configure
@ -61,22 +65,23 @@ define Package/n2n-edge/conffiles
/etc/config/n2n-edge.conf
endef
define Package/n2n-edge/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/edge $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/n2n_v2.init $(1)/etc/init.d/n2n_v2
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DATA) ./files/n2n_v2.config $(1)/etc/config/n2n_v2
endef
define Package/n2n-supernode/conffiles
/etc/config/n2n-supernode.conf
endef
define Package/n2n-edge/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/edge $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/n2n_v2.config $(1)/etc/config/n2n_v2
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/n2n_v2.init $(1)/etc/init.d/n2n_v2
endef
define Package/n2n-supernode/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/supernode $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/supernode $(1)/usr/bin/
endef
$(eval $(call BuildPackage,n2n-edge))

View File

@ -11,11 +11,11 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fullconenat
PKG_RELEASE:=1
PKG_SOURCE_DATE:=2019-10-21
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/Chion82/netfilter-full-cone-nat.git
PKG_MIRROR_HASH:=e7bb77d9916d190b3c02975faf62d1794557d4a4a774cd0cf1f3a6ddb7403e3e
PKG_SOURCE_DATE:=2019-10-21
PKG_SOURCE_VERSION:=0cf3b48fd7d2fa81d0297d1fff12bbd0580fc435
PKG_MIRROR_HASH:=e7bb77d9916d190b3c02975faf62d1794557d4a4a774cd0cf1f3a6ddb7403e3e
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE

View File

@ -1,19 +1,16 @@
#
# Copyright (C) 2016-2017 GitHub
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=pandownload-fake-server
PKG_VERSION:=1
PKG_RELEASE:=1
PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk
@ -26,13 +23,11 @@ define Package/pandownload-fake-server
endef
define Package/pandownload-fake-server/description
Fake server for Pandownload.
endef
define Build/Configure
Fake server for Pandownload.
endef
define Build/Compile
true
endef
define Package/pandownload-fake-server/install

View File

@ -1,17 +1,24 @@
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=pdnsd
PKG_VERSION:=1.2.9b-par
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/shadowsocks/pdnsd.git
PKG_MIRROR_HASH:=c4093a2a21cc44228f4fad536c3303e5d263f400b5ca6ec04fe17bb705f5b92e
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_DATE:=2012-04-26
PKG_SOURCE_VERSION:=a8e46ccba7b0fa2230d6c42ab6dcd92926f6c21d
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
# PKG_MIRROR_MD5SUM:=
# CMAKE_INSTALL:=1
PKG_MIRROR_HASH:=e3e9c56cf91b12d8db73def2c247be2f726a052bed012f7a1e48946375f8e478
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
@ -34,23 +41,20 @@ define Package/pdnsd-alt/description
endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
#TARGET_CFLAGS += -ggdb3
CMAKE_OPTIONS += -DDEBUG=1
CONFIGURE_ARGS += \
--with-cachedir=/var/pdnsd \
--with-target=Linux
--with-cachedir=/var/pdnsd \
--with-target=Linux
define Package/pdnsd-alt/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pdnsd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pdnsd-ctl/pdnsd-ctl $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pdnsd $(1)/usr/sbin/pdnsd
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pdnsd-ctl $(1)/usr/sbin/pdnsd-ctl
#$(INSTALL_DIR) $(1)/etc
#$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/pdnsd.conf.sample $(1)/etc/pdnsd.conf
#$(INSTALL_DIR) $(1)/etc/init.d
#$(INSTALL_BIN) ./files/pdnsd.init $(1)/etc/init.d/pdnsd
$(INSTALL_DIR) $(1)/etc
$(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/pdnsd.conf $(1)/etc/
endef
$(eval $(call BuildPackage,pdnsd-alt))

View File

@ -8,48 +8,40 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=polarssl
SRC_PKG_NAME:=mbedtls
PKG_VERSION:=1.3.16
PKG_VERSION:=1.3.22
PKG_RELEASE:=1
PKG_SOURCE_NAME:=mbedtls
PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION)-gpl.tgz
PKG_SOURCE_URL:=https://tls.mbed.org/download/
PKG_HASH:=ded041aa4acf9a3e4d0c85bf334b0860135da996e75afdcc3abf22f403d14457
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILE:=LICENSE
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(SRC_PKG_NAME)-$(PKG_VERSION)-gpl.tgz
PKG_SOURCE_URL:=https://polarssl.org/download/
PKG_HASH:=f413146c177c52d4ad8f48015e2fb21dd3a029ca30a2ea000cbc4f9bd092c933
PKG_BUILD_DIR:=$(BUILD_DIR)/$(SRC_PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPL-2.0+
CMAKE_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/polarssl/Default
define Package/libpolarssl
SECTION:=libs
CATEGORY:=Libraries
SUBMENU:=SSL
TITLE:=Embedded SSL
URL:=http://polarssl.org/
endef
define Package/polarssl/Default/description
The aim of the PolarSSL project is to provide a quality, open-source
cryptographic library written in C and targeted at embedded systems.
endef
define Package/libpolarssl
$(call Package/polarssl/Default)
SECTION:=libs
CATEGORY:=Libraries
TITLE+= (library)
ABI_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
endef
define Package/libpolarssl/description
$(call Package/polarssl/Default/description)
This package contains the PolarSSL library.
endef
The aim of the PolarSSL project is to provide a quality, open-source
cryptographic library written in C and targeted at embedded systems.
PKG_INSTALL:=1
This package contains the PolarSSL library.
endef
CMAKE_OPTIONS += \
-DCMAKE_BUILD_TYPE:String="Release" \
@ -58,10 +50,7 @@ CMAKE_OPTIONS += \
-DENABLE_PROGRAMS:Bool=OFF \
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/polarssl $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmbedtls.so.* $(1)/usr/lib/
$(Build/InstallDev/cmake)
$(LN) libmbedtls.so.$(PKG_VERSION) $(1)/usr/lib/libpolarssl.so
endef

View File

@ -1,12 +0,0 @@
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -1011,8 +1011,8 @@
* POLARSSL_SHA1_C
*
* Comment this macro to disable support for SSL 3.0
- */
#define POLARSSL_SSL_PROTO_SSL3
+ */
/**
* \def POLARSSL_SSL_PROTO_TLS1

View File

@ -1,6 +1,6 @@
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -432,8 +432,8 @@
@@ -441,8 +441,8 @@
* Requires: POLARSSL_HMAC_DRBG_C
*
* Comment this macro to disable deterministic ECDSA.
@ -10,7 +10,7 @@
/**
* \def POLARSSL_KEY_EXCHANGE_PSK_ENABLED
@@ -454,8 +454,8 @@
@@ -463,8 +463,8 @@
* TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
* TLS_PSK_WITH_3DES_EDE_CBC_SHA
* TLS_PSK_WITH_RC4_128_SHA
@ -20,7 +20,7 @@
/**
* \def POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
@@ -478,8 +478,8 @@
@@ -487,8 +487,8 @@
* TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
* TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
* TLS_DHE_PSK_WITH_RC4_128_SHA
@ -30,7 +30,7 @@
/**
* \def POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
@@ -498,8 +498,8 @@
@@ -507,8 +507,8 @@
* TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
* TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
* TLS_ECDHE_PSK_WITH_RC4_128_SHA
@ -40,7 +40,7 @@
/**
* \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
@@ -523,8 +523,8 @@
@@ -532,8 +532,8 @@
* TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
* TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* TLS_RSA_PSK_WITH_RC4_128_SHA
@ -50,7 +50,7 @@
/**
* \def POLARSSL_KEY_EXCHANGE_RSA_ENABLED
@@ -602,8 +602,8 @@
@@ -611,8 +611,8 @@
* TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
* TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
* TLS_ECDHE_RSA_WITH_RC4_128_SHA
@ -60,7 +60,7 @@
/**
* \def POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
@@ -626,8 +626,8 @@
@@ -635,8 +635,8 @@
* TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
* TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
* TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
@ -70,7 +70,7 @@
/**
* \def POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
@@ -650,8 +650,8 @@
@@ -659,8 +659,8 @@
* TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
* TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
* TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
@ -80,7 +80,7 @@
/**
* \def POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
@@ -674,8 +674,8 @@
@@ -683,8 +683,8 @@
* TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
* TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
* TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
@ -90,7 +90,7 @@
/**
* \def POLARSSL_PK_PARSE_EC_EXTENDED
@@ -835,8 +835,8 @@
@@ -844,8 +844,8 @@
* \def POLARSSL_SELF_TEST
*
* Enable the checkup functions (*_self_test).
@ -99,8 +99,8 @@
+ */
/**
* \def POLARSSL_SSL_AEAD_RANDOM_IV
@@ -1151,8 +1151,8 @@
* \def POLARSSL_SSL_ALL_ALERT_MESSAGES
@@ -1148,8 +1148,8 @@
* Requires: POLARSSL_VERSION_C
*
* Comment this to disable run-time checking and save ROM space
@ -110,7 +110,7 @@
/**
* \def POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
@@ -1470,8 +1470,8 @@
@@ -1483,8 +1483,8 @@
* TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
* TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
@ -120,7 +120,7 @@
/**
* \def POLARSSL_CCM_C
@@ -1498,8 +1498,8 @@
@@ -1511,8 +1511,8 @@
* Requires: POLARSSL_PEM_PARSE_C
*
* This module is used for testing (ssl_client/server).
@ -130,7 +130,7 @@
/**
* \def POLARSSL_CIPHER_C
@@ -1538,8 +1538,8 @@
@@ -1551,8 +1551,8 @@
* library/ssl_tls.c
*
* This module provides debugging functions.
@ -140,7 +140,7 @@
/**
* \def POLARSSL_DES_C
@@ -1594,8 +1594,8 @@
@@ -1610,8 +1610,8 @@
* ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
*
* Requires: POLARSSL_ECP_C
@ -150,7 +150,7 @@
/**
* \def POLARSSL_ECDSA_C
@@ -1609,8 +1609,8 @@
@@ -1625,8 +1625,8 @@
* ECDHE-ECDSA
*
* Requires: POLARSSL_ECP_C, POLARSSL_ASN1_WRITE_C, POLARSSL_ASN1_PARSE_C
@ -160,7 +160,7 @@
/**
* \def POLARSSL_ECP_C
@@ -1622,8 +1622,8 @@
@@ -1638,8 +1638,8 @@
* library/ecdsa.c
*
* Requires: POLARSSL_BIGNUM_C and at least one POLARSSL_ECP_DP_XXX_ENABLED
@ -170,7 +170,7 @@
/**
* \def POLARSSL_ENTROPY_C
@@ -1662,8 +1662,8 @@
@@ -1678,8 +1678,8 @@
*
* This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other
* requisites are enabled as well.
@ -180,7 +180,7 @@
/**
* \def POLARSSL_HAVEGE_C
@@ -1699,8 +1699,8 @@
@@ -1715,8 +1715,8 @@
* Requires: POLARSSL_MD_C
*
* Uncomment to enable the HMAC_DRBG random number geerator.
@ -190,7 +190,7 @@
/**
* \def POLARSSL_MD_C
@@ -1826,8 +1826,8 @@
@@ -1859,8 +1859,8 @@
* Requires: POLARSSL_HAVE_ASM
*
* This modules adds support for the VIA PadLock on x86.
@ -200,7 +200,7 @@
/**
* \def POLARSSL_PBKDF2_C
@@ -1992,8 +1992,8 @@
@@ -2025,8 +2025,8 @@
* Module: library/ripemd160.c
* Caller: library/md.c
*
@ -210,7 +210,7 @@
/**
* \def POLARSSL_RSA_C
@@ -2072,8 +2072,8 @@
@@ -2110,8 +2110,8 @@
* Caller:
*
* Requires: POLARSSL_SSL_CACHE_C
@ -220,7 +220,7 @@
/**
* \def POLARSSL_SSL_CLI_C
@@ -2149,8 +2149,8 @@
@@ -2187,8 +2187,8 @@
* Caller: library/havege.c
*
* This module is used by the HAVEGE random number generator.
@ -230,7 +230,7 @@
/**
* \def POLARSSL_VERSION_C
@@ -2160,8 +2160,8 @@
@@ -2198,8 +2198,8 @@
* Module: library/version.c
*
* This module provides run-time version information.
@ -240,7 +240,7 @@
/**
* \def POLARSSL_X509_USE_C
@@ -2270,8 +2270,8 @@
@@ -2308,8 +2308,8 @@
*
* Module: library/xtea.c
* Caller:

View File

@ -1,25 +1,26 @@
#
# Copyright (C) 2012-2017 OpenWrt.org
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=ps3netsrv
PKG_VERSION:=20190630
PKG_GIT_COMMIT:=3107bba17870657c5bb3f7830657838d766a296c
PKG_VERSION:=20200610
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_GIT_COMMIT).tar.gz
PKG_SOURCE_URL:=https://github.com/jhonathanc/ps3netsrv/releases/download/$(PKG_VERSION)
PKG_HASH:=b1df52bab6496d3008019ff76660436c4b24d05c84fc71f293719dbd608f1511
PKG_INSTALL:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/jhonathanc/ps3netsrv/tar.gz/$(PKG_VERSION)?
PKG_HASH:=e456a8edbca7cac95b5396cab71c9bba26e5c838fe4751fffe12b483b5bb4030
PKG_MAINTAINER:=JCorrea
PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DEPENDS:=mbedtls
PKG_MAINTAINER:=JCorrea
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
@ -28,28 +29,23 @@ define Package/ps3netsrv
CATEGORY:=Network
SUBMENU:=File Transfer
TITLE:=PS3 Game Server
URL:=https://github.com/jhonathanc/ps3netsrv-openwrt/
URL:=https://github.com/jhonathanc/ps3netsrv-openwrt
DEPENDS:=+libpthread +libstdcpp
endef
define Package/ps3netsrv/description
ps3netsrv allows you to stream games and ISOs over the network to your CFW PlayStation(R) 3 system.
This may be useful if you have a modified PS3, and your router has storage options.
endef
define Build/Install
# Do nothing
ps3netsrv allows you to stream games and ISOs over the network to your CFW PlayStation(R) 3 system.
This may be useful if you have a modified PS3, and your router has storage options.
endef
define Package/ps3netsrv/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ps3netsrv $(1)/usr/bin
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/ps3netsrv.init $(1)/etc/init.d/ps3netsrv
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/ps3netsrv.config $(1)/etc/config/ps3netsrv
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/ps3netsrv.init $(1)/etc/init.d/ps3netsrv
endef
$(eval $(call BuildPackage,ps3netsrv))

View File

@ -1,20 +0,0 @@
diff -Naur a/include/common.h b/include/common.h
--- a/include/common.h 2019-08-03 10:48:42.000000000 -0700
+++ b/include/common.h 2020-03-01 19:26:14.000000000 -0800
@@ -2,6 +2,7 @@
#define __COMMON_H__
#include <stdint.h>
+#include <endian.h>
#ifdef DEBUG
#include <stdio.h>
@@ -10,7 +11,7 @@
#define DPRINTF(...)
#endif
-#ifdef __BIG_ENDIAN__
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
static inline uint16_t BE16(uint16_t x)
{

View File

@ -1,6 +1,5 @@
diff -Naur a/include/compat.h b/include/compat.h
--- a/include/compat.h 2019-08-03 10:48:42.000000000 -0700
+++ b/include/compat.h 2020-03-01 19:26:14.000000000 -0800
--- a/include/compat.h
+++ b/include/compat.h
@@ -57,7 +57,7 @@ typedef int socklen_t;
#else

View File

@ -0,0 +1,26 @@
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-OS = windows
+OS = linux
BUILD_TYPE = release_static
OUTPUT := ps3netsrv
OBJS = src/main.o src/padlock.o src/aes.o src/compat.o src/File.o src/VIsoFile.o
-CFLAGS = -Wall -Wno-format -I./include -std=gnu99 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DPOLARSSL
-CPPFLAGS += -Wall -Wno-format -I./include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DPOLARSSL
+CFLAGS = -Wall -I./include -std=gnu99 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DPOLARSSL
+CPPFLAGS += -Wall -I./include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DPOLARSSL
#CFLAGS += -Doff64_t=off_t
#CPPFLAGS += -Doff64_t=off_t
@@ -18,7 +18,7 @@ LDFLAGS = -L.
LIBS = -lstdc++
ifeq ($(OS), linux)
-LIBS += -lpthread
+LIBS += -lpthread -lgcc_eh
endif
ifeq ($(OS), windows)

View File

@ -1,114 +0,0 @@
diff -Naur a/Makefile b/Makefile
--- a/Makefile 2019-08-03 10:48:42.000000000 -0700
+++ b/Makefile 2020-03-01 19:26:14.000000000 -0800
@@ -1,21 +1,17 @@
-OS = windows
+OS = linux
BUILD_TYPE = release_static
OUTPUT := ps3netsrv
OBJS = src/main.o src/compat.o src/File.o src/VIsoFile.o
-CFLAGS = -Wall -I./include -I./polarssl-1.3.2/include -std=gnu99 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DPOLARSSL
-CPPFLAGS += -Wall -I./include -I./polarssl-1.3.2/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DPOLARSSL
-
-#CFLAGS += -DNOSSL
-#CPPFLAGS +=-DNOSSL
-
-LDFLAGS = -L. -L./polarssl-1.3.2/library
-LIBS = -lstdc++ -lpolarssl
+CFLAGS = -Wall -I./include -std=gnu99 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+CPPFLAGS = -Wall -I./include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+LDFLAGS = -L.
+LIBS = -lstdc++
ifeq ($(OS), linux)
-LIBS += -lpthread
+LIBS += -lpthread -lgcc_eh
endif
ifeq ($(OS), windows)
@@ -37,28 +33,82 @@ endif
ifeq ($(BUILD_TYPE), debug)
CFLAGS += -O0 -g3 -DDEBUG
CPPFLAGS += -O0 -g3 -DDEBUG
+LIBS += -lmbedtls -lmbedx509 -lmbedcrypto
+endif
+
+ifeq ($(BUILD_TYPE), debug_nossl)
+CFLAGS += -O0 -g3 -DDEBUG -DNOSSL
+CPPFLAGS += -O0 -g3 -DDEBUG -DNOSSL
+endif
+
+ifeq ($(BUILD_TYPE), debug_polar)
+CFLAGS += -O0 -g3 -DDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
+CPPFLAGS += -O0 -g3 -DDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
+LDFLAGS += -L./polarssl-1.3.2/library
+LIBS += -lpolarssl
endif
ifeq ($(BUILD_TYPE), debug_static)
CFLAGS += -O0 -static -g3 -DDEBUG
CPPFLAGS += -O0 -static -g3 -DDEBUG
+LIBS += -lmbedtls -lmbedx509 -lmbedcrypto
+endif
+
+ifeq ($(BUILD_TYPE), debug_static_nossl)
+CFLAGS += -O0 -static -g3 -DDEBUG -DNOSSL
+CPPFLAGS += -O0 -static -g3 -DDEBUG -DNOSSL
+endif
+
+ifeq ($(BUILD_TYPE), debug_static_polar)
+CFLAGS += -O0 -static -g3 -DDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
+CPPFLAGS += -O0 -static -g3 -DDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
+LDFLAGS += -L./polarssl-1.3.2/library
+LIBS += -lpolarssl
endif
ifeq ($(BUILD_TYPE), release)
CFLAGS += -O3 -s -DNDEBUG
CPPFLAGS += -O3 -s -DNDEBUG
+LIBS += -lmbedtls -lmbedx509 -lmbedcrypto
+endif
+
+ifeq ($(BUILD_TYPE), release_nossl)
+CFLAGS += -O3 -s -DNDEBUG -DNOSSL
+CPPFLAGS += -O3 -s -DNDEBUG -DNOSSL
+endif
+
+ifeq ($(BUILD_TYPE), release_polar)
+CFLAGS += -O3 -s -DNDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
+CPPFLAGS += -O3 -s -DNDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
+LDFLAGS += -L./polarssl-1.3.2/library
+LIBS += -lpolarssl
endif
ifeq ($(BUILD_TYPE), release_static)
CFLAGS += -static -O3 -s -DNDEBUG
CPPFLAGS += -static -O3 -s -DNDEBUG
+LIBS += -lmbedtls -lmbedx509 -lmbedcrypto
+endif
+
+ifeq ($(BUILD_TYPE), release_static_nossl)
+CFLAGS += -static -O3 -s -DNDEBUG -DNOSSL
+CPPFLAGS += -static -O3 -s -DNDEBUG -DNOSSL
+endif
+
+ifeq ($(BUILD_TYPE), release_static_polar)
+CFLAGS += -static -O3 -s -DNDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
+CPPFLAGS += -static -O3 -s -DNDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
+LDFLAGS += -L./polarssl-1.3.2/library
+LIBS += -lpolarssl
endif
all: $(OUTPUT)
rm -r -f src/*.o
+ rm -r -f polarssl-1.3.2/library/*.o
clean:
rm -r -f $(OUTPUT) src/*.o
+ rm -r -f polarssl-1.3.2/library/*.o
$(OUTPUT): $(OBJS)
$(LINK.c) $(LDFLAGS) -o $@ $^ $(LIBS)

View File

@ -1,61 +1,3 @@
################################################################################
#
# r8125 is the Linux device driver released for Realtek 2.5Gigabit Ethernet
# controllers with PCI-Express interface.
#
# Copyright(c) 2018 Realtek Semiconductor Corp. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 of the License, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, see <http://www.gnu.org/licenses/>.
#
# Author:
# Realtek NIC software team <nicfae@realtek.com>
# No. 2, Innovation Road II, Hsinchu Science Park, Hsinchu 300, Taiwan
#
################################################################################
################################################################################
# This product is covered by one or more of the following patents:
# US6,570,884, US6,115,776, and US6,327,625.
################################################################################
#KFLAG := 2$(shell uname -r | sed -ne 's/^2\.[4]\..*/4/p')x
#all: clean modules install
#modules:
#ifeq ($(KFLAG),24x)
# $(MAKE) -C src/ -f Makefile_linux24x modules
#else
# $(MAKE) -C src/ modules
#endif
#clean:
#ifeq ($(KFLAG),24x)
# $(MAKE) -C src/ -f Makefile_linux24x clean
#else
# $(MAKE) -C src/ clean
#endif
#install:
#ifeq ($(KFLAG),24x)
# $(MAKE) -C src/ -f Makefile_linux24x install
#else
# $(MAKE) -C src/ install
#endif
# Attribution: https://gist.github.com/lenew/9b41ba901c3393047ede0766760f9d55
#Put this source to 'package/kernel/r8125' folder of OpenWRT/LEDE SDK
@ -66,10 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=r8125
PKG_VERSION:=9.004.01
PKG_RELEASE:=1
#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
#PKG_CAT:=bzcat
PKG_RELEASE:=2
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -84,25 +23,20 @@ define KernelPackage/r8125
endef
define Package/r8125/description
This package contains a driver for Realtek r8125 chipsets.
This package contains a driver for Realtek r8125 chipsets.
endef
R8125_MAKEOPTS= -C $(PKG_BUILD_DIR) \
PATH="$(TARGET_PATH)" \
ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
TARGET="$(HAL_TARGET)" \
TOOLPREFIX="$(KERNEL_CROSS)" \
TOOLPATH="$(KERNEL_CROSS)" \
KERNELPATH="$(LINUX_DIR)" \
KERNELDIR="$(LINUX_DIR)" \
LDOPTS=" " \
DOMULTI=1
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
$(CP) ./src/* $(PKG_BUILD_DIR)
endef
PATH="$(TARGET_PATH)" \
ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
TARGET="$(HAL_TARGET)" \
TOOLPREFIX="$(KERNEL_CROSS)" \
TOOLPATH="$(KERNEL_CROSS)" \
KERNELPATH="$(LINUX_DIR)" \
KERNELDIR="$(LINUX_DIR)" \
LDOPTS=" " \
DOMULTI=1
define Build/Compile
$(MAKE) $(R8125_MAKEOPTS) modules

View File

@ -1,3 +1,11 @@
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=shadowsocksr-libev
@ -6,60 +14,91 @@ PKG_RELEASE:=6
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/shadowsocksrr/shadowsocksr-libev
PKG_MIRROR_HASH:=834ce598f940fb9db2bf4c0d1f8cfa883df27c1c8553dbcb306d6f32ae13c317
PKG_SOURCE_DATE:=2018-03-07
PKG_SOURCE_VERSION:=d63ff863800a5645aca4309d5dd5962bd1e95543
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_MIRROR_HASH:=34308ed827a5dd4f4e35619914102d55b00604faa44fda051d1d25fb4a319325
PKG_LICENSE:=GPLv3
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=LICENSE
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_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/shadowsocksr-libev/Default
define Package/shadowsocksr-libev/template
SECTION:=net
CATEGORY:=Network
SUBMENU:=Web Servers/Proxies
TITLE:=Lightweight Secured Socks5 Proxy
TITLE:=shadowsocksr-libev
URL:=https://github.com/shadowsocksrr/shadowsocksr-libev
DEPENDS:=+libev +libsodium +libopenssl +libpthread +libpcre +libudns +zlib
PROVIDES:=shadowsocksr-libev
endef
Package/shadowsocksr-libev-server = $(Package/shadowsocksr-libev/Default)
Package/shadowsocksr-libev-alt = $(Package/shadowsocksr-libev/Default)
Package/shadowsocksr-libev-ssr-local = $(Package/shadowsocksr-libev/Default)
define Package/shadowsocksr-libev-ssr-check
$(call Package/shadowsocksr-libev/template,$(1))
TITLE+= ssr-check
endef
CONFIGURE_ARGS += --disable-documentation --disable-ssp --disable-assert \
define Package/shadowsocksr-libev-ssr-local
$(call Package/shadowsocksr-libev/template,$(1))
TITLE+= ssr-local
endef
define Package/shadowsocksr-libev-ssr-nat
$(call Package/shadowsocksr-libev/template,$(1))
TITLE+= ssr-nat
endef
define Package/shadowsocksr-libev-ssr-redir
$(call Package/shadowsocksr-libev/template,$(1))
TITLE+= ssr-redir
endef
define Package/shadowsocksr-libev-ssr-server
$(call Package/shadowsocksr-libev/template,$(1))
TITLE+= ssr-server
endef
CONFIGURE_ARGS += \
--disable-documentation \
--disable-ssp \
--disable-assert \
--enable-system-shared-lib
TARGET_CFLAGS += -flto
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
define Package/shadowsocksr-libev-alt/install
define Package/shadowsocksr-libev/install/template
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ss-redir $(1)/usr/bin/ssr-redir
$(INSTALL_BIN) $(PKG_BUILD_DIR)/server/ss-check $(1)/usr/bin/ssr-check
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ss-$(2) $(1)/usr/bin/ssr-$(2)
endef
define Package/shadowsocksr-libev-server/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/server/ss-server $(1)/usr/bin/ssr-server
define Package/shadowsocksr-libev-ssr-check/install
$(call Package/shadowsocksr-libev/install/template,$(1),check)
endef
define Package/shadowsocksr-libev-ssr-local/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ss-local $(1)/usr/bin/ssr-local
$(call Package/shadowsocksr-libev/install/template,$(1),local)
$(LN) ssr-local $(1)/usr/bin/ssr-tunnel
endef
$(eval $(call BuildPackage,shadowsocksr-libev-alt))
$(eval $(call BuildPackage,shadowsocksr-libev-server))
define Package/shadowsocksr-libev-ssr-nat/install
$(call Package/shadowsocksr-libev/install/template,$(1),nat)
endef
define Package/shadowsocksr-libev-ssr-redir/install
$(call Package/shadowsocksr-libev/install/template,$(1),redir)
endef
define Package/shadowsocksr-libev-ssr-server/install
$(call Package/shadowsocksr-libev/install/template,$(1),server)
endef
$(eval $(call BuildPackage,shadowsocksr-libev-ssr-check))
$(eval $(call BuildPackage,shadowsocksr-libev-ssr-local))
$(eval $(call BuildPackage,shadowsocksr-libev-ssr-nat))
$(eval $(call BuildPackage,shadowsocksr-libev-ssr-redir))
$(eval $(call BuildPackage,shadowsocksr-libev-ssr-server))

View File

@ -1,5 +1,3 @@
diff --git a/.gitignore b/.gitignore
index 4eab18e..64b8d9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ build/
@ -10,8 +8,6 @@ index 4eab18e..64b8d9f 100644
libev/Makefile
libudns/Makefile
libcork/Makefile
diff --git a/Makefile.am b/Makefile.am
index 690af43..75e158e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
@ -24,8 +20,6 @@ index 690af43..75e158e 100644
endif
if ENABLE_DOCUMENTATION
diff --git a/Makefile.in b/Makefile.in
index 4cb3deb..e210bc0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,7 +195,7 @@ am__define_uniq_tagged_files = \
@ -49,8 +43,6 @@ index 4cb3deb..e210bc0 100644
@USE_SYSTEM_SHARED_LIB_TRUE@ $(am__append_1)
ACLOCAL_AMFLAGS = -I m4
pkgconfiglibdir = $(libdir)/pkgconfig
diff --git a/configure b/configure
index 7d854c4..01d66ab 100755
--- a/configure
+++ b/configure
@@ -649,7 +649,6 @@ PTHREAD_CC
@ -102,7 +94,7 @@ index 7d854c4..01d66ab 100755
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1399,6 +1409,7 @@ Fine tuning of the installation directories:
@@ -1399,6 +1409,7 @@ Fine tuning of the installation director
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
@ -110,7 +102,7 @@ index 7d854c4..01d66ab 100755
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -2472,8 +2483,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
@@ -2472,8 +2483,8 @@ ac_configure="$SHELL $ac_aux_dir/configu
@ -121,7 +113,7 @@ index 7d854c4..01d66ab 100755
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3783,7 +3794,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
@@ -3783,7 +3794,7 @@ $as_echo "$ac_cv_safe_to_define___extens
@ -139,7 +131,7 @@ index 7d854c4..01d66ab 100755
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4363,8 +4374,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
@@ -4363,8 +4374,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
@ -206,7 +198,7 @@ index 7d854c4..01d66ab 100755
# Extract the first word of "mv", so it can be a program name with args.
set dummy mv; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -16204,15 +16175,162 @@ $as_echo "#define HAVE_IPv6 1" >>confdefs.h
@@ -16204,15 +16175,162 @@ $as_echo "#define HAVE_IPv6 1" >>confdef
if test -z "$USE_SYSTEM_SHARED_LIB_TRUE"; then :
@ -391,8 +383,6 @@ index 7d854c4..01d66ab 100755
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
diff --git a/configure.ac b/configure.ac
index 6586f2b..f9c51ab 100755
--- a/configure.ac
+++ b/configure.ac
@@ -315,7 +315,8 @@ AC_CONFIG_FILES([ shadowsocks-libev.pc
@ -405,9 +395,6 @@ index 6586f2b..f9c51ab 100755
AM_COND_IF([USE_SYSTEM_SHARED_LIB],[
AC_CHECK_LIB([udns], [dns_dnlen], ,[AC_MSG_ERROR([Couldn't find libudns. Try installing libudns-dev or udns-devel.])])
AC_CHECK_LIB([ev], [ev_loop_destroy], ,[AC_MSG_ERROR([Couldn't find libev. Try installing libev-dev@<:@el@:>@.])])
diff --git a/server/Makefile.am b/server/Makefile.am
new file mode 100644
index 0000000..3ae8bc2
--- /dev/null
+++ b/server/Makefile.am
@@ -0,0 +1,55 @@
@ -466,9 +453,6 @@ index 0000000..3ae8bc2
+
+ss_check_CFLAGS = $(AM_CFLAGS)
+ss_server_CFLAGS = $(AM_CFLAGS) -DMODULE_REMOTE
diff --git a/server/Makefile.in b/server/Makefile.in
new file mode 100644
index 0000000..3bfa53e
--- /dev/null
+++ b/server/Makefile.in
@@ -0,0 +1,919 @@
@ -1391,18 +1375,12 @@ index 0000000..3bfa53e
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/server/README.md b/server/README.md
new file mode 100644
index 0000000..ef6a20e
--- /dev/null
+++ b/server/README.md
@@ -0,0 +1,3 @@
+# server
+
+`ss-server` and `ss-check` from https://github.com/ywb94/shadowsocks-libev
diff --git a/server/acl.c b/server/acl.c
new file mode 100644
index 0000000..60d4b72
--- /dev/null
+++ b/server/acl.c
@@ -0,0 +1,597 @@
@ -2003,9 +1981,6 @@ index 0000000..60d4b72
+
+ return ret;
+}
diff --git a/server/acl.h b/server/acl.h
new file mode 100644
index 0000000..d6f18b8
--- /dev/null
+++ b/server/acl.h
@@ -0,0 +1,53 @@
@ -2062,9 +2037,6 @@ index 0000000..d6f18b8
+int outbound_block_match_host(const char *host);
+
+#endif // _ACL_H
diff --git a/server/auth.c b/server/auth.c
new file mode 100644
index 0000000..a36257a
--- /dev/null
+++ b/server/auth.c
@@ -0,0 +1,993 @@
@ -3061,9 +3033,6 @@ index 0000000..a36257a
+
+ return datalength - 4;
+}
diff --git a/server/auth.h b/server/auth.h
new file mode 100644
index 0000000..f7730df
--- /dev/null
+++ b/server/auth.h
@@ -0,0 +1,30 @@
@ -3097,9 +3066,6 @@ index 0000000..f7730df
+int auth_aes128_sha1_client_post_decrypt(obfs *self, char **pplaindata, int datalength, size_t* capacity);
+
+#endif // _AUTH_H
diff --git a/server/base64.c b/server/base64.c
new file mode 100644
index 0000000..7cf9552
--- /dev/null
+++ b/server/base64.c
@@ -0,0 +1,119 @@
@ -3222,9 +3188,6 @@ index 0000000..7cf9552
+
+ return BASE64_OK;
+}
diff --git a/server/base64.h b/server/base64.h
new file mode 100644
index 0000000..6432ba3
--- /dev/null
+++ b/server/base64.h
@@ -0,0 +1,16 @@
@ -3244,9 +3207,6 @@ index 0000000..6432ba3
+
+
+#endif /* __BASE64_H__ */
diff --git a/server/cache.c b/server/cache.c
new file mode 100644
index 0000000..c1a2995
--- /dev/null
+++ b/server/cache.c
@@ -0,0 +1,308 @@
@ -3558,9 +3518,6 @@ index 0000000..c1a2995
+
+ return 0;
+}
diff --git a/server/cache.h b/server/cache.h
new file mode 100644
index 0000000..0ec98f5
--- /dev/null
+++ b/server/cache.h
@@ -0,0 +1,62 @@
@ -3626,9 +3583,6 @@ index 0000000..0ec98f5
+int cache_key_exist(struct cache *cache, char *key, size_t key_len);
+
+#endif
diff --git a/server/check.c b/server/check.c
new file mode 100644
index 0000000..ad035e0
--- /dev/null
+++ b/server/check.c
@@ -0,0 +1,236 @@
@ -3869,9 +3823,6 @@ index 0000000..ad035e0
+
+}
\ No newline at end of file
diff --git a/server/common.h b/server/common.h
new file mode 100644
index 0000000..000f084
--- /dev/null
+++ b/server/common.h
@@ -0,0 +1,58 @@
@ -3933,9 +3884,6 @@ index 0000000..000f084
+#define STAGE_STREAM 5 /* Stream between client and server */
+
+#endif // _COMMON_H
diff --git a/server/crc32.c b/server/crc32.c
new file mode 100644
index 0000000..6d328d2
--- /dev/null
+++ b/server/crc32.c
@@ -0,0 +1,97 @@
@ -4036,9 +3984,6 @@ index 0000000..6d328d2
+ | (uint32_t)buffer[0]);
+}
+
diff --git a/server/encrypt.c b/server/encrypt.c
new file mode 100644
index 0000000..37dd5cd
--- /dev/null
+++ b/server/encrypt.c
@@ -0,0 +1,1645 @@
@ -5687,9 +5632,6 @@ index 0000000..37dd5cd
+
+ return 0;
+}
diff --git a/server/encrypt.h b/server/encrypt.h
new file mode 100644
index 0000000..3bb7940
--- /dev/null
+++ b/server/encrypt.h
@@ -0,0 +1,222 @@
@ -5915,9 +5857,6 @@ index 0000000..3bb7940
+void bfree(buffer_t *ptr);
+
+#endif // _ENCRYPT_H
diff --git a/server/http.c b/server/http.c
new file mode 100644
index 0000000..3bd4a32
--- /dev/null
+++ b/server/http.c
@@ -0,0 +1,152 @@
@ -6073,9 +6012,6 @@ index 0000000..3bd4a32
+
+ return header_len;
+}
diff --git a/server/http.h b/server/http.h
new file mode 100644
index 0000000..914815a
--- /dev/null
+++ b/server/http.h
@@ -0,0 +1,34 @@
@ -6113,9 +6049,6 @@ index 0000000..914815a
+const protocol_t *const http_protocol;
+
+#endif
diff --git a/server/http_simple.c b/server/http_simple.c
new file mode 100644
index 0000000..c1e34ee
--- /dev/null
+++ b/server/http_simple.c
@@ -0,0 +1,625 @@
@ -6744,9 +6677,6 @@ index 0000000..c1e34ee
+ }
+ return outlength;
+}
diff --git a/server/http_simple.h b/server/http_simple.h
new file mode 100644
index 0000000..cce24cc
--- /dev/null
+++ b/server/http_simple.h
@@ -0,0 +1,21 @@
@ -6771,9 +6701,6 @@ index 0000000..cce24cc
+int http_simple_server_decode(obfs *self, char **pencryptdata, int datalength, size_t* capacity, int *needsendback);
+
+#endif // _HTTP_SIMPLE_H
diff --git a/server/jconf.c b/server/jconf.c
new file mode 100644
index 0000000..494aa5f
--- /dev/null
+++ b/server/jconf.c
@@ -0,0 +1,260 @@
@ -7037,9 +6964,6 @@ index 0000000..494aa5f
+ json_value_free(obj);
+ return &conf;
+}
diff --git a/server/jconf.h b/server/jconf.h
new file mode 100644
index 0000000..9a7e5e3
--- /dev/null
+++ b/server/jconf.h
@@ -0,0 +1,78 @@
@ -7121,9 +7045,6 @@ index 0000000..9a7e5e3
+void free_addr(ss_addr_t *addr);
+
+#endif // _JCONF_H
diff --git a/server/json.c b/server/json.c
new file mode 100644
index 0000000..18e95ef
--- /dev/null
+++ b/server/json.c
@@ -0,0 +1,1002 @@
@ -8129,9 +8050,6 @@ index 0000000..18e95ef
+ settings.mem_free = default_free;
+ json_value_free_ex(&settings, value);
+}
diff --git a/server/json.h b/server/json.h
new file mode 100644
index 0000000..016fc5a
--- /dev/null
+++ b/server/json.h
@@ -0,0 +1,249 @@
@ -8384,9 +8302,6 @@ index 0000000..016fc5a
+#endif
+
+#endif
diff --git a/server/list.c b/server/list.c
new file mode 100644
index 0000000..dde085d
--- /dev/null
+++ b/server/list.c
@@ -0,0 +1,370 @@
@ -8760,9 +8675,6 @@ index 0000000..dde085d
+
+ return l;
+}
diff --git a/server/list.h b/server/list.h
new file mode 100644
index 0000000..ab49720
--- /dev/null
+++ b/server/list.h
@@ -0,0 +1,61 @@
@ -8827,9 +8739,6 @@ index 0000000..ab49720
+//释放链表
+List list_destroy(List l);
+#endif
diff --git a/server/netutils.c b/server/netutils.c
new file mode 100644
index 0000000..3a32b4d
--- /dev/null
+++ b/server/netutils.c
@@ -0,0 +1,297 @@
@ -9130,9 +9039,6 @@ index 0000000..3a32b4d
+
+ return 1;
+}
diff --git a/server/netutils.h b/server/netutils.h
new file mode 100644
index 0000000..0725592
--- /dev/null
+++ b/server/netutils.h
@@ -0,0 +1,98 @@
@ -9234,9 +9140,6 @@ index 0000000..0725592
+int validate_hostname(const char *hostname, const int hostname_len);
+
+#endif
diff --git a/server/obfs.c b/server/obfs.c
new file mode 100644
index 0000000..5c885bf
--- /dev/null
+++ b/server/obfs.c
@@ -0,0 +1,205 @@
@ -9445,9 +9348,6 @@ index 0000000..5c885bf
+void free_obfs_class(obfs_class *plugin) {
+ free(plugin);
+}
diff --git a/server/obfs.h b/server/obfs.h
new file mode 100644
index 0000000..74c60c9
--- /dev/null
+++ b/server/obfs.h
@@ -0,0 +1,100 @@
@ -9551,9 +9451,6 @@ index 0000000..74c60c9
+void dispose_obfs(obfs *self);
+
+#endif // _OBFS_H
diff --git a/server/obfsutil.c b/server/obfsutil.c
new file mode 100644
index 0000000..d00959b
--- /dev/null
+++ b/server/obfsutil.c
@@ -0,0 +1,36 @@
@ -9593,9 +9490,6 @@ index 0000000..d00959b
+ return x + y;
+}
+
diff --git a/server/protocol.h b/server/protocol.h
new file mode 100644
index 0000000..eaa866e
--- /dev/null
+++ b/server/protocol.h
@@ -0,0 +1,34 @@
@ -9633,9 +9527,6 @@ index 0000000..eaa866e
+} protocol_t;
+
+#endif
diff --git a/server/resolv.c b/server/resolv.c
new file mode 100644
index 0000000..f580d06
--- /dev/null
+++ b/server/resolv.c
@@ -0,0 +1,444 @@
@ -10083,9 +9974,6 @@ index 0000000..f580d06
+
+ return result;
+}
diff --git a/server/resolv.h b/server/resolv.h
new file mode 100644
index 0000000..0552922
--- /dev/null
+++ b/server/resolv.h
@@ -0,0 +1,50 @@
@ -10139,9 +10027,6 @@ index 0000000..0552922
+void resolv_shutdown(struct ev_loop *);
+
+#endif
diff --git a/server/rule.c b/server/rule.c
new file mode 100644
index 0000000..8aae04e
--- /dev/null
+++ b/server/rule.c
@@ -0,0 +1,137 @@
@ -10282,9 +10167,6 @@ index 0000000..8aae04e
+ pcre_free(rule->pattern_re);
+ ss_free(rule);
+}
diff --git a/server/rule.h b/server/rule.h
new file mode 100644
index 0000000..015bc42
--- /dev/null
+++ b/server/rule.h
@@ -0,0 +1,58 @@
@ -10346,9 +10228,6 @@ index 0000000..015bc42
+int accept_rule_arg(rule_t *, const char *);
+
+#endif
diff --git a/server/server.c b/server/server.c
new file mode 100644
index 0000000..65b0e42
--- /dev/null
+++ b/server/server.c
@@ -0,0 +1,2209 @@
@ -12561,9 +12440,6 @@ index 0000000..65b0e42
+
+ return 0;
+}
diff --git a/server/server.h b/server/server.h
new file mode 100644
index 0000000..4cd3cf6
--- /dev/null
+++ b/server/server.h
@@ -0,0 +1,115 @@
@ -12682,9 +12558,6 @@ index 0000000..4cd3cf6
+} remote_t;
+
+#endif // _SERVER_H
diff --git a/server/tls.c b/server/tls.c
new file mode 100644
index 0000000..5c42216
--- /dev/null
+++ b/server/tls.c
@@ -0,0 +1,263 @@
@ -12951,9 +12824,6 @@ index 0000000..5c42216
+
+ return -2;
+}
diff --git a/server/tls.h b/server/tls.h
new file mode 100644
index 0000000..3998913
--- /dev/null
+++ b/server/tls.h
@@ -0,0 +1,33 @@
@ -12990,9 +12860,6 @@ index 0000000..3998913
+const protocol_t *const tls_protocol;
+
+#endif
diff --git a/server/tls1.2_ticket.c b/server/tls1.2_ticket.c
new file mode 100644
index 0000000..88970c0
--- /dev/null
+++ b/server/tls1.2_ticket.c
@@ -0,0 +1,609 @@
@ -13605,9 +13472,6 @@ index 0000000..88970c0
+
+ return 0;
+}
diff --git a/server/tls1.2_ticket.h b/server/tls1.2_ticket.h
new file mode 100644
index 0000000..10a57c9
--- /dev/null
+++ b/server/tls1.2_ticket.h
@@ -0,0 +1,20 @@
@ -13631,9 +13495,6 @@ index 0000000..10a57c9
+int tls12_ticket_auth_server_decode(obfs *self, char **pencryptdata, int datalength, size_t* capacity, int *needsendback);
+
+#endif // _TLS1_2_TICKET_H
diff --git a/server/udprelay.c b/server/udprelay.c
new file mode 100644
index 0000000..d9251ee
--- /dev/null
+++ b/server/udprelay.c
@@ -0,0 +1,1452 @@
@ -15089,9 +14950,6 @@ index 0000000..d9251ee
+ server_ctx_list[server_num] = NULL;
+ }
+}
diff --git a/server/udprelay.h b/server/udprelay.h
new file mode 100644
index 0000000..89876d4
--- /dev/null
+++ b/server/udprelay.h
@@ -0,0 +1,95 @@
@ -15190,9 +15048,6 @@ index 0000000..89876d4
+} remote_ctx_t;
+
+#endif // _UDPRELAY_H
diff --git a/server/uthash.h b/server/uthash.h
new file mode 100644
index 0000000..45d1f9f
--- /dev/null
+++ b/server/uthash.h
@@ -0,0 +1,1074 @@
@ -16270,9 +16125,6 @@ index 0000000..45d1f9f
+} UT_hash_handle;
+
+#endif /* UTHASH_H */
diff --git a/server/utils.c b/server/utils.c
new file mode 100644
index 0000000..14a60c7
--- /dev/null
+++ b/server/utils.c
@@ -0,0 +1,448 @@
@ -16724,9 +16576,6 @@ index 0000000..14a60c7
+}
+
+#endif
diff --git a/server/utils.h b/server/utils.h
new file mode 100644
index 0000000..0fb7f5a
--- /dev/null
+++ b/server/utils.h
@@ -0,0 +1,232 @@
@ -16962,9 +16811,6 @@ index 0000000..0fb7f5a
+ } while (0)
+
+#endif // _UTILS_H
diff --git a/server/verify.c b/server/verify.c
new file mode 100644
index 0000000..9e7393d
--- /dev/null
+++ b/server/verify.c
@@ -0,0 +1,188 @@
@ -17156,9 +17002,6 @@ index 0000000..9e7393d
+ free(out_buffer);
+ return len;
+}
diff --git a/server/verify.h b/server/verify.h
new file mode 100644
index 0000000..57c6ff9
--- /dev/null
+++ b/server/verify.h
@@ -0,0 +1,19 @@
@ -17181,6 +17024,3 @@ index 0000000..57c6ff9
+int verify_simple_server_post_decrypt(obfs *self, char **pplaindata, int datalength, size_t* capacity);
+
+#endif // _VERIFY_H
--
2.19.1

View File

@ -1,8 +1,6 @@
diff --git a/src/obfs/obfs.c b/src/obfs/obfs.c
index 463359f..4cd750a 100644
--- a/src/obfs/obfs.c
+++ b/src/obfs/obfs.c
@@ -88,7 +88,7 @@
@@ -88,7 +88,7 @@ obfs_class *new_obfs_class(const char *p
plugin->client_decode = tls12_ticket_auth_client_decode;
return plugin;
@ -11,7 +9,7 @@ index 463359f..4cd750a 100644
obfs_class * plugin = (obfs_class*)malloc(sizeof(obfs_class));
plugin->init_data = init_data;
plugin->new_obfs = verify_simple_new_obfs;
@@ -115,7 +115,7 @@
@@ -115,7 +115,7 @@ obfs_class *new_obfs_class(const char *p
plugin->client_udp_pre_encrypt = NULL;
plugin->client_udp_post_decrypt = NULL;
@ -19,4 +17,4 @@ index 463359f..4cd750a 100644
+ return plugin;
} else if (strcmp(plugin_name, "auth_sha1") == 0) {
obfs_class *plugin = (obfs_class *) malloc(sizeof(obfs_class));
plugin->init_data = auth_simple_init_data;
plugin->init_data = auth_simple_init_data;

View File

@ -1,5 +1,3 @@
diff --git a/src/utils.c b/src/utils.c
index 94f8a83..01bcbac 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -258,8 +258,6 @@ usage()
@ -11,11 +9,10 @@ index 94f8a83..01bcbac 100644
printf(" usage:\n\n");
#ifdef MODULE_LOCAL
printf(" ss-local\n");
@@ -298,6 +296,25 @@ usage()
printf(
@@ -299,6 +297,25 @@ usage()
" The default cipher is rc4-md5.\n");
printf("\n");
+ printf(
printf(
+ " -o <obfs> Obfs of your remote server: plain,\n");
+ printf(
+ " http_simple, http_post and tls1.2_ticket_auth.\n");
@ -34,9 +31,7 @@ index 94f8a83..01bcbac 100644
+ printf(
+ " -G <protocol-param> Protocol-Param of your remote server.\n");
+ printf("\n");
printf(
+ printf(
" [-a <user>] Run as another user.\n");
printf(
--
2.19.1
" [-f <pid_file>] The file path to store pid.\n");

View File

@ -1,6 +1,6 @@
--- a/src/local.c
+++ b/src/local.c
@@ -718,7 +718,7 @@
@@ -718,7 +718,7 @@ server_recv_cb(EV_P_ ev_io *w, int reven
ss_free(hostname);
} else {

View File

@ -15,7 +15,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=shortcut-fe
PKG_RELEASE:=2
PKG_RELEASE:=3
include $(INCLUDE_DIR)/package.mk
@ -25,8 +25,11 @@ define KernelPackage/shortcut-fe
SUBMENU:=Network Support
DEPENDS:=
TITLE:=Kernel driver for SFE
FILES:=$(PKG_BUILD_DIR)/shortcut-fe.ko $(PKG_BUILD_DIR)/shortcut-fe-ipv6.ko
KCONFIG:=CONFIG_NF_CONNTRACK_EVENTS=y \
FILES:= \
$(PKG_BUILD_DIR)/shortcut-fe.ko \
$(PKG_BUILD_DIR)/shortcut-fe-ipv6.ko
KCONFIG:= \
CONFIG_NF_CONNTRACK_EVENTS=y \
CONFIG_NF_CONNTRACK_TIMEOUT=y \
CONFIG_SHORTCUT_FE=y \
CONFIG_XFRM=y
@ -34,16 +37,9 @@ define KernelPackage/shortcut-fe
endef
define KernelPackage/shortcut-fe/Description
Shortcut is an in-Linux-kernel IP packet forwarding engine.
Shortcut is an in-Linux-kernel IP packet forwarding engine.
endef
#define KernelPackage/shortcut-fe/install
# $(INSTALL_DIR) $(1)/etc/init.d
# $(INSTALL_BIN) ./files/etc/init.d/shortcut-fe $(1)/etc/init.d
# $(INSTALL_DIR) $(1)/usr/bin
# $(INSTALL_BIN) ./files/usr/bin/sfe_dump $(1)/usr/bin
#endef
define KernelPackage/shortcut-fe-cm
SECTION:=kernel
CATEGORY:=Kernel modules
@ -55,10 +51,10 @@ define KernelPackage/shortcut-fe-cm
endef
define KernelPackage/shortcut-fe-cm/Description
Simple connection manager for the Shortcut forwarding engine.
Simple connection manager for the Shortcut forwarding engine.
endef
EXTRA_CFLAGS+=-DSFE_SUPPORT_IPV6
EXTRA_CFLAGS+= -DSFE_SUPPORT_IPV6
define Build/Compile
+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
@ -70,12 +66,17 @@ define Build/Compile
modules
endef
ifneq ($(CONFIG_PACKAGE_kmod-shortcut-fe)$(CONFIG_PACKAGE_kmod-shortcut-fe-cm),)
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/shortcut-fe
$(CP) -rf $(PKG_BUILD_DIR)/sfe.h $(1)/usr/include/shortcut-fe
endef
endif
#define KernelPackage/shortcut-fe/install
# $(INSTALL_DIR) $(1)/etc/init.d
# $(INSTALL_BIN) ./files/etc/init.d/shortcut-fe $(1)/etc/init.d
# $(INSTALL_DIR) $(1)/usr/bin
# $(INSTALL_BIN) ./files/usr/bin/sfe_dump $(1)/usr/bin
#endef
$(eval $(call KernelPackage,shortcut-fe))
$(eval $(call KernelPackage,shortcut-fe-cm))

View File

@ -9,21 +9,23 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=srelay
PKG_VERSION:=0.4.8p3
PKG_RELEASE:=8
PKG_RELEASE:=9
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/socks-relay
PKG_HASH:=efa38cb3e9e745a05ccb4b59fcf5d041184f15dbea8eb80c1b0ce809bb00c924
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/srelay
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libpthread
SUBMENU:=Web Servers/Proxies
TITLE:=A socks 4/5 proxy server
URL:=http://www.c-wind.com/srelay/
DEPENDS:=+libpthread
endef
define Package/srelay/conffiles

View File

@ -1,39 +1,44 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tcpping
PKG_VERSION:=0.2
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/coolsnowwolf/tcping
PKG_MIRROR_HASH:=223649603b5cc521a721d5825ab17f9bd95935e2d650a41f240110b3b4b8449e
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=d890cc1bd8e3951390ceeff1ccb092a5d802850c
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
include $(INCLUDE_DIR)/package.mk
define Package/tcpping
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libnet-1.2.x +libpcap
TITLE:=Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes
endef
define Package/tcpping/description
Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes
endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.2.x/include -L$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" \
INSTALL_PROG=":"
endef
define Package/tcpping/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcpping $(1)/usr/bin/tcpping
endef
$(eval $(call BuildPackage,tcpping))
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=tcpping
PKG_VERSION:=0.2
PKG_RELEASE=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/coolsnowwolf/tcping
PKG_SOURCE_DATE:=2020-09-19
PKG_SOURCE_VERSION:=d890cc1bd8e3951390ceeff1ccb092a5d802850c
PKG_MIRROR_HASH:=018554a80e8a9d8fedd39821f35aa02c7c763fd42213761fba9b21c2533e1ab8
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/tcpping
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libnet-1.2.x +libpcap
TITLE:=Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes
endef
define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.2.x/include -L$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" \
INSTALL_PROG=":"
endef
define Package/tcpping/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcpping $(1)/usr/bin/tcpping
endef
$(eval $(call BuildPackage,tcpping))

View File

@ -1,44 +1,51 @@
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=vlmcsd
PKG_VERSION:=svn1113
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/Wind4/vlmcsd/tar.gz/$(PKG_VERSION)?
PKG_HASH:=9510cf4e48e809b09fea60f29e41d3a0fb0f58257644dc60929ad503e8a156af
PKG_MAINTAINER:=fuyumi <280604399@qq.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=fuyumi <280604399@qq.com>
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/Wind4/vlmcsd.git
PKG_MIRROR_HASH:=9510cf4e48e809b09fea60f29e41d3a0fb0f58257644dc60929ad503e8a156af
PKG_SOURCE_VERSION:=e599080486478e219cd065e141d6de050a450c27
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
define Package/vlmcsd
SECTION:=net
CATEGORY:=Network
TITLE:=vlmcsd for OpenWRT
URL:=http://forums.mydigitallife.info/threads/50234
TITLE:=A KMS Emulator in C
URL:=https://github.com/Wind4/vlmcsd
DEPENDS:=+libpthread
endef
define Package/vlmcsd/description
vlmcsd is a KMS Emulator in C.
KMS Emulator in C (currently runs on Linux including Android, FreeBSD,
Solaris, Minix, Mac OS, iOS, Windows with or without Cygwin)
endef
MAKE_FLAGS += \
-C $(PKG_BUILD_DIR)
MAKE_PATH:=vlmcsd
define Package/vlmcsd/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/vlmcsd $(1)/usr/bin/vlmcsd
#$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/vlmcs $(1)/usr/bin/vlmcs
#$(INSTALL_BIN) $(PKG_BUILD_DIR)/vlmcsd/bin/vlmcs $(1)/usr/bin/vlmcs
$(INSTALL_BIN) $(PKG_BUILD_DIR)/vlmcsd/bin/vlmcsd $(1)/usr/bin/vlmcsd
$(INSTALL_DIR) $(1)/etc
$(INSTALL_BIN) ./files/vlmcsd.ini $(1)/etc/vlmcsd.ini
#$(INSTALL_DIR) $(1)/etc/init.d

View File

@ -9,19 +9,23 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vsftpd-alt
PKG_VERSION:=3.0.3
PKG_RELEASE:=7
PKG_RELEASE:=8
PKG_SOURCE:=vsftpd-$(PKG_VERSION).tar.gz
PKG_SOURCE_NAME:=$(firstword $(subst -, ,$(PKG_NAME)))
PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://security.appspot.com/downloads/
PKG_HASH:=9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7
PKG_LICENSE:=GPLv2
BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/vsftpd-$(PKG_VERSION)
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILE:=LICENSE
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/vsftpd-alt/Default
define Package/vsftpd-alt
SUBMENU:=File Transfer
SECTION:=net
CATEGORY:=Network
@ -29,85 +33,43 @@ define Package/vsftpd-alt/Default
URL:=http://vsftpd.beasts.org/
MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>
DEPENDS=+libuci
#+PACKAGE_libpam:libpam
endef
define Package/vsftpd-alt/conffiles
/etc/vsftpd.conf
endef
#EXTRA_LDFLAGS:= -lcrypt -lcrypto -lssl
define Package/vsftpd-alt/config
config VSFTPD_USE_UCI_SCRIPTS
bool "Uses UCI scripts"
depends on PACKAGE_vsftpd-alt
default y
#config VSFTPD_ENABLE_AIO
# bool "Enable async I/O (Currently Buggy)"
# depends on PACKAGE_vsftpd-alt
# default n
endef
ifneq ($(CONFIG_USE_MUSL),)
NLSSTRING:=-lcrypt
else
NLSSTRING:=-lcrypt -lnsl
endif
TARGET_CFLAGS += -D_GNU_SOURCE -include fcntl.h
#ifdef CONFIG_PACKAGE_libpam
# EXTRA_LDFLAGS += -lpam
#endif
#ifeq ($(CONFIG_VSFTPD_ENABLE_AIO),y)
#define Package/vsftpd-alt
#$(call Package/vsftpd-alt/Default)
# DEPENDS=+PACKAGE_libpam:libpam +libopenssl +libuci +libaio
#endef
# EXTRA_LDFLAGS += -laio
# EXTRA_CFLAGS += -DVSFTPD_ASYNC_IO
#else
define Package/vsftpd-alt
$(call Package/vsftpd-alt/Default)
define Build/Configure
$(call Build/Configure/Default)
ifneq ($(CONFIG_USE_MUSL)$(CONFIG_USE_GLIBC),)
$(SED) 's/-lcrypt -lnsl/-lcrypt/' $(PKG_BUILD_DIR)/Makefile
endif
endef
#endif
define Build/Compile
$(SED) 's/-lcrypt -lnsl/$(NLSSTRING)/' $(PKG_BUILD_DIR)/Makefile
$(MAKE) -C $(PKG_BUILD_DIR) \
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
vsftpd
endef
ifeq ($(CONFIG_VSFTPD_USE_UCI_SCRIPTS),y)
define Package/vsftpd-alt/conffiles
#/etc/vsftpd.conf
/etc/config/vsftpd
endef
define Package/vsftpd-alt/install
$(call Package/vsftpd-alt/install/default, $(1))
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(1)/usr/sbin/
$(INSTALL_BIN) ./files/vsftpd_wrapper $(1)/usr/sbin/
$(INSTALL_BIN) ./files/vsftpd_prepare $(1)/usr/sbin/
#$(INSTALL_DIR) $(1)/etc
#$(INSTALL_CONF) ./files/vsftpd.conf $(1)/etc/vsftpd.conf
$(INSTALL_DIR) $(1)/etc/config
ifdef CONFIG_PACKAGE_libpam
$(INSTALL_DIR) $(1)/etc/pam.d
endif
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/vsftpd $(1)/usr/sbin
$(INSTALL_BIN) ./files/vsftpd-uci.init $(1)/etc/init.d/vsftpd
$(INSTALL_BIN) ./files/vsftpd.uci $(1)/etc/config/vsftpd
$(INSTALL_BIN) ./files/vsftpd_wrapper $(1)/usr/sbin
$(INSTALL_BIN) ./files/vsftpd_prepare $(1)/usr/sbin
endef
else
define Package/vsftpd-alt/install
$(call Package/vsftpd-alt/install/default, $(1))
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_CONF) ./files/vsftpd.conf $(1)/etc/vsftpd.conf
$(INSTALL_BIN) ./files/vsftpd.init $(1)/etc/init.d/vsftpd
$(INSTALL_BIN) $(PKG_BUILD_DIR)/vsftpd $(1)/usr/sbin
$(INSTALL_BIN) ./files/vsftpd-uci.init $(1)/etc/init.d/vsftpd
endef
endif
$(eval $(call BuildPackage,vsftpd-alt))

View File

@ -9,17 +9,16 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=wxbase
PKG_VERSION:=2.8.12
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=wxGTK-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/wxwindows
PKG_HASH:=f4193c29fb0e790c9a5c8936f082377a7e51c76bccafe41f4f9da7ca15c0ef1a
PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION)
PKG_INSTALL:=1
PKG_CHECK_FORMAT_SECURITY:=0
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
@ -32,21 +31,15 @@ define Package/libwxbase
endef
define Package/libwxbase/description
wxBase contains most of the non-GUI classes from the wxWindows cross-
-platform C++ framework. There are 2 categories: generally useful portable
code (date/time handling, command line parsing, regular expression support)
and wrappers for the OS objects (files, directories, sockets, threads,
etc.) allowing you to write portable programs easily.
wxBase contains most of the non-GUI classes from the wxWindows cross-
-platform C++ framework. There are 2 categories: generally useful portable
code (date/time handling, command line parsing, regular expression support)
and wrappers for the OS objects (files, directories, sockets, threads,
etc.) allowing you to write portable programs easily.
endef
TARGET_CFLAGS += $(FPIC)
# XXX: aMule *needs* the following configure options to be enabled:
# --enable-intl
# --enable-largefile
# --disable-no_rtti
# --with-regex
# --enable-unicode
CONFIGURE_ARGS+= \
--enable-shared \
--disable-rpath \
@ -77,6 +70,7 @@ CONFIGURE_ARGS+= \
--enable-exceptions \
--disable-sound \
--enable-largefile \
--enable-unicode \
\
--without-gtk \
--without-motif \
@ -108,28 +102,22 @@ CONFIGURE_ARGS+= \
--without-cppunit-prefix \
--disable-precomp-headers
UNICODE=yes
ifeq ($(UNICODE),yes)
CONFIGURE_ARGS+= --enable-unicode
LIB_PFX:=u
else
CONFIGURE_ARGS+= --disable-unicode
LIB_PFX:=
endif
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
$(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.8 $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/
$(SED) "s,$(PKG_BUILD_DIR),$(STAGING_DIR)/usr,g" $(1)/usr/bin/wx-config
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.8 $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_*.so* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/
endef
define Package/libwxbase/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so.* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_*.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libwxbase))

View File

@ -41,7 +41,7 @@ define Package/dns-forwarder/description
endef
define Package/dns-forwarder/conffiles
/etc/config/dns-forwarder
/etc/config/dns-forwarder
endef
define Package/dns-forwarder/install

View File

@ -97,9 +97,9 @@ define Package/$(PKG_NAME)
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-local \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Server:shadowsocks-libev-ss-server \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-alt \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-ssr-redir \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-ssr-local \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-server \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-ssr-server \
+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus:trojan-plus \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO:trojan-go \

View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for SSR Libev Server
LUCI_DEPENDS:=+libsodium +shadowsocksr-libev-server
LUCI_DEPENDS:=+libsodium +shadowsocksr-libev-ssr-server
LUCI_PKGARCH:=all
PKG_VERSION:=1
PKG_RELEASE:=8-20200326

View File

@ -107,7 +107,7 @@ IEEE8021X := wpad-basic
B43 := $(IEEE8021X) kmod-b43
BRCMFMAC_43602A1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-43602a1-pcie
BRCMFMAC_4366B1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-4366b1-pcie
BRCMFMAC_4366C0 := $(IEEE8021X) kmod-brcmfmac k3wifi
BRCMFMAC_4366C0 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-4366c0-pcie-vendor
USB2_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-phy-bcm-ns-usb2
USB2_PACKAGES += kmod-usb-ledtrig-usbport
USB3_PACKAGES := $(USB2_PACKAGES) kmod-usb3 kmod-phy-bcm-ns-usb3