drop debian/patches/openssl-autoconf.diff (merged upstream)
Michael Stapelberg
6 years ago
| 0 | Origin: upstream, https://github.com/FreeRADIUS/freeradius-server/commit/9b6e2ed690577f7c258c36bec6cdd4ebaf1f43ac | |
| 1 | Forwarded: not-needed | |
| 2 | Last-Update: 2016-09-17 | |
| 3 | ||
| 4 | --- | |
| 5 | ||
| 6 | Index: freeradius-new/configure.ac | |
| 7 | =================================================================== | |
| 8 | --- freeradius-new.orig/configure.ac | |
| 9 | +++ freeradius-new/configure.ac | |
| 10 | @@ -1174,6 +1174,7 @@ if test "x$WITH_OPENSSL" = xyes; then | |
| 11 | AC_MSG_RESULT([cross-compiling (assuming yes)]) | |
| 12 | ] | |
| 13 | ) | |
| 14 | + AC_CHECK_FUNCS(SSL_get_client_random SSL_get_server_random) | |
| 15 | CPPFLAGS="$old_CPPFLAGS" | |
| 16 | fi | |
| 17 | ||
| 18 | @@ -1182,7 +1183,6 @@ if test "x$WITH_OPENSSL" = xyes; then | |
| 19 | AC_SUBST(OPENSSL_LDFLAGS) | |
| 20 | AC_SUBST(OPENSSL_CPPFLAGS) | |
| 21 | export OPENSSL_LIBS OPENSSL_LDFLAGS OPENSSL_CPPFLAGS | |
| 22 | - AC_CHECK_FUNCS(SSL_get_client_random,SSL_get_server_random) | |
| 23 | fi | |
| 24 | ||
| 25 | dnl # | |
| 26 | Index: freeradius-new/configure | |
| 27 | =================================================================== | |
| 28 | --- freeradius-new.orig/configure | |
| 29 | +++ freeradius-new/configure | |
| 30 | @@ -8779,6 +8779,18 @@ rm -f core *.core core.conftest.* gmon.o | |
| 31 | conftest.$ac_objext conftest.beam conftest.$ac_ext | |
| 32 | fi | |
| 33 | ||
| 34 | + for ac_func in SSL_get_client_random SSL_get_server_random | |
| 35 | +do : | |
| 36 | + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | |
| 37 | +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | |
| 38 | +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | |
| 39 | + cat >>confdefs.h <<_ACEOF | |
| 40 | +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | |
| 41 | +_ACEOF | |
| 42 | + | |
| 43 | +fi | |
| 44 | +done | |
| 45 | + | |
| 46 | CPPFLAGS="$old_CPPFLAGS" | |
| 47 | fi | |
| 48 | ||
| 49 | @@ -8787,17 +8799,6 @@ fi | |
| 50 | ||
| 51 | ||
| 52 | export OPENSSL_LIBS OPENSSL_LDFLAGS OPENSSL_CPPFLAGS | |
| 53 | - for ac_func in SSL_get_client_random | |
| 54 | -do : | |
| 55 | - ac_fn_c_check_func "$LINENO" "SSL_get_client_random" "ac_cv_func_SSL_get_client_random" | |
| 56 | -if test "x$ac_cv_func_SSL_get_client_random" = xyes; then : | |
| 57 | - cat >>confdefs.h <<_ACEOF | |
| 58 | -#define HAVE_SSL_GET_CLIENT_RANDOM 1 | |
| 59 | -_ACEOF | |
| 60 | - SSL_get_server_random | |
| 61 | -fi | |
| 62 | -done | |
| 63 | - | |
| 64 | fi | |
| 65 | ||
| 66 | if test "x$PCAP_LIBS" = x; then |