rpms/ejabberd/EL-5 ejabberd_s2s_in_erl.diff, NONE, 1.1 ejabberd.spec, 1.15, 1.16

[Peter Lemenkov (peter)]

Author: peter

Update of /cvs/extras/rpms/ejabberd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18186/EL-5

Modified Files:
	ejabberd.spec 
Added Files:
	ejabberd_s2s_in_erl.diff 
Log Message:
Fix build with R11-2

ejabberd_s2s_in_erl.diff:

--- NEW FILE ejabberd_s2s_in_erl.diff ---
--- src/ejabberd_s2s_in.erl.r11_ssl	2008-05-05 17:49:50.000000000 +0400
+++ src/ejabberd_s2s_in.erl	2008-05-05 17:51:42.000000000 +0400
@@ -51,7 +51,8 @@
 -ifdef(SSL39).
 -include_lib("ssl/include/ssl_pkix.hrl").
 -else.
--include_lib("ssl/include/OTP-PKIX.hrl").
+-include_lib("ssl/include/PKIX1Explicit88.hrl").
+-include_lib("ssl/include/PKIX1Implicit88.hrl").
 -endif.
 -include("XmppAddr.hrl").
 


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/EL-5/ejabberd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ejabberd.spec	23 Feb 2008 08:59:01 -0000	1.15
+++ ejabberd.spec	5 May 2008 13:59:45 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -32,10 +32,14 @@
 # R12B
 Patch2: ejabberd-ssl.patch
 
+# R11B SSL
+Patch3: ejabberd_s2s_in_erl.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
 BuildRequires:  openssl-devel
+BuildRequires:  pam-devel
 BuildRequires:  erlang
 %if %{undefined rhel}
 BuildRequires:  hevea
@@ -90,6 +94,7 @@
 %patch0 -p1 -b .Er12b-build 
 %patch1 -p1 -b .MC-build
 #%patch2 -p1 -b .R12B
+%patch3 -p0 -b .r11_ssl
 
 %{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
 %{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
@@ -191,6 +196,9 @@
 %endif
 
 %changelog
+* Mon May  5 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.0-3
+- Fix build against R11B-2
+
 * Sat Feb 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.0-2
 - Disable docs again for EPEL (we haven't hevea for EPEL)