summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chat/ejabberd/Makefile9
-rw-r--r--chat/ejabberd/PLIST6
-rw-r--r--chat/ejabberd/distinfo14
-rw-r--r--chat/ejabberd/patches/patch-aa34
-rw-r--r--chat/ejabberd/patches/patch-ad14
-rw-r--r--chat/ejabberd/patches/patch-ae15
6 files changed, 58 insertions, 34 deletions
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 0357d25bb26..02a18dfcdf4 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/03/08 17:30:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.18 2010/03/13 21:05:48 fhajny Exp $
-DISTNAME= ejabberd-2.1.1
-PKGREVISION= 2
+DISTNAME= ejabberd-2.1.3
CATEGORIES= chat
-MASTER_SITES= http://www.process-one.net/downloads/ejabberd/2.1.1/
+MASTER_SITES= http://www.process-one.net/downloads/ejabberd/2.1.3/
MAINTAINER= martti@NetBSD.org
HOMEPAGE= http://www.ejabberd.im/
@@ -106,7 +105,9 @@ SUBST_FILES.paths+= src/ejabberdctl.template
SUBST_FILES.paths+= doc/guide.tex
SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
SUBST_SED.paths+= -e 's,@JABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
+SUBST_SED.paths+= -e 's,@EJABBERD_DBDIR@,${EJABBERD_DB},g'
SUBST_SED.paths+= -e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
+SUBST_SED.paths+= -e 's,@EJABBERD_PIDDIR@,${EJABBERD_PIDDIR},g'
SUBST_SED.paths+= -e 's,@EJABBERD_DB@,${EJABBERD_DB},g'
SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
SUBST_SED.paths+= -e 's,@DISTNAME@,${DISTNAME},g'
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index 2c7257fd00a..5840e7aa7a7 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/12/23 21:02:20 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/03/13 21:05:48 fhajny Exp $
lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -107,6 +107,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_roster.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_roster_odbc.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_service_log.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_sic.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_stats.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_time.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard.beam
@@ -165,6 +166,7 @@ lib/erlang/lib/${PKGNAME}/include/mod_pubsub/pubsub.hrl
lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl
lib/erlang/lib/${PKGNAME}/include/web/ejabberd_http.hrl
lib/erlang/lib/${PKGNAME}/include/web/ejabberd_web_admin.hrl
+lib/erlang/lib/${PKGNAME}/include/web/http_bind.hrl
lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
lib/erlang/lib/${PKGNAME}/priv/lib/ejabberd_zlib_drv.so
lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so
@@ -220,6 +222,8 @@ share/doc/ejabberd/release_notes_2.0.4.txt
share/doc/ejabberd/release_notes_2.0.5.txt
share/doc/ejabberd/release_notes_2.1.0.txt
share/doc/ejabberd/release_notes_2.1.1.txt
+share/doc/ejabberd/release_notes_2.1.2.txt
+share/doc/ejabberd/release_notes_2.1.3.txt
share/doc/ejabberd/webadmmain.png
share/doc/ejabberd/webadmmainru.png
share/doc/ejabberd/yozhikheader.png
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index c432a1a66ca..d6a69d69d75 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2010/03/11 06:33:03 spz Exp $
+$NetBSD: distinfo,v 1.12 2010/03/13 21:05:48 fhajny Exp $
-SHA1 (ejabberd-2.1.1.tar.gz) = 09cf5a151a7ed5c550939549b8de2c7d9519e4c2
-RMD160 (ejabberd-2.1.1.tar.gz) = d3566425ab18744ad28e520d40766d047d2bad95
-Size (ejabberd-2.1.1.tar.gz) = 2224808 bytes
-SHA1 (patch-aa) = c8692f36d57eceeb341964daf088c2366a487a24
-SHA1 (patch-ad) = 64e4795488cb21ee343f35e43aab08a713d5e65b
-SHA1 (patch-ae) = 362f19c23338154f0683cb2e97e6fc66fdae68a4
+SHA1 (ejabberd-2.1.3.tar.gz) = 77fdf18c0bb3b25cf9045e0c833ba4d82f180469
+RMD160 (ejabberd-2.1.3.tar.gz) = c57672928e30f71ec66636dd5e76adb802f17b03
+Size (ejabberd-2.1.3.tar.gz) = 2243874 bytes
+SHA1 (patch-aa) = 9bedb8f7ba32ad940ada86d00565a5dd521c7b16
+SHA1 (patch-ad) = 9108a39e78c57b78202eabc9ee7036baf1a3b144
+SHA1 (patch-ae) = ca6c8e35b3a72924eb8844f0a0111e87278285fa
diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa
index 40ab1510b9b..b2fcd8a24a5 100644
--- a/chat/ejabberd/patches/patch-aa
+++ b/chat/ejabberd/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2010/03/08 17:30:23 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.7 2010/03/13 21:05:49 fhajny Exp $
---- src/Makefile.in.orig 2009-11-06 19:53:19.000000000 +0000
+--- src/Makefile.in.orig 2010-03-12 10:40:41.000000000 +0000
+++ src/Makefile.in
@@ -59,7 +59,7 @@ endif
@@ -27,23 +27,27 @@ $NetBSD: patch-aa,v 1.6 2010/03/08 17:30:23 dmcmahill Exp $
# /share/doc/ejabberd
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -108,13 +108,13 @@ SODIR = $(PRIVDIR)/lib
+@@ -108,16 +108,16 @@ SODIR = $(PRIVDIR)/lib
MSGSDIR = $(PRIVDIR)/msgs
# /var/lib/ejabberd/
-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
-+SPOOLDIR = @EJABBERD_VARDIR@/spool/ejabberd/db/$NODE
++SPOOLDIR = $(DESTDIR)@EJABBERD_DB@
+
+ # /var/lock/ejabberdctl
+-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
++CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@
# /var/lib/ejabberd/.erlang.cookie
COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
# /var/log/ejabberd/
-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
-+LOGDIR = $(DESTDIR)/@JABBERD_LOGDIR@
++LOGDIR = $(DESTDIR)@JABBERD_LOGDIR@
# Assume Linux-style dynamic library flags
DYNAMIC_LIB_CFLAGS = -fpic -shared
-@@ -167,10 +167,10 @@ translations:
+@@ -170,10 +170,10 @@ translations:
install: all
#
# Configuration files
@@ -57,7 +61,7 @@ $NetBSD: patch-aa,v 1.6 2010/03/08 17:30:23 dmcmahill Exp $
sed -e "s*@rootdir@*@prefix@*" \
-e "s*@installuser@*@INSTALLUSER@*" \
-e "s*@LIBDIR@*@libdir@*" \
-@@ -180,13 +180,13 @@ install: all
+@@ -183,13 +183,13 @@ install: all
-e "s*@erl@*@ERL@*" ejabberdctl.template \
> ejabberdctl.example
[ -f $(ETCDIR)/ejabberdctl.cfg ] \
@@ -72,11 +76,11 @@ $NetBSD: patch-aa,v 1.6 2010/03/08 17:30:23 dmcmahill Exp $
- [ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR)
- install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
+ [ -d $(SBINDIR) ] || $(BSD_INSTALL_DATA_DIR) -m 755 $(SBINDIR)
-+ $(BSD_INSTALL_SCRIPT) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
++ $(BSD_INSTALL_SCRIPT) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
#
# Init script
sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \
-@@ -194,54 +194,48 @@ install: all
+@@ -197,59 +197,53 @@ install: all
> ejabberd.init
#
# Binary Erlang files
@@ -139,6 +143,12 @@ $NetBSD: patch-aa,v 1.6 2010/03/08 17:30:23 dmcmahill Exp $
+ $(BSD_INSTALL_DATA_DIR) $(MSGSDIR)
+ $(BSD_INSTALL_DATA) -m 644 msgs/*.msg $(MSGSDIR)
#
+ # ejabberdctl lock directory
+- install -d -m 750 $(O_USER) $(CTLLOCKDIR)
++ $(BSD_INSTALL_DATA_DIR) -m 750 ${O_USER} ${CTLLOCKDIR}
+ $(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT)
+ chmod -R 750 $(CTLLOCKDIR)
+ #
# Log directory
- install -d -m 750 $(O_USER) $(LOGDIR)
+ $(BSD_INSTALL_DATA_DIR) -m 750 $(O_USER) $(LOGDIR)
@@ -147,9 +157,9 @@ $NetBSD: patch-aa,v 1.6 2010/03/08 17:30:23 dmcmahill Exp $
#
# Documentation
- install -d $(DOCDIR)
-- install ../doc/guide.html $(DOCDIR)
-- install ../doc/*.png $(DOCDIR)
-- install ../doc/*.txt $(DOCDIR)
+- install -m 644 ../doc/guide.html $(DOCDIR)
+- install -m 644 ../doc/*.png $(DOCDIR)
+- install -m 644 ../doc/*.txt $(DOCDIR)
+ $(BSD_INSTALL_DATA_DIR) $(DOCDIR)
+ $(BSD_INSTALL_DATA) ../doc/guide.html $(DOCDIR)
+ $(BSD_INSTALL_DATA) ../doc/*.png $(DOCDIR)
diff --git a/chat/ejabberd/patches/patch-ad b/chat/ejabberd/patches/patch-ad
index c825dfc0e26..4720b1c4f52 100644
--- a/chat/ejabberd/patches/patch-ad
+++ b/chat/ejabberd/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.4 2009/12/15 13:30:54 fhajny Exp $
+$NetBSD: patch-ad,v 1.5 2010/03/13 21:05:49 fhajny Exp $
---- src/ejabberd.cfg.example.orig 2009-11-06 19:53:19.000000000 +0000
+--- src/ejabberd.cfg.example.orig 2010-03-12 10:40:41.000000000 +0000
+++ src/ejabberd.cfg.example
@@ -109,7 +109,6 @@
[
@@ -8,11 +8,11 @@ $NetBSD: patch-ad,v 1.4 2009/12/15 13:30:54 fhajny Exp $
{5222, ejabberd_c2s, [
-
%%
- %% If TLS is compiled and you installed a SSL
- %% certificate, put the correct path to the
+ %% If TLS is compiled in and you installed a SSL
+ %% certificate, specify the full path to the
@@ -125,12 +124,12 @@
%%
- %% To enable the old SSL connection method in port 5223:
+ %% To enable the old SSL connection method on port 5223:
%%
- %%{5223, ejabberd_c2s, [
- %% {access, c2s},
@@ -31,7 +31,7 @@ $NetBSD: patch-ad,v 1.4 2009/12/15 13:30:54 fhajny Exp $
{shaper, s2s_shaper},
@@ -140,10 +139,10 @@
%%
- %% ejabberd_service: Interact with external components (transports...)
+ %% ejabberd_service: Interact with external components (transports, ...)
%%
- %%{8888, ejabberd_service, [
+ %%{{8888, "127.0.0.1"},
@@ -42,7 +42,7 @@ $NetBSD: patch-ad,v 1.4 2009/12/15 13:30:54 fhajny Exp $
%% {hosts, ["icq.example.org", "sms.example.org"],
%% [{password, "secret"}]
%% }
-@@ -465,7 +464,7 @@
+@@ -471,7 +470,7 @@
%%
%% Full path to a script that generates the image.
%%
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index bf6f4fbbcda..aa6a1f8b6ed 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2009/12/15 13:30:54 fhajny Exp $
+$NetBSD: patch-ae,v 1.5 2010/03/13 21:05:49 fhajny Exp $
---- src/ejabberdctl.template.orig 2009-11-16 20:25:51.344260518 +0000
+--- src/ejabberdctl.template.orig 2010-03-12 10:40:41.000000000 +0000
+++ src/ejabberdctl.template
@@ -43,10 +43,10 @@ if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ;
fi
@@ -15,7 +15,7 @@ $NetBSD: patch-ae,v 1.4 2009/12/15 13:30:54 fhajny Exp $
fi
if [ "$EJABBERD_DOC_PATH" = "" ] ; then
EJABBERD_DOC_PATH=@DOCDIR@
-@@ -83,7 +83,7 @@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_
+@@ -86,7 +86,7 @@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_
# define additional environment variables
if [ "$EJABBERDDIR" = "" ]; then
@@ -24,3 +24,12 @@ $NetBSD: patch-ae,v 1.4 2009/12/15 13:30:54 fhajny Exp $
fi
if [ "$EJABBERD_EBIN_PATH" = "" ]; then
EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
+@@ -234,7 +234,7 @@ ctl ()
+ # using flock if available. Expects a linux-style
+ # flock that can lock a file descriptor.
+ MAXCONNID=100
+- CONNLOCKDIR=@LOCALSTATEDIR@/lock/ejabberdctl
++ CONNLOCKDIR=@EJABBERD_PIDDIR@
+ FLOCK='/usr/bin/flock'
+ if [ ! -x "$FLOCK" ] ; then
+ JOT='/usr/bin/jot'
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 23:18:49 +0000