Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Christian Faulhammer (opfer)" <opfer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/ejabberd/files: ejabberd-1.1.4-erlang-12.patch digest-ejabberd-1.1.4-r1
Date: Fri, 11 Jan 2008 11:43:38
Message-Id: E1JDIIQ-0003jN-TX@stork.gentoo.org
1 opfer 08/01/11 11:43:34
2
3 Added: ejabberd-1.1.4-erlang-12.patch
4 digest-ejabberd-1.1.4-r1
5 Log:
6 make ejabberd compile with Erlang 12B, patch take from Debian, reported in bug 202114 by Conrad Kostecki <ConiKost AT gmx DOT de>, thanks to Anton Romanov <theli AT ukr DOT net>
7 (Portage version: 2.1.3.19)
8
9 Revision Changes Path
10 1.1 net-im/ejabberd/files/ejabberd-1.1.4-erlang-12.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberd-1.1.4-erlang-12.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberd-1.1.4-erlang-12.patch?rev=1.1&content-type=text/plain
14
15 Index: ejabberd-1.1.4-erlang-12.patch
16 ===================================================================
17 Patch by Sergei Golovan fixes building ejabberd with erlang R12B-0.
18
19 Index: ejabberd-1.1.4/src/ejabberd_s2s_in.erl
20 ===================================================================
21 --- ejabberd-1.1.4.orig/src/ejabberd_s2s_in.erl
22 +++ ejabberd-1.1.4/src/ejabberd_s2s_in.erl
23 @@ -30,8 +30,12 @@
24
25 -include("ejabberd.hrl").
26 -include("jlib.hrl").
27 +-ifdef(SSL39).
28 +-include_lib("ssl/include/ssl_pkix.hrl").
29 +-else.
30 -include_lib("ssl/include/PKIX1Explicit88.hrl").
31 -include_lib("ssl/include/PKIX1Implicit88.hrl").
32 +-endif.
33 -include("XmppAddr.hrl").
34
35 -define(DICT, dict).
36 --- ejabberd-1.1.4.orig/src/configure
37 +++ ejabberd-1.1.4/src/configure
38 @@ -648,6 +648,7 @@
39 ERLC
40 ERL
41 ERLANG_CFLAGS
42 +ERLANG_SSL39
43 ERLANG_LIBS
44 LIBICONV
45 CPP
46 @@ -2865,14 +2866,21 @@
47 -author('alexey@××××××.net').
48
49 -export([start/0]).
50 +-include_lib("ssl/include/ssl_pkix.hrl").
51
52 start() ->
53 EIDirS = code:lib_dir("erl_interface") ++ "\n",
54 EILibS = libpath("erl_interface") ++ "\n",
55 RootDirS = code:root_dir() ++ "\n",
56 - file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)),
57 + file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)),
58 halt().
59
60 +-ifdef('id-pkix').
61 +ssldef() -> "-DSSL39\n".
62 +-else.
63 +ssldef() -> "\n".
64 +-endif.
65 +
66 %% return physical architecture based on OS/Processor
67 archname() ->
68 ArchStr = erlang:system_info(system_architecture),
69 @@ -2927,6 +2935,8 @@
70 # Second line
71 ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1`
72 # Third line
73 + ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1`
74 + # End line
75 ERLANG_DIR=`cat conftest.out | tail -n 1`
76
77 ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include"
78 @@ -6205,6 +6215,7 @@
79 ERL!$ERL$ac_delim
80 ERLANG_CFLAGS!$ERLANG_CFLAGS$ac_delim
81 ERLANG_LIBS!$ERLANG_LIBS$ac_delim
82 +ERLANG_SSL39!$ERLANG_SSL39$ac_delim
83 LIBICONV!$LIBICONV$ac_delim
84 CPP!$CPP$ac_delim
85 GREP!$GREP$ac_delim
86 @@ -6238,7 +6248,7 @@
87 LTLIBOBJS!$LTLIBOBJS$ac_delim
88 _ACEOF
89
90 - if test `grep -c "$ac_delim\$" conf$$subs.sed` = 79; then
91 + if test `grep -c "$ac_delim\$" conf$$subs.sed` = 80; then
92 break
93 elif $ac_last_try; then
94 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
95 --- ejabberd-1.1.4.orig/src/Makefile.in
96 +++ ejabberd-1.1.4/src/Makefile.in
97 @@ -12,6 +12,8 @@
98 EXPAT_LIBS = @EXPAT_LIBS@
99 ERLANG_LIBS = @ERLANG_LIBS@
100
101 +ERLC_FLAGS += @ERLANG_SSL39@
102 +
103 # make debug=true to compile Erlang module with debug informations.
104 ifdef debug
105 ERLC_FLAGS+=+debug_info
106 --- ejabberd-1.1.4.orig/src/aclocal.m4
107 +++ ejabberd-1.1.4/src/aclocal.m4
108 @@ -79,14 +79,21 @@
109 -author('alexey@××××××.net').
110
111 -export([[start/0]]).
112 +-include_lib("ssl/include/ssl_pkix.hrl").
113
114 start() ->
115 EIDirS = code:lib_dir("erl_interface") ++ "\n",
116 EILibS = libpath("erl_interface") ++ "\n",
117 RootDirS = code:root_dir() ++ "\n",
118 - file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)),
119 + file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)),
120 halt().
121
122 +-ifdef('id-pkix').
123 +ssldef() -> "-DSSL39\n".
124 +-else.
125 +ssldef() "\n".
126 +-endif.
127 +
128 %% return physical architecture based on OS/Processor
129 archname() ->
130 ArchStr = erlang:system_info(system_architecture),
131 @@ -135,6 +142,8 @@
132 # Second line
133 ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1`
134 # Third line
135 + ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1`
136 + # End line
137 ERLANG_DIR=`cat conftest.out | tail -n 1`
138
139 ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include"
140 @@ -142,6 +151,7 @@
141
142 AC_SUBST(ERLANG_CFLAGS)
143 AC_SUBST(ERLANG_LIBS)
144 + AC_SUBST(ERLANG_SSL39)
145 AC_SUBST(ERLC)
146 AC_SUBST(ERL)
147 ])
148
149
150
151 1.1 net-im/ejabberd/files/digest-ejabberd-1.1.4-r1
152
153 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/digest-ejabberd-1.1.4-r1?rev=1.1&view=markup
154 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/digest-ejabberd-1.1.4-r1?rev=1.1&content-type=text/plain
155
156 Index: digest-ejabberd-1.1.4-r1
157 ===================================================================
158 MD5 65e9cd346f11a28afbacfe1d7be3a33b ejabberd-1.1.4.tar.gz 846059
159 RMD160 4c72548129b0196ff0096bd85936e0750fc4d7be ejabberd-1.1.4.tar.gz 846059
160 SHA256 dcd61b72c522eee77ab56227b16d75fd5741efe2b9b9a8a1d3ed7eefc2a7e4f6 ejabberd-1.1.4.tar.gz 846059
161
162
163
164 --
165 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups