Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=32e0aef92ec443ce489e1d3ecaf75395dec659cf
commit 32e0aef92ec443ce489e1d3ecaf75395dec659cf Author: Miklos Vajna <[email protected]> Date: Sun Sep 5 13:25:00 2010 +0200 ejabberd-2.1.5-1-i686 - version bump - drop backported patches, add patch to build with md2 support which is not provided by openssl anymore diff --git a/source/network-extra/ejabberd/0001-Remove-workarounds-that-supported-R11-or-older-EJAB-.patch b/source/network-extra/ejabberd/0001-Remove-workarounds-that-supported-R11-or-older-EJAB-.patch deleted file mode 100644 index 53b50ab..0000000 --- a/source/network-extra/ejabberd/0001-Remove-workarounds-that-supported-R11-or-older-EJAB-.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 6eb5b544b4665da56bb79100f22c4db97549b53b Mon Sep 17 00:00:00 2001 -From: Badlop <[email protected]> -Date: Sat, 15 Aug 2009 20:10:49 +0000 -Subject: [PATCH] Remove workarounds that supported R11 or older (EJAB-446)(EJAB-628)(EJAB-997) - -SVN Revision: 2486 ---- - -diff --git a/src/Makefile.in b/src/Makefile.in -index dd728ce..a0d86fd 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -30,7 +30,7 @@ else - INIT_USER=$(INSTALLUSER) - endif - --EFLAGS += @ERLANG_SSL39@ -pa . -+EFLAGS += -pa . - - # make debug=true to compile Erlang module with debug informations. - ifdef debug -diff --git a/src/aclocal.m4 b/src/aclocal.m4 -index 79b0e3e..cb8ffa1 100644 ---- a/src/aclocal.m4 -+++ b/src/aclocal.m4 -@@ -121,21 +121,14 @@ AC_DEFUN(AM_WITH_ERLANG, - -author('[email protected]'). - - -export([[start/0]]). ---include_lib("ssl/include/ssl_pkix.hrl"). - - start() -> - EIDirS = code:lib_dir("erl_interface") ++ "\n", - EILibS = libpath("erl_interface") ++ "\n", - RootDirS = code:root_dir() ++ "\n", -- file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)), -+ file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)), - halt(). - ---[ifdef]('id-pkix'). --ssldef() -> "-DSSL39\n". ---else. --ssldef() -> "\n". ---endif. -- - %% return physical architecture based on OS/Processor - archname() -> - ArchStr = erlang:system_info(system_architecture), -@@ -183,8 +176,6 @@ _EOF - ERLANG_EI_DIR=`cat conftest.out | head -n 1` - # Second line - ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1` -- # Third line -- ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1` - # End line - ERLANG_DIR=`cat conftest.out | tail -n 1` - -@@ -193,7 +184,6 @@ _EOF - - AC_SUBST(ERLANG_CFLAGS) - AC_SUBST(ERLANG_LIBS) -- AC_SUBST(ERLANG_SSL39) - AC_SUBST(ERLC) - AC_SUBST(ERL) - ]) -diff --git a/src/configure b/src/configure -index a1a7cba..10dbe3d 100755 ---- a/src/configure -+++ b/src/configure -@@ -644,7 +644,6 @@ EGREP - GREP - CPP - LIBICONV --ERLANG_SSL39 - ERLANG_LIBS - ERLANG_CFLAGS - ERL -@@ -3180,21 +3179,14 @@ fi - -author('[email protected]'). - - -export([start/0]). ---include_lib("ssl/include/ssl_pkix.hrl"). - - start() -> - EIDirS = code:lib_dir("erl_interface") ++ "\n", - EILibS = libpath("erl_interface") ++ "\n", - RootDirS = code:root_dir() ++ "\n", -- file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)), -+ file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)), - halt(). - ---ifdef('id-pkix'). --ssldef() -> "-DSSL39\n". ---else. --ssldef() -> "\n". ---endif. -- - %% return physical architecture based on OS/Processor - archname() -> - ArchStr = erlang:system_info(system_architecture), -@@ -3242,8 +3234,6 @@ _EOF - ERLANG_EI_DIR=`cat conftest.out | head -n 1` - # Second line - ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1` -- # Third line -- ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1` - # End line - ERLANG_DIR=`cat conftest.out | tail -n 1` - -diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl -index 9b37833..864b1e2 100644 ---- a/src/ejabberd_s2s_in.erl -+++ b/src/ejabberd_s2s_in.erl -@@ -48,16 +48,9 @@ - - -include("ejabberd.hrl"). - -include("jlib.hrl"). ---ifdef(SSL39). - -include_lib("ssl/include/ssl_pkix.hrl"). - -define(PKIXEXPLICIT, 'OTP-PKIX'). - -define(PKIXIMPLICIT, 'OTP-PKIX'). ---else. ---include_lib("ssl/include/PKIX1Explicit88.hrl"). ---include_lib("ssl/include/PKIX1Implicit88.hrl"). ---define(PKIXEXPLICIT, 'PKIX1Explicit88'). ---define(PKIXIMPLICIT, 'PKIX1Implicit88'). ---endif. - -include("XmppAddr.hrl"). - - -define(DICT, dict). -diff --git a/src/web/Makefile.in b/src/web/Makefile.in -index 519314e..a5d019e 100644 ---- a/src/web/Makefile.in -+++ b/src/web/Makefile.in -@@ -9,7 +9,6 @@ LIBS = @LIBS@ - ERLANG_CFLAGS = @ERLANG_CFLAGS@ - ERLANG_LIBS = @ERLANG_LIBS@ - --EFLAGS += @ERLANG_SSL39@ - EFLAGS += -I .. - EFLAGS += -pz .. - -diff --git a/src/web/mod_http_fileserver.erl b/src/web/mod_http_fileserver.erl -index 8399640..9e7c33c 100644 ---- a/src/web/mod_http_fileserver.erl -+++ b/src/web/mod_http_fileserver.erl -@@ -66,12 +66,6 @@ - headers - }). - ---ifdef(SSL39). ---define(STRING2LOWER, string). ---else. ---define(STRING2LOWER, httpd_util). ---endif. -- - -record(state, {host, docroot, accesslog, accesslogfd, directory_indices, - custom_headers, default_content_type, content_types = []}). - -@@ -417,7 +411,7 @@ join([H | T], Separator) -> - lists:foldl(fun(E, Acc) -> lists:concat([Acc, Separator, E]) end, H, T). - - content_type(Filename, DefaultContentType, ContentTypes) -> -- Extension = ?STRING2LOWER:to_lower(filename:extension(Filename)), -+ Extension = string:to_lower(filename:extension(Filename)), - case lists:keysearch(Extension, 1, ContentTypes) of - {value, {_, ContentType}} -> ContentType; - false -> DefaultContentType -@@ -433,4 +427,4 @@ ip_to_string(Address) when size(Address) == 4 -> - join(tuple_to_list(Address), "."); - ip_to_string(Address) when size(Address) == 8 -> - Parts = lists:map(fun (Int) -> io_lib:format("~.16B", [Int]) end, tuple_to_list(Address)), -- ?STRING2LOWER:to_lower(lists:flatten(join(Parts, ":"))). -+ string:to_lower(lists:flatten(join(Parts, ":"))). diff --git a/source/network-extra/ejabberd/0002-When-using-OTP-R14-use-public_key-library-instead-of.patch b/source/network-extra/ejabberd/0002-When-using-OTP-R14-use-public_key-library-instead-of.patch deleted file mode 100644 index 0f9ed52..0000000 --- a/source/network-extra/ejabberd/0002-When-using-OTP-R14-use-public_key-library-instead-of.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f8412d7c5d62bde3c03b7a40734d74fbcebc8beb Mon Sep 17 00:00:00 2001 -From: Badlop <[email protected]> -Date: Fri, 9 Jul 2010 20:18:59 +0200 -Subject: [PATCH] When using OTP R14, use public_key library instead of old ssl (EJAB-953) - ---- - -diff -u b/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl ---- b/src/ejabberd_s2s_in.erl -+++ b/src/ejabberd_s2s_in.erl -@@ -48,9 +48,9 @@ - - -include("ejabberd.hrl"). - -include("jlib.hrl"). ---include_lib("ssl/include/ssl_pkix.hrl"). ---define(PKIXEXPLICIT, 'OTP-PKIX'). ---define(PKIXIMPLICIT, 'OTP-PKIX'). -+-include_lib("public_key/include/public_key.hrl"). -+-define(PKIXEXPLICIT, 'OTP-PUB-KEY'). -+-define(PKIXIMPLICIT, 'OTP-PUB-KEY'). - -include("XmppAddr.hrl"). - - -define(DICT, dict). ---- a/src/tls/tls.erl -+++ b/src/tls/tls.erl -@@ -232,7 +232,7 @@ close(#tlssock{tcpsock = TCPSocket, tlsport = Port}) -> - get_peer_certificate(#tlssock{tlsport = Port}) -> - case port_control(Port, ?GET_PEER_CERTIFICATE, []) of - <<0, BCert/binary>> -> -- case catch ssl_pkix:decode_cert(BCert, [pkix]) of -+ case catch public_key:pkix_decode_cert(BCert, [pkix]) of - {ok, Cert} -> - {ok, Cert}; - _ -> diff --git a/source/network-extra/ejabberd/FrugalBuild b/source/network-extra/ejabberd/FrugalBuild index 7947960..91f6173 100644 --- a/source/network-extra/ejabberd/FrugalBuild +++ b/source/network-extra/ejabberd/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna <[email protected]> pkgname=ejabberd -pkgver=2.1.4 -pkgrel=2 +pkgver=2.1.5 +pkgrel=1 pkgdesc="A free and open source instant messaging server written in Erlang." url="http://ejabberd.jabber.ru/"; depends=('erlang>=14A-2') @@ -13,14 +13,11 @@ 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 \ - 0001-Remove-workarounds-that-supported-R11-or-older-EJAB-.patch \ - 0002-When-using-OTP-R14-use-public_key-library-instead-of.patch) -sha1sums=('00b1b121f687ba8284dbeb40ff97915d9e1be355' \ + rc.ejabberd README.Frugalware md2-removal.patch) +sha1sums=('8966d6752219c9386f48a5b8e1f2f8fb0e7477ae' \ 'ac41a05fd1a21dcb6a4f1e104c185e82b5262d43' \ '016da166aa7527f148cb29d87eeca108424f1d2a' \ - '19bcb8458c99b27d0e878d0d2a6831b7ab23bb9e' \ - 'ea084f335cef3c0e16e418f3c10243fba9862297') + 'aa773dc776eca2d0a3efa15ae8d2281b21bbabc8') build() { diff --git a/source/network-extra/ejabberd/md2-removal.patch b/source/network-extra/ejabberd/md2-removal.patch new file mode 100644 index 0000000..a6237c0 --- /dev/null +++ b/source/network-extra/ejabberd/md2-removal.patch @@ -0,0 +1,76 @@ +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('[email protected]'). + + -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); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
