Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88b15cee535ddd0b57475db430019380aadf3cfc
commit 88b15cee535ddd0b57475db430019380aadf3cfc Author: Miklos Vajna <vmik...@frugalware.org> Date: Thu Dec 16 15:20:13 2010 +0100 ejabberd-2.1.6-1-i686 - version bump - drop no longer needed md2-removal.patch - fix rc.ejabberd description diff --git a/source/network-extra/ejabberd/FrugalBuild b/source/network-extra/ejabberd/FrugalBuild index 33e5339..554e038 100644 --- a/source/network-extra/ejabberd/FrugalBuild +++ b/source/network-extra/ejabberd/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna <vmik...@frugalware.org> pkgname=ejabberd -pkgver=2.1.5 -pkgrel=2 +pkgver=2.1.6 +pkgrel=1 pkgdesc="A free and open source instant messaging server written in Erlang." url="http://ejabberd.jabber.ru/"; depends=('erlang>=14A-2') @@ -13,11 +13,10 @@ archs=('i686' 'x86_64') _F_archive_grepv="beta\|rc" up2date="Flasttar http://www.process-one.net/en/ejabberd/archive/"; source=(http://www.process-one.net/downloads/ejabberd/${pkgver%%_*}/ejabberd-$pkgver.tar.gz \ - rc.ejabberd README.Frugalware md2-removal.patch) -sha1sums=('8966d6752219c9386f48a5b8e1f2f8fb0e7477ae' \ - 'ac41a05fd1a21dcb6a4f1e104c185e82b5262d43' \ - '016da166aa7527f148cb29d87eeca108424f1d2a' \ - 'aa773dc776eca2d0a3efa15ae8d2281b21bbabc8') + rc.ejabberd README.Frugalware) +sha1sums=('a1afbfc270f8e4c945bd91f64b7073781590535b' \ + 'ecdbed598b714815d46653d88f257a9a82624aed' \ + '016da166aa7527f148cb29d87eeca108424f1d2a') build() { diff --git a/source/network-extra/ejabberd/md2-removal.patch b/source/network-extra/ejabberd/md2-removal.patch deleted file mode 100644 index a6237c0..0000000 --- a/source/network-extra/ejabberd/md2-removal.patch +++ /dev/null @@ -1,76 +0,0 @@ -Fixes: - -sha_drv.c:23:25: fatal error: openssl/md2.h: No such file or directory -compilation terminated. -make[1]: *** [../sha_drv.so] Error 1 -make[1]: Leaving directory `/var/tmp/fst/src/ejabberd-2.1.5/src/tls' -make: *** [all-recursive] Error 1 - -diff -ur ejabberd-2.1.5.orig/src/mod_caps.erl ejabberd-2.1.5/src/mod_caps.erl ---- ejabberd-2.1.5.orig/src/mod_caps.erl 2010-08-02 19:33:20.000000000 +0300 -+++ ejabberd-2.1.5/src/mod_caps.erl 2010-08-05 14:49:04.000000000 +0300 -@@ -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); -diff -ur ejabberd-2.1.5.orig/src/sha.erl ejabberd-2.1.5/src/sha.erl ---- ejabberd-2.1.5.orig/src/sha.erl 2010-08-02 19:33:20.000000000 +0300 -+++ ejabberd-2.1.5/src/sha.erl 2010-08-05 14:49:34.000000000 +0300 -@@ -28,7 +28,7 @@ - -author('ale...@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"; -diff -ur ejabberd-2.1.5.orig/src/tls/sha_drv.c ejabberd-2.1.5/src/tls/sha_drv.c ---- ejabberd-2.1.5.orig/src/tls/sha_drv.c 2010-08-02 19:33:20.000000000 +0300 -+++ ejabberd-2.1.5/src/tls/sha_drv.c 2010-08-05 14:48:11.000000000 +0300 -@@ -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); diff --git a/source/network-extra/ejabberd/rc.ejabberd b/source/network-extra/ejabberd/rc.ejabberd index a790c02..5c6388f 100644 --- a/source/network-extra/ejabberd/rc.ejabberd +++ b/source/network-extra/ejabberd/rc.ejabberd @@ -1,11 +1,11 @@ #!/bin/bash -# (c) 2007, 2008 Miklos Vajna <vmik...@frugalware.org> +# (c) 2007, 2008, 2010 Miklos Vajna <vmik...@frugalware.org> # rc.ejabberd for Frugalware # distributed under GPL License # chkconfig: 2345 99 01 -# description: Start / stop the ejabber daemon +# description: Ejabber daemon source /lib/initscripts/functions TEXTDOMAIN=ejabberd _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
