head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.10 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.8 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.6 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.4 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.2 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.2.0.6 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.4 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.2 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.1.0.2 pkgsrc-2008Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2009.12.15.13.30.54; author fhajny; state dead; branches; next 1.2; 1.2 date 2009.03.22.10.39.44; author martti; state Exp; branches; next 1.1; 1.1 date 2008.11.12.13.13.59; author martti; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2009.03.23.18.34.29; author tron; state Exp; branches; next ; desc @@ 1.3 log @Update ejabberd to 2.1.0. Very brief list of additions: * Erlang/OTP R13 support * HTTP-Bind (BOSH) optimization and clean-up * LDAPS support * MUC rooms can require a CAPTCHA to join the room * PubSub: major improvements. Update to XEP version 1.12 * PEP and Caps: many improvements * Run commands with ejabberdctl or other frontends (XML-RPC, HTTP) * STUN server * XEPs like: XMPP Ping, Roster Versioning, Import/Export Format See full release note: http://www.process-one.net/en/ejabberd/release_notes/release_note_ejabberd_2.1.0 @ text @$NetBSD: patch-ah,v 1.2 2009/03/22 10:39:44 martti Exp $ Modified to use IPv6/v4 patch (https://support.process-one.net/browse/EJAB-389) --- src/mod_proxy65/mod_proxy65_service.erl.orig 2009-03-12 08:41:02.000000000 +0000 +++ src/mod_proxy65/mod_proxy65_service.erl 2009-03-22 10:27:50.000000000 +0000 @@@@ -52,6 +52,7 @@@@ name, stream_addr, port, + ip, acl }). @@@@ -69,14 +70,14 @@@@ gen_server:start_link({local, Proc}, ?MODULE, [Host, Opts], []). init([Host, Opts]) -> - {IP, State} = parse_options(Host, Opts), - NewOpts = [Host, {ip, IP} | Opts], - ejabberd_listener:add_listener(State#state.port, mod_proxy65_stream, NewOpts), + State = parse_options(Host, Opts), + NewOpts = [Host | Opts], + ejabberd_listener:add_listener({State#state.port, State#state.ip}, mod_proxy65_stream, NewOpts), ejabberd_router:register_route(State#state.myhost), {ok, State}. -terminate(_Reason, #state{myhost=MyHost, port=Port}) -> - catch ejabberd_listener:delete_listener(Port), +terminate(_Reason, #state{myhost=MyHost, port=Port, ip=IP}) -> + catch ejabberd_listener:delete_listener({Port, IP}), ejabberd_router:unregister_route(MyHost), ok. @@@@ -202,12 +203,13 @@@@ end, StrIP = inet_parse:ntoa(IP), StreamAddr = [{"jid", MyHost}, {"host", StrIP}, {"port", integer_to_list(Port)}], - {IP, #state{myhost = MyHost, + #state{myhost = MyHost, serverhost = ServerHost, name = Name, port = Port, + ip = IP, stream_addr = StreamAddr, - acl = ACL}}. + acl = ACL}. get_my_ip() -> {ok, MyHostName} = inet:gethostname(), @ 1.2 log @Updated chat/ejabberd to 2.0.4 This version is a maintenance release containing 20 bugfixes and improvements. http://secunia.com/advisories/34340/ @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.1 2008/11/12 13:13:59 martti Exp $ @ 1.1 log @Updated chat/ejabberd to 2.0.2 (patch received from Fabrice Colliot) * Bug fixes * Patch #389 (https://support.process-one.net/browse/EJAB-389) applied instead of the old pkgsrc patch. You MUST modify your ejabberd.cfg! @ text @d1 1 a1 1 $NetBSD$ d5 2 a6 2 --- src/mod_proxy65/mod_proxy65_service.erl.orig 2008-08-27 12:37:52.000000000 +0300 +++ src/mod_proxy65/mod_proxy65_service.erl d15 1 a15 1 @@@@ -69,14 +70,14 @@@@ start_link(Host, Opts) -> d35 2 a36 2 @@@@ -203,12 +204,13 @@@@ parse_options(ServerHost, Opts) -> end, d49 2 a50 2 %% Return the IP of the proxy host, or if not found, the ip of the xmpp domain get_proxy_or_domainip(ServerHost, MyHost) -> @ 1.1.2.1 log @Pullup ticket #2724 - requested by martti ejabberd: security update Revisions pulled up: chat/ejabberd/Makefile 1.8-1.9 chat/ejabberd/PLIST 1.5 chat/ejabberd/distinfo 1.6-1.7 chat/ejabberd/patches/patch-aa 1.4 chat/ejabberd/patches/patch-ac 1.4 chat/ejabberd/patches/patch-ad 1.3 chat/ejabberd/patches/patch-ah 1.2 chat/ejabberd/patches/patch-ai 1.2 --- Module Name: pkgsrc Committed By: joerg Date: Mon Feb 9 23:05:02 UTC 2009 Modified Files: pkgsrc/chat/ejabberd: Makefile distinfo pkgsrc/chat/ejabberd/patches: patch-aa Log Message: Don't create /var/spool/... at install time, the scripts will take care of it. Mark as user-destdir after that. --- Module Name: pkgsrc Committed By: martti Date: Sun Mar 22 10:39:44 UTC 2009 Modified Files: pkgsrc/chat/ejabberd: Makefile PLIST distinfo pkgsrc/chat/ejabberd/patches: patch-ac patch-ad patch-ah patch-ai Log Message: Updated chat/ejabberd to 2.0.4 This version is a maintenance release containing 20 bugfixes and improvements. http://secunia.com/advisories/34340/ @ text @d5 2 a6 2 --- src/mod_proxy65/mod_proxy65_service.erl.orig 2009-03-12 08:41:02.000000000 +0000 +++ src/mod_proxy65/mod_proxy65_service.erl 2009-03-22 10:27:50.000000000 +0000 d15 1 a15 1 @@@@ -69,14 +70,14 @@@@ d35 2 a36 2 @@@@ -202,12 +203,13 @@@@ end, d49 2 a50 2 get_my_ip() -> {ok, MyHostName} = inet:gethostname(), @