Mon Mar 15 10:21:58 2010 UTC ()
Pullup ticket #3054 - requested by martti
ejabberd: security update

Revisions pulled up:
- chat/ejabberd/Makefile			1.17-1.19
- chat/ejabberd/PLIST				1.11
- chat/ejabberd/distinfo			1.11-1.12
- chat/ejabberd/patches/patch-aa		1.6-1.7
- chat/ejabberd/patches/patch-ad		1.5
- chat/ejabberd/patches/patch-ae		1.5
---
Module Name:    pkgsrc
Committed By:   dmcmahill
Date:           Mon Mar  8 17:30:23 UTC 2010

Modified Files:
        pkgsrc/chat/ejabberd: Makefile
        pkgsrc/chat/ejabberd/patches: patch-aa

Log Message:
use BSD_INSTALL_SCRIPT instead of BSD_INSTALL_DATA for a shell script
---
Module Name:    pkgsrc
Committed By:   spz
Date:           Thu Mar 11 06:33:04 UTC 2010

Modified Files:
        pkgsrc/chat/ejabberd: distinfo

Log Message:
updated patch -> distinfo needs an update too
---
odule Name:    pkgsrc
Committed By:   fhajny
Date:           Sat Mar 13 21:05:49 UTC 2010

Modified Files:
         pkgsrc/chat/ejabberd: Makefile PLIST distinfo
         pkgsrc/chat/ejabberd/patches: patch-aa patch-ad patch-ae

Log Message:
Updated chat/ejabberd to 2.1.3.

Changes in ejabberd-2.1.3

Client connections
* Avoid 'invalid' value in iq record
* Avoid resending stream:error stanzas on terminate (EJAB-1180)
* Close also legacy sessions that were half connected (EJAB-1165)
* iq_query_info/1 now returns 'invalid' if XMLNS is invalid
* New ejabberd_c2s option support: max_fsm_queue
* Rewrite mnesia counter functions to use dirty_update_counter (EJAB-1177)
* Run user_receive_packet also when sending offline messages (EJAB-1193)
* Use p1_fsm behaviour in c2s FSM (EJAB-1173)

Clustering
* Fix cluster race condition in route read
* New command to set master Mnesia node
* Use mnesia:async_dirty when cleaning table from failed node

Documentation
* Add quotes in documentation of some erl arguments (EJAB-1191)
* Add option access_from (EJAB-1187)
* Add option max_fsm_queue (EJAB-1185)
* Fix documentation installation, no need for executable permission
   (EJAB-1170)
* Fix typo in EJABBERD_BIN_PATH (EJAB-891)
* Fix typos in example config comments (EJAB-1192)

ejabberdctl
* Support concurrent connections with bound connection names
* Add support for Jot in ctl and TTY in debug
* Support help command names with old - characters
* Fix to really use the variable ERL_PROCESSES

Erlang compatibility
* Don't call queue:filter/2 to keep compatibility with older Erlang versions
* Use alternative of file:read_line/1 to not require R13B02

HTTP
* Add new debugging hook to the http receiving process
* Allow a request_handler to serve a file in root of HTTP

HTTP-Bind (BOSH)
* Cross-domain HTTP-Bind support (EJAB-1168)
* Hibernate http-bind process after handling a request
* Reduce verbosity of HTTP Binding log messages

LDAP
* Document ldap_dn_filter, fetch only needed attributes in search
   (EJAB-1204)
* Use "%u" pattern as default for ldap_uids (EJAB-1203)

Localization
* Fix German translation (EJAB-1195)
* Fix Russian translation

ODBC
* Fix MSSQL support, which was broken (EJAB-1201)
* Improved SQL reconnect behaviour

Pubsub, PEP and Caps
* Add extended stanza addressing 'replyto' on PEP (EJAB-1198)
* Add pubsub#purge_offline (EJAB-1186)
* Fix pubsub#title option (EJAB-1190)
* Fix remove_user for node subscriptions (EJAB-1172)
* Optimizations in mod_caps

Other
* mod_register: Add new acl access_from, default is to deny
* mod_sic: new module for the experimental XEP-0279 Server IP Check
   (EJAB-1205)
* PIEFXIS: Catch errors when exporting to PIEFXIS file (EJAB-1178)
* Proxy65: new option "hostname" (EJAB-838)
* Roster: Fix resending authorization problem
* Shared Roster Groups: get contacts nickname from vcard (EJAB-114)
* S2S: Improved s2s connections clean up (EJAB-1202)

Changes in ejabberd-2.1.2

Core
* Close sessions that were half connected
* Fix SASL PLAIN authentication message for RFC4616 compliance
* Fix support for old Erlang/OTP R10 and R11
* Return proper error (not 'conflict') when register is forbidden by ACL
* When ejabberd stops, send stream close to clients

ejabberdctl
* Check for EGID in ejabberdctl command
* Command to stop ejabberd informing users, with grace period
* If there's a problem in config file, display config lines and stop node

MUC
* Kick occupants with reason when room is stopped due to MUC shutdown
* Write in room log when a room is created, destroyed, started, stopped

PubSub and PEP
* Don't call gen_server on internal event (improves performance and
   scalability)
* Fix duplicate SHIM header in Pubsub message
* Notification messages of Pubsub node config change contained a SHIM
   header
* SubID SHIM header missing in Pubsub message with multiple subscriptions
   on the same node
* PEP: last published item not sent from unavailable users when the
   subscription is implicit (XEP-0115)
* pep_mapping not working due to Node type mismatch

WebAdmin
* If big offline message queue, show only subset on WebAdmin
* Support in user list page of WebAdmin when mod_offline is disabled
---
Module Name:	pkgsrc
Committed By:	martti
Date:		Mon Mar 15 06:27:55 UTC 2010

Modified Files:
	pkgsrc/chat/ejabberd: Makefile

Log Message:
Reset MAINTAINER.


(tron)
diff -r1.15 -r1.15.2.1 pkgsrc/chat/ejabberd/Makefile
diff -r1.10 -r1.10.2.1 pkgsrc/chat/ejabberd/PLIST
diff -r1.10 -r1.10.2.1 pkgsrc/chat/ejabberd/distinfo
diff -r1.5 -r1.5.2.1 pkgsrc/chat/ejabberd/patches/patch-aa
diff -r1.4 -r1.4.2.1 pkgsrc/chat/ejabberd/patches/patch-ad
diff -r1.4 -r1.4.2.1 pkgsrc/chat/ejabberd/patches/patch-ae
cvs diff -r1.15 -r1.15.2.1 pkgsrc/chat/ejabberd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/Makefile 2009/12/23 21:02:20 1.15
+++ pkgsrc/chat/ejabberd/Makefile 2010/03/15 10:21:58 1.15.2.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.15 2009/12/23 21:02:20 fhajny Exp $ 1# $NetBSD: Makefile,v 1.15.2.1 2010/03/15 10:21:58 tron Exp $
2 2
3DISTNAME= ejabberd-2.1.1 3DISTNAME= ejabberd-2.1.3
4CATEGORIES= chat 4CATEGORIES= chat
5MASTER_SITES= http://www.process-one.net/downloads/ejabberd/2.1.1/ 5MASTER_SITES= http://www.process-one.net/downloads/ejabberd/2.1.3/
6 6
7MAINTAINER= martti@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.ejabberd.im/ 8HOMEPAGE= http://www.ejabberd.im/
9COMMENT= Free and Open Source distributed fault-tolerant Jabber server 9COMMENT= Free and Open Source distributed fault-tolerant Jabber server
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14CONFLICTS+= jabberd-[0-9]* 14CONFLICTS+= jabberd-[0-9]*
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18 18
19WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 19WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
20# much prefer to be explicit about the configure settings rather than 20# much prefer to be explicit about the configure settings rather than
@@ -95,25 +95,27 @@ post-install: @@ -95,25 +95,27 @@ post-install:
95 ${INSTALL_DATA} ${WRKSRC}/doc/features.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 95 ${INSTALL_DATA} ${WRKSRC}/doc/features.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
96 ${INSTALL_DATA} ${WRKSRC}/doc/features.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 96 ${INSTALL_DATA} ${WRKSRC}/doc/features.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
97 ${INSTALL_DATA} ${WRKSRC}/doc/guide.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 97 ${INSTALL_DATA} ${WRKSRC}/doc/guide.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
98 98
99SUBST_CLASSES+= paths 99SUBST_CLASSES+= paths
100SUBST_MESSAGE.paths= Localizing paths 100SUBST_MESSAGE.paths= Localizing paths
101SUBST_STAGE.paths= pre-configure 101SUBST_STAGE.paths= pre-configure
102SUBST_FILES.paths= src/Makefile.in 102SUBST_FILES.paths= src/Makefile.in
103SUBST_FILES.paths+= src/ejabberd.cfg.example 103SUBST_FILES.paths+= src/ejabberd.cfg.example
104SUBST_FILES.paths+= src/ejabberdctl.template 104SUBST_FILES.paths+= src/ejabberdctl.template
105SUBST_FILES.paths+= doc/guide.tex 105SUBST_FILES.paths+= doc/guide.tex
106SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' 106SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
107SUBST_SED.paths+= -e 's,@JABBERD_LOGDIR@,${EJABBERD_LOGDIR},g' 107SUBST_SED.paths+= -e 's,@JABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
 108SUBST_SED.paths+= -e 's,@EJABBERD_DBDIR@,${EJABBERD_DB},g'
108SUBST_SED.paths+= -e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g' 109SUBST_SED.paths+= -e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
 110SUBST_SED.paths+= -e 's,@EJABBERD_PIDDIR@,${EJABBERD_PIDDIR},g'
109SUBST_SED.paths+= -e 's,@EJABBERD_DB@,${EJABBERD_DB},g' 111SUBST_SED.paths+= -e 's,@EJABBERD_DB@,${EJABBERD_DB},g'
110SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 112SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
111SUBST_SED.paths+= -e 's,@DISTNAME@,${DISTNAME},g' 113SUBST_SED.paths+= -e 's,@DISTNAME@,${DISTNAME},g'
112SUBST_SED.paths+= -e 's,@EJABBERD_VARDIR@,${VARBASE},g' 114SUBST_SED.paths+= -e 's,@EJABBERD_VARDIR@,${VARBASE},g'
113 115
114.include "../../converters/libiconv/buildlink3.mk" 116.include "../../converters/libiconv/buildlink3.mk"
115.include "../../lang/erlang/buildlink3.mk" 117.include "../../lang/erlang/buildlink3.mk"
116.include "../../textproc/expat/buildlink3.mk" 118.include "../../textproc/expat/buildlink3.mk"
117.include "../../security/openssl/buildlink3.mk" 119.include "../../security/openssl/buildlink3.mk"
118.include "../../devel/zlib/buildlink3.mk" 120.include "../../devel/zlib/buildlink3.mk"
119.include "../../mk/bsd.pkg.mk" 121.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.10.2.1 pkgsrc/chat/ejabberd/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/PLIST 2009/12/23 21:02:20 1.10
+++ pkgsrc/chat/ejabberd/PLIST 2010/03/15 10:21:58 1.10.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.10 2009/12/23 21:02:20 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.10.2.1 2010/03/15 10:21:58 tron Exp $
2lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam 2lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
3lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam 3lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
4lib/erlang/lib/${PKGNAME}/ebin/acl.beam 4lib/erlang/lib/${PKGNAME}/ebin/acl.beam
5lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam 5lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam
6lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam 6lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
7lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam 7lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
8lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam 8lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
9lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam 9lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam
10lib/erlang/lib/${PKGNAME}/ebin/dynamic_compile.beam 10lib/erlang/lib/${PKGNAME}/ebin/dynamic_compile.beam
11lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app 11lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
12lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam 12lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
13lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam 13lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam
14lib/erlang/lib/${PKGNAME}/ebin/ejabberd_app.beam 14lib/erlang/lib/${PKGNAME}/ebin/ejabberd_app.beam
@@ -97,26 +97,27 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_priva @@ -97,26 +97,27 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_priva
97lib/erlang/lib/${PKGNAME}/ebin/mod_private_odbc.beam 97lib/erlang/lib/${PKGNAME}/ebin/mod_private_odbc.beam
98lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam 98lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam
99lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam 99lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam
100lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam 100lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam
101lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sm.beam 101lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sm.beam
102lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam 102lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam
103lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam 103lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam
104lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub_odbc.beam 104lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub_odbc.beam
105lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam 105lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam
106lib/erlang/lib/${PKGNAME}/ebin/mod_roster.beam 106lib/erlang/lib/${PKGNAME}/ebin/mod_roster.beam
107lib/erlang/lib/${PKGNAME}/ebin/mod_roster_odbc.beam 107lib/erlang/lib/${PKGNAME}/ebin/mod_roster_odbc.beam
108lib/erlang/lib/${PKGNAME}/ebin/mod_service_log.beam 108lib/erlang/lib/${PKGNAME}/ebin/mod_service_log.beam
109lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster.beam 109lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster.beam
 110lib/erlang/lib/${PKGNAME}/ebin/mod_sic.beam
110lib/erlang/lib/${PKGNAME}/ebin/mod_stats.beam 111lib/erlang/lib/${PKGNAME}/ebin/mod_stats.beam
111lib/erlang/lib/${PKGNAME}/ebin/mod_time.beam 112lib/erlang/lib/${PKGNAME}/ebin/mod_time.beam
112lib/erlang/lib/${PKGNAME}/ebin/mod_vcard.beam 113lib/erlang/lib/${PKGNAME}/ebin/mod_vcard.beam
113lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_ldap.beam 114lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_ldap.beam
114lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_odbc.beam 115lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_odbc.beam
115lib/erlang/lib/${PKGNAME}/ebin/mod_version.beam 116lib/erlang/lib/${PKGNAME}/ebin/mod_version.beam
116lib/erlang/lib/${PKGNAME}/ebin/node_buddy.beam 117lib/erlang/lib/${PKGNAME}/ebin/node_buddy.beam
117lib/erlang/lib/${PKGNAME}/ebin/node_club.beam 118lib/erlang/lib/${PKGNAME}/ebin/node_club.beam
118lib/erlang/lib/${PKGNAME}/ebin/node_dag.beam 119lib/erlang/lib/${PKGNAME}/ebin/node_dag.beam
119lib/erlang/lib/${PKGNAME}/ebin/node_dispatch.beam 120lib/erlang/lib/${PKGNAME}/ebin/node_dispatch.beam
120lib/erlang/lib/${PKGNAME}/ebin/node_flat.beam 121lib/erlang/lib/${PKGNAME}/ebin/node_flat.beam
121lib/erlang/lib/${PKGNAME}/ebin/node_flat_odbc.beam 122lib/erlang/lib/${PKGNAME}/ebin/node_flat_odbc.beam
122lib/erlang/lib/${PKGNAME}/ebin/node_hometree.beam 123lib/erlang/lib/${PKGNAME}/ebin/node_hometree.beam
@@ -155,26 +156,27 @@ lib/erlang/lib/${PKGNAME}/include/ejabbe @@ -155,26 +156,27 @@ lib/erlang/lib/${PKGNAME}/include/ejabbe
155lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl 156lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl
156lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl 157lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl
157lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl 158lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl
158lib/erlang/lib/${PKGNAME}/include/eldap/ELDAPv3.hrl 159lib/erlang/lib/${PKGNAME}/include/eldap/ELDAPv3.hrl
159lib/erlang/lib/${PKGNAME}/include/eldap/eldap.hrl 160lib/erlang/lib/${PKGNAME}/include/eldap/eldap.hrl
160lib/erlang/lib/${PKGNAME}/include/jlib.hrl 161lib/erlang/lib/${PKGNAME}/include/jlib.hrl
161lib/erlang/lib/${PKGNAME}/include/mod_muc/mod_muc_room.hrl 162lib/erlang/lib/${PKGNAME}/include/mod_muc/mod_muc_room.hrl
162lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl 163lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl
163lib/erlang/lib/${PKGNAME}/include/mod_proxy65/mod_proxy65.hrl 164lib/erlang/lib/${PKGNAME}/include/mod_proxy65/mod_proxy65.hrl
164lib/erlang/lib/${PKGNAME}/include/mod_pubsub/pubsub.hrl 165lib/erlang/lib/${PKGNAME}/include/mod_pubsub/pubsub.hrl
165lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl 166lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl
166lib/erlang/lib/${PKGNAME}/include/web/ejabberd_http.hrl 167lib/erlang/lib/${PKGNAME}/include/web/ejabberd_http.hrl
167lib/erlang/lib/${PKGNAME}/include/web/ejabberd_web_admin.hrl 168lib/erlang/lib/${PKGNAME}/include/web/ejabberd_web_admin.hrl
 169lib/erlang/lib/${PKGNAME}/include/web/http_bind.hrl
168lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh 170lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
169lib/erlang/lib/${PKGNAME}/priv/lib/ejabberd_zlib_drv.so 171lib/erlang/lib/${PKGNAME}/priv/lib/ejabberd_zlib_drv.so
170lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so 172lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so
171lib/erlang/lib/${PKGNAME}/priv/lib/iconv_erl.so 173lib/erlang/lib/${PKGNAME}/priv/lib/iconv_erl.so
172lib/erlang/lib/${PKGNAME}/priv/lib/stringprep_drv.so 174lib/erlang/lib/${PKGNAME}/priv/lib/stringprep_drv.so
173lib/erlang/lib/${PKGNAME}/priv/lib/tls_drv.so 175lib/erlang/lib/${PKGNAME}/priv/lib/tls_drv.so
174lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg 176lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg
175lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg 177lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg
176lib/erlang/lib/${PKGNAME}/priv/msgs/de.msg 178lib/erlang/lib/${PKGNAME}/priv/msgs/de.msg
177lib/erlang/lib/${PKGNAME}/priv/msgs/el.msg 179lib/erlang/lib/${PKGNAME}/priv/msgs/el.msg
178lib/erlang/lib/${PKGNAME}/priv/msgs/eo.msg 180lib/erlang/lib/${PKGNAME}/priv/msgs/eo.msg
179lib/erlang/lib/${PKGNAME}/priv/msgs/es.msg 181lib/erlang/lib/${PKGNAME}/priv/msgs/es.msg
180lib/erlang/lib/${PKGNAME}/priv/msgs/fr.msg 182lib/erlang/lib/${PKGNAME}/priv/msgs/fr.msg
@@ -210,20 +212,22 @@ share/doc/ejabberd/release_notes_1.0.0.t @@ -210,20 +212,22 @@ share/doc/ejabberd/release_notes_1.0.0.t
210share/doc/ejabberd/release_notes_1.1.0.txt 212share/doc/ejabberd/release_notes_1.1.0.txt
211share/doc/ejabberd/release_notes_1.1.1.txt 213share/doc/ejabberd/release_notes_1.1.1.txt
212share/doc/ejabberd/release_notes_1.1.2.txt 214share/doc/ejabberd/release_notes_1.1.2.txt
213share/doc/ejabberd/release_notes_1.1.3.txt 215share/doc/ejabberd/release_notes_1.1.3.txt
214share/doc/ejabberd/release_notes_1.1.4.txt 216share/doc/ejabberd/release_notes_1.1.4.txt
215share/doc/ejabberd/release_notes_2.0.0.txt 217share/doc/ejabberd/release_notes_2.0.0.txt
216share/doc/ejabberd/release_notes_2.0.1.txt 218share/doc/ejabberd/release_notes_2.0.1.txt
217share/doc/ejabberd/release_notes_2.0.2.txt 219share/doc/ejabberd/release_notes_2.0.2.txt
218share/doc/ejabberd/release_notes_2.0.3.txt 220share/doc/ejabberd/release_notes_2.0.3.txt
219share/doc/ejabberd/release_notes_2.0.4.txt 221share/doc/ejabberd/release_notes_2.0.4.txt
220share/doc/ejabberd/release_notes_2.0.5.txt 222share/doc/ejabberd/release_notes_2.0.5.txt
221share/doc/ejabberd/release_notes_2.1.0.txt 223share/doc/ejabberd/release_notes_2.1.0.txt
222share/doc/ejabberd/release_notes_2.1.1.txt 224share/doc/ejabberd/release_notes_2.1.1.txt
 225share/doc/ejabberd/release_notes_2.1.2.txt
 226share/doc/ejabberd/release_notes_2.1.3.txt
223share/doc/ejabberd/webadmmain.png 227share/doc/ejabberd/webadmmain.png
224share/doc/ejabberd/webadmmainru.png 228share/doc/ejabberd/webadmmainru.png
225share/doc/ejabberd/yozhikheader.png 229share/doc/ejabberd/yozhikheader.png
226share/examples/ejabberd/ejabberd.cfg 230share/examples/ejabberd/ejabberd.cfg
227share/examples/ejabberd/ejabberdctl.cfg 231share/examples/ejabberd/ejabberdctl.cfg
228share/examples/ejabberd/inetrc 232share/examples/ejabberd/inetrc
229share/examples/rc.d/ejabberd 233share/examples/rc.d/ejabberd
cvs diff -r1.10 -r1.10.2.1 pkgsrc/chat/ejabberd/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/distinfo 2009/12/23 21:02:20 1.10
+++ pkgsrc/chat/ejabberd/distinfo 2010/03/15 10:21:58 1.10.2.1
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.10 2009/12/23 21:02:20 fhajny Exp $ 1$NetBSD: distinfo,v 1.10.2.1 2010/03/15 10:21:58 tron Exp $
2 2
3SHA1 (ejabberd-2.1.1.tar.gz) = 09cf5a151a7ed5c550939549b8de2c7d9519e4c2 3SHA1 (ejabberd-2.1.3.tar.gz) = 77fdf18c0bb3b25cf9045e0c833ba4d82f180469
4RMD160 (ejabberd-2.1.1.tar.gz) = d3566425ab18744ad28e520d40766d047d2bad95 4RMD160 (ejabberd-2.1.3.tar.gz) = c57672928e30f71ec66636dd5e76adb802f17b03
5Size (ejabberd-2.1.1.tar.gz) = 2224808 bytes 5Size (ejabberd-2.1.3.tar.gz) = 2243874 bytes
6SHA1 (patch-aa) = f0c8f884f43d31e77456f273d2037595432b10ea 6SHA1 (patch-aa) = 9bedb8f7ba32ad940ada86d00565a5dd521c7b16
7SHA1 (patch-ad) = 64e4795488cb21ee343f35e43aab08a713d5e65b 7SHA1 (patch-ad) = 9108a39e78c57b78202eabc9ee7036baf1a3b144
8SHA1 (patch-ae) = 362f19c23338154f0683cb2e97e6fc66fdae68a4 8SHA1 (patch-ae) = ca6c8e35b3a72924eb8844f0a0111e87278285fa
cvs diff -r1.5 -r1.5.2.1 pkgsrc/chat/ejabberd/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-aa 2009/12/15 13:30:54 1.5
+++ pkgsrc/chat/ejabberd/patches/patch-aa 2010/03/15 10:21:58 1.5.2.1
@@ -1,92 +1,96 @@ @@ -1,92 +1,96 @@
1$NetBSD: patch-aa,v 1.5 2009/12/15 13:30:54 fhajny Exp $ 1$NetBSD: patch-aa,v 1.5.2.1 2010/03/15 10:21:58 tron Exp $
2 2
3--- src/Makefile.in.orig 2009-11-06 19:53:19.000000000 +0000 3--- src/Makefile.in.orig 2010-03-12 10:40:41.000000000 +0000
4+++ src/Makefile.in 4+++ src/Makefile.in
5@@ -59,7 +59,7 @@ endif 5@@ -59,7 +59,7 @@ endif
6  6
7 INSTALL_EPAM= 7 INSTALL_EPAM=
8 ifeq (@pam@, pam) 8 ifeq (@pam@, pam)
9- INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR) 9- INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR)
10+ INSTALL_EPAM=$(BSD_INSTALL_DATA) -m 750 $(O_USER) epam $(PBINDIR) 10+ INSTALL_EPAM=$(BSD_INSTALL_DATA) -m 750 $(O_USER) epam $(PBINDIR)
11 endif 11 endif
12  12
13 prefix = @prefix@ 13 prefix = @prefix@
14@@ -76,13 +76,13 @@ BEAMS = $(SOURCES:.erl=.beam) 14@@ -76,13 +76,13 @@ BEAMS = $(SOURCES:.erl=.beam)
15 DESTDIR = 15 DESTDIR =
16  16
17 # /etc/ejabberd/ 17 # /etc/ejabberd/
18-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd 18-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
19+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd 19+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
20  20
21 # /sbin/ 21 # /sbin/
22 SBINDIR = $(DESTDIR)@sbindir@ 22 SBINDIR = $(DESTDIR)@sbindir@
23  23
24 # /lib/ejabberd/ 24 # /lib/ejabberd/
25-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd 25-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
26+EJABBERDDIR = $(DESTDIR)@prefix@/lib/erlang/lib/@DISTNAME@ 26+EJABBERDDIR = $(DESTDIR)@prefix@/lib/erlang/lib/@DISTNAME@
27  27
28 # /share/doc/ejabberd 28 # /share/doc/ejabberd
29 PACKAGE_TARNAME = @PACKAGE_TARNAME@ 29 PACKAGE_TARNAME = @PACKAGE_TARNAME@
30@@ -108,13 +108,13 @@ SODIR = $(PRIVDIR)/lib 30@@ -108,16 +108,16 @@ SODIR = $(PRIVDIR)/lib
31 MSGSDIR = $(PRIVDIR)/msgs 31 MSGSDIR = $(PRIVDIR)/msgs
32  32
33 # /var/lib/ejabberd/ 33 # /var/lib/ejabberd/
34-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd 34-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
35+SPOOLDIR = @EJABBERD_VARDIR@/spool/ejabberd/db/$NODE 35+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@
 36
 37 # /var/lock/ejabberdctl
 38-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
 39+CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@
36  40
37 # /var/lib/ejabberd/.erlang.cookie 41 # /var/lib/ejabberd/.erlang.cookie
38 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie 42 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
39  43
40 # /var/log/ejabberd/ 44 # /var/log/ejabberd/
41-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd 45-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
42+LOGDIR = $(DESTDIR)/@JABBERD_LOGDIR@ 46+LOGDIR = $(DESTDIR)@JABBERD_LOGDIR@
43  47
44 # Assume Linux-style dynamic library flags 48 # Assume Linux-style dynamic library flags
45 DYNAMIC_LIB_CFLAGS = -fpic -shared 49 DYNAMIC_LIB_CFLAGS = -fpic -shared
46@@ -167,10 +167,10 @@ translations: 50@@ -170,10 +170,10 @@ translations:
47 install: all 51 install: all
48 # 52 #
49 # Configuration files 53 # Configuration files
50- install -d -m 750 $(G_USER) $(ETCDIR) 54- install -d -m 750 $(G_USER) $(ETCDIR)
51+ $(BSD_INSTALL_DATA_DIR) -m 750 $(G_USER) $(ETCDIR) 55+ $(BSD_INSTALL_DATA_DIR) -m 750 $(G_USER) $(ETCDIR)
52 [ -f $(ETCDIR)/ejabberd.cfg ] \ 56 [ -f $(ETCDIR)/ejabberd.cfg ] \
53- && install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \ 57- && install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
54- || install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg 58- || install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
55+ && $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \ 59+ && $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
56+ || $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg 60+ || $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
57 sed -e "s*@rootdir@*@prefix@*" \ 61 sed -e "s*@rootdir@*@prefix@*" \
58 -e "s*@installuser@*@INSTALLUSER@*" \ 62 -e "s*@installuser@*@INSTALLUSER@*" \
59 -e "s*@LIBDIR@*@libdir@*" \ 63 -e "s*@LIBDIR@*@libdir@*" \
60@@ -180,13 +180,13 @@ install: all 64@@ -183,13 +183,13 @@ install: all
61 -e "s*@erl@*@ERL@*" ejabberdctl.template \ 65 -e "s*@erl@*@ERL@*" ejabberdctl.template \
62 > ejabberdctl.example 66 > ejabberdctl.example
63 [ -f $(ETCDIR)/ejabberdctl.cfg ] \ 67 [ -f $(ETCDIR)/ejabberdctl.cfg ] \
64- && install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ 68- && install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
65- || install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg 69- || install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
66- install -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc 70- install -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
67+ && $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ 71+ && $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
68+ || $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg 72+ || $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
69+ $(BSD_INSTALL_DATA) -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc 73+ $(BSD_INSTALL_DATA) -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
70 # 74 #
71 # Administration script 75 # Administration script
72- [ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR) 76- [ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR)
73- install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl 77- install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
74+ [ -d $(SBINDIR) ] || $(BSD_INSTALL_DATA_DIR) -m 755 $(SBINDIR) 78+ [ -d $(SBINDIR) ] || $(BSD_INSTALL_DATA_DIR) -m 755 $(SBINDIR)
75+ $(BSD_INSTALL_DATA) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl 79+ $(BSD_INSTALL_SCRIPT) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
76 # 80 #
77 # Init script 81 # Init script
78 sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \ 82 sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \
79@@ -194,54 +194,48 @@ install: all 83@@ -197,59 +197,53 @@ install: all
80 > ejabberd.init 84 > ejabberd.init
81 # 85 #
82 # Binary Erlang files 86 # Binary Erlang files
83- install -d $(BEAMDIR) 87- install -d $(BEAMDIR)
84- install -m 644 *.app $(BEAMDIR) 88- install -m 644 *.app $(BEAMDIR)
85- install -m 644 *.beam $(BEAMDIR) 89- install -m 644 *.beam $(BEAMDIR)
86+ $(BSD_INSTALL_DATA_DIR) $(BEAMDIR) 90+ $(BSD_INSTALL_DATA_DIR) $(BEAMDIR)
87+ $(BSD_INSTALL_DATA) -m 644 *.app $(BEAMDIR) 91+ $(BSD_INSTALL_DATA) -m 644 *.app $(BEAMDIR)
88+ $(BSD_INSTALL_DATA) -m 644 *.beam $(BEAMDIR) 92+ $(BSD_INSTALL_DATA) -m 644 *.beam $(BEAMDIR)
89 rm -f $(BEAMDIR)/configure.beam 93 rm -f $(BEAMDIR)/configure.beam
90 # 94 #
91 # ejabberd header files 95 # ejabberd header files
92- install -d $(INCLUDEDIR) 96- install -d $(INCLUDEDIR)
@@ -129,31 +133,37 @@ $NetBSD: patch-aa,v 1.5 2009/12/15 13:30 @@ -129,31 +133,37 @@ $NetBSD: patch-aa,v 1.5 2009/12/15 13:30
129 # 133 #
130 # Translated strings 134 # Translated strings
131- install -d $(MSGSDIR) 135- install -d $(MSGSDIR)
132- install -m 644 msgs/*.msg $(MSGSDIR) 136- install -m 644 msgs/*.msg $(MSGSDIR)
133- # 137- #
134- # Spool directory 138- # Spool directory
135- install -d -m 750 $(O_USER) $(SPOOLDIR) 139- install -d -m 750 $(O_USER) $(SPOOLDIR)
136- $(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT) 140- $(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
137- chmod -R 750 $(SPOOLDIR) 141- chmod -R 750 $(SPOOLDIR)
138- [ ! -f $(COOKIEFILE) ] || { $(CHOWN_COMMAND) @INSTALLUSER@ $(COOKIEFILE) >$(CHOWN_OUTPUT) ; chmod 400 $(COOKIEFILE) ; } 142- [ ! -f $(COOKIEFILE) ] || { $(CHOWN_COMMAND) @INSTALLUSER@ $(COOKIEFILE) >$(CHOWN_OUTPUT) ; chmod 400 $(COOKIEFILE) ; }
139+ $(BSD_INSTALL_DATA_DIR) $(MSGSDIR) 143+ $(BSD_INSTALL_DATA_DIR) $(MSGSDIR)
140+ $(BSD_INSTALL_DATA) -m 644 msgs/*.msg $(MSGSDIR) 144+ $(BSD_INSTALL_DATA) -m 644 msgs/*.msg $(MSGSDIR)
141 # 145 #
 146 # ejabberdctl lock directory
 147- install -d -m 750 $(O_USER) $(CTLLOCKDIR)
 148+ $(BSD_INSTALL_DATA_DIR) -m 750 ${O_USER} ${CTLLOCKDIR}
 149 $(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT)
 150 chmod -R 750 $(CTLLOCKDIR)
 151 #
142 # Log directory 152 # Log directory
143- install -d -m 750 $(O_USER) $(LOGDIR) 153- install -d -m 750 $(O_USER) $(LOGDIR)
144+ $(BSD_INSTALL_DATA_DIR) -m 750 $(O_USER) $(LOGDIR) 154+ $(BSD_INSTALL_DATA_DIR) -m 750 $(O_USER) $(LOGDIR)
145 $(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT) 155 $(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
146 chmod -R 750 $(LOGDIR) 156 chmod -R 750 $(LOGDIR)
147 # 157 #
148 # Documentation 158 # Documentation
149- install -d $(DOCDIR) 159- install -d $(DOCDIR)
150- install ../doc/guide.html $(DOCDIR) 160- install -m 644 ../doc/guide.html $(DOCDIR)
151- install ../doc/*.png $(DOCDIR) 161- install -m 644 ../doc/*.png $(DOCDIR)
152- install ../doc/*.txt $(DOCDIR) 162- install -m 644 ../doc/*.txt $(DOCDIR)
153+ $(BSD_INSTALL_DATA_DIR) $(DOCDIR) 163+ $(BSD_INSTALL_DATA_DIR) $(DOCDIR)
154+ $(BSD_INSTALL_DATA) ../doc/guide.html $(DOCDIR) 164+ $(BSD_INSTALL_DATA) ../doc/guide.html $(DOCDIR)
155+ $(BSD_INSTALL_DATA) ../doc/*.png $(DOCDIR) 165+ $(BSD_INSTALL_DATA) ../doc/*.png $(DOCDIR)
156+ $(BSD_INSTALL_DATA) ../doc/*.txt $(DOCDIR) 166+ $(BSD_INSTALL_DATA) ../doc/*.txt $(DOCDIR)
157  167
158 uninstall: uninstall-binary 168 uninstall: uninstall-binary
159  169
cvs diff -r1.4 -r1.4.2.1 pkgsrc/chat/ejabberd/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/Attic/patch-ad 2009/12/15 13:30:54 1.4
+++ pkgsrc/chat/ejabberd/patches/Attic/patch-ad 2010/03/15 10:21:58 1.4.2.1
@@ -1,53 +1,53 @@ @@ -1,53 +1,53 @@
1$NetBSD: patch-ad,v 1.4 2009/12/15 13:30:54 fhajny Exp $ 1$NetBSD: patch-ad,v 1.4.2.1 2010/03/15 10:21:58 tron Exp $
2 2
3--- src/ejabberd.cfg.example.orig 2009-11-06 19:53:19.000000000 +0000 3--- src/ejabberd.cfg.example.orig 2010-03-12 10:40:41.000000000 +0000
4+++ src/ejabberd.cfg.example 4+++ src/ejabberd.cfg.example
5@@ -109,7 +109,6 @@ 5@@ -109,7 +109,6 @@
6 [ 6 [
7  7
8 {5222, ejabberd_c2s, [ 8 {5222, ejabberd_c2s, [
9- 9-
10 %% 10 %%
11 %% If TLS is compiled and you installed a SSL 11 %% If TLS is compiled in and you installed a SSL
12 %% certificate, put the correct path to the 12 %% certificate, specify the full path to the
13@@ -125,12 +124,12 @@ 13@@ -125,12 +124,12 @@
14 %% 14 %%
15 %% To enable the old SSL connection method in port 5223: 15 %% To enable the old SSL connection method on port 5223:
16 %% 16 %%
17- %%{5223, ejabberd_c2s, [ 17- %%{5223, ejabberd_c2s, [
18- %% {access, c2s}, 18- %% {access, c2s},
19- %% {shaper, c2s_shaper}, 19- %% {shaper, c2s_shaper},
20- %% {certfile, "/path/to/ssl.pem"}, tls, 20- %% {certfile, "/path/to/ssl.pem"}, tls,
21- %% {max_stanza_size, 65536} 21- %% {max_stanza_size, 65536}
22- %% ]}, 22- %% ]},
23+ {5223, ejabberd_c2s, [ 23+ {5223, ejabberd_c2s, [
24+ {access, c2s}, 24+ {access, c2s},
25+ {shaper, c2s_shaper}, 25+ {shaper, c2s_shaper},
26+ {certfile, "/path/to/ssl.pem"}, tls, 26+ {certfile, "/path/to/ssl.pem"}, tls,
27+ {max_stanza_size, 65536} 27+ {max_stanza_size, 65536}
28+ ]}, 28+ ]},
29  29
30 {5269, ejabberd_s2s_in, [ 30 {5269, ejabberd_s2s_in, [
31 {shaper, s2s_shaper}, 31 {shaper, s2s_shaper},
32@@ -140,10 +139,10 @@ 32@@ -140,10 +139,10 @@
33 %% 33 %%
34 %% ejabberd_service: Interact with external components (transports...) 34 %% ejabberd_service: Interact with external components (transports, ...)
35 %% 35 %%
36- %%{8888, ejabberd_service, [ 36- %%{8888, ejabberd_service, [
37+ %%{{8888, "127.0.0.1"}, 37+ %%{{8888, "127.0.0.1"},
38+ %% ejabberd_service, [ 38+ %% ejabberd_service, [
39 %% {access, all}, 39 %% {access, all},
40 %% {shaper_rule, fast}, 40 %% {shaper_rule, fast},
41- %% {ip, {127, 0, 0, 1}}, 41- %% {ip, {127, 0, 0, 1}},
42 %% {hosts, ["icq.example.org", "sms.example.org"], 42 %% {hosts, ["icq.example.org", "sms.example.org"],
43 %% [{password, "secret"}] 43 %% [{password, "secret"}]
44 %% } 44 %% }
45@@ -465,7 +464,7 @@ 45@@ -471,7 +470,7 @@
46 %% 46 %%
47 %% Full path to a script that generates the image. 47 %% Full path to a script that generates the image.
48 %% 48 %%
49-%%{captcha_cmd, "/lib/ejabberd/priv/bin/captcha.sh"}. 49-%%{captcha_cmd, "/lib/ejabberd/priv/bin/captcha.sh"}.
50+%%{captcha_cmd, "@PREFIX@/lib/erlang/lib/@DISTNAME@/priv/bin/captcha.sh"}. 50+%%{captcha_cmd, "@PREFIX@/lib/erlang/lib/@DISTNAME@/priv/bin/captcha.sh"}.
51  51
52 %% 52 %%
53 %% Host part of the URL sent to the user. 53 %% Host part of the URL sent to the user.
cvs diff -r1.4 -r1.4.2.1 pkgsrc/chat/ejabberd/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-ae 2009/12/15 13:30:54 1.4
+++ pkgsrc/chat/ejabberd/patches/patch-ae 2010/03/15 10:21:58 1.4.2.1
@@ -1,26 +1,35 @@ @@ -1,26 +1,35 @@
1$NetBSD: patch-ae,v 1.4 2009/12/15 13:30:54 fhajny Exp $ 1$NetBSD: patch-ae,v 1.4.2.1 2010/03/15 10:21:58 tron Exp $
2 2
3--- src/ejabberdctl.template.orig 2009-11-16 20:25:51.344260518 +0000 3--- src/ejabberdctl.template.orig 2010-03-12 10:40:41.000000000 +0000
4+++ src/ejabberdctl.template 4+++ src/ejabberdctl.template
5@@ -43,10 +43,10 @@ if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; 5@@ -43,10 +43,10 @@ if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ;
6 fi 6 fi
7 [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" 7 [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
8 if [ "$LOGS_DIR" = "" ] ; then 8 if [ "$LOGS_DIR" = "" ] ; then
9- LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd 9- LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd
10+ LOGS_DIR=@EJABBERD_LOGDIR@ 10+ LOGS_DIR=@EJABBERD_LOGDIR@
11 fi 11 fi
12 if [ "$SPOOLDIR" = "" ] ; then 12 if [ "$SPOOLDIR" = "" ] ; then
13- SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd 13- SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd
14+ SPOOLDIR=@EJABBERD_DB@ 14+ SPOOLDIR=@EJABBERD_DB@
15 fi 15 fi
16 if [ "$EJABBERD_DOC_PATH" = "" ] ; then 16 if [ "$EJABBERD_DOC_PATH" = "" ] ; then
17 EJABBERD_DOC_PATH=@DOCDIR@ 17 EJABBERD_DOC_PATH=@DOCDIR@
18@@ -83,7 +83,7 @@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_ 18@@ -86,7 +86,7 @@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_
19  19
20 # define additional environment variables 20 # define additional environment variables
21 if [ "$EJABBERDDIR" = "" ]; then 21 if [ "$EJABBERDDIR" = "" ]; then
22- EJABBERDDIR=@LIBDIR@/ejabberd 22- EJABBERDDIR=@LIBDIR@/ejabberd
23+ EJABBERDDIR=@LIBDIR@/erlang/lib/@DISTNAME@ 23+ EJABBERDDIR=@LIBDIR@/erlang/lib/@DISTNAME@
24 fi 24 fi
25 if [ "$EJABBERD_EBIN_PATH" = "" ]; then 25 if [ "$EJABBERD_EBIN_PATH" = "" ]; then
26 EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin 26 EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
 27@@ -234,7 +234,7 @@ ctl ()
 28 # using flock if available. Expects a linux-style
 29 # flock that can lock a file descriptor.
 30 MAXCONNID=100
 31- CONNLOCKDIR=@LOCALSTATEDIR@/lock/ejabberdctl
 32+ CONNLOCKDIR=@EJABBERD_PIDDIR@
 33 FLOCK='/usr/bin/flock'
 34 if [ ! -x "$FLOCK" ] ; then
 35 JOT='/usr/bin/jot'