Attachment 144847 Details for Bug 192011 – [patch] ejabberd fixes

[patch] [patch] ejabberd fixes

ejabberd.patch (text/plain), 2.46 KB, created by Jimmy Olgeni on 2014-07-21 14:08:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jimmy Olgeni

Created: 2014-07-21 14:08:49 UTC

Size: 2.46 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 362413)
>+++ Makefile	(working copy)
>@@ -78,6 +78,8 @@
> .if ${PORT_OPTIONS:MPAM}
> 	${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd ${STAGEDIR}${PREFIX}/etc/pam.d/ejabberd
> .endif
>-	@${CAT} ${PKGMESSAGE}
>+.for _file in p1_tls_drv.so expat_erl.so p1_yaml.so esip_drv.so p1_sha.so ezlib_drv.so iconv.so stringprep.so
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/erlang/lib/ejabberd-${PORTVERSION}/priv/lib/${_file}
>+.endfor
> 
> .include <bsd.port.post.mk>
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 362413)
>+++ files/patch-Makefile.in	(working copy)
>@@ -12,7 +12,7 @@
>  
>  # /share/doc/ejabberd
>  PACKAGE_TARNAME = @PACKAGE_TARNAME@
>-@@ -41,7 +41,7 @@
>+@@ -41,10 +41,10 @@
>  MSGSDIR = $(PRIVDIR)/msgs
>  
>  # /var/lib/ejabberd/
>@@ -19,8 +19,13 @@
> -SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
> +SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd
>  
>- # /var/lock/ejabberdctl
>- CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
>+-# /var/lock/ejabberdctl
>+-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
>++# /var/run/ejabberdctl
>++CTLLOCKDIR = $(DESTDIR)@localstatedir@/run/ejabberdctl
>+ 
>+ # /var/lib/ejabberd/.erlang.cookie
>+ COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
> @@ -109,25 +109,22 @@
>  	#
>  	# Configuration files
>Index: files/patch-ejabberdctl.template
>===================================================================
>--- files/patch-ejabberdctl.template	(revision 362413)
>+++ files/patch-ejabberdctl.template	(working copy)
>@@ -29,3 +29,12 @@
>      fi
>      if [ "$EJABBERD_BIN_PATH" = "" ] ; then
>          EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
>+@@ -261,7 +261,7 @@
>+     # using flock if available. Expects a linux-style
>+     # flock that can lock a file descriptor.
>+     MAXCONNID=100
>+-    CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
>++    CONNLOCKDIR={{localstatedir}}/run/ejabberdctl
>+     FLOCK='/usr/bin/flock'
>+     if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
>+         JOT='/usr/bin/jot'
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 362413)
>+++ pkg-plist	(working copy)
>@@ -416,3 +416,6 @@
> @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin
> @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%
> @dirrmtry %%ETCDIR%%
>+@dirrmtry /var/spool/ejabberd
>+@dirrmtry /var/run/ejabberdctl
>+@dirrmtry /var/log/ejabberd

Actions: View | Diff

Attachments on bug 192011: 144847