Skip to contentSkip to conversation

Bump ejabberd version to 17.04

PATCH New Johan Oudinet 2 participants 29 messages May 30, 2017 – May 31, 2017 1 message not in the archive

lore
Share & tools
lore

Johan Oudinet

author
#0 lore raw

cover Bump ejabberd version to 17.04

Ejabberd has many dependencies, bump all of them to the versions used by ejabberd-17.04. There are three new dependencies: erlang-jiffy, erlang-p1-oauth, and erlang-p1-xmpp.
This version of ejabberd is compatible with Erlang 19.03, which is not the case of ejabberd 16.01.

Christophe Romain (from process-one) helps me in this work. I'm not sure how to properly credit him here.

Johan Oudinet (16):
erlang-goldrush: bump version to 0.1.9
erlang-lager: bump to version 3.2.1
erlang-p1-utils: bump to version 1.0.8
erlang-p1-zlib: bump to version 1.0.2
erlang-p1-cache-tab: bump to version 1.0.7
erlang-p1-iconv: bump to version 1.0.4
erlang-p1-stringprep: bump to version 1.0.8
erlang-p1-tls: bump to version 1.0.11
erlang-p1-stun: bump to version 1.0.10
erlang-p1-sip: bump to version 1.0.11
erlang-p1-xml: bump to version 1.1.22
erlang-p1-yaml: bump to version 1.0.9
erlang-jiffy: New package
erlang-p1-oauth: New package
erlang-p1-xmpp: New package
ejabberd: bump to version 17.04

 package/Config.in                                  |   3 +
 .../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/Config.in                         |   8 +-
 package/ejabberd/ejabberd.hash                     |   4 +-
 package/ejabberd/ejabberd.mk                       |   6 +-
 package/erlang-goldrush/erlang-goldrush.hash       |   2 +-
 package/erlang-goldrush/erlang-goldrush.mk         |   2 +-
 package/erlang-jiffy/Config.in                     |  10 ++
 package/erlang-jiffy/erlang-jiffy.hash             |   2 +
 package/erlang-jiffy/erlang-jiffy.mk               |  12 ++
 package/erlang-lager/erlang-lager.hash             |   2 +-
 package/erlang-lager/erlang-lager.mk               |   2 +-
 .../erlang-p1-cache-tab/erlang-p1-cache-tab.hash   |   2 +-
 package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk |   2 +-
 package/erlang-p1-iconv/Config.in                  |   1 +
 package/erlang-p1-iconv/erlang-p1-iconv.hash       |   2 +-
 package/erlang-p1-iconv/erlang-p1-iconv.mk         |   9 +-
 package/erlang-p1-oauth/Config.in                  |   6 +
 package/erlang-p1-oauth/erlang-p1-oauth.hash       |   2 +
 package/erlang-p1-oauth/erlang-p1-oauth.mk         |  13 +++
 ...002-remove-dependencies-from-rebar-config.patch |  20 ++++
 package/erlang-p1-sip/erlang-p1-sip.hash           |   2 +-
 package/erlang-p1-sip/erlang-p1-sip.mk             |   8 +-
 .../0001-Stdint-is-required-on-windows.patch       |  28 -----
 .../erlang-p1-stringprep/erlang-p1-stringprep.hash |   2 +-
 .../erlang-p1-stringprep/erlang-p1-stringprep.mk   |   2 +-
 ...001-remove-dependencies-from-rebar-config.patch |  16 +++
 package/erlang-p1-stun/erlang-p1-stun.hash         |   2 +-
 package/erlang-p1-stun/erlang-p1-stun.mk           |   6 +-
 package/erlang-p1-tls/Config.in                    |   1 +
 package/erlang-p1-tls/erlang-p1-tls.hash           |   2 +-
 package/erlang-p1-tls/erlang-p1-tls.mk             |  10 +-
 package/erlang-p1-utils/erlang-p1-utils.hash       |   2 +-
 package/erlang-p1-utils/erlang-p1-utils.mk         |   5 +-
 ...001-remove-dependencies-from-rebar-config.patch |  18 +++
 package/erlang-p1-xml/erlang-p1-xml.hash           |   2 +-
 package/erlang-p1-xml/erlang-p1-xml.mk             |   5 +-
 package/erlang-p1-xmpp/0001-fix-includes.patch     |  16 +++
 ...002-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 +++
 ...001-remove-dependencies-from-rebar-config.patch |  18 +++
 package/erlang-p1-yaml/erlang-p1-yaml.hash         |   2 +-
 package/erlang-p1-yaml/erlang-p1-yaml.mk           |   6 +-
 package/erlang-p1-zlib/erlang-p1-zlib.hash         |   2 +-
 package/erlang-p1-zlib/erlang-p1-zlib.mk           |   8 +-
 51 files changed, 371 insertions(+), 204 deletions(-)
 create mode 100644 package/ejabberd/0008-rebar-uses-host-dependencies.patch
 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
 create mode 100644 package/erlang-p1-oauth/Config.in
 create mode 100644 package/erlang-p1-oauth/erlang-p1-oauth.hash
 create mode 100644 package/erlang-p1-oauth/erlang-p1-oauth.mk
 create mode 100644 package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch
 delete mode 100644 package/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch
 create mode 100644 package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch
 create mode 100644 package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch
 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
 create mode 100644 package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch

--
2.11.0

author
#1 lore raw

PATCH 1/16 erlang-goldrush: bump version to 0.1.9

Signed-off-by Johan Oudinet <[email protected]>
---
 package/erlang-goldrush/erlang-goldrush.hash | 2 +-
 package/erlang-goldrush/erlang-goldrush.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/erlang-goldrush/erlang-goldrush.hash +1 -1
index 00ccb43ca6..d575aa49b2 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 739d8ce15049c54f7e00528edbf536f63a24fdb9dfa053d176e6f97a9832b834 erlang-goldrush-0.1.8.tar.gz
+sha256 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612 erlang-goldrush-0.1.9.tar.gz
package/erlang-goldrush/erlang-goldrush.mk +1 -1
index 2fa88107e1..e95b09cd86 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_GOLDRUSH_VERSION = 0.1.8
+ERLANG_GOLDRUSH_VERSION = 0.1.9
 ERLANG_GOLDRUSH_SITE = $(call github,DeadZen,goldrush,$(ERLANG_GOLDRUSH_VERSION))
 ERLANG_GOLDRUSH_LICENSE = ISC
 ERLANG_GOLDRUSH_LICENSE_FILES = LICENSE
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH 2/16 erlang-lager: bump to version 3.2.1

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 package/erlang-lager/erlang-lager.hash | 2 +-
 package/erlang-lager/erlang-lager.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/erlang-lager/erlang-lager.hash +1 -1
index e436fdc7d5..97bf4c64ba 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 168a8e48646b04bcee1ab0c97c1ff63563bd7fd25638f1504b8d8f674d2ddd1b erlang-lager-2.2.0.tar.gz
+sha256 5ef0f65e0c18a7df5c5f2cd8e96780396f13369127d87857e7931670c79a9327 erlang-lager-3.2.1.tar.gz
package/erlang-lager/erlang-lager.mk +1 -1
index b55b6f7b78..208ccf1611 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_LAGER_VERSION = 2.2.0
+ERLANG_LAGER_VERSION = 3.2.1
 ERLANG_LAGER_SITE = $(call github,basho,lager,$(ERLANG_LAGER_VERSION))
 ERLANG_LAGER_LICENSE = Apache-2.0
 ERLANG_LAGER_LICENSE_FILES = LICENSE
Signature · 1 line
2.11.0
author
#3 lore raw

PATCH 3/16 erlang-p1-utils: bump to version 1.0.8

In reply to Johan Oudinet

License changed to Apache-2.0.

Signed-off-by Johan Oudinet <[email protected]>
---
 package/erlang-p1-utils/erlang-p1-utils.hash | 2 +-
 package/erlang-p1-utils/erlang-p1-utils.mk   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
package/erlang-p1-utils/erlang-p1-utils.hash +1 -1
index c41e5ef525..200d102450 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 9c7e9fa2990edd419953a6ae609ffed0b90e671b57c468d97c0d85d866d80210 erlang-p1-utils-1.0.3.tar.gz
+sha256 9b43e025b923221cfe6a6efc76790d97b1c233e3e2db37fc804294d847bcfaa3 erlang-p1-utils-1.0.8.tar.gz
package/erlang-p1-utils/erlang-p1-utils.mk +3 -2
index c9d9299443..32564cf89f 100644
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-ERLANG_P1_UTILS_VERSION = 1.0.3
+ERLANG_P1_UTILS_VERSION = 1.0.8
 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION))
-ERLANG_P1_UTILS_LICENSE = GPL-2.0+
+ERLANG_P1_UTILS_LICENSE = Apache-2.0
 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_UTILS_INSTALL_STAGING = YES
 
 $(eval $(rebar-package))
+$(eval $(host-rebar-package))
Signature · 1 line
2.11.0
author
#4 lore raw

PATCH 4/16 erlang-p1-zlib: bump to version 1.0.2

In reply to Johan Oudinet

License changed to Apache-2.0.

Signed-off-by Johan Oudinet <[email protected]>
---
 package/erlang-p1-zlib/erlang-p1-zlib.hash | 2 +-
 package/erlang-p1-zlib/erlang-p1-zlib.mk   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
package/erlang-p1-zlib/erlang-p1-zlib.hash +1 -1
index 488e75294c..eded821013 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 cb534ee8d8746e38027ada0ccd7e910daa025c74461286ded60ffaa933e3cf7b erlang-p1-zlib-1.0.0.tar.gz
+sha256 2200330f7d4fc595caf8806fec1318b853009ab3d643cf063d19bff59bf2b45e erlang-p1-zlib-1.0.2.tar.gz
package/erlang-p1-zlib/erlang-p1-zlib.mk +4 -4
index 89574b8275..a57b19fd13 100644
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ERLANG_P1_ZLIB_VERSION = 1.0.0
-ERLANG_P1_ZLIB_SITE = $(call github,processone,zlib,$(ERLANG_P1_ZLIB_VERSION))
-ERLANG_P1_ZLIB_LICENSE = GPL-2.0+
-ERLANG_P1_ZLIB_LICENSE_FILES = COPYING
+ERLANG_P1_ZLIB_VERSION = 1.0.2
+ERLANG_P1_ZLIB_SITE = $(call github,processone,ezlib,$(ERLANG_P1_ZLIB_VERSION))
+ERLANG_P1_ZLIB_LICENSE = Apache-2.0
+ERLANG_P1_ZLIB_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_ZLIB_DEPENDENCIES = zlib
 
 $(eval $(rebar-package))
Signature · 1 line
2.11.0
author
#5 lore raw

PATCH 5/16 erlang-p1-cache-tab: bump to version 1.0.7

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash | 2 +-
 package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash +1 -1
index d8b09f95a0..b6f7fb3b54 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 752b649f695e9f2777efd6b2d8dfdcc1f435104b4e363f5f0454b99fd009015c erlang-p1-cache-tab-1.0.1.tar.gz
+sha256 9376c14eaeb78c3847c3cf38853bb6e6860fb63959e182deeff5c819b23c95a4 erlang-p1-cache-tab-1.0.7.tar.gz
package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +1 -1
index 8f131237c6..6f1a13930e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_CACHE_TAB_VERSION = 1.0.1
+ERLANG_P1_CACHE_TAB_VERSION = 1.0.7
 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION))
 ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0
 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt
Signature · 1 line
2.11.0
author
#6 lore raw

PATCH 6/16 erlang-p1-iconv: bump to version 1.0.4

In reply to Johan Oudinet

License changed to Apache-2.0.

Signed-off-by Johan Oudinet <[email protected]>
---
 package/erlang-p1-iconv/Config.in            | 1 +
 package/erlang-p1-iconv/erlang-p1-iconv.hash | 2 +-
 package/erlang-p1-iconv/erlang-p1-iconv.mk   | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)
package/erlang-p1-iconv/Config.in +1 -0
index 98efb217d4..57729c398c 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_ERLANG_P1_ICONV
 	bool "erlang-p1-iconv"
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_ERLANG_P1_UTILS
 	help
 	  Erlang interface to libiconv
package/erlang-p1-iconv/erlang-p1-iconv.hash +1 -1
index a284189a32..883fd52095 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 3ef1fb814fdf23e8ad8a210efb66681fa67cd42753be536521bf9686158880d3 erlang-p1-iconv-0.9.0.tar.gz
+sha256 ca20d58166a4fb38883977600aca61e02bfd1257b8bded8c8ddd82d2a96084e6 erlang-p1-iconv-1.0.4.tar.gz
package/erlang-p1-iconv/erlang-p1-iconv.mk +5 -4
index 64a6ad4a96..044361e415 100644
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-ERLANG_P1_ICONV_VERSION = 0.9.0
-ERLANG_P1_ICONV_SITE = $(call github,processone,eiconv,$(ERLANG_P1_ICONV_VERSION))
-ERLANG_P1_ICONV_LICENSE = GPL-2.0+
-ERLANG_P1_ICONV_LICENSE_FILES = COPYING
+ERLANG_P1_ICONV_VERSION = 1.0.4
+ERLANG_P1_ICONV_SITE = $(call github,processone,iconv,$(ERLANG_P1_ICONV_VERSION))
+ERLANG_P1_ICONV_LICENSE = Apache-2.0
+ERLANG_P1_ICONV_LICENSE_FILES = LICENSE.txt
+ERLANG_P1_ICONV_DEPENDENCIES = erlang-p1-utils
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 ERLANG_P1_ICONV_DEPENDENCIES += libiconv
Signature · 1 line
2.11.0
#7 lore raw

PATCH 6/16 erlang-p1-iconv: bump to version 1.0.4

Hello,

package/erlang-p1-iconv/Config.in line 4

Quoted 2 lines · Johan Oudinet
package/erlang-p1-iconv/Config.in +1 -0
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_ERLANG_P1_UTILS

I fixed the alphabetic ordering here.

Thomas

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

PATCH 7/16 erlang-p1-stringprep: bump to version 1.0.8

In reply to Johan Oudinet

Remove a patch that has been applied upstream.

Signed-off-by Johan Oudinet <[email protected]>
---
 .../0001-Stdint-is-required-on-windows.patch       | 28 ----------------------
 .../erlang-p1-stringprep/erlang-p1-stringprep.hash |  2 +-
 .../erlang-p1-stringprep/erlang-p1-stringprep.mk   |  2 +-
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 package/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch
package/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch deleted +0 -28
deleted file mode 100644
index 7385503b71..0000000000
@@ -1,28 +0,0 @@
-From f5a2b8b78afb253630ee8833f16f131b3b52701e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <[email protected]>
-Date: Mon, 29 Feb 2016 10:56:32 +0100
-Subject: [PATCH] Stdint is required on windows
-
-[Backport from upstream commit
-4fc5cae81122540fff983e40dda1fa905c329fd0, which happens to not only
-fix the build on Windows, but also with the musl C library.]
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- c_src/stringprep.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/c_src/stringprep.cpp b/c_src/stringprep.cpp
-index 461cf09..26215cf 100644
---- a/c_src/stringprep.cpp
-+++ b/c_src/stringprep.cpp
-@@ -19,6 +19,7 @@
-  */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <erl_nif.h>
- 
- #include "uni_data.c"
--- 
-2.7.4
-
package/erlang-p1-stringprep/erlang-p1-stringprep.hash +1 -1
index 23bc6fbdce..ee7bdd9660 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 5a74277e7bfb18b8f35838fa78fcde83f0acdb5b2a5b90c4b6d2470a33f7911e erlang-p1-stringprep-1.0.0.tar.gz
+sha256 9d7485312d023eeb83f308206ff8088c03b49195fb7bf4b3b699d386e33e908a erlang-p1-stringprep-1.0.8.tar.gz
package/erlang-p1-stringprep/erlang-p1-stringprep.mk +1 -1
index 3bc8c7290b..2355918975 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_STRINGPREP_VERSION = 1.0.0
+ERLANG_P1_STRINGPREP_VERSION = 1.0.8
 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION))
 ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest)
 ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt
Signature · 1 line
2.11.0
author
#9 lore raw

PATCH 8/16 erlang-p1-tls: bump to version 1.0.11

In reply to Johan Oudinet

License changed to Apache-2.0.

Signed-off-by Johan Oudinet <[email protected]>
---
 package/erlang-p1-tls/Config.in          |  1 +
 package/erlang-p1-tls/erlang-p1-tls.hash |  2 +-
 package/erlang-p1-tls/erlang-p1-tls.mk   | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)
package/erlang-p1-tls/Config.in +1 -0
index 0df334820d..a684fbb6a6 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ERLANG_P1_TLS
 	bool "erlang-p1-tls"
+	select BR2_PACKAGE_ERLANG_P1_UTILS
 	select BR2_PACKAGE_OPENSSL
 	help
 	  Erlang interface to OpenSSL
package/erlang-p1-tls/erlang-p1-tls.hash +1 -1
index fd8d801f90..eb707f1d49 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 8e8b848a112ff6bf146df34b4f6bc50160a8858a18499a7a6124193b37237a40 erlang-p1-tls-1.0.0.tar.gz
+sha256 c42237e5dd231c558b48633788a0e9ca55b4f3b5bc4692107fee031a8f91cda3 erlang-p1-tls-1.0.11.tar.gz
package/erlang-p1-tls/erlang-p1-tls.mk +5 -5
index b2451df751..63d0112cc2 100644
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-ERLANG_P1_TLS_VERSION = 1.0.0
-ERLANG_P1_TLS_SITE = $(call github,processone,tls,$(ERLANG_P1_TLS_VERSION))
-ERLANG_P1_TLS_LICENSE = GPL-2.0+ with OpenSSL exception
-ERLANG_P1_TLS_LICENSE_FILES = COPYING
+ERLANG_P1_TLS_VERSION = 1.0.11
+ERLANG_P1_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_P1_TLS_VERSION))
+ERLANG_P1_TLS_LICENSE = Apache-2.0
+ERLANG_P1_TLS_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_TLS_INSTALL_STAGING = YES
-ERLANG_P1_TLS_DEPENDENCIES = openssl
+ERLANG_P1_TLS_DEPENDENCIES = openssl erlang-p1-utils
 
 $(eval $(rebar-package))
Signature · 1 line
2.11.0
author
#10 lore raw

PATCH 9/16 erlang-p1-stun: bump to version 1.0.10

In reply to Johan Oudinet

License changed to Apache-2.0.

Signed-off-by Johan Oudinet <[email protected]>
---
 .../0001-remove-dependencies-from-rebar-config.patch     | 16 ++++++++++++++++
 package/erlang-p1-stun/erlang-p1-stun.hash               |  2 +-
 package/erlang-p1-stun/erlang-p1-stun.mk                 |  6 +++---
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch
package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch new file +16 -0
new file mode 100644
index 0000000000..30101359f4
@@ -0,0 +1,16 @@
+Without this patch, dependencies would be downloaded and compiled
+by rebar at build time.
+
+diff --git a/rebar.config b/rebar.config
+index 94ee830..d0af863 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -22,9 +22,6 @@
+
+ {erl_opts, [debug_info, {i, "include"}]}.
+
+-{deps, [{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.11"}}},
+-	{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.7"}}}]}.
+-
+ {cover_enabled, true}.
+ {cover_export_enabled, true}.
package/erlang-p1-stun/erlang-p1-stun.hash +1 -1
index be56608097..893bc30e0b 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 ca33833f4b6ef70a7628e6f3697d15cb4e26d32ef4e5a31bbddee86cabe19c50 erlang-p1-stun-0.9.0.tar.gz
+sha256 75aac56fa770b3b4ea2d32e63706d2b8d56f8e0db54243acffa7448f4256864e erlang-p1-stun-1.0.10.tar.gz
package/erlang-p1-stun/erlang-p1-stun.mk +3 -3
index f9056f5b3b..5116c15284 100644
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ERLANG_P1_STUN_VERSION = 0.9.0
+ERLANG_P1_STUN_VERSION = 1.0.10
 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION))
-ERLANG_P1_STUN_LICENSE = GPL-2.0+
-ERLANG_P1_STUN_LICENSE_FILES = COPYING
+ERLANG_P1_STUN_LICENSE = Apache-2.0
+ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_STUN_DEPENDENCIES = erlang-p1-tls erlang-p1-utils
 ERLANG_P1_STUN_INSTALL_STAGING = YES
Signature · 1 line
2.11.0
author
#11 lore raw

PATCH 10/16 erlang-p1-sip: bump to version 1.0.11

In reply to Johan Oudinet

License changed to Apache-2.0.

Signed-off-by Johan Oudinet <[email protected]>
---
 .../0002-remove-dependencies-from-rebar-config.patch | 20 ++++++++++++++++++++
 package/erlang-p1-sip/erlang-p1-sip.hash             |  2 +-
 package/erlang-p1-sip/erlang-p1-sip.mk               |  8 ++++----
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch
package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch new file +20 -0
new file mode 100644
index 0000000000..5fe86d900f
@@ -0,0 +1,20 @@
+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 fbc69a1..6250420 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -29,10 +29,6 @@
+
+ {port_specs, [{"priv/lib/esip_drv.so", ["c_src/esip_codec.c"]}]}.
+
+-{deps, [{stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.10"}}},
+-	{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.11"}}},
+-	{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.7"}}}]}.
+-
+ {clean_files, ["c_src/esip_codec.gcda", "c_src/esip_codec.gcno"]}.
+
+ {cover_enabled, true}.
package/erlang-p1-sip/erlang-p1-sip.hash +1 -1
index 74382cca9a..2ea7bc8ec4 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 2d6dfad997931668eb83a0cb127ccca8c51f8a383d76f9dea393c0b3a4eabae7 erlang-p1-sip-1.0.0.tar.gz
+sha256 2c6ed00220ead631a4755000ad9f118d79c8c4d41aa7c98bd27365a8345f9a5d erlang-p1-sip-1.0.11.tar.gz
package/erlang-p1-sip/erlang-p1-sip.mk +4 -4
index b589721eb9..0f4b33e2d1 100644
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ERLANG_P1_SIP_VERSION = 1.0.0
-ERLANG_P1_SIP_SITE = $(call github,processone,p1_sip,$(ERLANG_P1_SIP_VERSION))
-ERLANG_P1_SIP_LICENSE = GPL-2.0 with OpenSSL exception
-ERLANG_P1_SIP_LICENSE_FILES = COPYING
+ERLANG_P1_SIP_VERSION = 1.0.11
+ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION))
+ERLANG_P1_SIP_LICENSE = Apache-2.0
+ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_SIP_DEPENDENCIES = erlang-p1-stun erlang-p1-tls erlang-p1-utils
 ERLANG_P1_SIP_INSTALL_STAGING = YES
Signature · 1 line
2.11.0
author
#12 lore raw

PATCH 11/16 erlang-p1-xml: bump to version 1.1.22

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 .../0001-remove-dependencies-from-rebar-config.patch   | 18 ++++++++++++++++++
 package/erlang-p1-xml/erlang-p1-xml.hash               |  2 +-
 package/erlang-p1-xml/erlang-p1-xml.mk                 |  5 +++--
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch
package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch new file +18 -0
new file mode 100644
index 0000000000..9b0a53502c
@@ -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 3e20029..a47f1ff 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -31,8 +31,6 @@
+ {port_specs, [{"priv/lib/fxml.so", ["c_src/fxml.c"]},
+               {"priv/lib/fxml_stream.so", ["c_src/fxml_stream.c"]}]}.
+
+-{deps, [{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.7"}}}]}.
+-
+ {clean_files, ["c_src/fxml.gcda", "c_src/fxml.gcno", "c_src/fxml_stream.gcda", "c_src/fxml_stream.gcno"]}.
+
+ {cover_enabled, true}.
package/erlang-p1-xml/erlang-p1-xml.hash +1 -1
index 8e4a79fee1..00b90b52ec 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4c163c5b9572baa93eb97e03544db57dc751c7995a5279081a0d56f5fdaa2521 erlang-p1-xml-1.1.1.tar.gz
+sha256 0163e7bd11b6705732fd7281209925e39534c9ea123887574218422c34762d7c erlang-p1-xml-1.1.22.tar.gz
package/erlang-p1-xml/erlang-p1-xml.mk +3 -2
index 31bab2311d..1e43400fc1 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-ERLANG_P1_XML_VERSION = 1.1.1
-ERLANG_P1_XML_SITE = $(call github,processone,xml,$(ERLANG_P1_XML_VERSION))
+ERLANG_P1_XML_VERSION = 1.1.22
+ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION))
 ERLANG_P1_XML_LICENSE = Apache-2.0
 ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_XML_DEPENDENCIES = expat erlang-p1-utils

@@ -14,3 +14,4 @@ ERLANG_P1_XML_INSTALL_STAGING = YES
 ERLANG_P1_XML_USE_AUTOCONF = YES
 
 $(eval $(rebar-package))
+$(eval $(host-rebar-package))
Signature · 1 line
2.11.0
#13 lore raw

PATCH 11/16 erlang-p1-xml: bump to version 1.1.22

Hello,

Quoted 1 line · Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>

Commit log was a bit too terse: you're adding a host variant of the package, it should have been explained (or be part of a separate patch). I've tweaked the commit log to mention this.

Quoted 2 lines
---
 .../0001-remove-dependencies-from-rebar-config.patch   | 18 ++++++++++++++++++

We have such a patch on many rebar packages. Is there a plan to have an upstream way to tell rebar to not automatically download dependencies, without having to patch each and every package ?

Thanks!

Thomas

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

PATCH 12/16 erlang-p1-yaml: bump to version 1.0.9

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 .../0001-remove-dependencies-from-rebar-config.patch   | 18 ++++++++++++++++++
 package/erlang-p1-yaml/erlang-p1-yaml.hash             |  2 +-
 package/erlang-p1-yaml/erlang-p1-yaml.mk               |  6 +++---
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch
package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch new file +18 -0
new file mode 100644
index 0000000000..facfc2c200
@@ -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 68ffdeb..651a829 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -24,8 +24,6 @@
+ {port_env, [{"CFLAGS", "$CFLAGS"}, {"LDFLAGS", "$LDFLAGS -lyaml"}]}.
+ {port_specs, [{"priv/lib/fast_yaml.so", ["c_src/fast_yaml.c"]}]}.
+
+-{deps, [{p1_utils, ".*", {git, "git://github.com/processone/p1_utils", {tag, "1.0.7"}}}]}.
+-
+ {clean_files, ["c_src/fast_yaml.gcda", "c_src/fast_yaml.gcno"]}.
+
+ {cover_enabled, true}.
package/erlang-p1-yaml/erlang-p1-yaml.hash +1 -1
index 0e11e45003..5b8956d7b5 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 8eaaddda056f1ebb515a5456ba2be855e5b71b9b6eb35788527f39c6600ac6b4 erlang-p1-yaml-1.0.0.tar.gz
+sha256 bf225023168873affd2c67a2ce5c6c81c3db0c7df4f0caa113f23770c7b04e05 erlang-p1-yaml-1.0.9.tar.gz
package/erlang-p1-yaml/erlang-p1-yaml.mk +3 -3
index 22fcda43f8..d8865e0d42 100644
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ERLANG_P1_YAML_VERSION = 1.0.0
-ERLANG_P1_YAML_SITE = $(call github,processone,p1_yaml,$(ERLANG_P1_YAML_VERSION))
+ERLANG_P1_YAML_VERSION = 1.0.9
+ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION))
 ERLANG_P1_YAML_LICENSE = Apache-2.0
-ERLANG_P1_YAML_LICENSE_FILES = COPYING
+ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_YAML_DEPENDENCIES = libyaml erlang-p1-utils
 
 $(eval $(rebar-package))
Signature · 1 line
2.11.0
author
#15 lore raw

PATCH 13/16 erlang-jiffy: New package

In reply to Johan Oudinet

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

Signed-off-by Johan Oudinet <[email protected]>
---
 package/Config.in                      |  1 +
 package/erlang-jiffy/Config.in         | 10 ++++++++++
 package/erlang-jiffy/erlang-jiffy.hash |  2 ++
 package/erlang-jiffy/erlang-jiffy.mk   | 12 ++++++++++++
 4 files changed, 25 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
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 +12 -0
new file mode 100644
index 0000000000..af53ecbe75
@@ -0,0 +1,12 @@
+################################################################################
+#
+# erlang-jiffy
+#
+################################################################################
+
+ERLANG_JIFFY_VERSION = 0.14.8
+ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION))
+ERLANG_JIFFY_LICENSE = MIT
+ERLANG_JIFFY_LICENSE_FILES = LICENSE
+
+$(eval $(rebar-package))
Signature · 1 line
2.11.0
#16 lore raw

PATCH 13/16 erlang-jiffy: New package

Hello,

Quoted 4 lines · Johan Oudinet

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

Signed-off-by Johan Oudinet <[email protected]>
Quoted 9 lines
---
 package/Config.in                      |  1 +
 package/erlang-jiffy/Config.in         | 10 ++++++++++
 package/erlang-jiffy/erlang-jiffy.hash |  2 ++
 package/erlang-jiffy/erlang-jiffy.mk   | 12 ++++++++++++
 4 files changed, 25 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

Missing addition to the DEVELOPERS file. Please fix this in the 3 patches adding the 3 new packages.

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

Quoted 3 lines
package/erlang-jiffy/erlang-jiffy.mk new file +3 -0
+ERLANG_JIFFY_VERSION = 0.14.8
+ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION))
+ERLANG_JIFFY_LICENSE = MIT

There are some parts under BSD-3c, and tests under yet another license. This should be indicated here.

Also, most other erlang packages have INSTALL_STAGING = YES, but not this one. Why?

Thanks!

Thomas

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

PATCH 13/16 erlang-jiffy: New package

Quoted 20 lines · Thomas Petazzoni

Hello,

Quoted 4 lines · Johan Oudinet

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

Signed-off-by Johan Oudinet <[email protected]>
Quoted 9 lines
---
 package/Config.in                      |  1 +
 package/erlang-jiffy/Config.in         | 10 ++++++++++
 package/erlang-jiffy/erlang-jiffy.hash |  2 ++
 package/erlang-jiffy/erlang-jiffy.mk   | 12 ++++++++++++
 4 files changed, 25 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

Missing addition to the DEVELOPERS file. Please fix this in the 3 patches adding the 3 new packages.

Quoted 6 lines

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

Quoted 3 lines
package/erlang-jiffy/erlang-jiffy.mk new file +3 -0
+ERLANG_JIFFY_VERSION = 0.14.8
+ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION))
+ERLANG_JIFFY_LICENSE = MIT

There are some parts under BSD-3c, and tests under yet another license. This should be indicated here.

Yep, the licensing of this package is a real mess. I'm not very competent in this stuff. What should I put in addition to MIT and BSD-3c?
I didn't understand the "Google double-conversion" reference in the LICENSE file and the commit that introduces it does not give more explanations.

Quoted 3 lines

Also, most other erlang packages have INSTALL_STAGING = YES, but not this one. Why?

That's an error. Thanks for spotting it. I'm not using the features offered by this package in my ejabberd configuration, that's why I haven't seen this bug.

Best,

Signature · 1 line
Johan
#18 lore raw

PATCH 13/16 erlang-jiffy: New package

Hello,

Quoted 10 lines · Johan Oudinet
Quoted 9 lines

Missing addition to the DEVELOPERS file. Please fix this in the 3 patches adding the 3 new packages.

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

Quoted 3 lines
package/erlang-jiffy/erlang-jiffy.mk new file +3 -0
+ERLANG_JIFFY_VERSION = 0.14.8
+ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION))
+ERLANG_JIFFY_LICENSE = MIT

There are some parts under BSD-3c, and tests under yet another license. This should be indicated here.

Quoted 6 lines

Yep, the licensing of this package is a real mess. I'm not very competent in this stuff. What should I put in addition to MIT and BSD-3c?
I didn't understand the "Google double-conversion" reference in the LICENSE file and the commit that introduces it does not give more explanations.

I guess something like:

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

is good enough.

Quoted 3 lines

That's an error. Thanks for spotting it. I'm not using the features offered by this package in my ejabberd configuration, that's why I haven't seen this bug.

Wait. Does this means that Jiffy is not a mandatory dependency to build ejabberd? If that's the case, then ejabberd should not select it.

Thomas

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

PATCH 13/16 erlang-jiffy: New package

Quoted 4 lines · Thomas Petazzoni

I guess something like:

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

Ok, thanks.

Quoted 8 lines
Quoted 4 lines

That's an error. Thanks for spotting it. I'm not using the features offered by this package in my ejabberd configuration, that's why I haven't seen this bug.

Wait. Does this means that Jiffy is not a mandatory dependency to build ejabberd? If that's the case, then ejabberd should not select it.

I did compile ejabberd without it. Christophe told me it is needed for the REST APIs. It is possible to use ejabberd without them (that's what I do) but if ejabberd crashes without it, I wouldn't call them optional dependencies. Still, I like your idea in improving ejabberd packaging in BR to be able to compile a minimal version of ejabberd and select additional options if needed.
Christophe, what do you think?

Signature · 1 line
Johan
author
#20 lore raw

PATCH 14/16 erlang-p1-oauth: New package

In reply to Johan Oudinet

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

Signed-off-by Johan Oudinet <[email protected]>
---
 package/Config.in                            |  1 +
 package/erlang-p1-oauth/Config.in            |  6 ++++++
 package/erlang-p1-oauth/erlang-p1-oauth.hash |  2 ++
 package/erlang-p1-oauth/erlang-p1-oauth.mk   | 13 +++++++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 package/erlang-p1-oauth/Config.in
 create mode 100644 package/erlang-p1-oauth/erlang-p1-oauth.hash
 create mode 100644 package/erlang-p1-oauth/erlang-p1-oauth.mk
package/Config.in +1 -0
index 2b53add300..580974a02d 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-oauth/Config.in"
 	source "package/erlang-p1-sip/Config.in"
 	source "package/erlang-p1-stringprep/Config.in"
 	source "package/erlang-p1-stun/Config.in"
package/erlang-p1-oauth/Config.in new file +6 -0
new file mode 100644
index 0000000000..3ac410b933
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_ERLANG_P1_OAUTH
+	bool "erlang-p1-oauth"
+	help
+	  OAuth2 library for Erlang
+
+	  https://github.com/processone/p1_oauth2
package/erlang-p1-oauth/erlang-p1-oauth.hash new file +2 -0
new file mode 100644
index 0000000000..34e518bf1a
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 9b43e025b923221cfe6a6efc76790d97b1c233e3e2db37fc804294d847bcfaa3 erlang-p1-oauth-0.6.1.tar.gz
package/erlang-p1-oauth/erlang-p1-oauth.mk new file +13 -0
new file mode 100644
index 0000000000..02a83fdb9f
@@ -0,0 +1,13 @@
+################################################################################
+#
+# erlang-p1-oauth
+#
+################################################################################
+
+ERLANG_P1_OAUTH_VERSION = 0.6.1
+ERLANG_P1_OAUTH_SITE = $(call github,processone,p1_oauth,$(ERLANG_P1_OAUTH_VERSION))
+ERLANG_P1_OAUTH_LICENSE = MIT
+ERLANG_P1_OAUTH_LICENSE_FILES = LICENSE
+ERLANG_P1_OAUTH_INSTALL_STAGING = YES
+
+$(eval $(rebar-package))
Signature · 1 line
2.11.0
#21 lore raw

PATCH 14/16 erlang-p1-oauth: New package

Hello,

Quoted 4 lines · Johan Oudinet

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

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

Missing change to the DEVELOPERS file.

package/erlang-p1-oauth/Config.in line 6

Quoted 1 line
package/erlang-p1-oauth/Config.in new file +1 -0
+	  https://github.com/processone/p1_oauth2

This URL exists.

package/erlang-p1-oauth/erlang-p1-oauth.mk line 8

Quoted 2 lines
package/erlang-p1-oauth/erlang-p1-oauth.mk new file +2 -0
+ERLANG_P1_OAUTH_VERSION = 0.6.1
+ERLANG_P1_OAUTH_SITE = $(call github,processone,p1_oauth,$(ERLANG_P1_OAUTH_VERSION))

But I don't see how this URL (which is different) can actually work. Isn't there a typo here?

Should the package be named erlang-p1-oauth2 instead ?

Thanks!

Thomas

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

A message that is not in the archive (sent off-list or not yet received): 20170530230314.GN2009@localhost

#23 lore raw

PATCH 14/16 erlang-p1-oauth: New package

Hello,

Quoted 8 lines · Christophe Romain
Quoted 5 lines

package/erlang-p1-oauth/erlang-p1-oauth.mk line 8

Quoted 2 lines
package/erlang-p1-oauth/erlang-p1-oauth.mk new file +2 -0
+ERLANG_P1_OAUTH_VERSION = 0.6.1
+ERLANG_P1_OAUTH_SITE = $(call github,processone,p1_oauth,$(ERLANG_P1_OAUTH_VERSION))

But I don't see how this URL (which is different) can actually work. Isn't there a typo here?

oups, there is indeed a typo from me.
repository is p1_oauth2 of course

OK.

Quoted 5 lines
Quoted 1 line

Should the package be named erlang-p1-oauth2 instead ?

I don't know what's your packaging naming convention. rename is not mandatory from what i understand, but can make sense. up to you guys.

There is no "rename" involved since it's a new package. We generally prefer to use the upstream package name, so erlang-p1-oauth2 seems better here.

Thanks!

Thomas

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

PATCH 15/16 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]>
---
 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 ++++++++++++++++
 6 files changed, 61 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
package/Config.in +1 -0
index 580974a02d..59980af2de 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
#25 lore raw

PATCH 15/16 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]>

Missing addition to the DEVELOPERS file. Also explaining why a host variant is added is always a good idea.

Thanks,

Thomas

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

PATCH 16/16 ejabberd: bump to version 17.04

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 .../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/Config.in                         |   8 +-
 package/ejabberd/ejabberd.hash                     |   4 +-
 package/ejabberd/ejabberd.mk                       |   6 +-
 8 files changed, 143 insertions(+), 133 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/Config.in +7 -1
index 5d176c3af6..9ac653c1ab 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_OAUTH
 	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/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
#27 lore raw

PATCH 16/16 ejabberd: bump to version 17.04

Hello,

Quoted 1 line · Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>

I find the commit log a bit too terse compared to all what it does. It's not a straightforward version bump, with just the version and hash being changed. There are new dependencies, new patches, patches being refreshed. Summarizing this in the commit log would be nice.

I would have applied anyway if the previous patches didn't had issues, but since there are things that prevent applying this patch, I thought I would mention this :)

Thanks!

Thomas

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

cover Bump ejabberd version to 17.04

In reply to Johan Oudinet

Hello,

Thanks a lot for this work!

Quoted 4 lines · Johan Oudinet

erlang-goldrush: bump version to 0.1.9
erlang-lager: bump to version 3.2.1
erlang-p1-utils: bump to version 1.0.8
erlang-p1-zlib: bump to version 1.0.2

Quoted 8 lines

erlang-p1-cache-tab: bump to version 1.0.7
erlang-p1-iconv: bump to version 1.0.4
erlang-p1-stringprep: bump to version 1.0.8
erlang-p1-tls: bump to version 1.0.11
erlang-p1-stun: bump to version 1.0.10
erlang-p1-sip: bump to version 1.0.11
erlang-p1-xml: bump to version 1.1.22
erlang-p1-yaml: bump to version 1.0.9

I've applied those ones to the next branch, with some minor changes on a few patches. I'll reply to the individual patches.

Quoted 4 lines

erlang-jiffy: New package
erlang-p1-oauth: New package
erlang-p1-xmpp: New package
ejabberd: bump to version 17.04

I do have comments on those ones, so I'll reply to them.

If you respin before the next branch gets merged back into master, please base your next iteration on top of the latest next branch.

Thanks!

Thomas

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

cover Bump ejabberd version to 17.04

Hi Thomas,

Quoted 1 line · Thomas Petazzoni

Thanks a lot for this work!

You're welcome. It was indeed a bit more work than what I expected.

Quoted 16 lines · Johan Oudinet
Quoted 13 lines

erlang-goldrush: bump version to 0.1.9
erlang-lager: bump to version 3.2.1
erlang-p1-utils: bump to version 1.0.8
erlang-p1-zlib: bump to version 1.0.2
erlang-p1-cache-tab: bump to version 1.0.7
erlang-p1-iconv: bump to version 1.0.4
erlang-p1-stringprep: bump to version 1.0.8
erlang-p1-tls: bump to version 1.0.11
erlang-p1-stun: bump to version 1.0.10
erlang-p1-sip: bump to version 1.0.11
erlang-p1-xml: bump to version 1.1.22
erlang-p1-yaml: bump to version 1.0.9

Quoted 2 lines

I've applied those ones to the next branch, with some minor changes on a few patches. I'll reply to the individual patches.

Wow, you're fast. Thanks.

Quoted 7 lines
Quoted 5 lines

erlang-jiffy: New package
erlang-p1-oauth: New package
erlang-p1-xmpp: New package
ejabberd: bump to version 17.04

I do have comments on those ones, so I'll reply to them.

Ok, I'll check your comments. I've also put Christophe in CC as he is the one who made those new packages (except for erlang-jiffy).

Quoted 2 lines

If you respin before the next branch gets merged back into master, please base your next iteration on top of the latest next branch.

Yeah, I've already done that for these patches.

Signature · 1 line
Johan