diff --git a/README.md b/README.md index a93a7e2f6ca..40c266c6a5a 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ Contributors of this project are not responsible for what happens next. >- [samba3.6](https://github.com/Linaro1985/padavan-ng/tree/master/trunk/user/samba36) ```CONFIG_FIRMWARE_INCLUDE_SMBD36``` >- [mtr](https://github.com/traviscross/mtr) ```CONFIG_FIRMWARE_INCLUDE_MTR``` >- [socat](http://www.dest-unreach.org/socat) ```CONFIG_FIRMWARE_INCLUDE_SOCAT``` +>- [srelay](https://socks-relay.sourceforge.io) ```CONFIG_FIRMWARE_INCLUDE_SRELAY``` - 已适配除官方适配外的以下机型 >- WR1200JS (128M,USB) >- NEWIFI3(D2) (512M,USB) diff --git a/trunk/configs/templates/5K-W20.config b/trunk/configs/templates/5K-W20.config index eee83be5b17..20dad8e9c67 100644 --- a/trunk/configs/templates/5K-W20.config +++ b/trunk/configs/templates/5K-W20.config @@ -256,3 +256,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/HC5661A.config b/trunk/configs/templates/HC5661A.config index 1ae038fe2a6..fbd46066ff1 100644 --- a/trunk/configs/templates/HC5661A.config +++ b/trunk/configs/templates/HC5661A.config @@ -246,3 +246,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/JCG-AC860M.config b/trunk/configs/templates/JCG-AC860M.config index 413a77ed7e9..7665620e3f5 100644 --- a/trunk/configs/templates/JCG-AC860M.config +++ b/trunk/configs/templates/JCG-AC860M.config @@ -261,3 +261,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/K2P.config b/trunk/configs/templates/K2P.config index af30b296fe6..c9072a35f07 100644 --- a/trunk/configs/templates/K2P.config +++ b/trunk/configs/templates/K2P.config @@ -258,3 +258,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/K2P_DRV.config b/trunk/configs/templates/K2P_DRV.config index f26d4eea1d2..722496929f3 100644 --- a/trunk/configs/templates/K2P_DRV.config +++ b/trunk/configs/templates/K2P_DRV.config @@ -263,3 +263,5 @@ CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/K2P_USB_32M_512M.config b/trunk/configs/templates/K2P_USB_32M_512M.config index edb33f89545..1dbacb7da7f 100644 --- a/trunk/configs/templates/K2P_USB_32M_512M.config +++ b/trunk/configs/templates/K2P_USB_32M_512M.config @@ -261,3 +261,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=y CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/K2P_nano.config b/trunk/configs/templates/K2P_nano.config index 956f0074931..643e314d5f0 100644 --- a/trunk/configs/templates/K2P_nano.config +++ b/trunk/configs/templates/K2P_nano.config @@ -261,3 +261,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/MI-3.config b/trunk/configs/templates/MI-3.config index 6e7f7abc849..9d03a3a4e0b 100644 --- a/trunk/configs/templates/MI-3.config +++ b/trunk/configs/templates/MI-3.config @@ -260,3 +260,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/MI-MINI.config b/trunk/configs/templates/MI-MINI.config index 6097e92ef99..0bb738fb935 100644 --- a/trunk/configs/templates/MI-MINI.config +++ b/trunk/configs/templates/MI-MINI.config @@ -260,3 +260,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/MZ-R13.config b/trunk/configs/templates/MZ-R13.config index 9f909e47bd3..9169894fab4 100644 --- a/trunk/configs/templates/MZ-R13.config +++ b/trunk/configs/templates/MZ-R13.config @@ -246,3 +246,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/MZ-R13P.config b/trunk/configs/templates/MZ-R13P.config index c88c13195ca..f6b1a6e3968 100644 --- a/trunk/configs/templates/MZ-R13P.config +++ b/trunk/configs/templates/MZ-R13P.config @@ -250,3 +250,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/NEWIFI3.config b/trunk/configs/templates/NEWIFI3.config index 46cfd708338..f32eb05ab91 100644 --- a/trunk/configs/templates/NEWIFI3.config +++ b/trunk/configs/templates/NEWIFI3.config @@ -265,3 +265,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=y CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/OYE-001.config b/trunk/configs/templates/OYE-001.config index 328768e3437..56244708b03 100644 --- a/trunk/configs/templates/OYE-001.config +++ b/trunk/configs/templates/OYE-001.config @@ -256,3 +256,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=y CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/PSG1218.config b/trunk/configs/templates/PSG1218.config index 199af2f9316..b4aaa9521f9 100644 --- a/trunk/configs/templates/PSG1218.config +++ b/trunk/configs/templates/PSG1218.config @@ -260,3 +260,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/PSG1218_nano.config b/trunk/configs/templates/PSG1218_nano.config index e45712168df..bd4945b8c90 100644 --- a/trunk/configs/templates/PSG1218_nano.config +++ b/trunk/configs/templates/PSG1218_nano.config @@ -260,3 +260,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/configs/templates/WR1200JS.config b/trunk/configs/templates/WR1200JS.config index 69e5897e531..90b6c5a666c 100644 --- a/trunk/configs/templates/WR1200JS.config +++ b/trunk/configs/templates/WR1200JS.config @@ -265,3 +265,5 @@ CONFIG_FIRMWARE_INCLUDE_RTL_SDR=y CONFIG_FIRMWARE_INCLUDE_MTR=y CONFIG_FIRMWARE_INCLUDE_SOCAT=y + +CONFIG_FIRMWARE_INCLUDE_SRELAY=y diff --git a/trunk/user/Makefile b/trunk/user/Makefile index 8e5fc642fbc..85c02ef5bfa 100644 --- a/trunk/user/Makefile +++ b/trunk/user/Makefile @@ -135,6 +135,7 @@ dir_$(CONFIG_FIRMWARE_INCLUDE_XUPNPD) += xupnpd dir_$(CONFIG_FIRMWARE_INCLUDE_TCPDUMP) += tcpdump dir_$(CONFIG_FIRMWARE_INCLUDE_MTR) += mtr dir_$(CONFIG_FIRMWARE_INCLUDE_SOCAT) += socat +dir_$(CONFIG_FIRMWARE_INCLUDE_SRELAY) += srelay ifeq ($(CONFIG_FIRMWARE_INCLUDE_SMBD36),y) dir_$(SAMBA_ENABLED) += samba36 else diff --git a/trunk/user/srelay/Makefile b/trunk/user/srelay/Makefile new file mode 100644 index 00000000000..ec823c4a9a7 --- /dev/null +++ b/trunk/user/srelay/Makefile @@ -0,0 +1,35 @@ +SRC_NAME = srelay-0.4.8p3 +THISDIR = $(shell pwd) + +all: extract_test config_test + $(MAKE) -j$(HOST_NCPU) -C $(SRC_NAME) + +extract_test: + ( if [ ! -d $(SRC_NAME) ]; then \ + tar xf $(SRC_NAME).tar.gz; \ + patch -p1 -d $(SRC_NAME) < ./fix-cross-compile.patch ; \ + fi ) + +config_test: + ( if [ -f ./config_done ]; then \ + echo "the same configuration"; \ + else \ + make configure && touch config_done; \ + fi ) + +configure: + ( cd $(SRC_NAME) ; \ + ./configure \ + --prefix=/usr \ + --host=$(HOST_TARGET) \ + --build=$(HOST_BUILD) ; \ + ) + +clean: + if [ -f $(SRC_NAME)/Makefile ] ; then \ + $(MAKE) -C $(SRC_NAME) distclean ; \ + fi ; \ + rm -f config_done + +romfs: + $(ROMFSINST) -p +x $(THISDIR)/$(SRC_NAME)/srelay /usr/bin/srelay diff --git a/trunk/user/srelay/fix-cross-compile.patch b/trunk/user/srelay/fix-cross-compile.patch new file mode 100644 index 00000000000..641ffac4907 --- /dev/null +++ b/trunk/user/srelay/fix-cross-compile.patch @@ -0,0 +1,43 @@ +--- a/configure 2018-08-05 13:53:26.000000000 +0800 ++++ b/configure 2019-05-08 18:06:25.654605000 +0800 +@@ -3998,40 +3998,10 @@ $as_echo_n "checking whether enabling th + elif test "$OS" = "SOLARIS"; then + LDFLAGS="$LDFLAGS -lpthread" + fi +- if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ + +-#include +-void +-init_routine() +-{ +- return; +-} +-main() +-{ +- pthread_once_t once_control = PTHREAD_ONCE_INIT; +- pthread_once(&once_control, &init_routine); +- return(0); +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : + $as_echo "#define USE_THREAD 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +-else +- CFLAGS="$save_CFLAGS"; LDFLAGS="$save_LDFLAGS"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi + + fi + fi diff --git a/trunk/user/srelay/srelay-0.4.8p3.tar.gz b/trunk/user/srelay/srelay-0.4.8p3.tar.gz new file mode 100644 index 00000000000..c79ceb8f8b8 Binary files /dev/null and b/trunk/user/srelay/srelay-0.4.8p3.tar.gz differ