Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

木马Patch好像有问题 #2621

Closed
stock169 opened this issue Dec 29, 2019 · 6 comments
Closed

木马Patch好像有问题 #2621

stock169 opened this issue Dec 29, 2019 · 6 comments

Comments

@stock169
Copy link

. /home/pchome/lede/include/shell.sh; gzip -dc /home/pchome/lede/dl/trojan-1.14.0-18763b7529963efef8dcb01f50389a6f49213ae1.tar.gz | tar -C /home/pchome/lede/build_dir/target-arm_cortex-a7+neon-vfpv4_musl_eabi/trojan-1.14.0/.. -xf -
[ ! -d ./src/ ] || cp -fpR ./src/. /home/pchome/lede/build_dir/target-arm_cortex-a7+neon-vfpv4_musl_eabi/trojan-1.14.0

Applying ./patches/001-force-openssl-version.patch using plaintext:
patching file CMakeLists.txt
Hunk #1 FAILED at 43.
1 out of 1 hunk FAILED -- saving rejects to file CMakeLists.txt.rej
Patch failed! Please fix ./patches/001-force-openssl-version.patch!
Makefile:66: recipe for target '/home/pchome/lede/build_dir/target-arm_cortex-a7+neon-vfpv4_musl_eabi/trojan-1.14.0/.prepared_8ecfaea1d57cf94f2009d16b20960d53_6664517399ebbbc92a37c5bb081b5c53' failed
make[3]: *** [/home/pchome/lede/build_dir/target-arm_cortex-a7+neon-vfpv4_musl_eabi/trojan-1.14.0/.prepared_8ecfaea1d57cf94f2009d16b20960d53_6664517399ebbbc92a37c5bb081b5c53] Error 1
make[3]: Leaving directory '/home/pchome/lede/package/lean/trojan'
time: package/lean/trojan/compile#0.14#0.08#0.20
package/Makefile:107: recipe for target 'package/lean/trojan/compile' failed
make[2]: *** [package/lean/trojan/compile] Error 2
make[2]: Leaving directory '/home/pchome/lede'

@adminidor
Copy link

确实,编译出错

@stock169
Copy link
Author

自己改成 1.1.0 应该可以过

@lqhorochi
Copy link

确实有问题,大雕快修复好

@stock169
Copy link
Author

改 001-force-openssl-version.patch 文件成下面样子就好了

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ if(MSVC)
add_definitions(-DBOOST_DATE_TIME_NO_LIB)
endif()

-find_package(OpenSSL 1.1.0 REQUIRED)
+find_package(OpenSSL 1.1.1 REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR})
target_link_libraries(trojan ${OPENSSL_LIBRARIES})
if(OPENSSL_VERSION VERSION_GREATER_EQUAL 1.1.1)

@zcluo
Copy link

zcluo commented Dec 29, 2019 via email

@ihuaer
Copy link

ihuaer commented Dec 29, 2019

改 001-force-openssl-version.patch 文件成下面样子就好了

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ if(MSVC)
add_definitions(-DBOOST_DATE_TIME_NO_LIB)
endif()

-find_package(OpenSSL 1.1.0 REQUIRED)
+find_package(OpenSSL 1.1.1 REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR})
target_link_libraries(trojan ${OPENSSL_LIBRARIES})
if(OPENSSL_VERSION VERSION_GREATER_EQUAL 1.1.1)

感谢,马上编译试试效果

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

6 participants