ports/81431: [PATCH] net/ejabberd: update to 0.9.1
Lars Eggert
lars.eggert at gmx.net
Tue May 24 08:30:03 UTC 2005
>Number: 81431
>Category: ports
>Synopsis: [PATCH] net/ejabberd: update to 0.9.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue May 24 08:30:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Lars Eggert
>Release: FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD kobe.netlab.nec.de 5.4-STABLE FreeBSD 5.4-STABLE #21: Fri Apr 29 15:48:54 CEST 2005
>Description:
- Update to 0.9.1
Removed file(s):
- files/patch-src-ejabberd.hrl
- files/patch-src-ejabberd_auth.erl
- files/patch-src-jd2ejd.erl
- files/patch-src-mod_disco.erl
- files/patch-src-tls-tls_drv.c
- files/patch-src-web-ejabberd_web_admin.erl
Port maintainer (gonzo at univ.kiev.ua) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- ejabberd-0.9.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/ejabberd--/Makefile /usr/ports/net/ejabberd/Makefile
--- /usr/ports/net/ejabberd--/Makefile Tue May 24 09:51:23 2005
+++ /usr/ports/net/ejabberd/Makefile Tue May 24 10:11:21 2005
@@ -6,7 +6,7 @@
#
PORTNAME= ejabberd
-PORTVERSION= 0.9
+PORTVERSION= 0.9.1
CATEGORIES= net
MASTER_SITES= http://www.jabber.ru/files/ejabberd/ \
http://www.process-one.net/en/projects/ejabberd/download/${PORTVERSION}/
@@ -19,7 +19,7 @@
PLIST_SUB= VERSION="${PORTVERSION}"
-WRKSRC= ${WRKDIR}/${PORTNAME}/src
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
@@ -38,7 +38,7 @@
@${INSTALL_SCRIPT} ${WRKSRC}/ejabberd ${PREFIX}/bin
@${INSTALL_SCRIPT} ${WRKSRC}/ejabberd.sh ${PREFIX}/etc/rc.d
@${INSTALL_DATA} ${FILESDIR}/ejabberd.defaults ${PREFIX}/etc
- @${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}/tools/ejabberdctl ${PREFIX}/bin
+ @${INSTALL_SCRIPT} ${WRKSRC}/../tools/ejabberdctl ${PREFIX}/bin
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}
diff -ruN --exclude=CVS /usr/ports/net/ejabberd--/distinfo /usr/ports/net/ejabberd/distinfo
--- /usr/ports/net/ejabberd--/distinfo Tue May 24 09:51:23 2005
+++ /usr/ports/net/ejabberd/distinfo Tue May 24 09:51:37 2005
@@ -1,2 +1,2 @@
-MD5 (ejabberd-0.9.tar.gz) = 9c349cddb6d0b144c12d277b17ce5e65
-SIZE (ejabberd-0.9.tar.gz) = 451676
+MD5 (ejabberd-0.9.1.tar.gz) = 77b9d1a080b7ed2cf471e28d9cdcdf12
+SIZE (ejabberd-0.9.1.tar.gz) = 689516
diff -ruN --exclude=CVS /usr/ports/net/ejabberd--/files/patch-src-ejabberd.hrl /usr/ports/net/ejabberd/files/patch-src-ejabberd.hrl
--- /usr/ports/net/ejabberd--/files/patch-src-ejabberd.hrl Tue May 24 09:51:23 2005
+++ /usr/ports/net/ejabberd/files/patch-src-ejabberd.hrl Thu Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
---- ejabberd.hrl Sun Apr 17 18:08:34 2005
-+++ ejabberd.hrl Sat Apr 23 19:28:48 2005
-@@ -3,10 +3,10 @@
- %%% Author : Alexey Shchepin <alexey at sevcom.net>
- %%% Purpose :
- %%% Created : 17 Nov 2002 by Alexey Shchepin <alexey at sevcom.net>
--%%% Id : $Id: ejabberd.hrl 307 2005-04-17 18:08:34Z tmallard $
-+%%% Id : $Id: ejabberd.hrl 326 2005-04-22 16:47:16Z alexey $
- %%%----------------------------------------------------------------------
-
---define(VERSION, "0.8-alpha").
-+-define(VERSION, "0.9.1-alpha").
-
- %-define(ejabberd_debug, true).
- %-define(DBGFSM, true).
diff -ruN --exclude=CVS /usr/ports/net/ejabberd--/files/patch-src-ejabberd_auth.erl /usr/ports/net/ejabberd/files/patch-src-ejabberd_auth.erl
--- /usr/ports/net/ejabberd--/files/patch-src-ejabberd_auth.erl Tue May 24 09:51:23 2005
+++ /usr/ports/net/ejabberd/files/patch-src-ejabberd_auth.erl Thu Jan 1 01:00:00 1970
@@ -1,40 +0,0 @@
---- ejabberd_auth.erl Sun Apr 17 18:08:34 2005
-+++ ejabberd_auth.erl Sat Apr 23 19:28:48 2005
-@@ -3,12 +3,12 @@
- %%% Author : Alexey Shchepin <alexey at sevcom.net>
- %%% Purpose : Authentification
- %%% Created : 23 Nov 2002 by Alexey Shchepin <alexey at sevcom.net>
--%%% Id : $Id: ejabberd_auth.erl 307 2005-04-17 18:08:34Z tmallard $
-+%%% Id : $Id: ejabberd_auth.erl 323 2005-04-19 23:10:22Z alexey $
- %%%----------------------------------------------------------------------
-
- -module(ejabberd_auth).
- -author('alexey at sevcom.net').
---vsn('$Revision$ ').
-+-vsn('$Revision: 323 $ ').
-
- %% External exports
- -export([start/0,
-@@ -26,6 +26,8 @@
- plain_password_required/0
- ]).
-
-+-include("ejabberd.hrl").
-+
- %%%----------------------------------------------------------------------
- %%% API
- %%%----------------------------------------------------------------------
-@@ -45,7 +47,12 @@
- (auth_module()):set_password(User, Server, Password).
-
- try_register(User, Server, Password) ->
-- (auth_module()):try_register(User, Server, Password).
-+ case lists:member(jlib:nameprep(Server), ?MYHOSTS) of
-+ true ->
-+ (auth_module()):try_register(User, Server, Password);
-+ false ->
-+ {error, not_allowed}
-+ end.
-
- dirty_get_registered_users() ->
- (auth_module()):dirty_get_registered_users().
diff -ruN --exclude=CVS /usr/ports/net/ejabberd--/files/patch-src-jd2ejd.erl /usr/ports/net/ejabberd/files/patch-src-jd2ejd.erl
--- /usr/ports/net/ejabberd--/files/patch-src-jd2ejd.erl Tue May 24 09:51:23 2005
+++ /usr/ports/net/ejabberd/files/patch-src-jd2ejd.erl Thu Jan 1 01:00:00 1970
@@ -1,29 +0,0 @@
---- jd2ejd.erl Sun Apr 17 18:08:34 2005
-+++ jd2ejd.erl Sat Apr 23 19:28:48 2005
-@@ -3,12 +3,12 @@
- %%% Author : Alexey Shchepin <alexey at sevcom.net>
- %%% Purpose : Import of jabberd1.4 user spool file
- %%% Created : 2 Feb 2003 by Alexey Shchepin <alexey at sevcom.net>
--%%% Id : $Id: jd2ejd.erl 307 2005-04-17 18:08:34Z tmallard $
-+%%% Id : $Id: jd2ejd.erl 324 2005-04-21 14:06:15Z alexey $
- %%%----------------------------------------------------------------------
-
- -module(jd2ejd).
- -author('alexey at sevcom.net').
---vsn('$Revision$ ').
-+-vsn('$Revision: 324 $ ').
-
- %% External exports
- -export([import_file/1,
-@@ -87,8 +87,9 @@
- end.
-
-
--xdb_data(User, Server, El) ->
-- {xmlelement, _Name, Attrs, _Els} = El,
-+xdb_data(User, Server, {xmlcdata, _CData}) ->
-+ ok;
-+xdb_data(User, Server, {xmlelement, _Name, Attrs, _Els} = El) ->
- From = jlib:make_jid(User, Server, ""),
- case xml:get_attr_s("xmlns", Attrs) of
- ?NS_AUTH ->
diff -ruN --exclude=CVS /usr/ports/net/ejabberd--/files/patch-src-mod_disco.erl /usr/ports/net/ejabberd/files/patch-src-mod_disco.erl
--- /usr/ports/net/ejabberd--/files/patch-src-mod_disco.erl Tue May 24 09:51:23 2005
+++ /usr/ports/net/ejabberd/files/patch-src-mod_disco.erl Thu Jan 1 01:00:00 1970
@@ -1,37 +0,0 @@
---- mod_disco.erl Sun Apr 17 18:08:34 2005
-+++ mod_disco.erl Sat Apr 23 19:28:48 2005
-@@ -3,12 +3,12 @@
- %%% Author : Alexey Shchepin <alexey at sevcom.net>
- %%% Purpose : Service Discovery (JEP-0030) support
- %%% Created : 1 Jan 2003 by Alexey Shchepin <alexey at sevcom.net>
--%%% Id : $Id: mod_disco.erl 307 2005-04-17 18:08:34Z tmallard $
-+%%% Id : $Id: mod_disco.erl 322 2005-04-19 22:19:22Z alexey $
- %%%----------------------------------------------------------------------
-
- -module(mod_disco).
- -author('alexey at sevcom.net').
---vsn('$Revision$ ').
-+-vsn('$Revision: 322 $ ').
-
- -behaviour(gen_mod).
-
-@@ -344,9 +344,17 @@
-
-
- get_vh_services(Host) ->
-- DotHost = "." ++ Host,
-+ Hosts = lists:sort(fun(H1, H2) -> length(H1) >= length(H2) end, ?MYHOSTS),
- lists:filter(fun(H) ->
-- lists:suffix(DotHost, H)
-+ case lists:dropwhile(
-+ fun(VH) ->
-+ not lists:suffix("." ++ VH, H)
-+ end, Hosts) of
-+ [] ->
-+ false;
-+ [VH | _] ->
-+ VH == Host
-+ end
- end, ejabberd_router:dirty_get_all_routes()).
-
- get_online_vh_users(Host) ->
diff -ruN --exclude=CVS /usr/ports/net/ejabberd--/files/patch-src-tls-tls_drv.c /usr/ports/net/ejabberd/files/patch-src-tls-tls_drv.c
--- /usr/ports/net/ejabberd--/files/patch-src-tls-tls_drv.c Tue May 24 09:51:23 2005
+++ /usr/ports/net/ejabberd/files/patch-src-tls-tls_drv.c Thu Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
---- tls/tls_drv.c Sat Apr 9 23:47:56 2005
-+++ tls/tls_drv.c Sat Apr 23 19:28:48 2005
-@@ -1,4 +1,4 @@
--/* $Id: tls_drv.c 305 2005-04-09 23:47:56Z aleksey $ */
-+/* $Id: tls_drv.c 327 2005-04-24 12:09:47Z alexey $ */
-
- #include <stdio.h>
- #include <string.h>
-@@ -80,8 +80,8 @@
- d->ctx = SSL_CTX_new(SSLv23_server_method());
- die_unless(d->ctx, "SSL_CTX_new failed");
-
-- res = SSL_CTX_use_certificate_chain_file(d->ctx, buf);
-- die_unless(res > 0, "ssl_ctx_use_certificate_chain_file failed");
-+ res = SSL_CTX_use_certificate_file(d->ctx, buf, SSL_FILETYPE_PEM);
-+ die_unless(res > 0, "SSL_CTX_use_certificate_file failed");
-
- res = SSL_CTX_use_PrivateKey_file(d->ctx, buf, SSL_FILETYPE_PEM);
- die_unless(res > 0, "SSL_CTX_use_PrivateKey_file failed");
diff -ruN --exclude=CVS /usr/ports/net/ejabberd--/files/patch-src-web-ejabberd_web_admin.erl /usr/ports/net/ejabberd/files/patch-src-web-ejabberd_web_admin.erl
--- /usr/ports/net/ejabberd--/files/patch-src-web-ejabberd_web_admin.erl Tue May 24 09:51:23 2005
+++ /usr/ports/net/ejabberd/files/patch-src-web-ejabberd_web_admin.erl Thu Jan 1 01:00:00 1970
@@ -1,64 +0,0 @@
---- web/ejabberd_web_admin.erl Mon Apr 18 20:03:07 2005
-+++ web/ejabberd_web_admin.erl Sat Apr 23 19:28:48 2005
-@@ -3,7 +3,7 @@
- %%% Author : Alexey Shchepin <alexey at sevcom.net>
- %%% Purpose : Administration web interface
- %%% Created : 9 Apr 2004 by Alexey Shchepin <alexey at sevcom.net>
--%%% Id : $Id: ejabberd_web_admin.erl 316 2005-04-18 20:03:07Z alexey $
-+%%% Id : $Id: ejabberd_web_admin.erl 323 2005-04-19 23:10:22Z alexey $
- %%%----------------------------------------------------------------------
- %%% Copyright (c) 2004-2005 Alexey Shchepin
- %%% Copyright (c) 2004-2005 Process One
-@@ -11,7 +11,7 @@
-
- -module(ejabberd_web_admin).
- -author('alexey at sevcom.net').
---vsn('$Revision$ ').
-+-vsn('$Revision: 323 $ ').
-
- %% External exports
- -export([process_admin/1]).
-@@ -1143,23 +1143,26 @@
- list_users_parse_query(Query) ->
- case lists:keysearch("addnewuser", 1, Query) of
- {value, _} ->
-- {value, {_, User}} =
-+ {value, {_, JIDString}} =
- lists:keysearch("newusername", 1, Query),
- {value, {_, Password}} =
- lists:keysearch("newuserpassword", 1, Query),
-- case jlib:nodeprep(User) of
-+ case jlib:string_to_jid(JIDString) of
- error ->
- error;
-- "" ->
-- error;
-- _ ->
-- ejabberd_auth:try_register(User, Password),
-- ok
-+ #jid{user = User, server = Server} ->
-+ case ejabberd_auth:try_register(User, Server, Password) of
-+ {error, _Reason} ->
-+ error;
-+ _ ->
-+ ok
-+ end
- end;
- false ->
- nothing
- end.
-
-+
- list_users_in_diapason(Diap, Lang) ->
- Users = ejabberd_auth:dirty_get_registered_users(),
- SUsers = lists:sort([{S, U} || {U, S} <- Users]),
-@@ -1181,7 +1184,8 @@
- fun(SU = {Server, User}) ->
- US = {User, Server},
- QueueLen = length(mnesia:dirty_read({offline_msg, US})),
-- FQueueLen = [?AC(Prefix ++ "user/" ++ User ++ "/queue/",
-+ FQueueLen = [?AC(Prefix ++ "user/" ++
-+ User ++ "@" ++ Server ++ "/queue/",
- integer_to_list(QueueLen))],
- FLast =
- case ejabberd_sm:get_user_resources(User, Server) of
diff -ruN --exclude=CVS /usr/ports/net/ejabberd--/pkg-plist /usr/ports/net/ejabberd/pkg-plist
--- /usr/ports/net/ejabberd--/pkg-plist Tue May 24 09:51:23 2005
+++ /usr/ports/net/ejabberd/pkg-plist Tue May 24 10:20:58 2005
@@ -87,21 +87,30 @@
lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/fr.msg
lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/nl.msg
lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/pl.msg
+lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/pt.msg
lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/ru.msg
+lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/sv.msg
lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/uk.msg
-%%PORTDOCS%%%%DOCSDIR%%/confacls.png
-%%PORTDOCS%%%%DOCSDIR%%/confhostname.png
+%%PORTDOCS%%%%DOCSDIR%%/dev.aux
%%PORTDOCS%%%%DOCSDIR%%/dev.html
+%%PORTDOCS%%%%DOCSDIR%%/dev.log
+%%PORTDOCS%%%%DOCSDIR%%/dev.pdf
%%PORTDOCS%%%%DOCSDIR%%/dev.tex
+%%PORTDOCS%%%%DOCSDIR%%/dev.toc
%%PORTDOCS%%%%DOCSDIR%%/disco.png
-%%PORTDOCS%%%%DOCSDIR%%/discoallusers.png
-%%PORTDOCS%%%%DOCSDIR%%/discorunnodes.png
%%PORTDOCS%%%%DOCSDIR%%/discorus.png
%%PORTDOCS%%%%DOCSDIR%%/flow.dot
+%%PORTDOCS%%%%DOCSDIR%%/guide.aux
%%PORTDOCS%%%%DOCSDIR%%/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/guide.log
+%%PORTDOCS%%%%DOCSDIR%%/guide.out
+%%PORTDOCS%%%%DOCSDIR%%/guide.pdf
%%PORTDOCS%%%%DOCSDIR%%/guide.tex
+%%PORTDOCS%%%%DOCSDIR%%/guide.toc
+%%PORTDOCS%%%%DOCSDIR%%/hevea.sty
%%PORTDOCS%%%%DOCSDIR%%/logo.png
%%PORTDOCS%%%%DOCSDIR%%/release_notes_%%PORTVERSION%%.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.txt
%%PORTDOCS%%%%DOCSDIR%%/webadmmain.png
%%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png
@dirrm %%PORTDOCS%%share/doc/ejabberd
--- ejabberd-0.9.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list