[71920] trunk/dports/net/ejabberd

[ryandesign at macports.org]

Revision: 71920
          http://trac.macports.org/changeset/71920
Author:   ryandesign at macports.org
Date:     2010-09-27 05:11:42 -0700 (Mon, 27 Sep 2010)
Log Message:
-----------
ejabberd: update to 2.1.5; disable md2 support which is gone in openssl 1.0.0a; see #25539 and #26641

Modified Paths:
--------------
    trunk/dports/net/ejabberd/Portfile

Added Paths:
-----------
    trunk/dports/net/ejabberd/files/
    trunk/dports/net/ejabberd/files/ejabberd-md2.patch

Modified: trunk/dports/net/ejabberd/Portfile
===================================================================
--- trunk/dports/net/ejabberd/Portfile	2010-09-27 06:38:04 UTC (rev 71919)
+++ trunk/dports/net/ejabberd/Portfile	2010-09-27 12:11:42 UTC (rev 71920)
@@ -3,8 +3,7 @@
 PortSystem          1.0
 
 name                ejabberd
-version             2.1.3
-revision        1
+version             2.1.5
 categories          net
 platforms           darwin
 maintainers         nomaintainer
@@ -14,9 +13,9 @@
 homepage            http://www.process-one.net/en/ejabberd/
 master_sites        http://www.process-one.net/downloads/ejabberd/${version}/
 
-checksums           md5     e5c87eda5312a6e8a53df0f9b4844b69 \
-                    sha1    77fdf18c0bb3b25cf9045e0c833ba4d82f180469 \
-                    rmd160  c57672928e30f71ec66636dd5e76adb802f17b03
+checksums           md5     2029ceca45584d704ca821a771d6d928 \
+                    sha1    8966d6752219c9386f48a5b8e1f2f8fb0e7477ae \
+                    rmd160  7abd6bc4a03f68d03e13ee8c1ff3a5fee6098dc6
 
 worksrcdir          ${worksrcdir}/src
 
@@ -29,6 +28,8 @@
 # erlang is not universal
 universal_variant   no
 
+patchfiles          ejabberd-md2.patch
+
 configure.args      --with-expat=${prefix} \
                     --with-zlib=${prefix} \
                     --with-openssl=${prefix}

Added: trunk/dports/net/ejabberd/files/ejabberd-md2.patch
===================================================================
--- trunk/dports/net/ejabberd/files/ejabberd-md2.patch	                        (rev 0)
+++ trunk/dports/net/ejabberd/files/ejabberd-md2.patch	2010-09-27 12:11:42 UTC (rev 71920)
@@ -0,0 +1,65 @@
+--- mod_caps.erl.orig	2010-09-26 12:34:01.000000000 -0700
++++ mod_caps.erl	2010-09-26 12:34:52.000000000 -0700
+@@ -277,8 +277,6 @@
+ 		 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 @@
+ 	      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);
+--- sha.erl.orig	2010-09-26 12:33:23.000000000 -0700
++++ sha.erl	2010-09-26 12:33:48.000000000 -0700
+@@ -28,7 +28,7 @@
+ -author('alexey at 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").
+ 
+@@ -80,9 +80,6 @@
+ sha512(Text) ->
+     erlang:port_control(?DRIVER, 512, Text).
+ 
+-md2(Text) ->
+-    erlang:port_control(?DRIVER, 2, Text).
+-
+ driver_path() ->
+     Suffix = case os:type() of
+ 		 {win32, _} -> ".dll";
+--- tls/sha_drv.c.orig	2010-09-26 12:32:33.000000000 -0700
++++ tls/sha_drv.c	2010-09-26 12:33:15.000000000 -0700
+@@ -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 @@
+   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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100927/8f75d713/attachment.html>