- update ejabberd to 2.1.6
from viq (MAINTAINER)
This commit is contained in:
jasper
parent
46061ee929
commit
d6e0954d70
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.23 2010/11/19 22:31:33 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.24 2010/12/23 22:54:39 jasper Exp $
|
||||
|
||||
COMMENT= jabber server written in Erlang
|
||||
|
||||
V= 2.1.5
|
||||
V= 2.1.6
|
||||
DISTNAME= ejabberd-$V
|
||||
REVISION= 4
|
||||
|
||||
CATEGORIES= net
|
||||
|
||||
@ -49,7 +48,8 @@ CONFIGURE_ARGS+= --disable-pam \
|
||||
--enable-ejabberd_zlib \
|
||||
--disable-roster-gateway-workaround \
|
||||
--disable-mssql
|
||||
CONFIGURE_ENV= HOME=${WRKDIST}
|
||||
CONFIGURE_ENV= HOME=${WRKDIST} \
|
||||
ac_cv_header_openssl_md2_h=no
|
||||
|
||||
JABBERDUSER= _ejabberd
|
||||
JABBERDGROUP= _ejabberd
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (ejabberd-2.1.5.tar.gz) = ICnOykVYTXBMqCGncdbZKA==
|
||||
RMD160 (ejabberd-2.1.5.tar.gz) = er1rxKA/aNA+E+6MH/Ol/uYJjcY=
|
||||
SHA1 (ejabberd-2.1.5.tar.gz) = iWbWdSIZyThvSKW44fL4+w50d64=
|
||||
SHA256 (ejabberd-2.1.5.tar.gz) = MaRiKMaTPXwkQ1dTMApNKuLoRWimCXF13F1OVTKZ3Z0=
|
||||
SIZE (ejabberd-2.1.5.tar.gz) = 2278008
|
||||
MD5 (ejabberd-2.1.6.tar.gz) = 9aQe3uIgTEFBUAdTMc7VBg==
|
||||
RMD160 (ejabberd-2.1.6.tar.gz) = m27UmG/80eqQ0jdw5UywArxSMEw=
|
||||
SHA1 (ejabberd-2.1.6.tar.gz) = oa+/wnD45MlFvZH2S3BzeBWQU1s=
|
||||
SHA256 (ejabberd-2.1.6.tar.gz) = tUiGsRmgrp8ZyN2RoY6F5Rj72XnUeBK+5YLocs+8NUQ=
|
||||
SIZE (ejabberd-2.1.6.tar.gz) = 2874967
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-src_ejabberd_cfg_example,v 1.3 2010/04/11 10:07:10 sthen Exp $
|
||||
$OpenBSD: patch-src_ejabberd_cfg_example,v 1.4 2010/12/23 22:54:39 jasper Exp $
|
||||
--- src/ejabberd.cfg.example.orig Fri Mar 12 11:40:41 2010
|
||||
+++ src/ejabberd.cfg.example Sat Mar 13 12:41:08 2010
|
||||
@@ -115,7 +115,7 @@
|
||||
@ -30,11 +30,11 @@ $OpenBSD: patch-src_ejabberd_cfg_example,v 1.3 2010/04/11 10:07:10 sthen Exp $
|
||||
{5269, ejabberd_s2s_in, [
|
||||
{shaper, s2s_shaper},
|
||||
@@ -172,18 +172,18 @@
|
||||
%% Allowed values are: true or false.
|
||||
%% Allowed values are: false optional required required_trusted
|
||||
%% You must specify a certificate file.
|
||||
%%
|
||||
-%%{s2s_use_starttls, true}.
|
||||
+{s2s_use_starttls, true}.
|
||||
-%%{s2s_use_starttls, optional}.
|
||||
+{s2s_use_starttls, optional}.
|
||||
|
||||
%%
|
||||
%% s2s_certfile: Specify a certificate file.
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-src_mod_caps_erl,v 1.1 2010/10/07 17:00:18 jasper Exp $
|
||||
|
||||
Disable MD2 as this is disabled in OpenSSL now.
|
||||
Patch via from Gentoo via https://support.process-one.net/browse/EJAB-1285
|
||||
|
||||
--- src/mod_caps.erl.orig Wed Oct 6 13:17:02 2010
|
||||
+++ src/mod_caps.erl Wed Oct 6 13:17:25 2010
|
||||
@@ -277,8 +277,6 @@ feature_response(#iq{type = result,
|
||||
Host, From, Caps, [SubNode | SubNodes]) ->
|
||||
BinaryNode = node_to_binary(Caps#caps.node, SubNode),
|
||||
IsValid = case Caps#caps.hash of
|
||||
- "md2" ->
|
||||
- Caps#caps.version == make_disco_hash(Els, md2);
|
||||
"md5" ->
|
||||
Caps#caps.version == make_disco_hash(Els, md5);
|
||||
"sha-1" ->
|
||||
@@ -354,9 +352,7 @@ make_disco_hash(DiscoEls, Algo) ->
|
||||
concat_features(DiscoEls),
|
||||
concat_info(DiscoEls)],
|
||||
base64:encode_to_string(
|
||||
- if Algo == md2 ->
|
||||
- sha:md2(Concat);
|
||||
- Algo == md5 ->
|
||||
+ if Algo == md5 ->
|
||||
crypto:md5(Concat);
|
||||
Algo == sha1 ->
|
||||
crypto:sha(Concat);
|
||||
@ -1,26 +0,0 @@
|
||||
$OpenBSD: patch-src_sha_erl,v 1.1 2010/10/07 17:00:18 jasper Exp $
|
||||
|
||||
Disable MD2 as this is disabled in OpenSSL now.
|
||||
Patch via from Gentoo via https://support.process-one.net/browse/EJAB-1285
|
||||
|
||||
--- src/sha.erl.orig Wed Oct 6 13:17:33 2010
|
||||
+++ src/sha.erl Wed Oct 6 13:17:52 2010
|
||||
@@ -28,7 +28,7 @@
|
||||
-author('alexey@process-one.net').
|
||||
|
||||
-export([start/0, sha/1, sha1/1, sha224/1, sha256/1, sha384/1,
|
||||
- sha512/1, md2/1]).
|
||||
+ sha512/1]).
|
||||
|
||||
-include("ejabberd.hrl").
|
||||
|
||||
@@ -79,9 +79,6 @@ sha384(Text) ->
|
||||
|
||||
sha512(Text) ->
|
||||
erlang:port_control(?DRIVER, 512, Text).
|
||||
-
|
||||
-md2(Text) ->
|
||||
- erlang:port_control(?DRIVER, 2, Text).
|
||||
|
||||
driver_path() ->
|
||||
Suffix = case os:type() of
|
||||
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-src_tls_sha_drv_c,v 1.1 2010/10/07 17:00:18 jasper Exp $
|
||||
|
||||
Disable MD2 as this is disabled in OpenSSL now.
|
||||
Patch via from Gentoo via https://support.process-one.net/browse/EJAB-1285
|
||||
|
||||
--- src/tls/sha_drv.c.orig Wed Oct 6 13:18:03 2010
|
||||
+++ src/tls/sha_drv.c Wed Oct 6 13:18:16 2010
|
||||
@@ -20,7 +20,6 @@
|
||||
|
||||
#include <erl_driver.h>
|
||||
#include <openssl/sha.h>
|
||||
-#include <openssl/md2.h>
|
||||
|
||||
static ErlDrvData sha_drv_start(ErlDrvPort port, char *buf)
|
||||
{
|
||||
@@ -36,11 +35,6 @@ static int sha_drv_control(ErlDrvData handle,
|
||||
ErlDrvBinary *b = NULL;
|
||||
|
||||
switch (command) {
|
||||
- case 2:
|
||||
- rlen = MD2_DIGEST_LENGTH;
|
||||
- b = driver_alloc_binary(rlen);
|
||||
- if (b) MD2((unsigned char*)buf, len, (unsigned char*)b->orig_bytes);
|
||||
- break;
|
||||
case 224:
|
||||
rlen = SHA224_DIGEST_LENGTH;
|
||||
b = driver_alloc_binary(rlen);
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2010/10/28 21:47:23 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.9 2010/12/23 22:54:39 jasper Exp $
|
||||
@newgroup _ejabberd:594
|
||||
@newuser _ejabberd:594:_ejabberd:daemon:ejabberd account:/var/db/ejabberd:/bin/sh
|
||||
%%SHARED%%
|
||||
@ -8,6 +8,8 @@ lib/ejabberd/ebin/ELDAPv3.beam
|
||||
lib/ejabberd/ebin/XmppAddr.beam
|
||||
lib/ejabberd/ebin/acl.beam
|
||||
lib/ejabberd/ebin/adhoc.beam
|
||||
lib/ejabberd/ebin/cache_tab.beam
|
||||
lib/ejabberd/ebin/cache_tab_sup.beam
|
||||
lib/ejabberd/ebin/cyrsasl.beam
|
||||
lib/ejabberd/ebin/cyrsasl_anonymous.beam
|
||||
lib/ejabberd/ebin/cyrsasl_digest.beam
|
||||
@ -108,10 +110,12 @@ lib/ejabberd/ebin/mod_proxy65_stream.beam
|
||||
lib/ejabberd/ebin/mod_pubsub.beam
|
||||
lib/ejabberd/ebin/mod_pubsub_odbc.beam
|
||||
lib/ejabberd/ebin/mod_register.beam
|
||||
lib/ejabberd/ebin/mod_register_web.beam
|
||||
lib/ejabberd/ebin/mod_roster.beam
|
||||
lib/ejabberd/ebin/mod_roster_odbc.beam
|
||||
lib/ejabberd/ebin/mod_service_log.beam
|
||||
lib/ejabberd/ebin/mod_shared_roster.beam
|
||||
lib/ejabberd/ebin/mod_shared_roster_ldap.beam
|
||||
lib/ejabberd/ebin/mod_sic.beam
|
||||
lib/ejabberd/ebin/mod_stats.beam
|
||||
lib/ejabberd/ebin/mod_time.beam
|
||||
@ -140,6 +144,7 @@ lib/ejabberd/ebin/nodetree_virtual.beam
|
||||
lib/ejabberd/ebin/odbc_queries.beam
|
||||
lib/ejabberd/ebin/p1_fsm.beam
|
||||
lib/ejabberd/ebin/p1_mnesia.beam
|
||||
lib/ejabberd/ebin/pg2_backport.beam
|
||||
lib/ejabberd/ebin/pubsub_db_odbc.beam
|
||||
lib/ejabberd/ebin/pubsub_index.beam
|
||||
lib/ejabberd/ebin/pubsub_subscription.beam
|
||||
@ -219,6 +224,10 @@ share/doc/ejabberd/features.html
|
||||
share/doc/ejabberd/guide.html
|
||||
share/doc/ejabberd/guide.pdf
|
||||
share/doc/ejabberd/logo.png
|
||||
share/doc/ejabberd/msrl-dit-deep.png
|
||||
share/doc/ejabberd/msrl-dit-flat.png
|
||||
share/doc/ejabberd/msrl-roster-deep.png
|
||||
share/doc/ejabberd/msrl-roster-flat.png
|
||||
share/doc/ejabberd/webadmmain.png
|
||||
share/doc/ejabberd/webadmmainru.png
|
||||
share/doc/ejabberd/yozhikheader.png
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user