Commit 8290f2ea authored by Johan Oudinet's avatar Johan Oudinet Committed by Thomas Petazzoni
Browse files

ejabberd: new package. 



[Thomas:
 - Adjust the comment about the dependency on erlang
 - Fix license to be 'GPLv2+ with OpenSSL exception' and not just 'GPLv2+'
 - Use double quotes instead of simple quotes in the .mk file.
 - Don't use the EJABBERD_MAKE_ENV variable, since it's not defined
   anywhere.
 - Remove the 0007-fix-init.patch patch, since we're not using the
   init script provided by ejabberd, and rename
   0008-fix-install-permissions.patch to
   0007-fix-install-permissions.patch.]

Signed-off-by: default avatarJohan Oudinet <johan.oudinet@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 527aaf08

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -1078,6 +1078,7 @@ endif 
	source "package/dnsmasq/Config.in"

	source "package/dropbear/Config.in"

	source "package/ebtables/Config.in"

	source "package/ejabberd/Config.in"

	source "package/ethtool/Config.in"

	source "package/faifa/Config.in"

	source "package/fmc/Config.in"

package/ejabberd/0001-remove-deps.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Description: 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>



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"])},

-          {post_hooks, PostHooks ++ CfgPostHooks},

-          {deps, Deps ++ CfgDeps}],

+           ++ filename:join([Cwd, "tools"])}],

 %%io:format("ejabberd configuration:~n  ~p~n", [Config]),

 Config.

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

0 → 100644
+70 −0
Original line number Diff line number Diff line 
Description: 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>



Index: ejabberd/Makefile.in

===================================================================

--- ejabberd.orig/Makefile.in

+++ ejabberd/Makefile.in

@@ -68,26 +68,11 @@ else

   INIT_USER=$(INSTALLUSER)

 endif

 

-all: deps src

+all: src

 

-deps: deps/.got

-

-deps/.got:

-	rm -rf deps/.got

-	rm -rf deps/.built

-	$(REBAR) get-deps && :> deps/.got

-

-deps/.built: deps/.got

-	$(REBAR) compile && :> deps/.built

-

-src: deps/.built

+src:

 	$(REBAR) skip_deps=true compile

 

-update:

-	rm -rf deps/.got

-	rm -rf deps/.built

-	$(REBAR) update-deps && :> deps/.got

-

 translations:

 	contrib/extract_translations/prepare-translation.sh -updateall

 

@@ -103,8 +88,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.'

 

-DLLs := $(wildcard deps/*/priv/*.so) $(wildcard deps/*/priv/lib/*.so)

-

 install: all

 	#

 	# Configuration files

@@ -139,14 +122,11 @@ 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

 	#

 	# ejabberd header files

 	$(INSTALL) -d $(INCLUDEDIR)

 	$(INSTALL) -m 644 include/*.hrl $(INCLUDEDIR)

-	$(INSTALL) -m 644 deps/*/include/*.hrl $(INCLUDEDIR)

 	#

 	# Binary C programs

 	$(INSTALL) -d $(PBINDIR)

@@ -156,7 +136,6 @@ install: all

 	#

 	# Binary system libraries

 	$(INSTALL) -d $(SODIR)

-	$(INSTALL) -m 644 $(DLLs) $(SODIR)

 	#

 	# Translated strings

 	$(INSTALL) -d $(MSGSDIR)

package/ejabberd/0003-disable-test.patch

0 → 100644
+21 −0
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>



Index: ejabberd/Makefile.in

===================================================================

--- ejabberd.orig/Makefile.in

+++ ejabberd/Makefile.in

@@ -260,10 +260,6 @@ dialyzer: erlang_plt deps_plt ejabberd_p

 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi

 

 test:

-	@echo "************************** NOTICE ***************************************"

-	@cat test/README

-	@echo "*************************************************************************"

-	$(REBAR) skip_deps=true ct

 

 .PHONY: src doc edoc dialyzer Makefile TAGS clean clean-rel distclean rel \

 	install uninstall uninstall-binary uninstall-all translations deps test spec \

package/ejabberd/0004-disable-version-check.patch

0 → 100644
+20 −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>



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,

 	[Check Erlang/OTP version @<:@default=yes@:>@])])

 case "$enable_erlang_version_check" in

 	yes|'')

-		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX])

 		;;

 	no)

-		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn])

 		;;

 esac