ejabberd: bump to version 15.06 (23f4cf81) · Commits · Dom Sekotill / buildroot

package/ejabberd/0001-remove-deps.patch

+11 −9

Original line number	Diff line number	Diff line
		@@ -5,16 +5,18 @@ Author: Philipp Huebner <debalance@debian.org>

		Index: ejabberd/rebar.config.script
		===================================================================
		--- ejabberd.orig/rebar.config.script
		+++ ejabberd/rebar.config.script
		@@ -126,9 +126,7 @@ Config = [{erl_opts, Macros ++ HiPE ++ D
		{sub_dirs, ["rel"]},
		{keep_build_info, true},
		{ct_extra_params, "-include "
		- ++ filename:join([Cwd, "tools"])},
		diff --git a/rebar.config.script b/rebar.config.script
		index b4dfaa3..9152c12 100644
		--- a/rebar.config.script
		+++ b/rebar.config.script
		@@ -183,9 +183,7 @@ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++
		{xref_checks, []},
		{xref_queries,
		[{"(XC - UC) \|\| (XU - X - B - "
		- ++ string:join(CfgXrefs, " - ") ++ ")", []}]},
		- {post_hooks, PostHooks ++ CfgPostHooks},
		- {deps, Deps ++ CfgDeps}],
		+ ++ filename:join([Cwd, "tools"])}],
		- {deps, Deps ++ CfgDeps}] ++ ElixirConfig,
		+ ++ string:join(CfgXrefs, " - ") ++ ")", []}]}],
		%%io:format("ejabberd configuration:~n ~p~n", [Config]),
		Config.

package/ejabberd/0002-disable-rebar-deps.patch

+16 −12

Original line number	Diff line number	Diff line
		@@ -5,9 +5,11 @@ Author: Philipp Huebner <debalance@debian.org>

		Index: ejabberd/Makefile.in
		===================================================================
		--- ejabberd.orig/Makefile.in
		+++ ejabberd/Makefile.in
		@@ -68,26 +68,11 @@ else
		diff --git a/Makefile.in b/Makefile.in
		index ffd1d30..09cb8d7 100644
		--- a/Makefile.in
		+++ b/Makefile.in
		@@ -74,26 +74,11 @@ else
		INIT_USER=$(INSTALLUSER)
		endif

		@@ -33,10 +35,10 @@ Index: ejabberd/Makefile.in
		- rm -rf deps/.built
		- $(REBAR) update-deps && :> deps/.got
		-
		translations:
		contrib/extract_translations/prepare-translation.sh -updateall
		xref: all
		$(REBAR) skip_deps=true xref

		@@ -103,8 +88,6 @@ spec:
		@@ -109,8 +94,6 @@ spec:
		$(ERL) -noinput +B -pa ebin -pa deps/*/ebin -eval \
		'case xml_gen:compile("tools/xmpp_codec.spec") of ok -> halt(0); _ -> halt(1) end.'

		@@ -45,14 +47,16 @@ Index: ejabberd/Makefile.in
		install: all
		#
		# Configuration files
		@@ -139,14 +122,11 @@ install: all
		@@ -151,8 +134,6 @@ install: all
		$(INSTALL) -d $(BEAMDIR)
		$(INSTALL) -m 644 ebin/*.app $(BEAMDIR)
		$(INSTALL) -m 644 ebin/*.beam $(BEAMDIR)
		- $(INSTALL) -m 644 deps//ebin/.app $(BEAMDIR)
		- $(INSTALL) -m 644 deps//ebin/.beam $(BEAMDIR)
		rm -f $(BEAMDIR)/configure.beam
		#
		# Install Elixir and Elixir dependancies
		-$(INSTALL) -m 644 deps//lib//ebin/*.app $(BEAMDIR)
		-$(INSTALL) -m 644 deps//lib//ebin/*.beam $(BEAMDIR)
		@@ -161,7 +142,6 @@ install: all
		# ejabberd header files
		$(INSTALL) -d $(INCLUDEDIR)
		$(INSTALL) -m 644 include/*.hrl $(INCLUDEDIR)
		@@ -60,11 +64,11 @@ Index: ejabberd/Makefile.in
		#
		# Binary C programs
		$(INSTALL) -d $(PBINDIR)
		@@ -156,7 +136,6 @@ install: all
		@@ -173,7 +153,6 @@ install: all
		#
		# Binary system libraries
		$(INSTALL) -d $(SODIR)
		- $(INSTALL) -m 644 $(DLLs) $(SODIR)
		-[ -f $(SODIR)/jiffy.so ] && (cd $(PRIVDIR); ln -s lib/jiffy.so; true)
		-[ -f $(SODIR)/sqlite3_drv.so ] && (cd $(PRIVDIR); ln -s lib/sqlite3_drv.so; true)
		#
		# Translated strings
		$(INSTALL) -d $(MSGSDIR)

package/ejabberd/0003-disable-test.patch

+10 −4

Original line number	Diff line number	Diff line
		@@ -6,16 +6,22 @@ Author: Philipp Huebner <debalance@debian.org>

		Index: ejabberd/Makefile.in
		===================================================================
		--- ejabberd.orig/Makefile.in
		+++ ejabberd/Makefile.in
		@@ -260,10 +260,6 @@ dialyzer: erlang_plt deps_plt ejabberd_p
		diff --git a/Makefile.in b/Makefile.in
		index ffd1d30..835d611 100644
		--- a/Makefile.in
		+++ b/Makefile.in
		@@ -306,14 +306,8 @@ dialyzer: erlang_plt deps_plt ejabberd_plt
		status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi

		test:
		- @echo "************************ NOTICE *************************************"
		- @cat test/README
		- @echo "*************************************************************************"
		- @cd priv && ln -sf ../sql
		- $(REBAR) skip_deps=true ct

		.PHONY: src doc edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
		quicktest:
		- $(REBAR) skip_deps=true ct suites=elixir

		.PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
		install uninstall uninstall-binary uninstall-all translations deps test spec \

package/ejabberd/0006-disable-erlang-deprecated-types-check.patch

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		Description: disable ERLANG_DEPRECATED_CHECK
		Without this patch, the configure will try to execute erlang to check
		if it uses deprecated types. Assume the answer is false.
		Author: Johan Oudinet <johan.oudinet@gmail.com>

		Index: ejabberd/configure.ac
		====================================================================
		diff --git a/configure.ac b/configure.ac
		index 6ae0a24..e5498df 100644
		--- a/configure.ac
		+++ b/configure.ac
		@@ -252,7 +252,7 @@ if test "$ENABLEUSER" != ""; then
		AC_SUBST([INSTALLUSER], [$ENABLEUSER])
		fi

		-ERLANG_DEPRECATED_TYPES_CHECK
		+AC_SUBST(erlang_deprecated_types, false)

		if test "$sqlite" = "true"; then
		AX_LIB_SQLITE3([3.6.19])

package/ejabberd/0006-remove-doc.patch

deleted100644 → 0

+0 −26

Original line number	Diff line number	Diff line
		Description: remove installing documentation
		Without this patch, the Makefile will try to install ejabberd
		documentation even if it is not generated, which will fail.
		Author: Johan Oudinet <johan.oudinet@gmail.com>

		Index: ejabberd/Makefile.in
		===================================================================
		--- ejabberd.orig/Makefile.in 2014-10-21 16:43:42.604972005 +0200
		+++ ejabberd/Makefile.in 2014-10-21 16:45:12.419989667 +0200
		@@ -156,16 +156,6 @@ install: all
		$(INSTALL) -d -m 750 $(O_USER) $(LOGDIR)
		$(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
		chmod -R 750 $(LOGDIR)
		- #
		- # Documentation
		- $(INSTALL) -d $(DOCDIR)
		- $(INSTALL) -m 644 doc/dev.html $(DOCDIR)
		- $(INSTALL) -m 644 doc/guide.html $(DOCDIR)
		- $(INSTALL) -m 644 doc/*.png $(DOCDIR)
		- [ -f doc/guide.pdf ] \
		- && $(INSTALL) -m 644 doc/guide.pdf $(DOCDIR) \
		- \|\| echo "No doc/guide.pdf was built"
		- $(INSTALL) -m 644 COPYING $(DOCDIR)

		uninstall: uninstall-binary