ejabberd: convert patches to git format (47da40e1) · Commits · Dom Sekotill / buildroot

package/ejabberd/0001-remove-deps.patch→package/ejabberd/0001-remove-make-targets-for-deps.patch

+29 −0

Original line number	Diff line number	Diff line
		Description: remove make targets for deps
		From a4910ec9257d0743e42c4b1650b6ef60196a013d Mon Sep 17 00:00:00 2001
		From: Philipp Huebner <debalance@debian.org>
		Date: Sun, 21 Feb 2016 10:52:53 -0500
		Subject: [PATCH] remove make targets for deps

		Without this patch, dependencies would be downloaded and compiled
		using rebar at build time.
		Author: Philipp Huebner <debalance@debian.org>
		---
		rebar.config.script \| 4 +---
		1 file changed, 1 insertion(+), 3 deletions(-)

		Index: ejabberd/rebar.config.script
		===================================================================
		diff --git a/rebar.config.script b/rebar.config.script
		index 633433c..646a15a 100644
		index 833595d..1b6177d 100644
		--- a/rebar.config.script
		+++ b/rebar.config.script
		@@ -187,9 +187,7 @@ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++
		@@ -192,9 +192,7 @@ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++
		{xref_checks, []},
		{xref_queries,
		[{"(XC - UC) \|\| (XU - X - B - "
		@@ -20,3 +24,6 @@ index 633433c..646a15a 100644
		%%io:format("ejabberd configuration:~n ~p~n", [Config]),
		Config.

		--
		2.5.0

package/ejabberd/0002-disable-rebar-deps.patch→package/ejabberd/0002-remove-make-targets-for-deps.patch

+13 −6

Original line number	Diff line number	Diff line
		Description: remove make targets for deps
		From 9ab065047fab913b7250525a51b9c9ad6f3a3478 Mon Sep 17 00:00:00 2001
		From: Philipp Huebner <debalance@debian.org>
		Date: Sun, 21 Feb 2016 10:55:14 -0500
		Subject: [PATCH] remove make targets for deps

		Without this patch, dependencies would be downloaded and compiled
		using rebar at build time.
		Author: Philipp Huebner <debalance@debian.org>
		---
		Makefile.in \| 32 ++++----------------------------
		1 file changed, 4 insertions(+), 28 deletions(-)

		Index: ejabberd/Makefile.in
		===================================================================
		diff --git a/Makefile.in b/Makefile.in
		index 8dd6bf5..b9d783a 100644
		--- a/Makefile.in
		@@ -74,3 +78,6 @@ index 8dd6bf5..b9d783a 100644
		dialyzer/erlang.plt:
		@mkdir -p dialyzer
		@dialyzer --build_plt --output_plt dialyzer/erlang.plt \
		--
		2.5.0

package/ejabberd/0003-disable-test.patch→package/ejabberd/0003-remove-testing-with-MySQL-and-PostgreSQL.patch

+16 −9

Original line number	Diff line number	Diff line
		Description: remove testing with MySQL and PostgreSQL
		Without this patch a test would be initiated after building ejabberd that
		requires specially configured instances of MySQL and PostgreSQL to be up
		and running.
		Author: Philipp Huebner <debalance@debian.org>
		From a4192bbd52250bd52d80b05f81cd5645abc650dc Mon Sep 17 00:00:00 2001
		From: Philipp Huebner <debalance@debian.org>
		Date: Sun, 21 Feb 2016 10:59:14 -0500
		Subject: [PATCH] remove testing with MySQL and PostgreSQL

		Without this patch a test would be initiated after building ejabberd
		that requires specially configured instances of MySQL and PostgreSQL
		to be up and running.
		---
		Makefile.in \| 6 ------
		1 file changed, 6 deletions(-)

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

		test:
		@@ -25,3 +29,6 @@ index ffd1d30..835d611 100644

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

package/ejabberd/0004-disable-version-check.patch→package/ejabberd/0004-remove-checking-erlang-version.patch

+30 −0

Original line number	Diff line number	Diff line
		Description: remove checking erlang version
		Without this patch, the configure will try to run erlang to simply check if
		the version is supported by ejabberd. Instead, we do this test statically.
		Author: Johan Oudinet <johan.oudinet@gmail.com>
		From bec405139144c8901b7d3771f5f658a3fed64b8a Mon Sep 17 00:00:00 2001
		From: Johan Oudinet <johan.oudinet@gmail.com>
		Date: Sun, 21 Feb 2016 11:00:24 -0500
		Subject: [PATCH] remove checking erlang version

		Index: ejabberd/configure.ac
		===================================================================
		--- ejabberd.orig/configure.ac 2014-10-20 11:04:14.751256865 +0200
		+++ ejabberd/configure.ac 2014-10-20 11:03:47.983578623 +0200
		@@ -37,10 +37,8 @@ AC_ARG_ENABLE(erlang-version-check,
		Without this patch, the configure will try to run erlang to simply
		check if the version is supported by ejabberd. Instead, we do this test
		statically.
		---
		configure.ac \| 2 --
		1 file changed, 2 deletions(-)

		diff --git a/configure.ac b/configure.ac
		index d5f313e..4b35d57 100644
		--- a/configure.ac
		+++ b/configure.ac
		@@ -39,10 +39,8 @@ AC_ARG_ENABLE(erlang-version-check,
		[Check Erlang/OTP version @<:@default=yes@:>@])])
		case "$enable_erlang_version_check" in
		yes\|'')
		@@ -18,3 +25,6 @@ Index: ejabberd/configure.ac
		;;
		esac

		--
		2.5.0

package/ejabberd/0005-fix-includes.patch→package/ejabberd/0005-correct-include.patch

+56 −0

Original line number	Diff line number	Diff line
		Description: correct include
		From 9878a2cfb1a927f4b42f1c4d08df434084739626 Mon Sep 17 00:00:00 2001
		From: Philipp Huebner <debalance@debian.org>
		Date: Sun, 21 Feb 2016 11:01:42 -0500
		Subject: [PATCH] correct include

		This part of the code was moved into it's own project and was packaged
		separately by me. To make the build process work, this small fix is
		necessary.
		Author: Philipp Huebner <debalance@debian.org>

		Index: ejabberd/src/mod_sip_proxy.erl
		===================================================================
		--- ejabberd.orig/src/mod_sip_proxy.erl
		+++ ejabberd/src/mod_sip_proxy.erl
		@@ -21,7 +21,7 @@
		---
		src/mod_sip.erl \| 2 +-
		src/mod_sip_proxy.erl \| 2 +-
		src/mod_sip_registrar.erl \| 2 +-
		3 files changed, 3 insertions(+), 3 deletions(-)

		diff --git a/src/mod_sip.erl b/src/mod_sip.erl
		index 1e4044b..4279b64 100644
		--- a/src/mod_sip.erl
		+++ b/src/mod_sip.erl
		@@ -38,7 +38,7 @@

		-include("ejabberd.hrl").
		-include("logger.hrl").
		--include_lib("esip/include/esip.hrl").
		+-include_lib("p1_sip/include/esip.hrl").

		-define(SIGN_LIFETIME, 300). %% in seconds.

		Index: ejabberd/src/mod_sip.erl
		===================================================================
		--- ejabberd.orig/src/mod_sip.erl
		+++ ejabberd/src/mod_sip.erl
		@@ -20,7 +20,7 @@
		%%%===================================================================
		%%% API
		diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl
		index a0dff12..b5794fa 100644
		--- a/src/mod_sip_proxy.erl
		+++ b/src/mod_sip_proxy.erl
		@@ -40,7 +40,7 @@

		-include("ejabberd.hrl").
		-include("logger.hrl").
		--include_lib("esip/include/esip.hrl").
		+-include_lib("p1_sip/include/esip.hrl").

		%%%===================================================================
		%%% API
		Index: ejabberd/src/mod_sip_registrar.erl
		===================================================================
		--- ejabberd.orig/src/mod_sip_registrar.erl
		+++ ejabberd/src/mod_sip_registrar.erl
		@@ -20,7 +20,7 @@
		-define(SIGN_LIFETIME, 300). %% in seconds.

		diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl
		index f6b3103..1061c88 100644
		--- a/src/mod_sip_registrar.erl
		+++ b/src/mod_sip_registrar.erl
		@@ -37,7 +37,7 @@

		-include("ejabberd.hrl").
		-include("logger.hrl").
		@@ -43,3 +51,6 @@ Index: ejabberd/src/mod_sip_registrar.erl

		-define(CALL_TIMEOUT, timer:seconds(30)).
		-define(DEFAULT_EXPIRES, 3600).
		--
		2.5.0