Skip to contentSkip to conversation

erlang-jiffy: New package

PATCH New Johan Oudinet 2 participants 8 messages May 31, 2017

lore
Share & tools
lore

Johan Oudinet

author
#0 lore raw

PATCH v2 1/4 erlang-jiffy: New package

JSON NIFs for Erlang.
https://github.com/davisp/jiffy

Signed-off-by Johan Oudinet <[email protected]>

---
Changes v1 -> v2:
- Fix license info (suggested by Thomas)
- Add an entry to the DEVELOPERS file

---
 DEVELOPERS                             |  1 +
 package/Config.in                      |  1 +
 package/erlang-jiffy/Config.in         | 10 ++++++++++
 package/erlang-jiffy/erlang-jiffy.hash |  2 ++
 package/erlang-jiffy/erlang-jiffy.mk   | 13 +++++++++++++
 5 files changed, 27 insertions(+)
 create mode 100644 package/erlang-jiffy/Config.in
 create mode 100644 package/erlang-jiffy/erlang-jiffy.hash
 create mode 100644 package/erlang-jiffy/erlang-jiffy.mk
DEVELOPERS +1 -0
index a8fa14365c..231e73323b 100644
@@ -861,6 +861,7 @@ F:	package/python-libconfig/
 N:	Johan Oudinet <[email protected]>
 F:	package/ejabberd/
 F:	package/erlang-goldrush/
+F:	package/erlang-jiffy/
 F:	package/erlang-lager/
 F:	package/erlang-p1-cache-tab/
 F:	package/erlang-p1-iconv/
package/Config.in +1 -0
index 7991353f99..2b53add300 100644
@@ -510,6 +510,7 @@ menu "Interpreter languages and scripting"
 if BR2_PACKAGE_ERLANG
 menu "Erlang libraries/modules"
 	source "package/erlang-goldrush/Config.in"
+	source "package/erlang-jiffy/Config.in"
 	source "package/erlang-lager/Config.in"
 	source "package/erlang-p1-cache-tab/Config.in"
 	source "package/erlang-p1-iconv/Config.in"
package/erlang-jiffy/Config.in new file +10 -0
new file mode 100644
index 0000000000..d65f42c9fd
@@ -0,0 +1,10 @@
+comment "erlang-jiffy needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_ERLANG_JIFFY
+	bool "erlang-jiffy"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  JSON NIFs for Erlang.
+
+	  https://github.com/davisp/jiffy
package/erlang-jiffy/erlang-jiffy.hash new file +2 -0
new file mode 100644
index 0000000000..1f83e2789c
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d erlang-jiffy-0.14.8.tar.gz
package/erlang-jiffy/erlang-jiffy.mk new file +13 -0
new file mode 100644
index 0000000000..4c2195af48
@@ -0,0 +1,13 @@
+################################################################################
+#
+# erlang-jiffy
+#
+################################################################################
+
+ERLANG_JIFFY_VERSION = 0.14.8
+ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION))
+ERLANG_JIFFY_LICENSE = MIT (core), BSD-3-Clause (Google double \
+conversion library), BSD-3-Clause (tests)
+ERLANG_JIFFY_LICENSE_FILES = LICENSE
+
+$(eval $(rebar-package))
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH v2 2/4 erlang-p1-oauth2: New package

OAuth2 library for Erlang
https://github.com/processone/p1_oauth2

Signed-off-by Johan Oudinet <[email protected]>

---
Changes v1 -> v2:
- Fix github URL and rename the package accordingly (suggested by Thomas)
- Add en entry to the DEVELOPERS file

---
 DEVELOPERS                                     |  1 +
 package/Config.in                              |  1 +
 package/ejabberd/Config.in                     |  8 +++++++-
 package/erlang-p1-oauth2/Config.in             |  6 ++++++
 package/erlang-p1-oauth2/erlang-p1-oauth2.hash |  2 ++
 package/erlang-p1-oauth2/erlang-p1-oauth2.mk   | 13 +++++++++++++
 6 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 package/erlang-p1-oauth2/Config.in
 create mode 100644 package/erlang-p1-oauth2/erlang-p1-oauth2.hash
 create mode 100644 package/erlang-p1-oauth2/erlang-p1-oauth2.mk
DEVELOPERS +1 -0
index 231e73323b..269fd79a21 100644
@@ -865,6 +865,7 @@ F:	package/erlang-jiffy/
 F:	package/erlang-lager/
 F:	package/erlang-p1-cache-tab/
 F:	package/erlang-p1-iconv/
+F:	package/erlang-p1-oauth2/
 F:	package/erlang-p1-sip/
 F:	package/erlang-p1-stringprep/
 F:	package/erlang-p1-stun/
package/Config.in +1 -0
index 2b53add300..a82ed039b8 100644
@@ -514,6 +514,7 @@ menu "Erlang libraries/modules"
 	source "package/erlang-lager/Config.in"
 	source "package/erlang-p1-cache-tab/Config.in"
 	source "package/erlang-p1-iconv/Config.in"
+	source "package/erlang-p1-oauth2/Config.in"
 	source "package/erlang-p1-sip/Config.in"
 	source "package/erlang-p1-stringprep/Config.in"
 	source "package/erlang-p1-stun/Config.in"
package/ejabberd/Config.in +7 -1
index 5d176c3af6..a7542cd12d 100644
@@ -1,13 +1,19 @@
 config BR2_PACKAGE_EJABBERD
 	bool "ejabberd"
 	depends on BR2_PACKAGE_ERLANG
-	depends on BR2_INSTALL_LIBSTDCPP # stringprep
+	depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep
+	select BR2_PACKAGE_ERLANG_JIFFY
 	select BR2_PACKAGE_ERLANG_LAGER
 	select BR2_PACKAGE_ERLANG_P1_CACHE_TAB
 	select BR2_PACKAGE_ERLANG_P1_ICONV
+	select BR2_PACKAGE_ERLANG_P1_OAUTH2
 	select BR2_PACKAGE_ERLANG_P1_SIP
 	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
+	select BR2_PACKAGE_ERLANG_P1_STUN
+	select BR2_PACKAGE_ERLANG_P1_TLS
+	select BR2_PACKAGE_ERLANG_P1_UTILS
 	select BR2_PACKAGE_ERLANG_P1_XML
+	select BR2_PACKAGE_ERLANG_P1_XMPP
 	select BR2_PACKAGE_ERLANG_P1_YAML
 	select BR2_PACKAGE_ERLANG_P1_ZLIB
 	select BR2_PACKAGE_GETENT
package/erlang-p1-oauth2/Config.in new file +6 -0
new file mode 100644
index 0000000000..32e79ec99a
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_ERLANG_P1_OAUTH2
+	bool "erlang-p1-oauth2"
+	help
+	  OAuth2 library for Erlang
+
+	  https://github.com/processone/p1_oauth2
package/erlang-p1-oauth2/erlang-p1-oauth2.hash new file +2 -0
new file mode 100644
index 0000000000..3666519f5f
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 86e4d93f0206135bc6017b6001d061305513917f79c53294e534d6e66fd54727 erlang-p1-oauth2-0.6.1.tar.gz
package/erlang-p1-oauth2/erlang-p1-oauth2.mk new file +13 -0
new file mode 100644
index 0000000000..c85706c8db
@@ -0,0 +1,13 @@
+################################################################################
+#
+# erlang-p1-oauth2
+#
+################################################################################
+
+ERLANG_P1_OAUTH2_VERSION = 0.6.1
+ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION))
+ERLANG_P1_OAUTH2_LICENSE = MIT
+ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE
+ERLANG_P1_OAUTH2_INSTALL_STAGING = YES
+
+$(eval $(rebar-package))
Signature · 1 line
2.11.0
#2 lore raw

PATCH v2 2/4 erlang-p1-oauth2: New package

Hello,

Quoted 2 lines · Johan Oudinet
 package/Config.in                              |  1 +
 package/ejabberd/Config.in                     |  8 +++++++-

This change clearly doesn't belong to this patch :)

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#3 lore raw

PATCH v2 3/4 erlang-p1-xmpp: New package

In reply to Johan Oudinet

XMPP library for Erlang.
https://github.com/processone/xmpp

Signed-off-by Johan Oudinet <[email protected]>

---
Changes v1 -> v2:
- Add an entry to the DEVELOPERS file (suggested by Thomas)

---
 DEVELOPERS                                             |  1 +
 package/Config.in                                      |  1 +
 package/erlang-p1-xmpp/0001-fix-includes.patch         | 16 ++++++++++++++++
 .../0002-remove-dependencies-from-rebar-config.patch   | 18 ++++++++++++++++++
 package/erlang-p1-xmpp/Config.in                       |  8 ++++++++
 package/erlang-p1-xmpp/erlang-p1-xmpp.hash             |  2 ++
 package/erlang-p1-xmpp/erlang-p1-xmpp.mk               | 16 ++++++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 package/erlang-p1-xmpp/0001-fix-includes.patch
 create mode 100644 package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch
 create mode 100644 package/erlang-p1-xmpp/Config.in
 create mode 100644 package/erlang-p1-xmpp/erlang-p1-xmpp.hash
 create mode 100644 package/erlang-p1-xmpp/erlang-p1-xmpp.mk
DEVELOPERS +1 -0
index 269fd79a21..aa9ecc1256 100644
@@ -872,6 +872,7 @@ F:	package/erlang-p1-stun/
 F:	package/erlang-p1-tls/
 F:	package/erlang-p1-utils/
 F:	package/erlang-p1-xml/
+F:	package/erlang-p1-xmpp/
 F:	package/erlang-p1-yaml/
 F:	package/erlang-p1-zlib/
 F:	package/nginx-dav-ext/
package/Config.in +1 -0
index a82ed039b8..e515510aa1 100644
@@ -521,6 +521,7 @@ menu "Erlang libraries/modules"
 	source "package/erlang-p1-tls/Config.in"
 	source "package/erlang-p1-utils/Config.in"
 	source "package/erlang-p1-xml/Config.in"
+	source "package/erlang-p1-xmpp/Config.in"
 	source "package/erlang-p1-yaml/Config.in"
 	source "package/erlang-p1-zlib/Config.in"
 endmenu
package/erlang-p1-xmpp/0001-fix-includes.patch new file +16 -0
new file mode 100644
index 0000000000..d0a267b721
@@ -0,0 +1,16 @@
+Without this patch, rebar fails to find include file fxml.hrl.
+
+Signed-off-by: Christophe Romain <[email protected]>
+
+diff --git a/include/xmpp.hrl b/include/xmpp.hrl
+index afa5f61..678858e 100644
+--- a/include/xmpp.hrl
++++ b/include/xmpp.hrl
+@@ -26,7 +26,7 @@
+ -include("ns.hrl").
+ -include("jid.hrl").
+ -include("xmpp_codec.hrl").
+--include("fxml.hrl").
++-include_lib("p1_xml/include/fxml.hrl").
+
+ -type stanza() :: iq() | presence() | message().
package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch new file +18 -0
new file mode 100644
index 0000000000..fa5c269c22
@@ -0,0 +1,18 @@
+Without this patch, dependencies would be downloaded and compiled
+by rebar at build time.
+
+Signed-off-by: Christophe Romain <[email protected]>
+
+diff --git a/rebar.config b/rebar.config
+index 79494b7..8d769f1 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -24,9 +24,6 @@
+ 	    {i, "../fast_xml/include"},
+ 	    {i, "deps/fast_xml/include"}]}.
+
+-{deps, [{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.22"}}},
+-	{stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.8"}}}]}.
+-
+ {cover_enabled, true}.
+ {cover_export_enabled, true}.
package/erlang-p1-xmpp/Config.in new file +8 -0
new file mode 100644
index 0000000000..1d518e2023
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_ERLANG_P1_XMPP
+	bool "erlang-p1-xmpp"
+	select BR2_PACKAGE_ERLANG_P1_XML
+	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
+	help
+	  XMPP library for Erlang.
+
+	  https://github.com/processone/xmpp
package/erlang-p1-xmpp/erlang-p1-xmpp.hash new file +2 -0
new file mode 100644
index 0000000000..f245c843e8
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 e7b5db5ab6204f5bc6ebf91a183ebeae2b43ca6372dd2506599a8e8168a99c50 erlang-p1-xmpp-1.1.9.tar.gz
package/erlang-p1-xmpp/erlang-p1-xmpp.mk new file +16 -0
new file mode 100644
index 0000000000..149d8bc5c7
@@ -0,0 +1,16 @@
+################################################################################
+#
+# erlang-p1-xmpp
+#
+################################################################################
+
+ERLANG_P1_XMPP_VERSION = 1.1.9
+ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION))
+ERLANG_P1_XMPP_LICENSE = Apache-2.0
+ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt
+ERLANG_P1_XMPP_INSTALL_STAGING = YES
+ERLANG_P1_XMPP_DEPENDENCIES = erlang-p1-xml erlang-p1-stringprep \
+	host-erlang-p1-xml
+
+$(eval $(rebar-package))
+$(eval $(host-rebar-package))
Signature · 1 line
2.11.0
#4 lore raw

PATCH v2 3/4 erlang-p1-xmpp: New package

Hello,

Quoted 4 lines · Johan Oudinet

XMPP library for Erlang.
https://github.com/processone/xmpp

Signed-off-by Johan Oudinet <[email protected]>

I've applied to next. However, I have a request for upcoming patches.

package/erlang-p1-xmpp/0001-fix-includes.patch line 3

Quoted 9 lines
package/erlang-p1-xmpp/0001-fix-includes.patch new file +3 -0
new file mode 100644
index 0000000000..d0a267b721
@@ -0,0 +1,16 @@
+Without this patch, rebar fails to find include file fxml.hrl.
+
+Signed-off-by: Christophe Romain <[email protected]>

Since all those packages are hosted in Git repository, we would very much prefer to have patches created with "git format-patch", as they can more easily be applied using "git am".

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#5 lore raw

PATCH v2 4/4 ejabberd: bump to version 17.04

In reply to Johan Oudinet

There are new dependencies: erlang-p1-jiffy, erlang-p1-oauth2, erlang-p1-stun, erlang-p1-tls, erlang-p1-utils, erlang-p1-xmpp

as well as two host dependencies on erlang-p1-utils and erlang-p1-xmpp. Otherwise the compilation via rebar fails.

4 patches have been refreshed and a new patch have been introduced to tell rebar to use host dependencies instead of trying to download them. Hopefully this patch could be drop in ejabberd 17.06.

Signed-off-by Johan Oudinet <[email protected]>

---
Changes v1 -> v2:
- Describe in the commit log the new dependencies and patches

---
 .../0001-remove-make-targets-for-deps.patch        |  42 +------
 ...002-remove-dependencies-from-rebar-config.patch | 129 +++++++++++----------
 .../ejabberd/0006-fix-install-permissions.patch    |  42 +++----
 package/ejabberd/0007-fix-ejabberdctl.patch        |  12 +-
 .../0008-rebar-uses-host-dependencies.patch        |  33 ++++++
 package/ejabberd/ejabberd.hash                     |   4 +-
 package/ejabberd/ejabberd.mk                       |   6 +-
 7 files changed, 136 insertions(+), 132 deletions(-)
 create mode 100644 package/ejabberd/0008-rebar-uses-host-dependencies.patch
package/ejabberd/0001-remove-make-targets-for-deps.patch +4 -38
index 6917f71f31..aee09670a1 100644
@@ -7,21 +7,18 @@ Without this patch, dependencies would be downloaded and compiled
 using rebar at build time.
 
 Signed-off-by: Frank Hunleth <[email protected]>
----
- Makefile.in | 26 +++-----------------------
- 1 file changed, 3 insertions(+), 23 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 08cd837..2a6457c 100644
+index a0b4553d..4190a515 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -77,26 +77,11 @@ else
    INIT_USER=$(INSTALLUSER)
  endif
- 
+
 -all: deps src
 +all: src
- 
+
 -deps: deps/.got
 -
 -deps/.got:

@@ -35,7 +32,7 @@ index 08cd837..2a6457c 100644
 -src: deps/.built
 +src:
  	$(REBAR) skip_deps=true compile
- 
+
 -update:
 -	rm -rf deps/.got
 -	rm -rf deps/.built

@@ -43,34 +40,3 @@ index 08cd837..2a6457c 100644
 -
  xref: all
  	$(REBAR) skip_deps=true xref
- 
-@@ -152,16 +137,13 @@ $(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template,
- $(sort $(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS))):
- 	$(INSTALL) -d $@
- 
--$(call TO_DEST,deps/p1_pam/priv/bin/epam): $(LIBDIR)/%: deps/p1_pam/priv/bin/epam $(call TO_DEST,deps/p1_pam/priv/bin/)
--	$(INSTALL) -m 750 $(O_USER) $< $@
--
- $(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql)
- 	$(INSTALL) -m 644 $< $@
- 
- $(call TO_DEST,priv/bin/captcha.sh): tools/captcha.sh $(call TO_DEST,priv/bin)
- 	$(INSTALL) -m 750 $(O_USER) $< $@
- 
--copy-files-sub2: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql)
-+copy-files-sub2: $(call TO_DEST,$(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql)
- 
- endif
- 
-@@ -287,8 +269,6 @@ TAGS:
- 
- Makefile: Makefile.in
- 
--deps := $(wildcard deps/*/ebin)
--
- dialyzer/erlang.plt:
- 	@mkdir -p dialyzer
- 	@dialyzer --build_plt --output_plt dialyzer/erlang.plt \
--- 
-2.5.0
-
package/ejabberd/0002-remove-dependencies-from-rebar-config.patch +69 -60

148 lines not on this page · raw message

package/ejabberd/0006-fix-install-permissions.patch +22 -20

68 lines not on this page · raw message

package/ejabberd/0007-fix-ejabberdctl.patch +3 -9
index 36aa3a707f..ab70d8900a 100644
@@ -7,28 +7,22 @@ Change default values so ejabberdctl run commands as ejabberd user
 Also add a way for the user to change default values.
 
 Signed-off-by: Johan Oudinet <[email protected]>
----
- ejabberdctl.template | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/ejabberdctl.template b/ejabberdctl.template
-index f65c21f..ff9225f 100755
+index 5b34ebee..51acaca8 100755
 --- a/ejabberdctl.template
 +++ b/ejabberdctl.template
 @@ -14,9 +14,12 @@ SCRIPT_DIR=`cd ${0%/*} && pwd`
  ERL={{erl}}
  IEX={{bindir}}/iex
- EPMD={{bindir}}/epmd
+ EPMD={{epmd}}
 -INSTALLUSER={{installuser}}
 +INSTALLUSER=ejabberd
  ERL_LIBS={{libdir}}
- 
+
 +# Read default configuration file if present
 +[ ! -r /etc/default/ejabberd ] || . /etc/default/ejabberd
 +
  # check the proper system user is used if defined
  if [ "$INSTALLUSER" != "" ] ; then
      EXEC_CMD="false"
--- 
-2.5.0
-
package/ejabberd/0008-rebar-uses-host-dependencies.patch new file +33 -0
new file mode 100644
index 0000000000..45f387993e
@@ -0,0 +1,33 @@
+Fix location of rebar dependencies.
+
+Signed-off-by: Christophe Romain <[email protected]>
+
+diff --git a/rebar.config.script b/rebar.config.script
+index 19142b9e..9107af26 100644
+--- a/rebar.config.script
++++ b/rebar.config.script
+@@ -218,20 +218,10 @@ TestConfig = case file:read_file_info(TestConfigFile) of
+ 		     ""
+ 	     end,
+
+-ResolveDepPath = case IsRebar3 of
+-		     true ->
+-			 fun("deps/" ++ Rest) ->
+-				 Slash = string:str(Rest, "/"),
+-				 Dir = "_build/default/lib/" ++
+-				     string:sub_string(Rest, 1, Slash - 1),
+-				 Dir ++ string:sub_string(Rest, Slash);
+-			    (Path) ->
+-				 Path
+-			 end;
+-		     _ ->
+-			 fun(P) ->
+-				 P
+-			 end
++ResolveDepPath = fun("deps/fast_xml/include") -> code:lib_dir(p1_xml) ++ "/include";
++		    ("deps/xmpp/include") -> code:lib_dir(p1_xmpp) ++ "/include";
++		    ("deps/p1_utils/include") -> code:lib_dir(p1_utils) ++ "/include";
++		    (Path) -> Path
+ 		 end,
+
+ CtParams = fun(CompileOpts) ->
package/ejabberd/ejabberd.hash +1 -3
index 4284eec8fb..24a26d21d9 100644
@@ -1,4 +1,2 @@
-# From https://www.process-one.net/downloads/ejabberd/16.01/ejabberd-16.01.tgz.md5
-md5 5e525c25c8f04287217b8a9522d7c942 ejabberd-16.01.tgz
 # Locally computed
-sha256 e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 ejabberd-16.01.tgz
+sha256 b8395bc65b09f135a60320b62338258acd6056cc241e9e245fde267fb18dd3c9 ejabberd-17.04.tgz
package/ejabberd/ejabberd.mk +4 -2
index 66686616ce..a835bc4549 100644
@@ -4,14 +4,16 @@
 #
 ################################################################################
 
-EJABBERD_VERSION = 16.01
+EJABBERD_VERSION = 17.04
 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz
 EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION)
 EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception
 EJABBERD_LICENSE_FILES = COPYING
 EJABBERD_DEPENDENCIES = getent openssl host-erlang-lager erlang-lager \
 	erlang-p1-cache-tab erlang-p1-iconv erlang-p1-sip \
-	erlang-p1-stringprep erlang-p1-xml erlang-p1-yaml erlang-p1-zlib
+	erlang-p1-stringprep erlang-p1-stun erlang-p1-tls \
+	erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \
+	erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp
 
 # 0001-remove-make-targets-for-deps.patch updates Makefile.in
 EJABBERD_USE_AUTOCONF = YES
Signature · 1 line
2.11.0
#6 lore raw

PATCH v2 4/4 ejabberd: bump to version 17.04

Hello,

Quoted 15 lines · Johan Oudinet

There are new dependencies: erlang-p1-jiffy, erlang-p1-oauth2, erlang-p1-stun, erlang-p1-tls, erlang-p1-utils, erlang-p1-xmpp

as well as two host dependencies on erlang-p1-utils and erlang-p1-xmpp. Otherwise the compilation via rebar fails.

4 patches have been refreshed and a new patch have been introduced to tell rebar to use host dependencies instead of trying to download them. Hopefully this patch could be drop in ejabberd 17.06.

Signed-off-by Johan Oudinet <[email protected]>

---
Changes v1 -> v2:
- Describe in the commit log the new dependencies and patches

Quoted 10 lines
---
 .../0001-remove-make-targets-for-deps.patch        |  42 +------
 ...002-remove-dependencies-from-rebar-config.patch | 129 +++++++++++----------
 .../ejabberd/0006-fix-install-permissions.patch    |  42 +++----
 package/ejabberd/0007-fix-ejabberdctl.patch        |  12 +-
 .../0008-rebar-uses-host-dependencies.patch        |  33 ++++++
 package/ejabberd/ejabberd.hash                     |   4 +-
 package/ejabberd/ejabberd.mk                       |   6 +-
 7 files changed, 136 insertions(+), 132 deletions(-)
 create mode 100644 package/ejabberd/0008-rebar-uses-host-dependencies.patch

So this one lacks the changes in package/ejabberd/Config.in.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Applied
#7 lore raw

PATCH v2 1/4 erlang-jiffy: New package

In reply to Johan Oudinet

Hello,

package/erlang-jiffy/erlang-jiffy.mk line 10

Quoted 4 lines · Johan Oudinet
package/erlang-jiffy/erlang-jiffy.mk new file +4 -0
+ERLANG_JIFFY_VERSION = 0.14.8
+ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION))
+ERLANG_JIFFY_LICENSE = MIT (core), BSD-3-Clause (Google double \
+conversion library), BSD-3-Clause (tests)

I've adjusted the line splitting to be more logical (IMO) :

ERLANG_JIFFY_LICENSE = MIT (core), \
        BSD-3-Clause (Google double conversion library), \
        BSD-3-Clause (tests)

Applied to next. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com