| 1 |
diff -urN ejabberd-1.1.4.orig/src/aclocal.m4 ejabberd-1.1.4/src/aclocal.m4 |
| 2 |
--- ejabberd-1.1.4.orig/src/aclocal.m4 2006-04-23 17:35:14.000000000 +0200 |
| 3 |
+++ ejabberd-1.1.4/src/aclocal.m4 2008-01-23 10:15:01.000000000 +0100 |
| 4 |
@@ -79,14 +79,21 @@ |
| 5 |
-author('alexey@sevcom.net'). |
| 6 |
|
| 7 |
-export([[start/0]]). |
| 8 |
+-include_lib("ssl/include/ssl_pkix.hrl"). |
| 9 |
|
| 10 |
start() -> |
| 11 |
EIDirS = code:lib_dir("erl_interface") ++ "\n", |
| 12 |
EILibS = libpath("erl_interface") ++ "\n", |
| 13 |
RootDirS = code:root_dir() ++ "\n", |
| 14 |
- file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)), |
| 15 |
+ file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)), |
| 16 |
halt(). |
| 17 |
|
| 18 |
+-ifdef('id-pkix'). |
| 19 |
+ssldef() -> "-DSSL39\n". |
| 20 |
+-else. |
| 21 |
+ssldef() "\n". |
| 22 |
+-endif. |
| 23 |
+ |
| 24 |
%% return physical architecture based on OS/Processor |
| 25 |
archname() -> |
| 26 |
ArchStr = erlang:system_info(system_architecture), |
| 27 |
@@ -135,6 +142,8 @@ |
| 28 |
# Second line |
| 29 |
ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1` |
| 30 |
# Third line |
| 31 |
+ ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1` |
| 32 |
+ # End line |
| 33 |
ERLANG_DIR=`cat conftest.out | tail -n 1` |
| 34 |
|
| 35 |
ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include" |
| 36 |
@@ -142,6 +151,7 @@ |
| 37 |
|
| 38 |
AC_SUBST(ERLANG_CFLAGS) |
| 39 |
AC_SUBST(ERLANG_LIBS) |
| 40 |
+ AC_SUBST(ERLANG_SSL39) |
| 41 |
AC_SUBST(ERLC) |
| 42 |
AC_SUBST(ERL) |
| 43 |
]) |
| 44 |
diff -urN ejabberd-1.1.4.orig/src/configure ejabberd-1.1.4/src/configure |
| 45 |
--- ejabberd-1.1.4.orig/src/configure 2006-09-03 17:15:46.000000000 +0200 |
| 46 |
+++ ejabberd-1.1.4/src/configure 2008-01-23 10:15:01.000000000 +0100 |
| 47 |
@@ -648,6 +648,7 @@ |
| 48 |
ERLC |
| 49 |
ERL |
| 50 |
ERLANG_CFLAGS |
| 51 |
+ERLANG_SSL39 |
| 52 |
ERLANG_LIBS |
| 53 |
LIBICONV |
| 54 |
CPP |
| 55 |
@@ -2865,14 +2866,21 @@ |
| 56 |
-author('alexey@sevcom.net'). |
| 57 |
|
| 58 |
-export([start/0]). |
| 59 |
+-include_lib("ssl/include/ssl_pkix.hrl"). |
| 60 |
|
| 61 |
start() -> |
| 62 |
EIDirS = code:lib_dir("erl_interface") ++ "\n", |
| 63 |
EILibS = libpath("erl_interface") ++ "\n", |
| 64 |
RootDirS = code:root_dir() ++ "\n", |
| 65 |
- file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)), |
| 66 |
+ file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)), |
| 67 |
halt(). |
| 68 |
|
| 69 |
+-ifdef('id-pkix'). |
| 70 |
+ssldef() -> "-DSSL39\n". |
| 71 |
+-else. |
| 72 |
+ssldef() -> "\n". |
| 73 |
+-endif. |
| 74 |
+ |
| 75 |
%% return physical architecture based on OS/Processor |
| 76 |
archname() -> |
| 77 |
ArchStr = erlang:system_info(system_architecture), |
| 78 |
@@ -2927,6 +2935,8 @@ |
| 79 |
# Second line |
| 80 |
ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1` |
| 81 |
# Third line |
| 82 |
+ ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1` |
| 83 |
+ # End line |
| 84 |
ERLANG_DIR=`cat conftest.out | tail -n 1` |
| 85 |
|
| 86 |
ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include" |
| 87 |
@@ -6205,6 +6215,7 @@ |
| 88 |
ERL!$ERL$ac_delim |
| 89 |
ERLANG_CFLAGS!$ERLANG_CFLAGS$ac_delim |
| 90 |
ERLANG_LIBS!$ERLANG_LIBS$ac_delim |
| 91 |
+ERLANG_SSL39!$ERLANG_SSL39$ac_delim |
| 92 |
LIBICONV!$LIBICONV$ac_delim |
| 93 |
CPP!$CPP$ac_delim |
| 94 |
GREP!$GREP$ac_delim |
| 95 |
@@ -6237,7 +6248,7 @@ |
| 96 |
LTLIBOBJS!$LTLIBOBJS$ac_delim |
| 97 |
_ACEOF |
| 98 |
|
| 99 |
- if test `grep -c "$ac_delim\$" conf$$subs.sed` = 79; then |
| 100 |
+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 80; then |
| 101 |
break |
| 102 |
elif $ac_last_try; then |
| 103 |
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
| 104 |
diff -urN ejabberd-1.1.4.orig/src/ejabberd_s2s_in.erl ejabberd-1.1.4/src/ejabberd_s2s_in.erl |
| 105 |
--- ejabberd-1.1.4.orig/src/ejabberd_s2s_in.erl 2006-06-19 04:32:57.000000000 +0200 |
| 106 |
+++ ejabberd-1.1.4/src/ejabberd_s2s_in.erl 2008-01-23 10:16:25.000000000 +0100 |
| 107 |
@@ -30,8 +30,12 @@ |
| 108 |
|
| 109 |
-include("ejabberd.hrl"). |
| 110 |
-include("jlib.hrl"). |
| 111 |
+-ifdef(SSL39). |
| 112 |
+-include_lib("ssl/include/ssl_pkix.hrl"). |
| 113 |
+-else. |
| 114 |
-include_lib("ssl/include/PKIX1Explicit88.hrl"). |
| 115 |
-include_lib("ssl/include/PKIX1Implicit88.hrl"). |
| 116 |
+-endif. |
| 117 |
-include("XmppAddr.hrl"). |
| 118 |
|
| 119 |
-define(DICT, dict). |
| 120 |
diff -urN ejabberd-1.1.4.orig/src/Makefile.in ejabberd-1.1.4/src/Makefile.in |
| 121 |
--- ejabberd-1.1.4.orig/src/Makefile.in 2008-01-23 10:11:01.000000000 +0100 |
| 122 |
+++ ejabberd-1.1.4/src/Makefile.in 2008-01-23 10:15:01.000000000 +0100 |
| 123 |
@@ -12,6 +12,8 @@ |
| 124 |
EXPAT_LIBS = @EXPAT_LIBS@ |
| 125 |
ERLANG_LIBS = @ERLANG_LIBS@ |
| 126 |
|
| 127 |
+ERLC_FLAGS += @ERLANG_SSL39@ |
| 128 |
+ |
| 129 |
# make debug=true to compile Erlang module with debug informations. |
| 130 |
ifdef debug |
| 131 |
ERLC_FLAGS+=+debug_info |
Parent Directory
| 
Revision Log
| 
Revision Graph
