patch ejabberd to work with new erlang. from erlang maintainer

Jon Olsson, thanks to viq at viq.ath.cx for testing.

ok jasper
This commit is contained in:
sthen 2007-12-19 22:55:30 +00:00
parent ac50ce691f
commit 049d095cb0
2 changed files with 19 additions and 4 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2007/10/28 21:37:34 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2007/12/19 22:55:30 sthen Exp $
COMMENT= jabber server written in Erlang
V= 1.1.4
DISTNAME= ejabberd-$V
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= net chat
@ -20,8 +20,8 @@ WANTLIB= expat crypto ssl z
MASTER_SITES= http://www.process-one.net/downloads/ejabberd/$V/
MODULES= converters/libiconv
BUILD_DEPENDS= :erlang-*:lang/erlang
RUN_DEPENDS= :erlang-*:lang/erlang
BUILD_DEPENDS= :erlang->=12b.0:lang/erlang
RUN_DEPENDS= ${BUILD_DEPENDS}
MAKE_FLAGS+= EJABBERDDIR=${PREFIX}/lib/ejabberd \
LOGDIR=${EJLOGDIR} \

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_ejabberd_s2s_in_erl,v 1.1 2007/12/19 22:55:30 sthen Exp $
--- src/ejabberd_s2s_in.erl.orig Thu Dec 6 12:21:26 2007
+++ src/ejabberd_s2s_in.erl Thu Dec 6 12:22:44 2007
@@ -30,8 +30,9 @@
-include("ejabberd.hrl").
-include("jlib.hrl").
--include_lib("ssl/include/PKIX1Explicit88.hrl").
--include_lib("ssl/include/PKIX1Implicit88.hrl").
+-include_lib("ssl/pkix/PKIX1Explicit88.hrl").
+-include_lib("ssl/pkix/PKIX1Implicit88.hrl").
+-include_lib("ssl/pkix/OTP-PKIX.hrl").
-include("XmppAddr.hrl").
-define(DICT, dict).