Attachment 154306 Details for Bug 198587 – patch to update ejabberd to the 15.02

[patch] patch to update ejabberd to the 15.02

ejabberd.patch (text/plain), 3.75 KB, created by Oleksii Samorukov on 2015-03-14 23:04:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleksii Samorukov

Created: 2015-03-14 23:04:43 UTC

Size: 3.75 KB

patch

obsolete

>diff -ur /usr/ports/net-im/ejabberd/Makefile /root/ejabberd/Makefile
>--- /usr/ports/net-im/ejabberd/Makefile	2015-02-16 14:55:49.000000000 +0100
>+++ /root/ejabberd/Makefile	2015-03-14 23:45:03.000000000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/net-im/ejabberd/Makefile 379092 2015-02-16 13:55:49Z ashish $
> 
> PORTNAME=	ejabberd
>-PORTVERSION=	14.12
>+PORTVERSION=	15.02
> CATEGORIES=	net-im
> MASTER_SITES=	http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \
> 		http://distfiles.pirateparty.in/%SUBDIR%/:deps \
>diff -ur /usr/ports/net-im/ejabberd/distinfo /root/ejabberd/distinfo
>--- /usr/ports/net-im/ejabberd/distinfo	2015-02-07 21:37:44.000000000 +0100
>+++ /root/ejabberd/distinfo	2015-03-14 23:46:13.000000000 +0100
>@@ -1,4 +1,4 @@
>-SHA256 (ejabberd-14.12.tgz) = 88c481e6e81e6e81100cdfae8e77bc6ffd6faed62f1938cf1e90ed7504c8785a
>-SIZE (ejabberd-14.12.tgz) = 3261685
>+SHA256 (ejabberd-15.02.tgz) = 58cc6b9b512f2f495993be735a8313a8a0591157e0f35a9a3702b59ff9eb6beb
>+SIZE (ejabberd-15.02.tgz) = 3281316
> SHA256 (ejabberd-deps-2.tar.xz) = 0f5604c0ce40c499f082170b457c4238fac570df71b4b03b9d5fa525abb15847
> SIZE (ejabberd-deps-2.tar.xz) = 12475132
>diff -ur /usr/ports/net-im/ejabberd/files/patch-Makefile.in /root/ejabberd/files/patch-Makefile.in
>--- /usr/ports/net-im/ejabberd/files/patch-Makefile.in	2015-02-07 21:37:44.000000000 +0100
>+++ /root/ejabberd/files/patch-Makefile.in	2015-03-14 23:51:35.000000000 +0100
>@@ -1,9 +1,6 @@
>-
>-$FreeBSD$
>-
>---- Makefile.in.orig
>-+++ Makefile.in
>-@@ -15,7 +15,7 @@
>+--- Makefile.in.orig	2015-02-12 00:14:57.000000000 +0100
>++++ Makefile.in	2015-03-14 23:50:41.000000000 +0100
>+@@ -18,7 +18,7 @@
>  SBINDIR = $(DESTDIR)@sbindir@
>  
>  # /lib/ejabberd/
>@@ -12,7 +9,7 @@
>  
>  # /share/doc/ejabberd
>  PACKAGE_TARNAME = @PACKAGE_TARNAME@
>-@@ -41,10 +41,10 @@
>+@@ -44,10 +44,10 @@
>  MSGSDIR = $(PRIVDIR)/msgs
>  
>  # /var/lib/ejabberd/
>@@ -26,7 +23,7 @@
>  
>  # /var/lib/ejabberd/.erlang.cookie
>  COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
>-@@ -113,25 +113,22 @@
>+@@ -116,9 +116,7 @@
>  	#
>  	# Configuration files
>  	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
>@@ -36,7 +33,8 @@
> +	$(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)
>  	$(SED) -e "s*{{rootdir}}*@prefix@*" \
>  		-e "s*{{installuser}}*@INSTALLUSER@*" \
>- 		-e "s*{{libdir}}*@libdir@*" \
>+ 		-e "s*{{bindir}}*@bindir@*" \
>+@@ -126,16 +124,15 @@
>  		-e "s*{{sysconfdir}}*@sysconfdir@*" \
>  		-e "s*{{localstatedir}}*@localstatedir@*" \
>  		-e "s*{{docdir}}*@docdir@*" \
>@@ -47,7 +45,7 @@
> -		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
> -	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
> +		-e "s*{{erl}}*@ERL@*" \
>-+ 		-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \
>++		-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \
> +		ejabberdctl.template > ejabberdctl.example
> +	$(INSTALL) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)
> +	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc.example
>@@ -56,10 +54,10 @@
>  	[ -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)*" \
>-@@ -184,6 +181,7 @@
>+ 	# Elixir binaries
>+ 	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
>+ 	-[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex
>+@@ -196,6 +193,7 @@
>  	chmod -R 750 $(LOGDIR)
>  	#
>  	# Documentation
>@@ -67,7 +65,7 @@
>  	$(INSTALL) -d $(DOCDIR)
>  	[ -f doc/dev.html ] \
>  		&& $(INSTALL) -m 644 doc/dev.html $(DOCDIR) \
>-@@ -196,6 +194,7 @@
>+@@ -208,6 +206,7 @@
>  		|| echo "No doc/guide.pdf was built"
>  	$(INSTALL) -m 644 doc/*.png $(DOCDIR)
>  	$(INSTALL) -m 644 COPYING $(DOCDIR)

Actions: View | Diff

Attachments on bug 198587: 154306