Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-26 22:50:48 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Clear SSL (C|LD)FLAGS if not willing to use SSL at all ##build

Browse Source 
* Fixes crash in r2frida
This commit is contained in:
pancake 2023-02-16 19:45:20 +01:00
parent 21f0bb8e47
commit 1b49733909
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh
# This script was automatically generated by ACR v2.0.0
# This script was automatically generated by ACR v2.0.1
# @author: pancake <nopcode.org>
# @url: http://www.nopcode.org
# @repo: git clone https://github.com/radare/acr
@ -184,7 +184,8 @@ System types:
--target=TARGET configure for building compilers for TARGET [HOST]
EOF2
printf "\nOptional Features:
printf "
Optional Features:
--disable-debugger disable native debugger features
--with-sysmagic force to use system's magic
--disable-threads disable use of thread apis
@ -212,16 +213,20 @@ printf "\nOptional Features:
--with-ostype Choose OS ( android windows wsl mingw32 bsd solaris gnulinux darwin haiku ) (USEROSTYPE=auto)
--with-libversion specify different libversion (LIBVERSION=xxx)
--without-jemalloc build without jemalloc
--with-checks-level value between 0 and 3 to enable different level of assert (see R_CHECKS_LEVEL) (R_CHECKS_LEVEL=2)\n"
printf "\nSome influential environment variables:
--with-checks-level value between 0 and 3 to enable different level of assert (see R_CHECKS_LEVEL) (R_CHECKS_LEVEL=2)
"
printf "
Some influential environment variables:
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir>
CPP C preprocessor\n"
printf "\nReport bugs to: pancake <pancake@nopcode.org>"
CPP C preprocessor
"
printf "
Report bugs to: pancake <pancake@nopcode.org>"
echo ""
exit 0
}
@ -248,7 +253,7 @@ if [ "$QUIET" = 1 ]; then
echo "5.8.3"
exit 0
fi
echo "radare2-5.8.3 configuration script done with acr v2.0.0.
echo "radare2-5.8.3 configuration script done with acr v2.0.1.
The 'Free Software Foundation' message is only for autodetection.
Originally written by pancake <nopcode.org>."
exit 0
@ -760,7 +765,9 @@ if [ 11 = "$WANT_SSL$HAVE_OPENSSL" ]; then
HAVE_OPENSSL="1"
else
HAVE_OPENSSL="0"; fi
HAVE_OPENSSL="0"
SSL_CFLAGS=""
SSL_LDFLAGS=""; fi
if [ "$SSL_LDFLAGS" = "" ]; then
if [ "$HAVE_LIB_SSL" = "0" ]; then
HAVE_OPENSSL="0"

2
configure.acr
View File

@ -136,6 +136,8 @@ IFAND WANT_SSL HAVE_OPENSSL {
HAVE_OPENSSL = 1 ;
}{
HAVE_OPENSSL = 0 ;
SSL_CFLAGS = "" ;
SSL_LDFLAGS = "" ;
}
IFNULL SSL_LDFLAGS {
IFNOT HAVE_LIB_SSL {

2
doc/fortunes.fun
View File

@ -317,3 +317,5 @@ burn it before the bug spreads to other installations
The signals are strong tonight
It's dangerous to go alone, take this.
"If you gotta burn it all to the ground; Then let it burn"
Watch until the end!
Don't forget to subscribe!

2
libr/core/libs.c
View File

@ -150,7 +150,7 @@ R_API bool r_core_loadlibs(RCore *core, int where, const char *path) {
char *file;
r_list_foreach (files, iter, file) {
if (__isScriptFilename (file)) {
r_core_cmdf (core, "\". %s/%s\"", homeplugindir, file);
r_core_cmdf (core, "\"\". %s/%s", homeplugindir, file);
}
}
r_list_free (files);

3
libr/util/lib.c
View File

@ -334,6 +334,9 @@ R_API int r_lib_open_ptr(RLib *lib, const char *file, void *handler, RLibStruct
}
}
RLibPlugin *p = R_NEW0 (RLibPlugin);
if (R_UNLIKELY (!p)) {
return -1;
}
p->type = stru->type;
p->data = stru->data;
p->file = strdup (file);