From b499dc8c594465c21b1d2fd2eaf4f4aeeb3d11c1 Mon Sep 17 00:00:00 2001 From: viq Date: Sun, 22 Jan 2012 20:47:21 +0100 Subject: [PATCH] Update to 2.1.10 Add rc script (doen't fully work yet) Pull in changes from current port. --- net/ejabberd/Makefile | 4 ++-- net/ejabberd/distinfo | 10 +++++----- net/ejabberd/patches/patch-src_Makefile_in | 18 ++++++++++++++---- .../patches/patch-src_ejabberd_cfg_example | 6 +++--- .../patches/patch-src_ejabberdctl_template | 14 +++++++------- net/ejabberd/pkg/PLIST | 3 ++- net/ejabberd/pkg/README | 8 ++++---- net/ejabberd/pkg/ejabberd.rc | 5 +---- 8 files changed, 38 insertions(+), 30 deletions(-) diff --git a/net/ejabberd/Makefile b/net/ejabberd/Makefile index 6ec8a917aa..c860c4e7c8 100644 --- a/net/ejabberd/Makefile +++ b/net/ejabberd/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.26 2011/06/03 13:45:43 gsoares Exp $ +# $OpenBSD: Makefile,v 1.27 2011/11/22 17:11:07 gsoares Exp $ COMMENT= jabber server written in Erlang -V= 2.1.9 +V= 2.1.10 DISTNAME= ejabberd-$V CATEGORIES= net diff --git a/net/ejabberd/distinfo b/net/ejabberd/distinfo index dfdb583bc4..bfa4a519d4 100644 --- a/net/ejabberd/distinfo +++ b/net/ejabberd/distinfo @@ -1,5 +1,5 @@ -MD5 (ejabberd-2.1.9.tar.gz) = KcoU6mL5BzYyLk5nIDMTUg== -RMD160 (ejabberd-2.1.9.tar.gz) = amQxpUmZ9cpAJz/vKJrn/ZsolHY= -SHA1 (ejabberd-2.1.9.tar.gz) = f6/0JS6yoQwEbx5qL8sR/U9QDqg= -SHA256 (ejabberd-2.1.9.tar.gz) = +X8tqtSX2dmXlFW2fOMeLdvTo81jipey4ddqash1h4E= -SIZE (ejabberd-2.1.9.tar.gz) = 1872544 +MD5 (ejabberd-2.1.10.tar.gz) = cPDheYMRTGKJPkO27y6dDA== +RMD160 (ejabberd-2.1.10.tar.gz) = cGmu64f9B0mIvGLLTomPe5IKs8A= +SHA1 (ejabberd-2.1.10.tar.gz) = wRZKoA9ERcxGTMV6mGzyYHMVY1s= +SHA256 (ejabberd-2.1.10.tar.gz) = ncLliJ6Rmn1R8rlbg9qDURZjHbgVUKEVwC5xkJrZMr4= +SIZE (ejabberd-2.1.10.tar.gz) = 1942456 diff --git a/net/ejabberd/patches/patch-src_Makefile_in b/net/ejabberd/patches/patch-src_Makefile_in index e71e9a23ea..9350ae628d 100644 --- a/net/ejabberd/patches/patch-src_Makefile_in +++ b/net/ejabberd/patches/patch-src_Makefile_in @@ -1,9 +1,10 @@ No need to install release notes. +ejabberdctl mode 550 is annoying, and debian doesn't do that either $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 +--- src/Makefile.in.orig Fri Dec 23 12:27:30 2011 ++++ src/Makefile.in Sun Jan 22 20:22:08 2012 +@@ -124,7 +124,7 @@ MSGSDIR = $(PRIVDIR)/msgs SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd # /var/lock/ejabberdctl @@ -12,7 +13,16 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2010/09/13 17:17:06 sebastia Exp $ # /var/lib/ejabberd/.erlang.cookie COOKIEFILE = $(SPOOLDIR)/.erlang.cookie -@@ -257,7 +257,6 @@ install: all +@@ -202,7 +202,7 @@ install: all + # + # Administration script + [ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR) +- install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl ++ install -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl + # + # Init script + sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \ +@@ -264,7 +264,6 @@ install: all install -m 644 ../doc/dev.html $(DOCDIR) install -m 644 ../doc/guide.html $(DOCDIR) install -m 644 ../doc/*.png $(DOCDIR) diff --git a/net/ejabberd/patches/patch-src_ejabberd_cfg_example b/net/ejabberd/patches/patch-src_ejabberd_cfg_example index 4815d955da..d5d2f9caa8 100644 --- a/net/ejabberd/patches/patch-src_ejabberd_cfg_example +++ b/net/ejabberd/patches/patch-src_ejabberd_cfg_example @@ -1,6 +1,6 @@ $OpenBSD: patch-src_ejabberd_cfg_example,v 1.4 2010/12/23 22:54:39 jasper Exp $ ---- src/ejabberd.cfg.example.orig Fri Mar 12 11:40:41 2010 -+++ src/ejabberd.cfg.example Sat Mar 13 12:41:08 2010 +--- src/ejabberd.cfg.example.orig Fri Dec 23 12:27:30 2011 ++++ src/ejabberd.cfg.example Sun Jan 22 20:11:03 2012 @@ -115,7 +115,7 @@ %% certificate, specify the full path to the %% file and uncomment this line: @@ -29,7 +29,7 @@ $OpenBSD: patch-src_ejabberd_cfg_example,v 1.4 2010/12/23 22:54:39 jasper Exp $ {5269, ejabberd_s2s_in, [ {shaper, s2s_shaper}, -@@ -172,18 +172,18 @@ +@@ -173,18 +173,18 @@ %% Allowed values are: false optional required required_trusted %% You must specify a certificate file. %% diff --git a/net/ejabberd/patches/patch-src_ejabberdctl_template b/net/ejabberd/patches/patch-src_ejabberdctl_template index d341ab5395..da9cda99b0 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.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 +--- src/ejabberdctl.template.orig Fri Dec 23 12:27:30 2011 ++++ src/ejabberdctl.template Sun Jan 22 20:11:03 2012 @@ -1,7 +1,7 @@ #!/bin/sh @@ -54,7 +54,7 @@ $OpenBSD: patch-src_ejabberdctl_template,v 1.4 2010/09/13 17:17:06 sebastia Exp fi done if [ "$ID" -eq "$EJID" ] ; then -@@ -86,7 +86,7 @@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL +@@ -88,7 +88,7 @@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL # define additional environment variables if [ "$EJABBERDDIR" = "" ]; then @@ -63,16 +63,16 @@ $OpenBSD: patch-src_ejabberdctl_template,v 1.4 2010/09/13 17:17:06 sebastia Exp fi if [ "$EJABBERD_EBIN_PATH" = "" ]; then EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin -@@ -112,7 +112,7 @@ ERL_INETRC=$ETCDIR/inetrc +@@ -114,7 +114,7 @@ ERL_INETRC=$ETCDIR/inetrc HOME=$SPOOLDIR # create the home dir with the proper user if doesn't exist, because it stores cookie file -[ -d $HOME ] || $EXEC_CMD "mkdir -p $HOME" +#[ -d $HOME ] || $EXEC_CMD "mkdir -p $HOME" - # export global variables - export EJABBERD_CONFIG_PATH -@@ -237,7 +237,7 @@ ctl () + # Change to a directory readable by INSTALLUSER to + # prevent "File operation error: eacces." messages +@@ -244,7 +244,7 @@ ctl () # using flock if available. Expects a linux-style # flock that can lock a file descriptor. MAXCONNID=100 diff --git a/net/ejabberd/pkg/PLIST b/net/ejabberd/pkg/PLIST index 294c2ed41b..cf4772bbff 100644 --- a/net/ejabberd/pkg/PLIST +++ b/net/ejabberd/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2010/12/23 22:54:39 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.10 2011/11/22 17:11:07 gsoares Exp $ @newgroup _ejabberd:594 @newuser _ejabberd:594:_ejabberd:daemon:ejabberd account:/var/db/ejabberd:/bin/sh %%SHARED%% @@ -49,6 +49,7 @@ lib/ejabberd/ebin/ejabberd_odbc_sup.beam lib/ejabberd/ebin/ejabberd_piefxis.beam lib/ejabberd/ebin/ejabberd_rdbms.beam lib/ejabberd/ebin/ejabberd_receiver.beam +lib/ejabberd/ebin/ejabberd_regexp.beam lib/ejabberd/ebin/ejabberd_router.beam lib/ejabberd/ebin/ejabberd_s2s.beam lib/ejabberd/ebin/ejabberd_s2s_in.beam diff --git a/net/ejabberd/pkg/README b/net/ejabberd/pkg/README index 23e709555d..a7722b3431 100644 --- a/net/ejabberd/pkg/README +++ b/net/ejabberd/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.4 2011/06/02 13:41:39 ajacoutot Exp $ +$OpenBSD: README,v 1.5 2011/11/22 17:11:07 gsoares Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -32,15 +32,15 @@ $OpenBSD: README,v 1.4 2011/06/02 13:41:39 ajacoutot Exp $ * Running - Control is done using ${LOCALBASE}/sbin/ejabberdctl, run it without + Control is done using ${TRUEPREFIX}/sbin/ejabberdctl, run it without arguments for list of possible commands and flags. It needs to be executed as either root or _ejabberd user. To start ejabberd at boot time, you may insert the following into ${SYSCONFDIR}/rc.local: - if [ -x ${LOCALBASE}/sbin/ejabberdctl ]; then - echo -n ' ejabberd'; ${LOCALBASE}/sbin/ejabberdctl start + if [ -x ${TRUEPREFIX}/sbin/ejabberdctl ]; then + echo -n ' ejabberd'; ${TRUEPREFIX}/sbin/ejabberdctl start fi diff --git a/net/ejabberd/pkg/ejabberd.rc b/net/ejabberd/pkg/ejabberd.rc index 49fc90d028..1b1862921b 100644 --- a/net/ejabberd/pkg/ejabberd.rc +++ b/net/ejabberd/pkg/ejabberd.rc @@ -4,6 +4,7 @@ daemon="${TRUEPREFIX}/sbin/ejabberdctl" daemon_user="_ejabberd" +daemon_flags="start" . /etc/rc.d/rc.subr @@ -14,10 +15,6 @@ rc_check() { ${TRUEPREFIX}/sbin/ejabberdctl status || return 1 } -rc_start() { - ${TRUEPREFIX}/sbin/ejabberdctl start -} - rc_stop() { ${TRUEPREFIX}/sbin/ejabberdctl stop }