diff options
| -rw-r--r-- | src/Makefile.in | 5 | ||||
| -rw-r--r-- | src/aclocal.m4 | 42 | ||||
| -rwxr-xr-x | src/configure | 25 | ||||
| -rw-r--r-- | src/configure.ac | 9 | ||||
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 4 |
5 files changed, 65 insertions, 20 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index d00daa61..c05c2ebf 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -12,6 +12,8 @@ ERLANG_CFLAGS= @ERLANG_CFLAGS@ EXPAT_LIBS = @EXPAT_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@ +ERLC_FLAGS += @ERLANG_SSL39@ + ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj # make debug=true to compile Erlang module with debug informations. ifdef debug @@ -46,7 +48,7 @@ ERLBEHAVS = cyrsasl.erl gen_mod.erl p1_fsm.erl SOURCES = $(ERLBEHAVS) $(wildcard *.erl) BEAMS = $(SOURCES:.erl=.beam) -DESTDIR = +DESTDIR = EJABBERDDIR = $(DESTDIR)@prefix@/var/lib/ejabberd BEAMDIR = $(EJABBERDDIR)/ebin @@ -144,4 +146,3 @@ Makefile: Makefile.in dialyzer: $(BEAMS) @dialyzer -c . - diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 0115f214..46020d33 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -8,7 +8,7 @@ AC_DEFUN(AM_WITH_EXPAT, EXPAT_CFLAGS="-I$with_expat/include" EXPAT_LIBS="-L$with_expat/lib" fi - + AC_CHECK_LIB(expat, XML_ParserCreate, [ EXPAT_LIBS="$EXPAT_LIBS -lexpat" expat_found=yes ], @@ -42,7 +42,7 @@ AC_DEFUN(AM_WITH_ZLIB, ZLIB_CFLAGS="-I$with_zlib/include" ZLIB_LIBS="-L$with_zlib/lib" fi - + AC_CHECK_LIB(z, gzgets, [ ZLIB_LIBS="$ZLIB_LIBS -lz" zlib_found=yes ], @@ -76,7 +76,7 @@ AC_DEFUN(AM_WITH_PAM, PAM_CFLAGS="-I$with_pam/include" PAM_LIBS="-L$with_pam/lib" fi - + AC_CHECK_LIB(pam, pam_start, [ PAM_LIBS="$PAM_LIBS -lpam" pam_found=yes ], @@ -106,26 +106,33 @@ AC_DEFUN(AM_WITH_ERLANG, AC_PATH_TOOL(ERLC, erlc, , $with_erlang:$with_erlang/bin:$PATH) AC_PATH_TOOL(ERL, erl, , $with_erlang:$with_erlang/bin:$PATH) - + if test "z$ERLC" = "z" || test "z$ERL" = "z"; then AC_MSG_ERROR([erlang not found]) fi - - + + cat >>conftest.erl <<_EOF - + -module(conftest). -author('alexey@sevcom.net'). -export([[start/0]]). +-include_lib("ssl/include/ssl_pkix.hrl"). start() -> EIDirS = code:lib_dir("erl_interface") ++ "\n", EILibS = libpath("erl_interface") ++ "\n", RootDirS = code:root_dir() ++ "\n", - file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)), + file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)), halt(). +-[ifdef]('id-pkix'). +ssldef() -> "-DSSL39\n". +-else. +ssldef() -> "\n". +-endif. + %% return physical architecture based on OS/Processor archname() -> ArchStr = erlang:system_info(system_architecture), @@ -154,33 +161,36 @@ libpath(App) -> %% ({error, enoent}): _Error -> code:lib_dir("erl_interface") ++ "/lib" end. - + _EOF - + if ! $ERLC conftest.erl; then AC_MSG_ERROR([could not compile sample program]) fi - + if ! $ERL -s conftest -noshell; then AC_MSG_ERROR([could not run sample program]) fi - + if ! test -f conftest.out; then AC_MSG_ERROR([erlang program was not properly executed, (conftest.out was not produced)]) fi - + # First line ERLANG_EI_DIR=`cat conftest.out | head -n 1` # Second line ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1` # Third line + ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1` + # End line ERLANG_DIR=`cat conftest.out | tail -n 1` - + ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include" ERLANG_LIBS="-L$ERLANG_EI_LIB -lerl_interface -lei" - + AC_SUBST(ERLANG_CFLAGS) AC_SUBST(ERLANG_LIBS) + AC_SUBST(ERLANG_SSL39) AC_SUBST(ERLC) AC_SUBST(ERL) ]) @@ -262,7 +272,7 @@ AC_DEFUN([AM_ICONV], CFLAGS="$am_save_CFLAGS") LIBS="$am_save_LIBS" fi - + ]) if test "$am_cv_func_iconv" = yes; then AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) diff --git a/src/configure b/src/configure index c6263ecf..39fe6b55 100755 --- a/src/configure +++ b/src/configure @@ -663,6 +663,7 @@ ERLC ERL ERLANG_CFLAGS ERLANG_LIBS +ERLANG_SSL39 LIBICONV CPP GREP @@ -2924,14 +2925,21 @@ echo "$as_me: error: erlang not found" >&2;} -author('alexey@sevcom.net'). -export([start/0]). +-include_lib("ssl/include/ssl_pkix.hrl"). start() -> EIDirS = code:lib_dir("erl_interface") ++ "\n", EILibS = libpath("erl_interface") ++ "\n", RootDirS = code:root_dir() ++ "\n", - file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)), + file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)), halt(). +-ifdef('id-pkix'). +ssldef() -> "-DSSL39\n". +-else. +ssldef() -> "\n". +-endif. + %% return physical architecture based on OS/Processor archname() -> ArchStr = erlang:system_info(system_architecture), @@ -2986,6 +2994,8 @@ echo "$as_me: error: erlang program was not properly executed, (conftest.out was # Second line ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1` # Third line + ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1` + # End line ERLANG_DIR=`cat conftest.out | tail -n 1` ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include" @@ -2996,6 +3006,7 @@ echo "$as_me: error: erlang program was not properly executed, (conftest.out was + #locating iconv @@ -6530,6 +6541,7 @@ ERLC!$ERLC$ac_delim ERL!$ERL$ac_delim ERLANG_CFLAGS!$ERLANG_CFLAGS$ac_delim ERLANG_LIBS!$ERLANG_LIBS$ac_delim +ERLANG_SSL39!$ERLANG_SSL39$ac_delim LIBICONV!$LIBICONV$ac_delim CPP!$CPP$ac_delim GREP!$GREP$ac_delim @@ -6571,7 +6583,7 @@ SSL_CFLAGS!$SSL_CFLAGS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -6898,3 +6910,12 @@ if test "$no_create" != yes; then $ac_cs_success || { (exit 1); exit 1; } fi + +if test -n "$ERLANG_SSL39" ; then + echo + echo "**************** WARNING ! ********************" + echo "ejabberd will be compiled with Erlang R12." + echo "This version of Erlang is not supported" + echo "and not recommended for production servers" + echo "***********************************************" +fi diff --git a/src/configure.ac b/src/configure.ac index a3e8894e..bc89e67e 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -120,3 +120,12 @@ fi AC_CHECK_HEADER(krb5.h,,) AC_OUTPUT + +if test -n "$ERLANG_SSL39" ; then + echo + echo "**************** WARNING ! ********************" + echo "ejabberd will be compiled with Erlang R12." + echo "This version of Erlang is not supported" + echo "and not recommended for production servers" + echo "***********************************************" +fi diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 8527ec2b..80c3d63d 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -48,8 +48,12 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). +-ifdef(SSL39). +-include_lib("ssl/include/ssl_pkix.hrl"). +-else. -include_lib("ssl/include/PKIX1Explicit88.hrl"). -include_lib("ssl/include/PKIX1Implicit88.hrl"). +-endif. -include("XmppAddr.hrl"). -define(DICT, dict). |