From db95239afc6b94992cf5d3ce5332901318272027 Mon Sep 17 00:00:00 2001 From: sebastia Date: Mon, 13 Sep 2010 17:17:06 +0000 Subject: [PATCH] update from maintainer to latest ejabberd 2.1.5 OK, jasper@ --- net/ejabberd/Makefile | 5 +++-- net/ejabberd/distinfo | 10 +++++----- net/ejabberd/patches/patch-src_Makefile_in | 18 +++++++++--------- .../patches/patch-src_ejabberdctl_template | 10 +++++----- net/ejabberd/pkg/PLIST | 10 ++++++---- 5 files changed, 28 insertions(+), 25 deletions(-) diff --git a/net/ejabberd/Makefile b/net/ejabberd/Makefile index 7e6677b403b..131c752a9bf 100644 --- a/net/ejabberd/Makefile +++ b/net/ejabberd/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.16 2010/04/11 10:07:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2010/09/13 17:17:06 sebastia Exp $ COMMENT= jabber server written in Erlang -V= 2.1.3 +V= 2.1.5 DISTNAME= ejabberd-$V CATEGORIES= net @@ -78,6 +78,7 @@ post-install: @chown ${SHAREOWN}:${BINGRP} ${PREFIX}/sbin/ejabberdctl @chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/ejabberd @chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/ejabberd + @find ${WRKINST} -type f -name '*.beforesubst' -exec rm {} \; .include diff --git a/net/ejabberd/distinfo b/net/ejabberd/distinfo index cde22378ed4..a6438205352 100644 --- a/net/ejabberd/distinfo +++ b/net/ejabberd/distinfo @@ -1,5 +1,5 @@ -MD5 (ejabberd-2.1.3.tar.gz) = 5ch+2lMSpuilPfD5tIRLaQ== -RMD160 (ejabberd-2.1.3.tar.gz) = xXZyko4w9x7GZjbdXnatuALxewM= -SHA1 (ejabberd-2.1.3.tar.gz) = d/3xjAuzslz5BF4Mgzuk2C8YBGk= -SHA256 (ejabberd-2.1.3.tar.gz) = YCxuTnQsTKuFlOnwSfCNC/ISX6hK9JHgzrbW8vOFTvY= -SIZE (ejabberd-2.1.3.tar.gz) = 2243874 +MD5 (ejabberd-2.1.5.tar.gz) = ICnOykVYTXBMqCGncdbZKA== +RMD160 (ejabberd-2.1.5.tar.gz) = er1rxKA/aNA+E+6MH/Ol/uYJjcY= +SHA1 (ejabberd-2.1.5.tar.gz) = iWbWdSIZyThvSKW44fL4+w50d64= +SHA256 (ejabberd-2.1.5.tar.gz) = MaRiKMaTPXwkQ1dTMApNKuLoRWimCXF13F1OVTKZ3Z0= +SIZE (ejabberd-2.1.5.tar.gz) = 2278008 diff --git a/net/ejabberd/patches/patch-src_Makefile_in b/net/ejabberd/patches/patch-src_Makefile_in index c4973031e84..e71e9a23eab 100644 --- a/net/ejabberd/patches/patch-src_Makefile_in +++ b/net/ejabberd/patches/patch-src_Makefile_in @@ -1,9 +1,9 @@ No need to install release notes. -$OpenBSD: patch-src_Makefile_in,v 1.1 2010/04/11 10:07:10 sthen Exp $ ---- src/Makefile.in.orig Fri Mar 12 11:40:41 2010 -+++ src/Makefile.in Sun Mar 14 02:57:29 2010 -@@ -111,7 +111,7 @@ MSGSDIR = $(PRIVDIR)/msgs +$OpenBSD: patch-src_Makefile_in,v 1.2 2010/09/13 17:17:06 sebastia Exp $ +--- src/Makefile.in.orig Mon Aug 2 18:33:20 2010 ++++ src/Makefile.in Wed Aug 18 00:36:10 2010 +@@ -118,7 +118,7 @@ MSGSDIR = $(PRIVDIR)/msgs SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd # /var/lock/ejabberdctl @@ -12,11 +12,11 @@ $OpenBSD: patch-src_Makefile_in,v 1.1 2010/04/11 10:07:10 sthen Exp $ # /var/lib/ejabberd/.erlang.cookie COOKIEFILE = $(SPOOLDIR)/.erlang.cookie -@@ -249,7 +249,6 @@ install: all - install -d $(DOCDIR) +@@ -257,7 +257,6 @@ install: all + install -m 644 ../doc/dev.html $(DOCDIR) install -m 644 ../doc/guide.html $(DOCDIR) install -m 644 ../doc/*.png $(DOCDIR) - install -m 644 ../doc/*.txt $(DOCDIR) - - uninstall: uninstall-binary - + [ -f ../doc/guide.pdf ] \ + && install -m 644 ../doc/guide.pdf $(DOCDIR) \ + || echo "No ../doc/guide.pdf was built" diff --git a/net/ejabberd/patches/patch-src_ejabberdctl_template b/net/ejabberd/patches/patch-src_ejabberdctl_template index cc99fd015de..d341ab53952 100644 --- a/net/ejabberd/patches/patch-src_ejabberdctl_template +++ b/net/ejabberd/patches/patch-src_ejabberdctl_template @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_ejabberdctl_template,v 1.3 2010/04/11 10:07:10 sthen Exp $ ---- src/ejabberdctl.template.orig Fri Mar 12 11:40:41 2010 -+++ src/ejabberdctl.template Sat Apr 3 20:49:01 2010 +$OpenBSD: patch-src_ejabberdctl_template,v 1.4 2010/09/13 17:17:06 sebastia Exp $ +--- src/ejabberdctl.template.orig Mon Aug 2 18:33:20 2010 ++++ src/ejabberdctl.template Wed Aug 18 00:30:24 2010 @@ -1,7 +1,7 @@ #!/bin/sh @@ -72,12 +72,12 @@ $OpenBSD: patch-src_ejabberdctl_template,v 1.3 2010/04/11 10:07:10 sthen Exp $ # export global variables export EJABBERD_CONFIG_PATH -@@ -234,7 +234,7 @@ ctl () +@@ -237,7 +237,7 @@ ctl () # using flock if available. Expects a linux-style # flock that can lock a file descriptor. MAXCONNID=100 - CONNLOCKDIR=@LOCALSTATEDIR@/lock/ejabberdctl + CONNLOCKDIR=/tmp FLOCK='/usr/bin/flock' - if [ ! -x "$FLOCK" ] ; then + if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then JOT='/usr/bin/jot' diff --git a/net/ejabberd/pkg/PLIST b/net/ejabberd/pkg/PLIST index aa4a2e77759..84e49caa45c 100644 --- a/net/ejabberd/pkg/PLIST +++ b/net/ejabberd/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2010/04/11 10:07:10 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.7 2010/09/13 17:17:06 sebastia Exp $ @newgroup _ejabberd:594 @newuser _ejabberd:594:_ejabberd:daemon:ejabberd account:/var/db/ejabberd:/bin/sh %%SHARED%% @@ -31,7 +31,6 @@ lib/ejabberd/ebin/ejabberd_check.beam lib/ejabberd/ebin/ejabberd_commands.beam lib/ejabberd/ebin/ejabberd_config.beam lib/ejabberd/ebin/ejabberd_ctl.beam -lib/ejabberd/ebin/ejabberd_debug.beam lib/ejabberd/ebin/ejabberd_frontend_socket.beam lib/ejabberd/ebin/ejabberd_hooks.beam lib/ejabberd/ebin/ejabberd_http.beam @@ -65,6 +64,7 @@ lib/ejabberd/ebin/ejabberd_zlib.beam lib/ejabberd/ebin/ejd2odbc.beam lib/ejabberd/ebin/eldap.beam lib/ejabberd/ebin/eldap_filter.beam +lib/ejabberd/ebin/eldap_filter_yecc.beam lib/ejabberd/ebin/eldap_pool.beam lib/ejabberd/ebin/eldap_utils.beam lib/ejabberd/ebin/extauth.beam @@ -118,6 +118,7 @@ lib/ejabberd/ebin/mod_time.beam lib/ejabberd/ebin/mod_vcard.beam lib/ejabberd/ebin/mod_vcard_ldap.beam lib/ejabberd/ebin/mod_vcard_odbc.beam +lib/ejabberd/ebin/mod_vcard_xupdate.beam lib/ejabberd/ebin/mod_version.beam lib/ejabberd/ebin/node_buddy.beam lib/ejabberd/ebin/node_club.beam @@ -182,6 +183,7 @@ lib/ejabberd/priv/ lib/ejabberd/priv/bin/ lib/ejabberd/priv/bin/captcha.sh lib/ejabberd/priv/lib/ +lib/ejabberd/priv/lib/sha_drv.so lib/ejabberd/priv/msgs/ lib/ejabberd/priv/msgs/ca.msg lib/ejabberd/priv/msgs/cs.msg @@ -208,14 +210,15 @@ lib/ejabberd/priv/msgs/vi.msg lib/ejabberd/priv/msgs/wa.msg lib/ejabberd/priv/msgs/zh.msg sbin/ejabberdctl -@comment sbin/ejabberdctl.bak share/doc/ejabberd/ +share/doc/ejabberd/COPYING share/doc/ejabberd/README.OpenBSD @comment share/doc/ejabberd/api/ share/doc/ejabberd/dev.html share/doc/ejabberd/discorus.png share/doc/ejabberd/features.html share/doc/ejabberd/guide.html +share/doc/ejabberd/guide.pdf share/doc/ejabberd/logo.png share/doc/ejabberd/webadmmain.png share/doc/ejabberd/webadmmainru.png @@ -224,7 +227,6 @@ share/examples/ejabberd/ @sample ${SYSCONFDIR}/ejabberd/ share/examples/ejabberd/ejabberd.cfg @sample ${SYSCONFDIR}/ejabberd/ejabberd.cfg -@comment share/examples/ejabberd/ejabberd.cfg.bak share/examples/ejabberd/ejabberdctl.cfg @sample ${SYSCONFDIR}/ejabberd/ejabberdctl.cfg share/examples/ejabberd/extauth/