From: Romain Naour <romain.naour@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 17/18] ejabberd: bump to version 16.01
Date: Sun, 7 Feb 2016 00:24:26 +0100 [thread overview]
Message-ID: <56B680AA.9040003@gmail.com> (raw)
In-Reply-To: <1454443064-14269-18-git-send-email-fhunleth@troodon-software.com>
Hi Frank, All,
Le 02/02/2016 20:57, Frank Hunleth a ?crit :
> As part of the upgrade, updated patches from Debian were used where
> appropriate. All patches were converted to git format.
>
> Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
> ---
> ...001-remove-dependencies-from-rebar-config.patch | 83 ++++++++++++++++++++++
> package/ejabberd/0001-remove-deps.patch | 22 ------
> package/ejabberd/0002-disable-rebar-deps.patch | 76 --------------------
> .../0002-remove-make-targets-for-deps.patch | 74 +++++++++++++++++++
> package/ejabberd/0003-disable-test.patch | 27 -------
> .../0003-remove-checking-erlang-version.patch | 30 ++++++++
> package/ejabberd/0004-correct-include.patch | 56 +++++++++++++++
> package/ejabberd/0004-disable-version-check.patch | 20 ------
> .../0005-disable-ERLANG_DEPRECATED_CHECK.patch | 27 +++++++
> package/ejabberd/0005-fix-includes.patch | 45 ------------
> ...006-disable-erlang-deprecated-types-check.patch | 20 ------
> ...ns.patch => 0006-fix-install-permissions.patch} | 41 +++++------
> ...jabberdctl.patch => 0007-fix-ejabberdctl.patch} | 21 ++++--
> package/ejabberd/Config.in | 5 +-
> package/ejabberd/ejabberd.hash | 6 +-
> package/ejabberd/ejabberd.mk | 2 +-
> 16 files changed, 313 insertions(+), 242 deletions(-)
> create mode 100644 package/ejabberd/0001-remove-dependencies-from-rebar-config.patch
> delete mode 100644 package/ejabberd/0001-remove-deps.patch
> delete mode 100644 package/ejabberd/0002-disable-rebar-deps.patch
> create mode 100644 package/ejabberd/0002-remove-make-targets-for-deps.patch
> delete mode 100644 package/ejabberd/0003-disable-test.patch
> create mode 100644 package/ejabberd/0003-remove-checking-erlang-version.patch
> create mode 100644 package/ejabberd/0004-correct-include.patch
> delete mode 100644 package/ejabberd/0004-disable-version-check.patch
> create mode 100644 package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch
> delete mode 100644 package/ejabberd/0005-fix-includes.patch
> delete mode 100644 package/ejabberd/0006-disable-erlang-deprecated-types-check.patch
> rename package/ejabberd/{0007-fix-install-permissions.patch => 0006-fix-install-permissions.patch} (73%)
> rename package/ejabberd/{0008-fix-ejabberdctl.patch => 0007-fix-ejabberdctl.patch} (56%)
>
[snip]
You need to add your Sob line in each patch you add in package/ejabberd.
> +
> diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in
> index 7b4e99b..7add8c6 100644
> --- a/package/ejabberd/Config.in
> +++ b/package/ejabberd/Config.in
> @@ -1,6 +1,7 @@
> config BR2_PACKAGE_EJABBERD
> bool "ejabberd"
> depends on BR2_PACKAGE_ERLANG
> + depends on BR2_INSTALL_LIBSTDCPP # required for erlang-p1-stringprep
> select BR2_PACKAGE_ERLANG_LAGER
> select BR2_PACKAGE_ERLANG_P1_CACHE_TAB
> select BR2_PACKAGE_ERLANG_P1_ICONV
> @@ -18,5 +19,5 @@ config BR2_PACKAGE_EJABBERD
>
> http://www.ejabberd.im
>
> -comment "ejabberd needs erlang"
> - depends on !BR2_PACKAGE_ERLANG
> +comment "ejabberd needs erlang and a toolchain w/ C++"
> + depends on !BR2_PACKAGE_ERLANG || !BR2_INSTALL_LIBSTDCPP
This part must be in erlang-p1-stringprep patch bump.
> diff --git a/package/ejabberd/ejabberd.hash b/package/ejabberd/ejabberd.hash
> index b027183..ea85d1c 100644
> --- a/package/ejabberd/ejabberd.hash
> +++ b/package/ejabberd/ejabberd.hash
> @@ -1,4 +1,4 @@
> -# From https://www.process-one.net/downloads/ejabberd/15.11/ejabberd-15.11.tgz.md5
> -md5 a6997b88d44c5a5acff45bb1d938d0f3 ejabberd-15.11.tgz
> +# From https://www.process-one.net/downloads/ejabberd/15.11/ejabberd-16.01.tgz.md5
> +md5 5e525c25c8f04287217b8a9522d7c942 ejabberd-16.01.tgz
> # Locally computed
> -sha256 01044b5a25f9f8dda8c60726698bd27d650751b810e5bfa23f9bb49ba20e946a ejabberd-15.11.tgz
> +sha256 e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 ejabberd-16.01.tgz
> diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk
> index 841c911..a3aad35 100644
> --- a/package/ejabberd/ejabberd.mk
> +++ b/package/ejabberd/ejabberd.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -EJABBERD_VERSION = 15.11
> +EJABBERD_VERSION = 16.01
> EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz
> EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION)
> EJABBERD_LICENSE = GPLv2+ with OpenSSL exception
>
It would be great if you add a comment about these lines (patch 0003)
EJABBERD_USE_AUTOCONF = YES
EJABBERD_AUTORECONF = YES
Best regards,
Romain
next prev parent reply other threads:[~2016-02-06 23:24 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-23 1:10 [Buildroot] [PATCH 00/18] Erlang 18 and native atomic ops Frank Hunleth
2016-01-23 1:10 ` [Buildroot] [PATCH 01/18] erlang: bump to version 18.2.1 Frank Hunleth
2016-02-01 20:47 ` Romain Naour
2016-01-23 1:10 ` [Buildroot] [PATCH 02/18] pkg-rebar.mk: pass C++ compiler path and options Frank Hunleth
2016-01-23 1:10 ` [Buildroot] [PATCH 03/18] erlang-goldrush: bump to version 0.1.8 Frank Hunleth
2016-01-23 1:10 ` [Buildroot] [PATCH 04/18] erlang-lager: bump to version 2.2.0 Frank Hunleth
2016-01-23 1:10 ` [Buildroot] [PATCH 05/18] erlang-rebar: bump to version 2.6.1 Frank Hunleth
2016-01-23 1:10 ` [Buildroot] [PATCH 06/18] erlang-fast_tls: new package Frank Hunleth
2016-01-23 8:20 ` Thomas Petazzoni
2016-02-01 20:38 ` Romain Naour
2016-01-23 1:11 ` [Buildroot] [PATCH 07/18] erlang-p1-cache-tab: bump to version 1.0.1 Frank Hunleth
2016-01-23 1:11 ` [Buildroot] [PATCH 08/18] erlang-p1-iconv: bump to version 0.9.0 Frank Hunleth
2016-01-23 1:11 ` [Buildroot] [PATCH 09/18] erlang-p1-stringprep: bump to version 1.0.0 Frank Hunleth
2016-01-23 1:11 ` [Buildroot] [PATCH 10/18] erlang-p1_stun: bump to version 0.9.0 Frank Hunleth
2016-01-23 8:21 ` Thomas Petazzoni
2016-01-23 1:11 ` [Buildroot] [PATCH 11/18] erlang-p1-sip: bump to version 1.0.0 Frank Hunleth
2016-01-23 1:11 ` [Buildroot] [PATCH 12/18] erlang-p1-tls: " Frank Hunleth
2016-01-23 1:11 ` [Buildroot] [PATCH 13/18] erlang-p1-utils: bump to version 1.0.3 Frank Hunleth
2016-02-01 21:04 ` Romain Naour
2016-01-23 1:11 ` [Buildroot] [PATCH 14/18] erlang-p1-xml: bump to version 1.1.1 Frank Hunleth
2016-01-23 1:11 ` [Buildroot] [PATCH 15/18] erlang-p1-yaml: bump to version 1.0.0 Frank Hunleth
2016-01-23 1:11 ` [Buildroot] [PATCH 16/18] erlang-p1-zlib: " Frank Hunleth
2016-01-23 1:11 ` [Buildroot] [PATCH 17/18] ejabberd: bump to version 16.01 Frank Hunleth
2016-01-23 1:11 ` [Buildroot] [PATCH 18/18] erlang: make libatomic_ops optional Frank Hunleth
2016-01-23 8:25 ` Thomas Petazzoni
2016-01-26 0:43 ` Frank Hunleth
2016-02-01 21:55 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 00/18] Erlang 18 and native atomic ops Frank Hunleth
2016-02-02 19:57 ` [Buildroot] [PATCH v2 01/18] erlang: bump to version 18.2.1 Frank Hunleth
2016-02-06 22:28 ` Romain Naour
2016-02-20 18:22 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 02/18] pkg-rebar.mk: pass C++ compiler path and options Frank Hunleth
2016-02-06 22:34 ` Romain Naour
2016-02-09 1:45 ` Frank Hunleth
2016-02-20 18:23 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 03/18] erlang-goldrush: bump to version 0.1.8 Frank Hunleth
2016-02-06 22:35 ` Romain Naour
2016-02-20 18:23 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 04/18] erlang-lager: bump to version 2.2.0 Frank Hunleth
2016-02-06 22:36 ` Romain Naour
2016-02-20 18:24 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 05/18] erlang-rebar: bump to version 2.6.1 Frank Hunleth
2016-02-06 22:39 ` Romain Naour
2016-02-09 1:58 ` Frank Hunleth
2016-02-20 17:37 ` Thomas Petazzoni
2016-02-20 18:08 ` Yann E. MORIN
2016-02-20 23:05 ` Arnout Vandecappelle
2016-02-20 23:19 ` Yann E. MORIN
2016-02-21 0:02 ` Arnout Vandecappelle
2016-02-21 8:37 ` Peter Korsgaard
2016-02-20 18:24 ` Thomas Petazzoni
2016-02-20 18:31 ` Frank Hunleth
2016-02-20 22:54 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 06/18] erlang-fast_tls: new package Frank Hunleth
2016-02-06 22:42 ` Romain Naour
2016-02-20 18:25 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 07/18] erlang-p1-cache-tab: bump to version 1.0.1 Frank Hunleth
2016-02-06 22:43 ` Romain Naour
2016-02-20 18:26 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 08/18] erlang-p1-iconv: bump to version 0.9.0 Frank Hunleth
2016-02-06 22:45 ` Romain Naour
2016-02-20 18:26 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 09/18] erlang-p1-stringprep: bump to version 1.0.0 Frank Hunleth
2016-02-06 22:47 ` Romain Naour
2016-02-20 22:28 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 10/18] erlang-p1_stun: bump to version 0.9.0 Frank Hunleth
2016-02-06 22:52 ` Romain Naour
2016-02-09 2:23 ` Frank Hunleth
2016-02-20 22:30 ` Thomas Petazzoni
2016-02-20 23:09 ` Frank Hunleth
2016-02-20 23:12 ` Thomas Petazzoni
2016-02-21 22:16 ` Frank Hunleth
2016-02-02 19:57 ` [Buildroot] [PATCH v2 11/18] erlang-p1-sip: bump to version 1.0.0 Frank Hunleth
2016-02-06 22:58 ` Romain Naour
2016-02-20 22:31 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 12/18] erlang-p1-tls: " Frank Hunleth
2016-02-06 23:01 ` Romain Naour
2016-02-20 22:31 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 13/18] erlang-p1-utils: bump to version 1.0.3 Frank Hunleth
2016-02-06 23:02 ` Romain Naour
2016-02-20 22:34 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 14/18] erlang-p1-xml: bump to version 1.1.1 Frank Hunleth
2016-02-06 23:07 ` Romain Naour
2016-02-20 22:35 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 15/18] erlang-p1-yaml: bump to version 1.0.0 Frank Hunleth
2016-02-06 23:10 ` Romain Naour
2016-02-20 22:35 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 16/18] erlang-p1-zlib: " Frank Hunleth
2016-02-06 23:13 ` Romain Naour
2016-02-20 22:52 ` Thomas Petazzoni
2016-02-02 19:57 ` [Buildroot] [PATCH v2 17/18] ejabberd: bump to version 16.01 Frank Hunleth
2016-02-06 23:24 ` Romain Naour [this message]
2016-02-02 19:57 ` [Buildroot] [PATCH v2 18/18] erlang: support choosing atomic ops Frank Hunleth
2016-02-07 12:49 ` Romain Naour
2016-02-07 13:15 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56B680AA.9040003@gmail.com \
--to=romain.naour@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox