From patchwork Tue Jan 16 14:06:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861586 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CAFD37mG"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLX9S0JdBz9s1h for ; Wed, 17 Jan 2018 01:07:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 785ED2A349; Tue, 16 Jan 2018 14:07:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8e1qZLv93rL7; Tue, 16 Jan 2018 14:07:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 61A292F05E; Tue, 16 Jan 2018 14:07:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 626381C3F9D for ; Tue, 16 Jan 2018 14:07:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5ED4B87909 for ; Tue, 16 Jan 2018 14:07:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ym-nQ13Rux94 for ; Tue, 16 Jan 2018 14:07:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 95C0C878C9 for ; Tue, 16 Jan 2018 14:07:33 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id t16so1651493wrc.10 for ; Tue, 16 Jan 2018 06:07:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UdR79Kx23fm80C2esaMxVEoSoSmjNA5qJBTiSEcDBaY=; b=CAFD37mGqLHGSaOVJp3dYiR5i+Hvs5Shn7rvXYBaZT5X7kEVI4CLgoz18kTd9Xx5qP /Cm8WNVBnFey2XLczM+wQV2d+Q57T4i/D78toRh/C2SURDV54mCq9aM6zlUNaKH5wTYJ C/gCOXuwmURUBF6Mxe1t6AC7eotQrhAUENiM+9nJDhbAbcrNNWqxcosVo3mpfn66Uazd XiRc7f4QbPkGIQLYz6EnaH0VgLctrHwjUL1FqFdnvRITq83IXi1oSLJy2rR0l2bYN2/w C1fq46+c5hpIzD8DbfsFkonLUVaRi9K0WNnFqTBCHACHYAkmHH9PQFunC/LMclVmqldW ti0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UdR79Kx23fm80C2esaMxVEoSoSmjNA5qJBTiSEcDBaY=; b=c/j25IG0tC7xOGu74crbOl32CWNms5QS6+lNsTLiNcE/0UXjhY0IeI4p9paClcF4bK ISI+l6F5Hx+egnAQdIh98YnVo8z1PBjE/+nPJjcVH8AwFpEM0zOtg84FR03nUDlpVeMX pYcsS2QVzTuk0hrN6IF/pHIFAsADB6rBc5WpKt7Y+nVaeFwQwel36taKNO/vKvfQztOP au8jdy2YqxfPpvujjPZVqLAuEI/zpiFSq58qVJWI5z/B/ZnhVUGxGWpLTn35Bmi1Qg/6 xZC8DkPDWs4E1enCQLuEItyjeYNC1Qs5ab7CSgNWnAnSh6npqT72m7F8cUWFtctaIG0W w5sg== X-Gm-Message-State: AKwxytcC3TAMHEaUsVdn/kC1bS66C9SuahLs35Q4MRZPPK4gidgfZj4F Z+Y1j0IHNdq0zS3j9UeHoIYezA6S X-Google-Smtp-Source: ACJfBot/Qxokt28kJS5Da5ftV5iWt8L8DuhaenMwxrbEw0xfvOkso6U/VVMkjlJL4iP7/6KSkWVc/g== X-Received: by 10.223.161.150 with SMTP id u22mr12208407wru.251.1516111651851; Tue, 16 Jan 2018 06:07:31 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.07.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:07:30 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:36 +0100 Message-Id: <20180116140649.7381-2-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 01/14] erlang-lager: Bump to version 3.4.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Change repository from basho to erlang-lager. Signed-off-by: Johan Oudinet --- package/erlang-lager/erlang-lager.hash | 2 +- package/erlang-lager/erlang-lager.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/erlang-lager/erlang-lager.hash b/package/erlang-lager/erlang-lager.hash index 97bf4c64ba..144cef6d3d 100644 --- a/package/erlang-lager/erlang-lager.hash +++ b/package/erlang-lager/erlang-lager.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5ef0f65e0c18a7df5c5f2cd8e96780396f13369127d87857e7931670c79a9327 erlang-lager-3.2.1.tar.gz +sha256 c5f532dd236e07dad27976abcf12b9c90fcf33ffd6fe1b1d34639c06171c36ea erlang-lager-3.4.2.tar.gz diff --git a/package/erlang-lager/erlang-lager.mk b/package/erlang-lager/erlang-lager.mk index 208ccf1611..790288a460 100644 --- a/package/erlang-lager/erlang-lager.mk +++ b/package/erlang-lager/erlang-lager.mk @@ -4,8 +4,8 @@ # ################################################################################ -ERLANG_LAGER_VERSION = 3.2.1 -ERLANG_LAGER_SITE = $(call github,basho,lager,$(ERLANG_LAGER_VERSION)) +ERLANG_LAGER_VERSION = 3.4.2 +ERLANG_LAGER_SITE = $(call github,erlang-lager,lager,$(ERLANG_LAGER_VERSION)) ERLANG_LAGER_LICENSE = Apache-2.0 ERLANG_LAGER_LICENSE_FILES = LICENSE ERLANG_LAGER_DEPENDENCIES = erlang-goldrush From patchwork Tue Jan 16 14:06:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861589 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="plR3kxeb"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLX9v4NqTz9t42 for ; Wed, 17 Jan 2018 01:08:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1930888B77; Tue, 16 Jan 2018 14:07:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C-asJa7UM3ID; Tue, 16 Jan 2018 14:07:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4DE4388A59; Tue, 16 Jan 2018 14:07:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A5EB41C3F9D for ; Tue, 16 Jan 2018 14:07:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A23032FB22 for ; Tue, 16 Jan 2018 14:07:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dPxLfdyo4nP8 for ; Tue, 16 Jan 2018 14:07:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by silver.osuosl.org (Postfix) with ESMTPS id DC2822F8FC for ; Tue, 16 Jan 2018 14:07:55 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id d9so15302145wre.3 for ; Tue, 16 Jan 2018 06:07:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F4b6sNai1Uz/w0XtHLC+mPpAi9LesDz9KxwTCvnzX94=; b=plR3kxebJ0CXnmtmupidhCc/LSsb5gCSTVJP5i4OH8tYSft8ciT5I3+D4KNJEo8wpP 4vZV66BHh9mML1IMKOZfAY1CH8Cep5lX9gRJpr941fuKwkQ1OV22dnvz+NzogBhaxbaI ovzLTHNDx8aBo6d9lKaVS+8n4ILxKE1cQl78LEhGdlg0P+b/8dUbHoGvPQJHNU1CVeFL 6syX/haBfY2FrBmOTDs5dyLJxuOQanNuiiHYnGgLTxXPdRHSWBWWXytwbnYjG8uboYWy pbnE/p1bGdP1QKnUhqLssDvVT/civPI5Nic6POJfh3E8lItXG3po+hyjCQaQP2SI8p18 HyUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F4b6sNai1Uz/w0XtHLC+mPpAi9LesDz9KxwTCvnzX94=; b=XmLbnVoWaWQ9nKBWHmo6DZdCqRUYxPqZCZfcvf5UESyeHK7kNTSov3FV4yMuHFH1FT IlCGdDtY1ZCKt2sg4RKOFAchVN1sr5F9wUB7xYcNVcqDvdM5I+ou3/AcPijlTbE6VwHu SNdsDz+WOcboSIHmoK1vI5j8VKiy7lcBdo4tQU08Dr7ew3gJWVOEJrlAS6F9hAyo6JbZ o/45hN1ozAPaXGhlQlWW8oNjZ2QresRnygIOwinQYyvUrCk24o27S3v1YIUKilu5N82N fx2B0E7tjt+oU6Ly/Gb4/pUMAQY3H6HJ587A4Qql7R2JMbAF7F147R1V6GpbwuQF8j1Y 6g6w== X-Gm-Message-State: AKGB3mKmxxPBM8odZ/kIN21p+tD3WsCSCGqMfw832qSmX/2MZzLn/QyN cI8w/WMLgLixZWZVdzmffWOwqDhA X-Google-Smtp-Source: ACJfBovzNlrnb6xE27qkr0GbLFup7lzscrsDIhWkKwcZ0o4VdeEd+HNHnzPcW+wT+O/eAr2LkJmucQ== X-Received: by 10.223.184.175 with SMTP id i44mr24442097wrf.253.1516111671808; Tue, 16 Jan 2018 06:07:51 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.07.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:07:49 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:37 +0100 Message-Id: <20180116140649.7381-3-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 02/14] erlang-p1-utils: Bump to version 1.0.10 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Johan Oudinet --- package/erlang-p1-utils/erlang-p1-utils.hash | 2 +- package/erlang-p1-utils/erlang-p1-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-utils/erlang-p1-utils.hash b/package/erlang-p1-utils/erlang-p1-utils.hash index 200d102450..950a5540d7 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.hash +++ b/package/erlang-p1-utils/erlang-p1-utils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9b43e025b923221cfe6a6efc76790d97b1c233e3e2db37fc804294d847bcfaa3 erlang-p1-utils-1.0.8.tar.gz +sha256 57bfc575179733a723717f4fecb65b9f7fd056595f798b52e7bc0206e8a9333f erlang-p1-utils-1.0.10.tar.gz diff --git a/package/erlang-p1-utils/erlang-p1-utils.mk b/package/erlang-p1-utils/erlang-p1-utils.mk index 32564cf89f..6a4920738c 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.mk +++ b/package/erlang-p1-utils/erlang-p1-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_UTILS_VERSION = 1.0.8 +ERLANG_P1_UTILS_VERSION = 1.0.10 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION)) ERLANG_P1_UTILS_LICENSE = Apache-2.0 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt From patchwork Tue Jan 16 14:06:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861591 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W1Nq0T3Z"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXB20TsHz9s7n for ; Wed, 17 Jan 2018 01:08:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 12F8388244; Tue, 16 Jan 2018 14:08:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XYzkcYwS7bnn; Tue, 16 Jan 2018 14:08:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 48B0987909; Tue, 16 Jan 2018 14:08:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 84D501C3F9D for ; Tue, 16 Jan 2018 14:08:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8057087909 for ; Tue, 16 Jan 2018 14:08:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BWe3U5CaSJHJ for ; Tue, 16 Jan 2018 14:08:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C3ABB878C9 for ; Tue, 16 Jan 2018 14:08:00 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id p6so15337150wrd.0 for ; Tue, 16 Jan 2018 06:08:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NNB7SGF8x1jia38PEiijNSNyISNl1Nzp18Ty9NB7wy4=; b=W1Nq0T3Z1AA6UXp7AKnLSwOqlDD3u9sOBy3MAaAI2WexHuT8KjzHRvay/KZbciPJxC NJc0kRdfd/A4eU/GBo+X6YLzp4EBg3+HpVoxp3kalrzdrhrO4VobB0DUuQ898GKy57DO E42loB1zQIgQA8Qe6E2efAabLu5bBQ3h+nBbNuOB8NHf6oxgERFGhJBQPLndsqJ+Uxi7 oIjibzMRvI8ZOZyEc/7mqjGFuK+Icx88ZMFMAJ/Vt4540ktgBXvfPCINvH6KxefE8Yn8 vbj43MNBYszAKibiNr4kzTDPSNw8YhTXPZCWuzEKPsINsaaOjLvB3+JK/EpCXdV3sMft Ri1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NNB7SGF8x1jia38PEiijNSNyISNl1Nzp18Ty9NB7wy4=; b=iMOJeGescx8nV6h8+gnhCYrC1UVH3dOhBCEBW0k/7j64fjad7C5LGmY4la7SkDruuZ gI0wz1hd3XVJPvBlVigFcp6giw53cZpeoutzRKFNMT8dOcq2C8gmRBJ5p9Pt0M64XdeA DDX8paCXDYzzoGy8tNP+rs4/8TfbppOW0mtR70VBJMfUET1G9Ucj+Ddf36NxXQfRTCtZ TVFZLh/UCJVuKCK8Xy2tvMzXJiFtAhdvAnNL+eP54BrK/EzbQJsTfTeKGrBC0UqaL/Q8 sxvUb4Sc6MpqdeY1U3c/v61Kzq8YBYRkZGS/jJzrCUFru7vsYT4A/hmcjAYpMtsJSFqs pRvQ== X-Gm-Message-State: AKGB3mIifd90N/Tf9TdeAAeBLJnBJdgnDqhNlB6BnlCbWG6EcTtYMtpg GK0IHcB6CVmQANxBghpZz4HTCFBQ X-Google-Smtp-Source: ACJfBovbN1bILwPLUADw9Z2mGEVkyhM1nE44w5gZvdPM1E6CBOzKVlDymWNgSIaWBovNIrZ2ibjAaQ== X-Received: by 10.223.192.76 with SMTP id c12mr32593403wrf.260.1516111679046; Tue, 16 Jan 2018 06:07:59 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.07.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:07:58 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:38 +0100 Message-Id: <20180116140649.7381-4-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 03/14] erlang-p1-zlib: Bump to version 1.0.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Johan Oudinet --- package/erlang-p1-zlib/erlang-p1-zlib.hash | 2 +- package/erlang-p1-zlib/erlang-p1-zlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.hash b/package/erlang-p1-zlib/erlang-p1-zlib.hash index eded821013..dc14dd0707 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.hash +++ b/package/erlang-p1-zlib/erlang-p1-zlib.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2200330f7d4fc595caf8806fec1318b853009ab3d643cf063d19bff59bf2b45e erlang-p1-zlib-1.0.2.tar.gz +sha256 8396f9cb17fdb195d9a2537ad76327bf930d66118b87b7108f27e5ed28b7cde6 erlang-p1-zlib-1.0.3.tar.gz diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.mk b/package/erlang-p1-zlib/erlang-p1-zlib.mk index a57b19fd13..bc53efccd7 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.mk +++ b/package/erlang-p1-zlib/erlang-p1-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ZLIB_VERSION = 1.0.2 +ERLANG_P1_ZLIB_VERSION = 1.0.3 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 From patchwork Tue Jan 16 14:06:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861590 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u9zmkKTd"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXB6194Qz9t2Q for ; Wed, 17 Jan 2018 01:08:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 809C588EBF; Tue, 16 Jan 2018 14:08:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J25qsZgZqWqu; Tue, 16 Jan 2018 14:08:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4386B88E77; Tue, 16 Jan 2018 14:08:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 39DE61C3F9D for ; Tue, 16 Jan 2018 14:08:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 364F287DC7 for ; Tue, 16 Jan 2018 14:08:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JAELoAXA5QMw for ; Tue, 16 Jan 2018 14:08:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2D95588B4A for ; Tue, 16 Jan 2018 14:08:07 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id t16so1653579wrc.10 for ; Tue, 16 Jan 2018 06:08:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oPw1ZOsupnZDHiYA3DoxnWRN5z3AnhvTPMJGBV9NWmc=; b=u9zmkKTdRsv1rJ1MK9Itx/FQfIpnKTeBxMlR/1C7w+VBcfgwF68k6uAjLKwpGWKH0D SBTalJCCHDumvUN5zWyl4QK/9GS896sKrDJjf/WDP5vMzFjNani3RKjhPGMkSzl0O2Ip +xw9Nal3Nb/m07kl34QdxJJG7W+2TlPNIwTHQ2DPCZd+e2zdR2idi5S/2zFqFgjUc/fg hbSiJ1QHvFSKTmqQoYUb+GXHkV7EIAq/YsCUmagiWiJQKVOQNu9xXs1K0OYQGtLObS8J HUXLZygrxrDFnMdqLJpwzdJUo4U3gEs1agV2fi/uVBrR+Uf+pCBuagha6QkY+amzSIRd R0mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oPw1ZOsupnZDHiYA3DoxnWRN5z3AnhvTPMJGBV9NWmc=; b=j7yv3NZPXyjTS5tzdVG95u5X2ad0MhSGpREdMMY9COVu1lJyIv/w507C3ZnGk+JoDG TSHKmoKja+dFt9fe5qVO1tHcYnJJIX7gvmvkMScy3DxdM+1GElKxwsAZ53+16qsglHZD IEwqvjUxgDfPZeknlKy1/VPfd+nRHR5BUSBCy3gbiPEAC+wq8jDDAQYTJIJJ4Zt8h1WQ 5g9LHvfIpaAFm2n4wmD++psguPWh00pfPc+C1lyleN9NwIkh32ZvmJMDkLCoZohZlMz+ kAevFL7AOcfbk5y38Kvj/JW0pKzYsh3eQ8HiYPXJ8VQzX99KcqXgE6pz0n50ec6FAfZT Pwjw== X-Gm-Message-State: AKwxytewlboNLirXWM258wU0vrDytaXvh3eXa8XuWMQbkagNqvlCjT0h YzJyelbkFSmM1S+00q8N/2jH8aWH X-Google-Smtp-Source: ACJfBosy13MXgP0QwR2DE7kFTikIy7U9py8c2DVthaRZd3hHaJL/0STKcda0vMizAHDK6c/Q3IOmoA== X-Received: by 10.223.186.76 with SMTP id t12mr4221223wrg.219.1516111685310; Tue, 16 Jan 2018 06:08:05 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:04 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:39 +0100 Message-Id: <20180116140649.7381-5-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 04/14] erlang-p1-xml: Bump to version 1.1.25 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also adjust the patch that removes rebar dependencies to reflect version changes. Signed-off-by: Johan Oudinet --- .../erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch | 6 +++--- package/erlang-p1-xml/erlang-p1-xml.hash | 2 +- package/erlang-p1-xml/erlang-p1-xml.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch index 9b0a53502c..b58db3f2c5 100644 --- a/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch +++ b/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch @@ -4,14 +4,14 @@ by rebar at build time. Signed-off-by: Christophe Romain diff --git a/rebar.config b/rebar.config -index 3e20029..a47f1ff 100644 +index 99f5047..ac2f3b2 100644 --- a/rebar.config +++ b/rebar.config -@@ -31,8 +31,6 @@ +@@ -32,8 +32,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"}}}]}. +-{deps, [{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}. - {clean_files, ["c_src/fxml.gcda", "c_src/fxml.gcno", "c_src/fxml_stream.gcda", "c_src/fxml_stream.gcno"]}. diff --git a/package/erlang-p1-xml/erlang-p1-xml.hash b/package/erlang-p1-xml/erlang-p1-xml.hash index 00b90b52ec..ae3f3241c6 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.hash +++ b/package/erlang-p1-xml/erlang-p1-xml.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0163e7bd11b6705732fd7281209925e39534c9ea123887574218422c34762d7c erlang-p1-xml-1.1.22.tar.gz +sha256 aeda4051c08b78e2f036d82705433a667d03736f07ff0054862e82105435e285 erlang-p1-xml-1.1.25.tar.gz diff --git a/package/erlang-p1-xml/erlang-p1-xml.mk b/package/erlang-p1-xml/erlang-p1-xml.mk index 58ba3cbdeb..ff9999834d 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.mk +++ b/package/erlang-p1-xml/erlang-p1-xml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_XML_VERSION = 1.1.22 +ERLANG_P1_XML_VERSION = 1.1.25 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 From patchwork Tue Jan 16 14:06:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861592 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D2zEBx2K"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXB81j1Rz9t2c for ; Wed, 17 Jan 2018 01:08:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 833F92FD77; Tue, 16 Jan 2018 14:08:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QgKFdXe-IttT; Tue, 16 Jan 2018 14:08:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7A8A52F8FC; Tue, 16 Jan 2018 14:08:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 0B8C71C3F9D for ; Tue, 16 Jan 2018 14:08:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0745F2F8FC for ; Tue, 16 Jan 2018 14:08:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J1inckV0j339 for ; Tue, 16 Jan 2018 14:08:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by silver.osuosl.org (Postfix) with ESMTPS id 2A64B2F7B0 for ; Tue, 16 Jan 2018 14:08:10 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id t74so8682830wme.3 for ; Tue, 16 Jan 2018 06:08:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+j9MsqJBRkgY+TnBWO1qfbYJWkRYjXb32uUrnmfQJ3c=; b=D2zEBx2KEa9twmIrue3LYRwiyldAuaWUvJwK2Ff/W8z309eA/BEoGZkjFNuZuPR73J DHigiL+/mv6aar3Y9M1o8SLGoXpWp5qcLwaBGO0gk1Z4exxoY/DoYDHQDX1snUrexZIC HmG8131jPUQ7hPJhNXtlZdthQydYSlt1sKGn2N83rzDV6+QH0zsTmz4dTWb05H/HDnZ5 5Yo6Hn4WQSHKhyCsvVLdynXhqZ88FBk9gh6YrxtYPzo+j1eSOIrEJWVIlz64222fXCL7 JfifgQszPHCVzBgTOc/efaATImXuGYB+3c4TFKOq+imVNYLcL+yLToXEN+B37fyXgF6n 0Apw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+j9MsqJBRkgY+TnBWO1qfbYJWkRYjXb32uUrnmfQJ3c=; b=BaoJCMsnkAcoUU5Qh7NQI0u4H2vXV7sQn071v+iozKppNWHOGcWbqhkSafMsqR74VW daMgRa3z49KeAmQt4EMS7qEuA48iS9PaRDWjVBh0/I5t5ybUKOqn3yNvIbRPkP8XdBiH xmN5ZqNqTfz2basXJ3AVER8s0jBA03bleWcVJw2HH69M0M6axELf3iq60NBMElHWZYF3 Q178+oq71V2gIB2EyV1ZdTS/fg8vFV9cenD8/djWDUpEOC7PrxlS6LtFMUEuxpeejIAB z5DrCNXNsJ7h5CDG8JYDXY8A6d+nkQkejt5qlqdG/EsXip393Xx0anAijx681m9ZYsV1 +GBQ== X-Gm-Message-State: AKwxytd9f/OwmKjZRfyhJXHfKEG4sU3CKKAurN25zI0L8PheVKbuVDDg 1db/L7CJFgULfOR2TfAHJxpUyGe+ X-Google-Smtp-Source: ACJfBosUJC826+WhSuEW7BN23VdQc32wPGgthjonZVp46YRtcc6VKTCu2qm7d3VxvPxKPlMig0VtOA== X-Received: by 10.28.122.15 with SMTP id v15mr12295276wmc.38.1516111688316; Tue, 16 Jan 2018 06:08:08 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:07 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:40 +0100 Message-Id: <20180116140649.7381-6-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 05/14] erlang-stringprep: Bump to version 1.0.10 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Johan Oudinet --- package/erlang-p1-stringprep/erlang-p1-stringprep.hash | 2 +- package/erlang-p1-stringprep/erlang-p1-stringprep.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash index ee7bdd9660..769e2180d6 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9d7485312d023eeb83f308206ff8088c03b49195fb7bf4b3b699d386e33e908a erlang-p1-stringprep-1.0.8.tar.gz +sha256 baef9e6bd59e00c9d2600e8db87078c19d76cbf66d5068efeaf1df740ee306ce erlang-p1-stringprep-1.0.10.tar.gz diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk index 2355918975..f104a2ce87 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STRINGPREP_VERSION = 1.0.8 +ERLANG_P1_STRINGPREP_VERSION = 1.0.10 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 From patchwork Tue Jan 16 14:06:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861594 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CmOkmjjD"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXBF0ntYz9sDB for ; Wed, 17 Jan 2018 01:08:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EBC5888B8A; Tue, 16 Jan 2018 14:08:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ul1WeG3vXNSi; Tue, 16 Jan 2018 14:08:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 767C588A81; Tue, 16 Jan 2018 14:08:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id ABF171C3F9D for ; Tue, 16 Jan 2018 14:08:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9BA8988C4A for ; Tue, 16 Jan 2018 14:08:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wvE0Cif-0f39 for ; Tue, 16 Jan 2018 14:08:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 27FFE88E77 for ; Tue, 16 Jan 2018 14:08:14 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id p6so15337954wrd.0 for ; Tue, 16 Jan 2018 06:08:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nEf0a4HPuEH7A7X3bOJ+gJE6szV7R05r5KMyDZUHIe8=; b=CmOkmjjDngFEBl06lrMwXHSawEG/6PaMLzeCU6GJ28D9uhngODqKVCwiDLM9R08ZEK ZZ3plyjkwfzAgHvZRLsY1cdx+Fwkiuov416e7OHfbYCSDYEE0qgqULD3Ov6jnKdMRHzL mdsoxi1EDV6oaBxG4p62hqgUoDBVC+08CUN0dqIT/jW5GS8ZOvqg0U4+AGn4DfXE+yCU xloOgEzxTvv0gv2oZCBVPSNArIMcehC3OG8uupt/WnMS6vo/6OCFEcH1IWmmLNYyDwQb D7wan0DxSEPi2dIGT/MIL9yOdWCTZWIL661YBpBR0RgXmZfsUTNPcyJFqr0sUPep1KMp MmQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nEf0a4HPuEH7A7X3bOJ+gJE6szV7R05r5KMyDZUHIe8=; b=mtM7qUiqpJJO8J4pQ2vuScraorPds+nZ0Iv/0ZHCSU4MBTzqe+Fl7MGcM0VIdDdJTz 2IGNSiBsQGb3uRsg0yNERd+8ZM4gRNCvWfYa+Ct33UDMbMhiOMbtcROoLZk6RiLd4jh7 ajR5VmTRsphmG18nsOs6oD/MCR5ZPaZhNcuyTT5Px90grRnvEEG1NyMRUdwOnJzw9wo0 Hvl7jAPOUioUq0Qks99PSzhWXT3yNQv7HwtvJ13lm5HlPo9dE1ObcCqn8boCRPVLXeQN w7D0YNAkEYEmjFzsHINvwCoE2JgaZDYqx/aJ53mXhB1ALXT83pxlTA1bw4PqaSAYxGST 524g== X-Gm-Message-State: AKwxyte4IJEfyjtQTkaInEDqtStdvapW07KcWU3YfGkwuzID9lysfooY imQLmqYPZ+vPhcqW3CyY1nA1yYAL X-Google-Smtp-Source: ACJfBosR6m4CP8NDyvoWdCDG8YIwUc9BE9gHrsOewj1fghFUxFBFRTKJwevExT2afBGHLwtmKFehTQ== X-Received: by 10.223.161.150 with SMTP id u22mr12210719wru.251.1516111691929; Tue, 16 Jan 2018 06:08:11 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:10 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:41 +0100 Message-Id: <20180116140649.7381-7-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 06/14] erlang-p1-xmpp: Bump to version 1.1.16 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This packages now depends also on erlang-p1-utils. Adapt the patch that removes rebar dependencies to version changes. Signed-off-by: Johan Oudinet --- .../0002-remove-dependencies-from-rebar-config.patch | 19 ++++++++++--------- package/erlang-p1-xmpp/Config.in | 1 + package/erlang-p1-xmpp/erlang-p1-xmpp.hash | 2 +- package/erlang-p1-xmpp/erlang-p1-xmpp.mk | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch index fa5c269c22..fed44f626d 100644 --- a/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch +++ b/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch @@ -4,15 +4,16 @@ by rebar at build time. Signed-off-by: Christophe Romain 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"}]}. +--- a/rebar.config 2017-11-30 14:24:52.348695123 +0100 ++++ b/rebar.config 2017-11-30 14:35:11.816407195 +0100 +@@ -29,10 +29,6 @@ --{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"}}}]}. + {port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}. + +-{deps, [{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.25"}}}, +- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.10"}}}, +- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}. - + {clean_files, ["c_src/jid.gcda", "c_src/jid.gcno"]}. + {cover_enabled, true}. - {cover_export_enabled, true}. diff --git a/package/erlang-p1-xmpp/Config.in b/package/erlang-p1-xmpp/Config.in index c7a68bc800..7080ce6435 100644 --- a/package/erlang-p1-xmpp/Config.in +++ b/package/erlang-p1-xmpp/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_ERLANG_P1_XMPP depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep select BR2_PACKAGE_ERLANG_P1_XML select BR2_PACKAGE_ERLANG_P1_STRINGPREP + select BR2_PACKAGE_ERLANG_P1_UTILS help XMPP library for Erlang. diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash index f245c843e8..d3d2dafb9e 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e7b5db5ab6204f5bc6ebf91a183ebeae2b43ca6372dd2506599a8e8168a99c50 erlang-p1-xmpp-1.1.9.tar.gz +sha256 558e8d8734052bdbe679cf10165a63944c208940ab84be78c97ba661dfcf3cb2 erlang-p1-xmpp-1.1.16.tar.gz diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk index 149d8bc5c7..096876ca34 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk @@ -4,13 +4,13 @@ # ################################################################################ -ERLANG_P1_XMPP_VERSION = 1.1.9 +ERLANG_P1_XMPP_VERSION = 1.1.16 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 + erlang-p1-utils host-erlang-p1-xml $(eval $(rebar-package)) $(eval $(host-rebar-package)) From patchwork Tue Jan 16 14:06:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gxO19ZB4"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXBF3lNsz9t3w for ; Wed, 17 Jan 2018 01:08:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D9BBA87909; Tue, 16 Jan 2018 14:08:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1VKaSxLYcppA; Tue, 16 Jan 2018 14:08:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4B7F48820C; Tue, 16 Jan 2018 14:08:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4D9D51C3F9D for ; Tue, 16 Jan 2018 14:08:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4898E87DC7 for ; Tue, 16 Jan 2018 14:08:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Cm8a8BI2dwAS for ; Tue, 16 Jan 2018 14:08:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id BD1E988A81 for ; Tue, 16 Jan 2018 14:08:14 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id w50so15288709wrc.11 for ; Tue, 16 Jan 2018 06:08:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/3lYECTTG19zlQOivf3gamusu7LmX4KQjLfEBWiObdU=; b=gxO19ZB4jbe+3qD/hcvJMh1JgwYKC9z2nDrwij5g9BiHLsH9r7L6wgyC+GFplg3TKo R0NwDFYMpW+N61fUNZEqjJ2pqfP1gkgwIMPYQqWy60ie9AofJl3RiTFspeTHbU7mjvUS qhLj1QXQnLjIYATjFJ4q2SESOzm2huI6OM0GNURisCVHRr/rNfCXy6WazrxrlI8BVIfY kGVrlE7z1l2cwd/cGCTjTNfA8QeuUwp9EOaNBqJ793cIzHxD0daOxORrMNJNyKG5VDz8 owNub7k2+YJzaX0qh59aj4mLR/n1P3xxvQPRq7W1ShH5WZB8ojRgVTS+NmRPI/W3tq9Q iceg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/3lYECTTG19zlQOivf3gamusu7LmX4KQjLfEBWiObdU=; b=hHryKrWOcGfdixBi7FfPXsHzVyG2XjGeXr7vtp1GsXsuuXkflsC+PBwf9j42W3OqFv 4q0x94n9R0mOTn/gvoFhHHnnfSGeSNG3gjFTewdxWi4zaYTxzvN3j+ch4ZzOStLRclbT zzKU/xuDz3j/Cjcs1kZ6fHxaIY9rfcDrQz5BqIJksirpohBF2jMeeU0HBMTjPe9uMZJt FE9yulvpmKsCBVaXqBU9qWNpwWxzzuVIIK7PQulKuJIQIEbPHYP2iP/rqK7R70gJL3zv /DXAJwO95jLM7Eqp4Y/5PGwUw5062CrD4TKzYwsQQBtucQiTUPX1xXIrm6jfroXxFKHZ aPTg== X-Gm-Message-State: AKGB3mJfCD1ueEnygsTy5qTHRgp9eaYvlKaDNGjG4IB2Z3xVg3MNj0fQ 6sf4jdl+gU1S9wZ7eKtJnXgCXe1m X-Google-Smtp-Source: ACJfBout5wnqSJG5jaaYVJPuTA0pHBYyQClObCDuS9OQ2x0fGMyjDAqouQipjaSw2828LH1XhfnliQ== X-Received: by 10.223.183.74 with SMTP id n10mr34951010wre.197.1516111692966; Tue, 16 Jan 2018 06:08:12 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:12 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:42 +0100 Message-Id: <20180116140649.7381-8-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 07/14] erlang-p1-cache-tab: Bump to version 1.0.12 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Johan Oudinet --- 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(-) diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash index b6f7fb3b54..9425bcda8b 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9376c14eaeb78c3847c3cf38853bb6e6860fb63959e182deeff5c819b23c95a4 erlang-p1-cache-tab-1.0.7.tar.gz +sha256 5ef27d3be0ef2e8dc06468ec39dc3a43506d6f85af0edc21b9c14db860669d38 erlang-p1-cache-tab-1.0.12.tar.gz diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk index 6f1a13930e..ae96103ead 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_CACHE_TAB_VERSION = 1.0.7 +ERLANG_P1_CACHE_TAB_VERSION = 1.0.12 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 From patchwork Tue Jan 16 14:06:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gLD9ExRH"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXBL37lDz9sNV for ; Wed, 17 Jan 2018 01:08:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C93B188BE4; Tue, 16 Jan 2018 14:08:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wm7Klws4awSd; Tue, 16 Jan 2018 14:08:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 58B3C88B6C; Tue, 16 Jan 2018 14:08:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 04FD21C3F9D for ; Tue, 16 Jan 2018 14:08:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EBEB18796A for ; Tue, 16 Jan 2018 14:08:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CRK_JjklqUtk for ; Tue, 16 Jan 2018 14:08:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4F859878C9 for ; Tue, 16 Jan 2018 14:08:16 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id t16so1654104wrc.10 for ; Tue, 16 Jan 2018 06:08:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qhRShEMqnpfy01Pa1IVR5xoSWqdJcKUR8wCmT7br6Rc=; b=gLD9ExRHCIWr2DF1lfb2tbjDQxUmj959a9dCwu+TeC3Vg5xCTB/Pc7OfCjpSBUf3+0 HqJ/ysozrRjs3aiFPKC9+yrBQMROXTeizMINBlrrHSyiu9xPG+sBfLb5/GPtPzgKZRYO x81OCp6Gpz7Nt6Lhl901pMjKVc2xLIM19k+CgsleQX0JEgUhPA8BWUGGQPDGbBtYmHWy TKVEiuaWddk481MNBA1WJYKYFX7zp58Qe+mGjrU+My1lKK+I2KvjWrGHdnHcA2NiS37A 7iB3MFAlqDDlssnqWJ7ChIb0IjBz8gATe5D8yLk354lVKqoeB1qmvyo4JiqPsuUHCpAC ZsoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qhRShEMqnpfy01Pa1IVR5xoSWqdJcKUR8wCmT7br6Rc=; b=V0/CE19QYjyZ1moCZJrkA921fIzBwTFYonO1CvCxZwPeznBja/JF9SL9rZx0CqntN+ 1B9p+B8UuvmmOnM7+ehpIoFAVMgd+ILeYG6uS+mKjPED4InFe80rbftcTQiEZ1SwaGXo HdwFjLkTK/Ms4IWRptfAkBcz6jjrJ1YwHeufjA0FIcqbi8XsnaTKFclAvlTvFtQststk ufEOkurt7KCCzBusNzvoo+FChwYk6P0+FGrs9fU2YDiGOoF0ttq83JXk+8BNJ8ujq8WQ LarKrSnSzBXz0NdYmkY3Zfkrd4a6krIbQk9U1x9zQfgUNFehl0Yo5LvVI0VCJM0px1XO 5lGQ== X-Gm-Message-State: AKGB3mK7uKelWl2gt+ZuA6kG1ftTvnrBiDrji/f8aRKsk6McT85ztIqp HKSTfQvdgwzrXsfJ8zg5fXA9fRuU X-Google-Smtp-Source: ACJfBosglGI6f3gQ5MikFajTLu8nQryBAloiaZ5jVnQGWJT4Q9UH3oDUnmUD3eTRyo1ZL9ei8rN4GA== X-Received: by 10.223.184.175 with SMTP id i44mr24443305wrf.253.1516111694528; Tue, 16 Jan 2018 06:08:14 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:13 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:43 +0100 Message-Id: <20180116140649.7381-9-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 08/14] erlang-p1-iconv: Bump to version 1.0.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Johan Oudinet --- package/erlang-p1-iconv/erlang-p1-iconv.hash | 2 +- package/erlang-p1-iconv/erlang-p1-iconv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-iconv/erlang-p1-iconv.hash b/package/erlang-p1-iconv/erlang-p1-iconv.hash index 883fd52095..0f0a23161a 100644 --- a/package/erlang-p1-iconv/erlang-p1-iconv.hash +++ b/package/erlang-p1-iconv/erlang-p1-iconv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ca20d58166a4fb38883977600aca61e02bfd1257b8bded8c8ddd82d2a96084e6 erlang-p1-iconv-1.0.4.tar.gz +sha256 c7214ea7503c3de1edf3bdd72b37187aa3a9a36d7cf7f5945a067ae8d262d3fb erlang-p1-iconv-1.0.6.tar.gz diff --git a/package/erlang-p1-iconv/erlang-p1-iconv.mk b/package/erlang-p1-iconv/erlang-p1-iconv.mk index 044361e415..6b22431cce 100644 --- a/package/erlang-p1-iconv/erlang-p1-iconv.mk +++ b/package/erlang-p1-iconv/erlang-p1-iconv.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ICONV_VERSION = 1.0.4 +ERLANG_P1_ICONV_VERSION = 1.0.6 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 From patchwork Tue Jan 16 14:06:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861595 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M/bYQwRI"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXBL24Rkz9s7n for ; Wed, 17 Jan 2018 01:08:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A807E2FD7B; Tue, 16 Jan 2018 14:08:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wqoU1s1MuSkR; Tue, 16 Jan 2018 14:08:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6A5EA2F7B0; Tue, 16 Jan 2018 14:08:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8AAA31C3F9D for ; Tue, 16 Jan 2018 14:08:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 871DB8820C for ; Tue, 16 Jan 2018 14:08:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KGWhn-09zIjM for ; Tue, 16 Jan 2018 14:08:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E20A987909 for ; Tue, 16 Jan 2018 14:08:17 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id t16so1654204wrc.10 for ; Tue, 16 Jan 2018 06:08:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ERKpESW8/6ROxpC9N/mSPq9XBtvWFIVrKQ8JTxTSlI4=; b=M/bYQwRImM0030a9AOdYumfb/y+vpBwRKRFPHzDr4OTZeo+vHnz006nozaArK1rM9y DbfNZXAFetSPuQC4BnhtYdgeSrFKUz8AnDz+3YXGv4rcbmfMr6vuEBoTWDuQSLG0c4Am w3lzOqyciRgRjO+aIEIemy7GT95bQDY8Slkrnj21KytkbMGojUYxTg+XdOy4sbGtuH6/ ExcPAykfpyC2b9aX3loUIheJId6uNKtI/B4IRYqbgCgPGobYUx+dCru1Ae1oYE/QgbVp uxn9MAyiGXtLzxhrSqjZYAXiFb1NamqrG+BhJbf8YD+cGzFHfD74W5pY+kmJ/l5ISHEL eUdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ERKpESW8/6ROxpC9N/mSPq9XBtvWFIVrKQ8JTxTSlI4=; b=kZ3uNPHH0wngcC5rsh1Axs6aBhD1L/yqzvBUBYTXHCZvDaOMGS2mA+6sAgE+Ibw7x0 UV3fzr3WgHWcsEvb4eBFYPMlzSPbe+LrK7opAf1H2IWB1s9imRiQ5vhHWZllBo/r0nzU N9zQcpUz+yXk375SNo+86mZNG01Fk93yInqKYRUKuCL0RY40u6+4S3Jy9Et+/hKXvXm6 NwAl1Xk7T/xWpoOiPiAZwy4cFCMtx1vzIR/ZGGZhWGPNnBPy6xdwoHMZ6J4jAdKdgnxV 3ZkKeFhtKfzw4c/1CepPFifZm6rxpqAwPuAMPyqxlM3gIEdEsUBDNhn2jQOQuEHcauqz 9b7w== X-Gm-Message-State: AKwxytdd4fh+1M/W5qheJOPAALWzuU0uHcAOhqhRS8p4uddRX6qa0aGF edTaLchgb7YFDG+q+imct9bhxrBV X-Google-Smtp-Source: ACJfBosyaVmVIOUR5rdgJTkPVL8Mr3a5l3TIG1Nv0cx9bceYTxaqx9+uFQlSZxEnbU85i2FMgXfjVA== X-Received: by 10.223.184.134 with SMTP id i6mr19559776wrf.169.1516111696163; Tue, 16 Jan 2018 06:08:16 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:15 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:44 +0100 Message-Id: <20180116140649.7381-10-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 09/14] erlang-p1-oauth2: Bump to version 0.6.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Johan Oudinet --- package/erlang-p1-oauth2/erlang-p1-oauth2.hash | 2 +- package/erlang-p1-oauth2/erlang-p1-oauth2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-oauth2/erlang-p1-oauth2.hash b/package/erlang-p1-oauth2/erlang-p1-oauth2.hash index 3666519f5f..29fae12636 100644 --- a/package/erlang-p1-oauth2/erlang-p1-oauth2.hash +++ b/package/erlang-p1-oauth2/erlang-p1-oauth2.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 86e4d93f0206135bc6017b6001d061305513917f79c53294e534d6e66fd54727 erlang-p1-oauth2-0.6.1.tar.gz +sha256 aea823ccc49b20f7e27f1893c7edf231339f56b16ba21ce78a60f735b6211718 erlang-p1-oauth2-0.6.2.tar.gz diff --git a/package/erlang-p1-oauth2/erlang-p1-oauth2.mk b/package/erlang-p1-oauth2/erlang-p1-oauth2.mk index c85706c8db..5c27393ae2 100644 --- a/package/erlang-p1-oauth2/erlang-p1-oauth2.mk +++ b/package/erlang-p1-oauth2/erlang-p1-oauth2.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_OAUTH2_VERSION = 0.6.1 +ERLANG_P1_OAUTH2_VERSION = 0.6.2 ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION)) ERLANG_P1_OAUTH2_LICENSE = MIT ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE From patchwork Tue Jan 16 14:06:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WatymikR"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXBP1sMzz9t3v for ; Wed, 17 Jan 2018 01:08:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D98D688BEC; Tue, 16 Jan 2018 14:08:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UycDcyp1149m; Tue, 16 Jan 2018 14:08:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 43ADD88BCD; Tue, 16 Jan 2018 14:08:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7C37C1C3F9D for ; Tue, 16 Jan 2018 14:08:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 71A8D88B6C for ; Tue, 16 Jan 2018 14:08:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0bTpcDGTU0nw for ; Tue, 16 Jan 2018 14:08:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id A15CA87DC7 for ; Tue, 16 Jan 2018 14:08:19 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id w50so15288993wrc.11 for ; Tue, 16 Jan 2018 06:08:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+lxmYkYjgHkBoCpjI9zlrD6OMPxC4s/RfpR5shzZmEg=; b=WatymikRKK8K1tw+7lJVFsg5mtQKQEQN4CFU2qSm2T/qWWVX+W9PtsfdKwt9Kfva4Q W9a1rChT3E5hjtLcMtBHY78p/SS4JZQ1Zr+Rr/eiBfoQhjp1xP9NoOF+6wpA8Zf4hwQy BjJt9qvihB0aBddVL/QwJ8ZxYPAJbB1U8xljSb0x1bPAUtMQyIMG5pz3EJUXp7hQjpQG 3FJK48LVvdJQvR8lNf2xqYYWM1UlIYNfxw9wXDpt8JPO3Rpb7ykDOQyvDgt3GQJcjSgD UAQqwGmSiH5+Y9WbcsFR1mxgy+wz7p0JrtX7vLGUVt2gtLWl7J83U3S9A/a3V+guTTDW VTyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+lxmYkYjgHkBoCpjI9zlrD6OMPxC4s/RfpR5shzZmEg=; b=O9OnprZ/EfbH50bL1D6EnD1gpFhNIh/5u/Uj4IGrXU8hqb+Fl88SpAYxrF2Wtj/I6Q e/ODm/S8i5J7RqrFxBV0i1REpol7MLWdFynN+eyNEuVrVLQvVKv2hlkpgCyWYIYLw6DA von5smgrImK2AmNaUPXHyz/gLw9lwLgve5k4b4Lz3oXs91rzjmvqDnA6ErbiZlmirZZX zbONm6e+vcIZKFf6bOqrTVUjvhFFL21I101fjEEupF+nTkkVeSPtQuFPD4cyRaSjyvSm nA+eAevKFFnYz/8/24P7P5xcTkfRSdb2agwH7m4gqDUnTs0AEEIDjZ95MUa8YmT3KxG1 FkCw== X-Gm-Message-State: AKwxytca+l9q/85LkFXP7uPhBBNKiRKlBmuI0vsNSR6zfY8SlkqwT0N6 JJyusz2v1eTKUw1OCIGC/kdvUO+g X-Google-Smtp-Source: ACJfBou5FtN94iuESmx5Mo9B/jQz20qZMgzEvvXCCJAfvY6+ksJ2LVrDxPvl4whID1iRZ7YeGiX7iQ== X-Received: by 10.223.130.196 with SMTP id 62mr22560761wrc.145.1516111697819; Tue, 16 Jan 2018 06:08:17 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:16 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:45 +0100 Message-Id: <20180116140649.7381-11-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 10/14] erlang-p1-tls: Bump to version 1.0.17 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Johan Oudinet --- package/erlang-p1-tls/erlang-p1-tls.hash | 2 +- package/erlang-p1-tls/erlang-p1-tls.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-tls/erlang-p1-tls.hash b/package/erlang-p1-tls/erlang-p1-tls.hash index eb707f1d49..b5b800b202 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.hash +++ b/package/erlang-p1-tls/erlang-p1-tls.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c42237e5dd231c558b48633788a0e9ca55b4f3b5bc4692107fee031a8f91cda3 erlang-p1-tls-1.0.11.tar.gz +sha256 ca9670b7f78a025b101e3fee6255d7472d6b52abc46444cc45616c3d1bd75b9b erlang-p1-tls-1.0.17.tar.gz diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk index 63d0112cc2..ad7317dc8c 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.mk +++ b/package/erlang-p1-tls/erlang-p1-tls.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_TLS_VERSION = 1.0.11 +ERLANG_P1_TLS_VERSION = 1.0.17 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 From patchwork Tue Jan 16 14:06:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pr96i+/g"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXBX4kZcz9t3l for ; Wed, 17 Jan 2018 01:08:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A005988BBC; Tue, 16 Jan 2018 14:08:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KvHy701Iuul7; Tue, 16 Jan 2018 14:08:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A86A188BF0; Tue, 16 Jan 2018 14:08:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2CCE01C3F9D for ; Tue, 16 Jan 2018 14:08:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 23A6C88E77 for ; Tue, 16 Jan 2018 14:08:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5jj9NFY8nm1I for ; Tue, 16 Jan 2018 14:08:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3B33588C4A for ; Tue, 16 Jan 2018 14:08:21 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id 16so15298809wry.12 for ; Tue, 16 Jan 2018 06:08:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wU+DV2dlL+CWrX+DrnVA01K5IoqM7+bisirurTopmz8=; b=pr96i+/gvRU2+0hAbbsIuXw9c/dUb/LRkhCyZQKCApVo7LB3EHkT8zs7SkYqyioW6q ixbLdIB9FSBOjca6QesQKudxq6OCyJVJ2u+7QUIot5ueKV99W6kupnHz+mp5ZAZ+rJY6 NK8MhcoWbFLKkDpdcl1Y8uWsRMKw9J2kLbEoiQBSo9ETftbjDbWMJ85SOO83XOncsnBu Km+g5C4M2kA9pn5KmcBNTFDDr4MToEZUWLcLY80TfJM49RkJpxBmJisRXPG9aC4Z8mcm R57QJXbuag7InhEZDHbrCqmldmRsVEAuXcEn9X1x1+Ez7OwAdDyE0OigsQpp3C6VeJe2 giUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wU+DV2dlL+CWrX+DrnVA01K5IoqM7+bisirurTopmz8=; b=iVJNNfysOO49NPMMAMekt0bNMO1Cua+g7v6PvomScj2Z6d80aTpc8txWFab5Cxw/B+ nICtUHaQBKZhC1lRV9NgbizlqHZmbFU09VViawyvolmEqcDPlDm3OmHOxYM7uQ7OEUtO s9knI8hqNGHwyRUoF1AaGOw6ZFgcaATQburDN3cBlC8lUQys5B1NTP9BsQESIDIVKrsr IhxUPh1bH7VDuufBuWC11kJR0pxgwZbdLUudeLywgfZIFT1TAjYBmSsDIKjjw31qxPfS /6OFoCmSAnlZ9YSi8uOxBQw7UftZQ9JQyTNWvmg7N4PI8ylL6HY3rVwR8HOAQpWIIwPg Bv3g== X-Gm-Message-State: AKwxytcDBeNnez6INBkSSUXPSzw8ArVRYjPU4ENGfFrVDN9oH7nsEXGq YjLOcHJp5A0rapBQhqpBnNO4iE+6 X-Google-Smtp-Source: ACJfBov6+iIpikR8/VpNVt45e54/zpsc+plm2Xwi8DyRZoBoOakL5A2fkbqPSCCos8LJKnaj7CgQ1Q== X-Received: by 10.223.139.76 with SMTP id v12mr12840507wra.95.1516111699288; Tue, 16 Jan 2018 06:08:19 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:17 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:46 +0100 Message-Id: <20180116140649.7381-12-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 11/14] erlang-p1-stun: Bump to version 1.0.16 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Adapt the patch that removes rebar dependencies to version changes. Signed-off-by: Johan Oudinet --- .../erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch | 6 +++--- package/erlang-p1-stun/erlang-p1-stun.hash | 2 +- package/erlang-p1-stun/erlang-p1-stun.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch index 30101359f4..7e6b4b5345 100644 --- a/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch +++ b/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch @@ -2,15 +2,15 @@ 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 +index f02ea40..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"}}}]}. +-{deps, [{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}}, +- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}. - {cover_enabled, true}. {cover_export_enabled, true}. diff --git a/package/erlang-p1-stun/erlang-p1-stun.hash b/package/erlang-p1-stun/erlang-p1-stun.hash index 893bc30e0b..ee32834e34 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.hash +++ b/package/erlang-p1-stun/erlang-p1-stun.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 75aac56fa770b3b4ea2d32e63706d2b8d56f8e0db54243acffa7448f4256864e erlang-p1-stun-1.0.10.tar.gz +sha256 8efe2f47c2460b1e0d68a680dcfcd938a2bc98c85abb5b100c15246fe6a25506 erlang-p1-stun-1.0.16.tar.gz diff --git a/package/erlang-p1-stun/erlang-p1-stun.mk b/package/erlang-p1-stun/erlang-p1-stun.mk index 5116c15284..42bbc758e5 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.mk +++ b/package/erlang-p1-stun/erlang-p1-stun.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STUN_VERSION = 1.0.10 +ERLANG_P1_STUN_VERSION = 1.0.16 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION)) ERLANG_P1_STUN_LICENSE = Apache-2.0 ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt From patchwork Tue Jan 16 14:06:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861598 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ts3CrsI1"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXBR50gLz9t3w for ; Wed, 17 Jan 2018 01:08:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A807E2FD8C; Tue, 16 Jan 2018 14:08:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YucF+ZWRKRw8; Tue, 16 Jan 2018 14:08:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8BAC42F8FC; Tue, 16 Jan 2018 14:08:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2E3EB1C3F9D for ; Tue, 16 Jan 2018 14:08:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0126388BEA for ; Tue, 16 Jan 2018 14:08:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jUbTKVhijxRp for ; Tue, 16 Jan 2018 14:08:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id 711F188B82 for ; Tue, 16 Jan 2018 14:08:22 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id 36so15334222wrh.1 for ; Tue, 16 Jan 2018 06:08:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+ik2VOXzqSrIPCCHJY5GT+2oJDTlqMdtOUG5CQWeWw4=; b=ts3CrsI1Otz9zlobg97eGWXHjeXo81D7aeb4qq5yS33SUDyXPiuc4Xj8e7ry23ycnO nKmIP/AO5+U+RLctnCipKyyHUck7YOBhFy2zrn7ntjaD/3R3EB/bo9vBhpjHFfwfO49D 0eJ39vR6Fk5NYBhW6N+S55xYnL4j1613r9UEblNkaykpTCF7XQIPrqdQjjyjpayPSRbQ J6Xvj1CxT79aiKx09hr2a3MjYIB58hSanMYjDwS4HiOC6EHpR/GQtrm3ZBW8BCBqfWoj fRJp4q1SaH2SgjlRCiZE5pULEkARTWJdsYDuOR+F9/p6a67xChb//HyGETU5InOGONuw z/tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+ik2VOXzqSrIPCCHJY5GT+2oJDTlqMdtOUG5CQWeWw4=; b=oHUbWqVfH+V4fjOzC8scc4TR6uzSs5rypU6i19OiTsYesnxi2djMRPToW9oQrRxUra Kf1p4w5mU1u/1dAA94qYVlSoWNHpKE3AjgszJ8mszOLxeOgBPhAE5zgTZ9H/ib+NIOTL VmABD2XVkNbyKCeCDc+7O7YcyDLly0WmpW58reWw4PIYYDtirOMg4mMIzruXiQ5l45Pt k8Sek2wMF319Xx/Qy4HUZucbWubaf0zFli1bQHCvH2RZr9PUmOqV7hHkl191MSOhOStW nb1DfJ0DVc0ueOmt8Usyk7mlva3tvtHAiPvIosECABMEIOXhAHcfkzu/jCeoRarY/S5T RwrQ== X-Gm-Message-State: AKwxytcK0GjO/aKUqsJV7xx/2wLw/yG3Oq1mGaBEoz5900czOaDBFyA9 t6YhbMCYqp3t2JDtPNBh+opbKBbe X-Google-Smtp-Source: ACJfBosT7TO8AB1glMxf/ev+m+D++CEdjejI7WVzJSLSyq4pALbR1R0D/sNZwNSI2M79onXy6EXU/w== X-Received: by 10.223.165.30 with SMTP id i30mr14067980wrb.84.1516111700682; Tue, 16 Jan 2018 06:08:20 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:19 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:47 +0100 Message-Id: <20180116140649.7381-13-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 12/14] erlang-p1-sip: Bump to version 1.0.17 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Adapt the patch that removes rebar dependencies to version changes. Signed-off-by: Johan Oudinet --- .../0002-remove-dependencies-from-rebar-config.patch | 10 +++++----- package/erlang-p1-sip/erlang-p1-sip.hash | 2 +- package/erlang-p1-sip/erlang-p1-sip.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch index 5fe86d900f..da86076988 100644 --- a/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch +++ b/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch @@ -4,16 +4,16 @@ by rebar at build time. Signed-off-by: Christophe Romain diff --git a/rebar.config b/rebar.config -index fbc69a1..6250420 100644 +index ed93134..5b32788 100644 --- a/rebar.config +++ b/rebar.config -@@ -29,10 +29,6 @@ +@@ -31,10 +31,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"}}}]}. +-{deps, [{stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.16"}}}, +- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}}, +- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}. - {clean_files, ["c_src/esip_codec.gcda", "c_src/esip_codec.gcno"]}. diff --git a/package/erlang-p1-sip/erlang-p1-sip.hash b/package/erlang-p1-sip/erlang-p1-sip.hash index 2ea7bc8ec4..4d41b9884c 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.hash +++ b/package/erlang-p1-sip/erlang-p1-sip.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2c6ed00220ead631a4755000ad9f118d79c8c4d41aa7c98bd27365a8345f9a5d erlang-p1-sip-1.0.11.tar.gz +sha256 6ac36594921561d0d5502bb824b7408223a3f53560a9d2fa4b0f685c0441baf0 erlang-p1-sip-1.0.17.tar.gz diff --git a/package/erlang-p1-sip/erlang-p1-sip.mk b/package/erlang-p1-sip/erlang-p1-sip.mk index 0f4b33e2d1..a9f572df2d 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.mk +++ b/package/erlang-p1-sip/erlang-p1-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_SIP_VERSION = 1.0.11 +ERLANG_P1_SIP_VERSION = 1.0.17 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 From patchwork Tue Jan 16 14:06:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="afjUA6VF"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXBT0hgyz9s7v for ; Wed, 17 Jan 2018 01:08:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E094388255; Tue, 16 Jan 2018 14:08:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NDjWo00KZBeD; Tue, 16 Jan 2018 14:08:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 93B6188241; Tue, 16 Jan 2018 14:08:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 60BA21C3F9D for ; Tue, 16 Jan 2018 14:08:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5A8CC88248 for ; Tue, 16 Jan 2018 14:08:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3qeogHHsA3yY for ; Tue, 16 Jan 2018 14:08:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 663A188241 for ; Tue, 16 Jan 2018 14:08:24 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id o7so15303581wro.8 for ; Tue, 16 Jan 2018 06:08:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TLG4Aq7ndDguJjGPCb7Xw2PEagOWjKAeVf61UV0+H5U=; b=afjUA6VFicAYLMScVmZAka8m2xbROrbHLtBkvsVtAJWLCrGjvmJ3YKM3slbha4uosR eR15+ZbcBLtAbEi3XUwvuLIik9F2XbrHDhcV9od3gdKcMH9byfirDxIu5qulLy2D3CKq Z3QvB0CybEjBVnwfAnC24ZeCfH94z5/stX/xddmqfXJ9uwKBxubopu1ALqA6/iw1qDpP +heofECvX9u2orekeixoAlsWdU0I17kP+Uf9UygoLGdA0DHseS0czSCDghdouyJJh4hG B0kE+UphHR3E5JFdFkxTYJ/o4xRbtXt2++18IgUMlifL17PjA9M1tdiXznk+5joyBbCp 3wKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TLG4Aq7ndDguJjGPCb7Xw2PEagOWjKAeVf61UV0+H5U=; b=hO83UsL4wAFeIg7zd2I668W/Pllm4ZDCUxFyLIrfWXWXBU9f42egB7J3fxAS/GHIyo vo+8D/9+BGyzm0weMonmlt1KiIpi8pyTiaWT4hEyYd2ATv2FxKfeRcphdKKlusOL02UR nlNI95PbrvSU7FhD2s+gUEV4i8KFLwDEEk+MSDbj69KettOdjye+2z1rF7wlnzgGd+ho fdGLCCea/uibwutBqwJ9eVMKCbDEdrkuhPkjwwHQkeRSSTmM/7J1Zn/2F8+YZ2r7o3QX wQs+FnXvJeR37bR0Ie4oIEkLPARnqUBzqFEqUotnRPN/8s9LxCTTeqNW/UAODmB7HKm4 PHtg== X-Gm-Message-State: AKGB3mJ61LhC8HW+ELpp7/3i/1Ut24PVO9hQQbKQR3viKPU9h/ySabTi DiFyVHTsLXjDsJOumrPJksjKmLeA X-Google-Smtp-Source: ACJfBovBPK0k6ggDGdv1XckON7m+RQvMmR6z2qr8ghenCJiV/CAy+yDspbhiHGtUnT/tZ1uP3fVEUg== X-Received: by 10.223.150.213 with SMTP id u79mr29529009wrb.137.1516111702602; Tue, 16 Jan 2018 06:08:22 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:20 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:48 +0100 Message-Id: <20180116140649.7381-14-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 13/14] erlang-p1-yaml: Bump to version 1.0.12 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Adapt the patch that removes rebar dependencies to version changes. Signed-off-by: Johan Oudinet --- .../erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch | 4 ++-- package/erlang-p1-yaml/erlang-p1-yaml.hash | 2 +- package/erlang-p1-yaml/erlang-p1-yaml.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch b/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch index facfc2c200..4dfdb929c1 100644 --- a/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch +++ b/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch @@ -4,14 +4,14 @@ by rebar at build time. Signed-off-by: Christophe Romain diff --git a/rebar.config b/rebar.config -index 68ffdeb..651a829 100644 +index e09d08d..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"}}}]}. +-{deps, [{p1_utils, ".*", {git, "git://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}. - {clean_files, ["c_src/fast_yaml.gcda", "c_src/fast_yaml.gcno"]}. diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.hash b/package/erlang-p1-yaml/erlang-p1-yaml.hash index 5b8956d7b5..24282e6c37 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.hash +++ b/package/erlang-p1-yaml/erlang-p1-yaml.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 bf225023168873affd2c67a2ce5c6c81c3db0c7df4f0caa113f23770c7b04e05 erlang-p1-yaml-1.0.9.tar.gz +sha256 5a6499a47cdd1f753a527cb8b79074312354063535adc0ca0fd7f72c2a015e3a erlang-p1-yaml-1.0.12.tar.gz diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.mk b/package/erlang-p1-yaml/erlang-p1-yaml.mk index d8865e0d42..de138a9f93 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.mk +++ b/package/erlang-p1-yaml/erlang-p1-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_YAML_VERSION = 1.0.9 +ERLANG_P1_YAML_VERSION = 1.0.12 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 = LICENSE.txt From patchwork Tue Jan 16 14:06:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 861602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uvQ6ScMM"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXBj0Qc0z9s7n for ; Wed, 17 Jan 2018 01:08:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C253E8823D; Tue, 16 Jan 2018 14:08:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7ZbKU-SY40vT; Tue, 16 Jan 2018 14:08:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8C8918824D; Tue, 16 Jan 2018 14:08:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7AF271C3F9D for ; Tue, 16 Jan 2018 14:08:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6DCE888E77 for ; Tue, 16 Jan 2018 14:08:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MEvpELJDjSSN for ; Tue, 16 Jan 2018 14:08:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3166388C4A for ; Tue, 16 Jan 2018 14:08:28 +0000 (UTC) Received: by mail-wm0-f42.google.com with SMTP id 143so8573275wma.5 for ; Tue, 16 Jan 2018 06:08:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=krqaNkLB5HkU0GiVgWdFFtz6Pf8yGW5ED4zRlPfatIQ=; b=uvQ6ScMMIbYIObPZkKXNwPydYXTLHJZaJKQ5i0ewPG3KbfUysMZpySX5aY6tILmXQ3 Ju8tQ5TilcVfOxJgqgt07PYkWG2QkuUXSdH6bX2wkygq9a2e4pT32E1UPpW6sUSsCF1s tbDqHJBUiYv1GI44Aq2qiHLY6T8ecL3PXAqAaOBMpcqK0XSFzNRDTaTnonKrnAEGNV4c OtFlcOqnnk0oFC5Gvw2fGSEOPdl+u5ElD+rPAOkIKtAd+7XgRdV7SH3SyTniXF489Xj/ 1TWGB3Y3QmUQxSL4dwQXRcw2lYo9srwUJ6esDwFiIfLb/tcMN1kd6T1cSDh8DsvGZgOa uTbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=krqaNkLB5HkU0GiVgWdFFtz6Pf8yGW5ED4zRlPfatIQ=; b=V196q2A0O9V1KwL/Gf7onfO46FO0mTzWRlNMIuS3Jav/xrQprJNkar6EkZahApIs0V VaxTZxBd4yHF1cvPPu2e7+ch33a2mrCMABcSqfYlOuAfd0vcRjKqTsCjWUYinogDm0F9 k/+dYZZyUDQdg0kQfKNgZshyEFwih8kPsjSN2RiXCGRMp+h8wt+0zx+UgbmCX7fpffYi m2PiAHWVhWPrWl6yMB46I5smp5LEPqfH6srilL2tcr9a4z4k/ExmYHIIGHN86wjbKD0a kP9oF0cQJ2AhcZMsSEf6169q6aNSo2l1ozAFD5xQx7k9EuEsezfutbGMgWRqQNzWQkck 2heQ== X-Gm-Message-State: AKwxytfu3DHAEmJ9qTwCKsRD8dof7dPlv4XAKGkhG6GbuhjuorOnMm2P tK1NmVCIVqhj7paLcIo4/cPVovzN X-Google-Smtp-Source: ACJfBovmvU7r2EAtXPOJerlOL1S5/MCtU+qgfAS7F1nG68msfXQdf6ESHVV39ErXRbN9NYDJ+cQq/w== X-Received: by 10.28.166.195 with SMTP id p186mr1683201wme.81.1516111704265; Tue, 16 Jan 2018 06:08:24 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id h2sm1822654wrf.54.2018.01.16.06.08.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:08:22 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 15:06:49 +0100 Message-Id: <20180116140649.7381-15-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180116140649.7381-1-johan.oudinet@gmail.com> References: <20180116140649.7381-1-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 14/14] ejabberd: Bump to version 17.11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" * Adapt all patches. * Use the new configure option enable-system-deps even though there is still a patch needed to correct includes. * Disable graphics to not depends on X libraries. Disable also mod_avatar from the default loaded modules, since this module requires graphics enabled. * Add a configure option to specify the Erlang cookie for users that do not want a random cookie generated at first boot. Signed-off-by: Johan Oudinet --- .../0001-remove-make-targets-for-deps.patch | 5 +- ...002-remove-dependencies-from-rebar-config.patch | 82 +- package/ejabberd/0004-correct-include.patch | 58 - package/ejabberd/0004-correct-includes.patch | 1909 ++++++++++++++++++++ package/ejabberd/0007-fix-ejabberdctl.patch | 34 +- .../0008-handle-error-case-from-lib_dir.patch | 28 + .../0008-rebar-uses-host-dependencies.patch | 33 - package/ejabberd/0009-disable-mod_avatar.patch | 32 + package/ejabberd/Config.in | 10 + package/ejabberd/ejabberd.hash | 2 +- package/ejabberd/ejabberd.mk | 38 +- 11 files changed, 2082 insertions(+), 149 deletions(-) delete mode 100644 package/ejabberd/0004-correct-include.patch create mode 100644 package/ejabberd/0004-correct-includes.patch create mode 100644 package/ejabberd/0008-handle-error-case-from-lib_dir.patch delete mode 100644 package/ejabberd/0008-rebar-uses-host-dependencies.patch create mode 100644 package/ejabberd/0009-disable-mod_avatar.patch diff --git a/package/ejabberd/0001-remove-make-targets-for-deps.patch b/package/ejabberd/0001-remove-make-targets-for-deps.patch index aee09670a1..f012140a18 100644 --- a/package/ejabberd/0001-remove-make-targets-for-deps.patch +++ b/package/ejabberd/0001-remove-make-targets-for-deps.patch @@ -9,10 +9,10 @@ using rebar at build time. Signed-off-by: Frank Hunleth diff --git a/Makefile.in b/Makefile.in -index a0b4553d..4190a515 100644 +index df2abfdc..8c8fd714 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -77,26 +77,11 @@ else +@@ -86,27 +86,11 @@ else INIT_USER=$(INSTALLUSER) endif @@ -24,6 +24,7 @@ index a0b4553d..4190a515 100644 -deps/.got: - rm -rf deps/.got - rm -rf deps/.built +- mkdir -p deps - $(REBAR) get-deps && :> deps/.got - -deps/.built: deps/.got diff --git a/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch b/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch index bcf1e8a5ee..154c7bffd5 100644 --- a/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch +++ b/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch @@ -1,54 +1,61 @@ -From d399ecdd99e62b5554210a3b5c733e738e4d54be Mon Sep 17 00:00:00 2001 -From: Philipp Huebner -Date: Wed, 20 Jan 2016 08:08:42 -0500 +From 8674f61701da41cc53c532b5fa3a516838a2c5d4 Mon Sep 17 00:00:00 2001 +From: Johan Oudinet +Date: Wed, 10 Jan 2018 15:14:56 +0100 Subject: [PATCH] remove dependencies from rebar config -Without this patch, dependencies would be downloaded and compiled -by rebar at build time. +Without this patch, dependencies would be downloaded and compiled by +rebar at build time. -Signed-off-by: Frank Hunleth +Signed-off-by: Johan Oudinet +--- + rebar.config | 72 ------------------------------------------------------------ + 1 file changed, 72 deletions(-) diff --git a/rebar.config b/rebar.config -index aef3a017..71937023 100644 +index d6ad5e7b..0b246b92 100644 --- a/rebar.config +++ b/rebar.config -@@ -18,63 +18,6 @@ +@@ -18,68 +18,6 @@ %%% %%%---------------------------------------------------------------------- - --{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.2.1"}}}, -- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.8"}}}, -- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.7"}}}, -- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.11"}}}, -- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.8"}}}, -- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.21"}}}, -- {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.9"}}}, -- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.10"}}}, -- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.11"}}}, -- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.9"}}}, + +-{deps, [{lager, ".*", {git, "https://github.com/erlang-lager/lager", +- {tag, {if_version_above, "17", "3.4.2", "3.2.1"}}}}, +- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}, +- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.12"}}}, +- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}}, +- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.10"}}}, +- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.25"}}}, +- {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.16"}}}, +- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.12"}}}, - {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, -- {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.1"}}}, +- {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.2"}}}, - {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}}, +- {jose, ".*", {git, "git://github.com/potatosalad/erlang-jose.git", {tag, "1.8.4"}}}, +- {fs, ".*", {git, "https://github.com/synrc/fs.git", {tag, "2.12.0"}}}, +- {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.16"}}}}, +- {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.17"}}}}, - {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", -- {tag, "1.0.2"}}}}, +- {tag, "1.0.4"}}}}, - {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", -- {tag, "1.1.2"}}}}, +- {tag, "1.1.4"}}}}, - {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3", - {tag, "1.1.5"}}}}, - {if_var_true, pam, {epam, ".*", {git, "https://github.com/processone/epam", -- {tag, "1.0.2"}}}}, +- {tag, "1.0.3"}}}}, - {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib", -- {tag, "1.0.2"}}}}, -- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", -- {tag, "2.4.1"}}}}, +- {tag, "1.0.3"}}}}, +- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/processone/riak-erlang-client.git", +- {tag, {if_version_above, "19", "develop", "2.5.3"}}}}}, +- {if_var_true, graphics, {eimp, ".*", {git, "https://github.com/processone/eimp.git", {tag, "1.0.2"}}}}, - %% Elixir support, needed to run tests - {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", -- {tag, {if_version_above, "17", "v1.2.6", "v1.1.1"}}}}}, +- {tag, {if_version_above, "17", "v1.4.4", "v1.1.1"}}}}}, - %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin - {if_not_rebar3, {if_var_true, elixir, {rebar_elixir_plugin, ".*", - {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}}, - {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv", -- {tag, "1.0.4"}}}}, +- {tag, "1.0.6"}}}}, - {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck", - {tag, "0.8.4"}}}}, - {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git", @@ -62,33 +69,38 @@ index aef3a017..71937023 100644 - stringprep, - fast_xml, - esip, -- luerl, - stun, - fast_yaml, - xmpp, - p1_utils, - p1_mysql, - p1_pgsql, +- p1_oauth2, - epam, - ezlib, +- eimp, - iconv]}}. - - {erl_first_files, ["src/ejabberd_config.erl", "src/gen_mod.erl", "src/mod_muc_room.erl"]}. - + {erl_first_files, ["src/ejabberd_config.erl", "src/gen_mod.erl", "src/mod_muc_room.erl", "src/mod_push.erl"]}. + {erl_opts, [nowarn_deprecated_function, -@@ -142,15 +85,6 @@ +@@ -153,16 +91,6 @@ {if_version_above, "17", {cover_enabled, true}}. {cover_export_enabled, true}. - + -{post_hook_configure, [{"fast_tls", []}, - {"stringprep", []}, - {"fast_yaml", []}, -- {"esip", []}, +- {if_var_true, sip, {"esip", []}}, - {"fast_xml", [{if_var_true, full_xml, "--enable-full-xml"}]}, - {if_var_true, pam, {"epam", []}}, - {if_var_true, zlib, {"ezlib", []}}, +- {if_var_true, graphics, {"eimp", []}}, - {if_var_true, iconv, {"iconv", []}}]}. - {port_env, [{"CFLAGS", "-g -O2 -Wall"}]}. - + {port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}. +-- +2.14.1 + diff --git a/package/ejabberd/0004-correct-include.patch b/package/ejabberd/0004-correct-include.patch deleted file mode 100644 index 4db7395f75..0000000000 --- a/package/ejabberd/0004-correct-include.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 705a9ad229de49cd9cce226a2025716902455663 Mon Sep 17 00:00:00 2001 -From: Philipp Huebner -Date: Wed, 20 Jan 2016 08:13:21 -0500 -Subject: [PATCH] correct include - -This part of the code was moved into it's own project and was packaged -separately by me. To make the build process work, this small fix is -necessary. - -Signed-off-by: Johan Oudinet ---- - src/mod_sip.erl | 2 +- - src/mod_sip_proxy.erl | 2 +- - src/mod_sip_registrar.erl | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/mod_sip.erl b/src/mod_sip.erl -index c8c9533..7f188a0 100644 ---- a/src/mod_sip.erl -+++ b/src/mod_sip.erl -@@ -38,7 +38,7 @@ - - -include("ejabberd.hrl"). - -include("logger.hrl"). ---include_lib("esip/include/esip.hrl"). -+-include_lib("p1_sip/include/esip.hrl"). - - %%%=================================================================== - %%% API -diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl -index bf297bc..d8b65cd 100644 ---- a/src/mod_sip_proxy.erl -+++ b/src/mod_sip_proxy.erl -@@ -40,7 +40,7 @@ - - -include("ejabberd.hrl"). - -include("logger.hrl"). ---include_lib("esip/include/esip.hrl"). -+-include_lib("p1_sip/include/esip.hrl"). - - -define(SIGN_LIFETIME, 300). %% in seconds. - -diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl -index 44091ed..4d2ec82 100644 ---- a/src/mod_sip_registrar.erl -+++ b/src/mod_sip_registrar.erl -@@ -37,7 +37,7 @@ - - -include("ejabberd.hrl"). - -include("logger.hrl"). ---include_lib("esip/include/esip.hrl"). -+-include_lib("p1_sip/include/esip.hrl"). - - -define(CALL_TIMEOUT, timer:seconds(30)). - -define(DEFAULT_EXPIRES, 3600). --- -2.5.0 - diff --git a/package/ejabberd/0004-correct-includes.patch b/package/ejabberd/0004-correct-includes.patch new file mode 100644 index 0000000000..812bf6c5be --- /dev/null +++ b/package/ejabberd/0004-correct-includes.patch @@ -0,0 +1,1909 @@ +From 0487178693143955ff57e3c9371fb6e7b164294c Mon Sep 17 00:00:00 2001 +From: Johan Oudinet +Date: Thu, 11 Jan 2018 12:49:38 +0100 +Subject: [PATCH] correct includes + +This part of the code was moved into it's own project and was packaged +separately by me. To make the build process work, this small fix is +necessary. +Author: Philipp Huebner + +Signed-off-by: Johan Oudinet +--- + include/jlib.hrl | 4 ++-- + src/acl.erl | 2 +- + src/acme_challenge.erl | 2 +- + src/ejabberd_acme.erl | 2 +- + src/ejabberd_acme_comm.erl | 2 +- + src/ejabberd_auth_anonymous.erl | 2 +- + src/ejabberd_bosh.erl | 2 +- + src/ejabberd_c2s.erl | 2 +- + src/ejabberd_captcha.erl | 2 +- + src/ejabberd_http.erl | 2 +- + src/ejabberd_http_ws.erl | 2 +- + src/ejabberd_iq.erl | 2 +- + src/ejabberd_local.erl | 2 +- + src/ejabberd_oauth.erl | 2 +- + src/ejabberd_oauth_rest.erl | 2 +- + src/ejabberd_oauth_sql.erl | 2 +- + src/ejabberd_piefxis.erl | 2 +- + src/ejabberd_router.erl | 2 +- + src/ejabberd_router_multicast.erl | 2 +- + src/ejabberd_s2s.erl | 2 +- + src/ejabberd_s2s_in.erl | 2 +- + src/ejabberd_s2s_out.erl | 2 +- + src/ejabberd_service.erl | 2 +- + src/ejabberd_sm.erl | 2 +- + src/ejabberd_socket.erl | 2 +- + src/ejabberd_system_monitor.erl | 2 +- + src/ejabberd_web.erl | 2 +- + src/ejabberd_web_admin.erl | 2 +- + src/ejabberd_websocket.erl | 2 +- + src/ejabberd_xmlrpc.erl | 2 +- + src/gen_iq_handler.erl | 2 +- + src/gen_pubsub_node.erl | 2 +- + src/gen_pubsub_nodetree.erl | 2 +- + src/jd2ejd.erl | 2 +- + src/mod_adhoc.erl | 2 +- + src/mod_admin_extra.erl | 2 +- + src/mod_admin_update_sql.erl | 2 +- + src/mod_announce.erl | 2 +- + src/mod_announce_mnesia.erl | 2 +- + src/mod_announce_riak.erl | 2 +- + src/mod_announce_sql.erl | 2 +- + src/mod_avatar.erl | 2 +- + src/mod_block_strangers.erl | 2 +- + src/mod_blocking.erl | 2 +- + src/mod_bosh.erl | 2 +- + src/mod_caps.erl | 2 +- + src/mod_carboncopy.erl | 2 +- + src/mod_client_state.erl | 2 +- + src/mod_configure.erl | 2 +- + src/mod_delegation.erl | 2 +- + src/mod_disco.erl | 2 +- + src/mod_echo.erl | 2 +- + src/mod_fail2ban.erl | 2 +- + src/mod_http_api.erl | 2 +- + src/mod_http_upload.erl | 2 +- + src/mod_http_upload_quota.erl | 2 +- + src/mod_irc.erl | 2 +- + src/mod_irc_connection.erl | 2 +- + src/mod_irc_mnesia.erl | 2 +- + src/mod_irc_riak.erl | 2 +- + src/mod_irc_sql.erl | 2 +- + src/mod_last.erl | 2 +- + src/mod_legacy_auth.erl | 2 +- + src/mod_mam.erl | 2 +- + src/mod_mam_mnesia.erl | 2 +- + src/mod_mam_sql.erl | 2 +- + src/mod_metrics.erl | 2 +- + src/mod_mix.erl | 2 +- + src/mod_muc.erl | 2 +- + src/mod_muc_admin.erl | 2 +- + src/mod_muc_log.erl | 2 +- + src/mod_muc_mnesia.erl | 2 +- + src/mod_muc_riak.erl | 2 +- + src/mod_muc_room.erl | 2 +- + src/mod_muc_sql.erl | 2 +- + src/mod_multicast.erl | 2 +- + src/mod_offline.erl | 2 +- + src/mod_offline_mnesia.erl | 2 +- + src/mod_offline_riak.erl | 2 +- + src/mod_offline_sql.erl | 2 +- + src/mod_ping.erl | 2 +- + src/mod_pres_counter.erl | 2 +- + src/mod_privacy.erl | 2 +- + src/mod_privacy_mnesia.erl | 2 +- + src/mod_privacy_riak.erl | 2 +- + src/mod_privacy_sql.erl | 2 +- + src/mod_private.erl | 2 +- + src/mod_private_mnesia.erl | 2 +- + src/mod_private_riak.erl | 2 +- + src/mod_private_sql.erl | 2 +- + src/mod_privilege.erl | 2 +- + src/mod_proxy65_service.erl | 2 +- + src/mod_pubsub.erl | 2 +- + src/mod_push.erl | 2 +- + src/mod_push_keepalive.erl | 2 +- + src/mod_push_mnesia.erl | 2 +- + src/mod_push_sql.erl | 2 +- + src/mod_register.erl | 2 +- + src/mod_register_web.erl | 2 +- + src/mod_roster.erl | 2 +- + src/mod_s2s_dialback.erl | 2 +- + src/mod_service_log.erl | 2 +- + src/mod_shared_roster.erl | 2 +- + src/mod_shared_roster_ldap.erl | 2 +- + src/mod_shared_roster_mnesia.erl | 2 +- + src/mod_shared_roster_riak.erl | 2 +- + src/mod_shared_roster_sql.erl | 2 +- + src/mod_sic.erl | 2 +- + src/mod_sip.erl | 2 +- + src/mod_sip_proxy.erl | 2 +- + src/mod_sip_registrar.erl | 2 +- + src/mod_stats.erl | 2 +- + src/mod_stream_mgmt.erl | 2 +- + src/mod_time.erl | 2 +- + src/mod_vcard.erl | 2 +- + src/mod_vcard_ldap.erl | 2 +- + src/mod_vcard_mnesia.erl | 2 +- + src/mod_vcard_riak.erl | 2 +- + src/mod_vcard_sql.erl | 2 +- + src/mod_vcard_xupdate.erl | 2 +- + src/mod_version.erl | 2 +- + src/node_dag.erl | 2 +- + src/node_dispatch.erl | 2 +- + src/node_flat.erl | 2 +- + src/node_flat_sql.erl | 2 +- + src/node_online.erl | 2 +- + src/nodetree_dag.erl | 2 +- + src/nodetree_tree.erl | 2 +- + src/nodetree_tree_sql.erl | 2 +- + src/prosody2ejabberd.erl | 2 +- + src/pubsub_subscription.erl | 2 +- + src/pubsub_subscription_sql.erl | 2 +- + src/xmpp_stream_in.erl | 2 +- + src/xmpp_stream_out.erl | 2 +- + src/xmpp_stream_pkix.erl | 2 +- + 135 files changed, 136 insertions(+), 136 deletions(-) + +diff --git a/include/jlib.hrl b/include/jlib.hrl +index cd5fedbf..293fcc0e 100644 +--- a/include/jlib.hrl ++++ b/include/jlib.hrl +@@ -18,8 +18,8 @@ + %%% + %%%---------------------------------------------------------------------- + +--include("ns.hrl"). +--include("fxml.hrl"). ++-include_lib("p1_xmpp/include/ns.hrl"). ++-include_lib("p1_xml/include/fxml.hrl"). + + -define(STANZA_ERROR(Code, Type, Condition), + #xmlel{name = <<"error">>, +diff --git a/src/acl.erl b/src/acl.erl +index 2d848b99..88df4625 100644 +--- a/src/acl.erl ++++ b/src/acl.erl +@@ -45,7 +45,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + + -record(acl, {aclname, aclspec}). + -record(access, {name :: aclname(), +diff --git a/src/acme_challenge.erl b/src/acme_challenge.erl +index f4fde4e7..45fc6d8f 100644 +--- a/src/acme_challenge.erl ++++ b/src/acme_challenge.erl +@@ -16,7 +16,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_http.hrl"). + -include("ejabberd_acme.hrl"). + +diff --git a/src/ejabberd_acme.erl b/src/ejabberd_acme.erl +index a5166b45..eee74092 100644 +--- a/src/ejabberd_acme.erl ++++ b/src/ejabberd_acme.erl +@@ -21,7 +21,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_commands.hrl"). + -include("ejabberd_acme.hrl"). + -include_lib("public_key/include/public_key.hrl"). +diff --git a/src/ejabberd_acme_comm.erl b/src/ejabberd_acme_comm.erl +index a5668d08..02acd1c4 100644 +--- a/src/ejabberd_acme_comm.erl ++++ b/src/ejabberd_acme_comm.erl +@@ -24,7 +24,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_acme.hrl"). + -include_lib("public_key/include/public_key.hrl"). +diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl +index a4f3ac1c..697b3e08 100644 +--- a/src/ejabberd_auth_anonymous.erl ++++ b/src/ejabberd_auth_anonymous.erl +@@ -46,7 +46,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + + start(Host) -> + ejabberd_hooks:add(sm_register_connection_hook, Host, +diff --git a/src/ejabberd_bosh.erl b/src/ejabberd_bosh.erl +index 1df6681f..e8cc5f9b 100644 +--- a/src/ejabberd_bosh.erl ++++ b/src/ejabberd_bosh.erl +@@ -47,7 +47,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl +index a94d065f..a56d9041 100644 +--- a/src/ejabberd_c2s.erl ++++ b/src/ejabberd_c2s.erl +@@ -52,7 +52,7 @@ + host_up/1, host_down/1]). + + -include("ejabberd.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_roster.hrl"). + +diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl +index 76af5278..3a950786 100644 +--- a/src/ejabberd_captcha.erl ++++ b/src/ejabberd_captcha.erl +@@ -43,7 +43,7 @@ + is_feature_available/0, create_captcha_x/5, + opt_type/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd.hrl"). + -include("logger.hrl"). + -include("ejabberd_http.hrl"). +diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl +index 0bc0d8fc..d39a585d 100644 +--- a/src/ejabberd_http.erl ++++ b/src/ejabberd_http.erl +@@ -39,7 +39,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl +index f9f7b07e..5c0e6ea1 100644 +--- a/src/ejabberd_http_ws.erl ++++ b/src/ejabberd_http_ws.erl +@@ -39,7 +39,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_iq.erl b/src/ejabberd_iq.erl +index 7d2751dc..76a6b056 100644 +--- a/src/ejabberd_iq.erl ++++ b/src/ejabberd_iq.erl +@@ -34,7 +34,7 @@ + -export([init/1, handle_call/3, handle_cast/2, handle_info/2, + terminate/2, code_change/3]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + -record(state, {expire = infinity :: timeout()}). +diff --git a/src/ejabberd_local.erl b/src/ejabberd_local.erl +index cc1d6a2e..f72fd43b 100644 +--- a/src/ejabberd_local.erl ++++ b/src/ejabberd_local.erl +@@ -50,7 +50,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, {}). + +diff --git a/src/ejabberd_oauth.erl b/src/ejabberd_oauth.erl +index df4e4bc2..34bf24f8 100644 +--- a/src/ejabberd_oauth.erl ++++ b/src/ejabberd_oauth.erl +@@ -52,7 +52,7 @@ + + -export([oauth_issue_token/3, oauth_list_tokens/0, oauth_revoke_token/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd.hrl"). + -include("logger.hrl"). +diff --git a/src/ejabberd_oauth_rest.erl b/src/ejabberd_oauth_rest.erl +index 206fab43..1a7287ee 100644 +--- a/src/ejabberd_oauth_rest.erl ++++ b/src/ejabberd_oauth_rest.erl +@@ -37,7 +37,7 @@ + -include("ejabberd.hrl"). + -include("ejabberd_oauth.hrl"). + -include("logger.hrl"). +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + + init() -> + rest:start(?MYNAME), +diff --git a/src/ejabberd_oauth_sql.erl b/src/ejabberd_oauth_sql.erl +index 14eaca6a..fcd105ba 100644 +--- a/src/ejabberd_oauth_sql.erl ++++ b/src/ejabberd_oauth_sql.erl +@@ -36,7 +36,7 @@ + -include("ejabberd_oauth.hrl"). + -include("ejabberd.hrl"). + -include("ejabberd_sql_pt.hrl"). +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("logger.hrl"). + + init() -> +diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl +index ecb4908a..7331f442 100644 +--- a/src/ejabberd_piefxis.erl ++++ b/src/ejabberd_piefxis.erl +@@ -42,7 +42,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("mod_roster.hrl"). + +diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl +index e2901483..315505ec 100644 +--- a/src/ejabberd_router.erl ++++ b/src/ejabberd_router.erl +@@ -71,7 +71,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + -include("ejabberd_router.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -callback init() -> any(). + -callback register_route(binary(), binary(), local_hint(), +diff --git a/src/ejabberd_router_multicast.erl b/src/ejabberd_router_multicast.erl +index 5d5acfca..3f206ef2 100644 +--- a/src/ejabberd_router_multicast.erl ++++ b/src/ejabberd_router_multicast.erl +@@ -43,7 +43,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(route_multicast, {domain = <<"">> :: binary() | '_', + pid = self() :: pid()}). +diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl +index 0626d62f..e2fc34c9 100644 +--- a/src/ejabberd_s2s.erl ++++ b/src/ejabberd_s2s.erl +@@ -57,7 +57,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_commands.hrl"). + +diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl +index a949e83d..3d8e100e 100644 +--- a/src/ejabberd_s2s_in.erl ++++ b/src/ejabberd_s2s_in.erl +@@ -45,7 +45,7 @@ + host_up/1, host_down/1]). + + -include("ejabberd.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + -type state() :: map(). +diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl +index fea5d816..c035731f 100644 +--- a/src/ejabberd_s2s_out.erl ++++ b/src/ejabberd_s2s_out.erl +@@ -43,7 +43,7 @@ + route/2, establish/1, update_state/2, host_up/1, host_down/1]). + + -include("ejabberd.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + -type state() :: map(). +diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl +index 7b5f945d..895fed09 100644 +--- a/src/ejabberd_service.erl ++++ b/src/ejabberd_service.erl +@@ -37,7 +37,7 @@ + -export([send/2]). + + -include("ejabberd.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + -type state() :: map(). +diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl +index 3df1d88e..e8087c48 100644 +--- a/src/ejabberd_sm.erl ++++ b/src/ejabberd_sm.erl +@@ -89,7 +89,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_commands.hrl"). + -include("ejabberd_sm.hrl"). +diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl +index 9953a76a..0dd1c4ff 100644 +--- a/src/ejabberd_socket.erl ++++ b/src/ejabberd_socket.erl +@@ -52,7 +52,7 @@ + sockname/1, peername/1]). + + -include("ejabberd.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + -type sockmod() :: ejabberd_bosh | +diff --git a/src/ejabberd_system_monitor.erl b/src/ejabberd_system_monitor.erl +index 773104f9..46e641b7 100644 +--- a/src/ejabberd_system_monitor.erl ++++ b/src/ejabberd_system_monitor.erl +@@ -41,7 +41,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, {}). + +diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl +index 7a40d2c7..aa1abc9b 100644 +--- a/src/ejabberd_web.erl ++++ b/src/ejabberd_web.erl +@@ -34,7 +34,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl +index b3d72c19..cdd951b6 100644 +--- a/src/ejabberd_web_admin.erl ++++ b/src/ejabberd_web_admin.erl +@@ -38,7 +38,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl +index 9926c20c..fabf2293 100644 +--- a/src/ejabberd_websocket.erl ++++ b/src/ejabberd_websocket.erl +@@ -47,7 +47,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl +index 213aef7a..f5b51894 100644 +--- a/src/ejabberd_xmlrpc.erl ++++ b/src/ejabberd_xmlrpc.erl +@@ -42,7 +42,7 @@ + -include("ejabberd_http.hrl"). + -include("mod_roster.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, + {access_commands = [] :: list(), +diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl +index d34db358..ab04a252 100644 +--- a/src/gen_iq_handler.erl ++++ b/src/gen_iq_handler.erl +@@ -45,7 +45,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, {host, module, function}). + +diff --git a/src/gen_pubsub_node.erl b/src/gen_pubsub_node.erl +index 4f516bd5..83de80a8 100644 +--- a/src/gen_pubsub_node.erl ++++ b/src/gen_pubsub_node.erl +@@ -25,7 +25,7 @@ + + -module(gen_pubsub_node). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -type(host() :: mod_pubsub:host()). + -type(nodeId() :: mod_pubsub:nodeId()). +diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl +index bf7140aa..4267b9a1 100644 +--- a/src/gen_pubsub_nodetree.erl ++++ b/src/gen_pubsub_nodetree.erl +@@ -36,7 +36,7 @@ + ServerHost :: binary(), + Opts :: [any()]) -> atom(). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -callback terminate(Host :: host(), ServerHost :: binary()) -> atom(). + +diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl +index ae293698..bbe9bc6d 100644 +--- a/src/jd2ejd.erl ++++ b/src/jd2ejd.erl +@@ -32,7 +32,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%%---------------------------------------------------------------------- + %%% API +diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl +index e6df3904..0f3ada11 100644 +--- a/src/mod_adhoc.erl ++++ b/src/mod_adhoc.erl +@@ -39,7 +39,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + start(Host, Opts) -> + IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)), +diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl +index 799f0079..9fd8531b 100644 +--- a/src/mod_admin_extra.erl ++++ b/src/mod_admin_extra.erl +@@ -84,7 +84,7 @@ + -include("mod_roster.hrl"). + -include("mod_privacy.hrl"). + -include("ejabberd_sm.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%% + %%% gen_mod +diff --git a/src/mod_admin_update_sql.erl b/src/mod_admin_update_sql.erl +index 2f105d97..cace1b94 100644 +--- a/src/mod_admin_update_sql.erl ++++ b/src/mod_admin_update_sql.erl +@@ -38,7 +38,7 @@ + -include("logger.hrl"). + -include("ejabberd.hrl"). + -include("ejabberd_commands.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sql_pt.hrl"). + + %%% +diff --git a/src/mod_announce.erl b/src/mod_announce.erl +index b259aced..146b6a35 100644 +--- a/src/mod_announce.erl ++++ b/src/mod_announce.erl +@@ -52,7 +52,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_announce.hrl"). + + -callback init(binary(), gen_mod:opts()) -> any(). +diff --git a/src/mod_announce_mnesia.erl b/src/mod_announce_mnesia.erl +index f2e5c1c4..cecd68cc 100644 +--- a/src/mod_announce_mnesia.erl ++++ b/src/mod_announce_mnesia.erl +@@ -31,7 +31,7 @@ + get_motd/1, is_motd_user/2, set_motd_user/2, import/3]). + -export([need_transform/1, transform/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_announce.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_announce_riak.erl b/src/mod_announce_riak.erl +index 04a29a68..a3dac3e9 100644 +--- a/src/mod_announce_riak.erl ++++ b/src/mod_announce_riak.erl +@@ -30,7 +30,7 @@ + -export([init/2, set_motd_users/2, set_motd/2, delete_motd/1, + get_motd/1, is_motd_user/2, set_motd_user/2, import/3]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_announce.hrl"). + + %%%=================================================================== +diff --git a/src/mod_announce_sql.erl b/src/mod_announce_sql.erl +index c5c9eb58..b243d05d 100644 +--- a/src/mod_announce_sql.erl ++++ b/src/mod_announce_sql.erl +@@ -33,7 +33,7 @@ + get_motd/1, is_motd_user/2, set_motd_user/2, import/3, + export/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_announce.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("logger.hrl"). +diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl +index dde58abf..ffc31c94 100644 +--- a/src/mod_avatar.erl ++++ b/src/mod_avatar.erl +@@ -28,7 +28,7 @@ + %% Hooks + -export([pubsub_publish_item/6, vcard_iq_convert/1, vcard_iq_publish/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("pubsub.hrl"). + +diff --git a/src/mod_block_strangers.erl b/src/mod_block_strangers.erl +index b2c56f36..429c0ab2 100644 +--- a/src/mod_block_strangers.erl ++++ b/src/mod_block_strangers.erl +@@ -34,7 +34,7 @@ + + -export([filter_packet/1, filter_offline_msg/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl +index 738c5e16..479b34ea 100644 +--- a/src/mod_blocking.erl ++++ b/src/mod_blocking.erl +@@ -35,7 +35,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("mod_privacy.hrl"). + +diff --git a/src/mod_bosh.erl b/src/mod_bosh.erl +index 6ee58047..e49ab960 100644 +--- a/src/mod_bosh.erl ++++ b/src/mod_bosh.erl +@@ -41,7 +41,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_http.hrl"). + -include("bosh.hrl"). + +diff --git a/src/mod_caps.erl b/src/mod_caps.erl +index edc93bbf..6ead4230 100644 +--- a/src/mod_caps.erl ++++ b/src/mod_caps.erl +@@ -53,7 +53,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_caps.hrl"). + + -define(BAD_HASH_LIFETIME, 600). +diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl +index 307d6154..c3a998d8 100644 +--- a/src/mod_carboncopy.erl ++++ b/src/mod_carboncopy.erl +@@ -40,7 +40,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_carboncopy.hrl"). + + -type direction() :: sent | received. +diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl +index f7adb1c6..09507b73 100644 +--- a/src/mod_client_state.erl ++++ b/src/mod_client_state.erl +@@ -42,7 +42,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(CSI_QUEUE_MAX, 100). + +diff --git a/src/mod_configure.erl b/src/mod_configure.erl +index 31f7a9c8..6ea5bd37 100644 +--- a/src/mod_configure.erl ++++ b/src/mod_configure.erl +@@ -40,7 +40,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sm.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). + +diff --git a/src/mod_delegation.erl b/src/mod_delegation.erl +index 27e00768..c93912d6 100644 +--- a/src/mod_delegation.erl ++++ b/src/mod_delegation.erl +@@ -42,7 +42,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -type disco_acc() :: {error, stanza_error()} | {result, [binary()]} | empty. + -record(state, {server_host = <<"">> :: binary(), +diff --git a/src/mod_disco.erl b/src/mod_disco.erl +index 76be408f..5bea1fb7 100644 +--- a/src/mod_disco.erl ++++ b/src/mod_disco.erl +@@ -42,7 +42,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). + -include("mod_roster.hrl"). + +diff --git a/src/mod_echo.erl b/src/mod_echo.erl +index 79dd5996..38199d3c 100644 +--- a/src/mod_echo.erl ++++ b/src/mod_echo.erl +@@ -41,7 +41,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, {hosts = [] :: [binary()]}). + +diff --git a/src/mod_fail2ban.erl b/src/mod_fail2ban.erl +index 5e931853..01bdfe2f 100644 +--- a/src/mod_fail2ban.erl ++++ b/src/mod_fail2ban.erl +@@ -39,7 +39,7 @@ + -include_lib("stdlib/include/ms_transform.hrl"). + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(C2S_AUTH_BAN_LIFETIME, 3600). %% 1 hour + -define(C2S_MAX_AUTH_FAILURES, 20). +diff --git a/src/mod_http_api.erl b/src/mod_http_api.erl +index ef881d14..f7cd10bf 100644 +--- a/src/mod_http_api.erl ++++ b/src/mod_http_api.erl +@@ -77,7 +77,7 @@ + -export([start/2, stop/1, reload/3, process/2, mod_opt_type/1, depends/2]). + + -include("ejabberd.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_http.hrl"). + +diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl +index c3c295f6..d3bd4e84 100644 +--- a/src/mod_http_upload.erl ++++ b/src/mod_http_upload.erl +@@ -89,7 +89,7 @@ + + -include("ejabberd.hrl"). + -include("ejabberd_http.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + -record(state, +diff --git a/src/mod_http_upload_quota.erl b/src/mod_http_upload_quota.erl +index 10243ac0..cda5c563 100644 +--- a/src/mod_http_upload_quota.erl ++++ b/src/mod_http_upload_quota.erl +@@ -50,7 +50,7 @@ + %% ejabberd_hooks callback. + -export([handle_slot_request/5]). + +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("logger.hrl"). + -include_lib("kernel/include/file.hrl"). + +diff --git a/src/mod_irc.erl b/src/mod_irc.erl +index 92093507..9b9becc8 100644 +--- a/src/mod_irc.erl ++++ b/src/mod_irc.erl +@@ -43,7 +43,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_irc.hrl"). + + -define(DEFAULT_IRC_ENCODING, <<"iso8859-15">>). +diff --git a/src/mod_irc_connection.erl b/src/mod_irc_connection.erl +index 59336591..ca81358f 100644 +--- a/src/mod_irc_connection.erl ++++ b/src/mod_irc_connection.erl +@@ -41,7 +41,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(SETS, gb_sets). + +diff --git a/src/mod_irc_mnesia.erl b/src/mod_irc_mnesia.erl +index eb982e1f..510ce09d 100644 +--- a/src/mod_irc_mnesia.erl ++++ b/src/mod_irc_mnesia.erl +@@ -30,7 +30,7 @@ + -export([init/2, get_data/3, set_data/4, import/2]). + -export([need_transform/1, transform/1]). + +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("mod_irc.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_irc_riak.erl b/src/mod_irc_riak.erl +index 23f2a2c3..d236bfa7 100644 +--- a/src/mod_irc_riak.erl ++++ b/src/mod_irc_riak.erl +@@ -29,7 +29,7 @@ + %% API + -export([init/2, get_data/3, set_data/4, import/2]). + +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("mod_irc.hrl"). + + %%%=================================================================== +diff --git a/src/mod_irc_sql.erl b/src/mod_irc_sql.erl +index 1f8d7d16..5f784fdc 100644 +--- a/src/mod_irc_sql.erl ++++ b/src/mod_irc_sql.erl +@@ -31,7 +31,7 @@ + %% API + -export([init/2, get_data/3, set_data/4, import/1, import/2, export/1]). + +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("mod_irc.hrl"). + -include("ejabberd_sql_pt.hrl"). + +diff --git a/src/mod_last.erl b/src/mod_last.erl +index e97ef43f..34498e26 100644 +--- a/src/mod_last.erl ++++ b/src/mod_last.erl +@@ -40,7 +40,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("mod_privacy.hrl"). + -include("mod_last.hrl"). +diff --git a/src/mod_legacy_auth.erl b/src/mod_legacy_auth.erl +index 722a0573..c6644386 100644 +--- a/src/mod_legacy_auth.erl ++++ b/src/mod_legacy_auth.erl +@@ -29,7 +29,7 @@ + %% hooks + -export([c2s_unauthenticated_packet/2, c2s_stream_features/2]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -type c2s_state() :: ejabberd_c2s:state(). + +diff --git a/src/mod_mam.erl b/src/mod_mam.erl +index eb839ea1..abc461db 100644 +--- a/src/mod_mam.erl ++++ b/src/mod_mam.erl +@@ -41,7 +41,7 @@ + delete_old_messages/2, get_commands_spec/0, msg_to_el/4, + get_room_config/4, set_room_option/3, offline_message/1, export/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_muc_room.hrl"). + -include("ejabberd_commands.hrl"). +diff --git a/src/mod_mam_mnesia.erl b/src/mod_mam_mnesia.erl +index 71f1f701..a3a7eb5f 100644 +--- a/src/mod_mam_mnesia.erl ++++ b/src/mod_mam_mnesia.erl +@@ -31,7 +31,7 @@ + extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6]). + + -include_lib("stdlib/include/ms_transform.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_mam.hrl"). + +diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl +index 40aa9836..b4fab39b 100644 +--- a/src/mod_mam_sql.erl ++++ b/src/mod_mam_sql.erl +@@ -33,7 +33,7 @@ + extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6, export/1]). + + -include_lib("stdlib/include/ms_transform.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_mam.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_metrics.erl b/src/mod_metrics.erl +index 73a68a8d..1b0d2e1b 100644 +--- a/src/mod_metrics.erl ++++ b/src/mod_metrics.erl +@@ -30,7 +30,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -export([start/2, stop/1, mod_opt_type/1, depends/2, reload/3]). + +diff --git a/src/mod_mix.erl b/src/mod_mix.erl +index 90507665..627363f3 100644 +--- a/src/mod_mix.erl ++++ b/src/mod_mix.erl +@@ -37,7 +37,7 @@ + terminate/2, code_change/3]). + + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(NODES, [?NS_MIX_NODES_MESSAGES, + ?NS_MIX_NODES_PRESENCE, +diff --git a/src/mod_muc.erl b/src/mod_muc.erl +index f7d5303f..f01cde16 100644 +--- a/src/mod_muc.erl ++++ b/src/mod_muc.erl +@@ -73,7 +73,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_muc.hrl"). + + -record(state, +diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl +index e41f62b5..4d18d068 100644 +--- a/src/mod_muc_admin.erl ++++ b/src/mod_muc_admin.erl +@@ -43,7 +43,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_muc.hrl"). + -include("mod_muc_room.hrl"). + -include("ejabberd_http.hrl"). +diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl +index f2685aaa..abb55c42 100644 +--- a/src/mod_muc_log.erl ++++ b/src/mod_muc_log.erl +@@ -44,7 +44,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_muc_room.hrl"). + + -define(T(Text), translate:translate(Lang, Text)). +diff --git a/src/mod_muc_mnesia.erl b/src/mod_muc_mnesia.erl +index aa59038c..7334aca4 100644 +--- a/src/mod_muc_mnesia.erl ++++ b/src/mod_muc_mnesia.erl +@@ -44,7 +44,7 @@ + + -include("mod_muc.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). + + -record(state, {}). +diff --git a/src/mod_muc_riak.erl b/src/mod_muc_riak.erl +index 57d9666b..4ebd2949 100644 +--- a/src/mod_muc_riak.erl ++++ b/src/mod_muc_riak.erl +@@ -38,7 +38,7 @@ + -export([set_affiliation/6, set_affiliations/4, get_affiliation/5, + get_affiliations/3, search_affiliation/4]). + +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("mod_muc.hrl"). + + %%%=================================================================== +diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl +index bafa938d..d8b5e288 100644 +--- a/src/mod_muc_room.erl ++++ b/src/mod_muc_room.erl +@@ -51,7 +51,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("mod_muc_room.hrl"). + +diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl +index 8aa6071c..71d79b02 100644 +--- a/src/mod_muc_sql.erl ++++ b/src/mod_muc_sql.erl +@@ -41,7 +41,7 @@ + -export([set_affiliation/6, set_affiliations/4, get_affiliation/5, + get_affiliations/3, search_affiliation/4]). + +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("mod_muc.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl +index 7b772521..7c1cab3b 100644 +--- a/src/mod_multicast.erl ++++ b/src/mod_multicast.erl +@@ -45,7 +45,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, + {lserver, lservice, access, service_limits}). +diff --git a/src/mod_offline.erl b/src/mod_offline.erl +index 5b95fe4b..8146ffdc 100644 +--- a/src/mod_offline.erl ++++ b/src/mod_offline.erl +@@ -70,7 +70,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/mod_offline_mnesia.erl b/src/mod_offline_mnesia.erl +index a725ab00..126fd1bb 100644 +--- a/src/mod_offline_mnesia.erl ++++ b/src/mod_offline_mnesia.erl +@@ -32,7 +32,7 @@ + remove_all_messages/2, count_messages/2, import/1]). + -export([need_transform/1, transform/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_offline.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_offline_riak.erl b/src/mod_offline_riak.erl +index 5d0fd1af..607a78ba 100644 +--- a/src/mod_offline_riak.erl ++++ b/src/mod_offline_riak.erl +@@ -31,7 +31,7 @@ + read_message/3, remove_message/3, read_all_messages/2, + remove_all_messages/2, count_messages/2, import/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_offline.hrl"). + + %%%=================================================================== +diff --git a/src/mod_offline_sql.erl b/src/mod_offline_sql.erl +index 53a0d345..50fa83bc 100644 +--- a/src/mod_offline_sql.erl ++++ b/src/mod_offline_sql.erl +@@ -33,7 +33,7 @@ + read_message/3, remove_message/3, read_all_messages/2, + remove_all_messages/2, count_messages/2, import/1, export/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_offline.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_ping.erl b/src/mod_ping.erl +index 02357181..7d51f4dc 100644 +--- a/src/mod_ping.erl ++++ b/src/mod_ping.erl +@@ -36,7 +36,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(DEFAULT_SEND_PINGS, false). + +diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl +index 875aeef3..ffa95576 100644 +--- a/src/mod_pres_counter.erl ++++ b/src/mod_pres_counter.erl +@@ -33,7 +33,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(pres_counter, + {dir, start, count, logged = false}). +diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl +index 64ae9620..034a56e4 100644 +--- a/src/mod_privacy.erl ++++ b/src/mod_privacy.erl +@@ -42,7 +42,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + + -define(PRIVACY_CACHE, privacy_cache). +diff --git a/src/mod_privacy_mnesia.erl b/src/mod_privacy_mnesia.erl +index 7449262b..201b92ec 100644 +--- a/src/mod_privacy_mnesia.erl ++++ b/src/mod_privacy_mnesia.erl +@@ -32,7 +32,7 @@ + remove_list/3, use_cache/1, import/1]). + -export([need_transform/1, transform/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_privacy_riak.erl b/src/mod_privacy_riak.erl +index 0cd39c11..88f294f8 100644 +--- a/src/mod_privacy_riak.erl ++++ b/src/mod_privacy_riak.erl +@@ -33,7 +33,7 @@ + + -export([privacy_schema/0]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + + %%%=================================================================== +diff --git a/src/mod_privacy_sql.erl b/src/mod_privacy_sql.erl +index 7939cbb2..6141feda 100644 +--- a/src/mod_privacy_sql.erl ++++ b/src/mod_privacy_sql.erl +@@ -35,7 +35,7 @@ + + -export([item_to_raw/1, raw_to_item/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_private.erl b/src/mod_private.erl +index cb167468..0b84d071 100644 +--- a/src/mod_private.erl ++++ b/src/mod_private.erl +@@ -37,7 +37,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_private.hrl"). + + -define(PRIVATE_CACHE, private_cache). +diff --git a/src/mod_private_mnesia.erl b/src/mod_private_mnesia.erl +index 04c1a04a..6a9dee68 100644 +--- a/src/mod_private_mnesia.erl ++++ b/src/mod_private_mnesia.erl +@@ -31,7 +31,7 @@ + use_cache/1, import/3]). + -export([need_transform/1, transform/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_private.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_private_riak.erl b/src/mod_private_riak.erl +index be175f07..f97c2dd8 100644 +--- a/src/mod_private_riak.erl ++++ b/src/mod_private_riak.erl +@@ -30,7 +30,7 @@ + -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2, + import/3]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_private.hrl"). + + %%%=================================================================== +diff --git a/src/mod_private_sql.erl b/src/mod_private_sql.erl +index 5ed584c3..da4974ce 100644 +--- a/src/mod_private_sql.erl ++++ b/src/mod_private_sql.erl +@@ -30,7 +30,7 @@ + -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2, + import/3, export/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_private.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("logger.hrl"). +diff --git a/src/mod_privilege.erl b/src/mod_privilege.erl +index dab7a619..695c8acf 100644 +--- a/src/mod_privilege.erl ++++ b/src/mod_privilege.erl +@@ -41,7 +41,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, {server_host = <<"">> :: binary(), + permissions = dict:new() :: ?TDICT}). +diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl +index fb34ba55..f42aa461 100644 +--- a/src/mod_proxy65_service.erl ++++ b/src/mod_proxy65_service.erl +@@ -39,7 +39,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(PROCNAME, ejabberd_mod_proxy65_service). + +diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl +index d2e1f6c5..b7cd6644 100644 +--- a/src/mod_pubsub.erl ++++ b/src/mod_pubsub.erl +@@ -41,7 +41,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("pubsub.hrl"). + -include("mod_roster.hrl"). + +diff --git a/src/mod_push.erl b/src/mod_push.erl +index 1eaec6ad..ac4ed89e 100644 +--- a/src/mod_push.erl ++++ b/src/mod_push.erl +@@ -52,7 +52,7 @@ + -include("ejabberd.hrl"). + -include("ejabberd_commands.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(PUSH_CACHE, push_cache). + +diff --git a/src/mod_push_keepalive.erl b/src/mod_push_keepalive.erl +index bcdc0c25..d979eaec 100644 +--- a/src/mod_push_keepalive.erl ++++ b/src/mod_push_keepalive.erl +@@ -36,7 +36,7 @@ + c2s_handle_cast/2, c2s_handle_info/2, c2s_stanza/3]). + + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(PUSH_BEFORE_TIMEOUT_SECS, 120). + +diff --git a/src/mod_push_mnesia.erl b/src/mod_push_mnesia.erl +index ff12150f..866b5630 100644 +--- a/src/mod_push_mnesia.erl ++++ b/src/mod_push_mnesia.erl +@@ -35,7 +35,7 @@ + + -include_lib("stdlib/include/ms_transform.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_push.hrl"). + + %%%------------------------------------------------------------------- +diff --git a/src/mod_push_sql.erl b/src/mod_push_sql.erl +index c82d9fc0..79fedba4 100644 +--- a/src/mod_push_sql.erl ++++ b/src/mod_push_sql.erl +@@ -32,7 +32,7 @@ + lookup_sessions/3, lookup_sessions/2, lookup_sessions/1, + delete_session/3, delete_old_sessions/2, export/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("mod_push.hrl"). +diff --git a/src/mod_register.erl b/src/mod_register.erl +index 77557ee0..8ad27fcf 100644 +--- a/src/mod_register.erl ++++ b/src/mod_register.erl +@@ -41,7 +41,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + start(Host, Opts) -> + IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)), +diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl +index b7bc2edc..a7bb83f5 100644 +--- a/src/mod_register_web.erl ++++ b/src/mod_register_web.erl +@@ -60,7 +60,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/mod_roster.erl b/src/mod_roster.erl +index a86b50d9..57f5fdce 100644 +--- a/src/mod_roster.erl ++++ b/src/mod_roster.erl +@@ -54,7 +54,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("mod_roster.hrl"). + +diff --git a/src/mod_s2s_dialback.erl b/src/mod_s2s_dialback.erl +index b4c2ed9d..645ab37f 100644 +--- a/src/mod_s2s_dialback.erl ++++ b/src/mod_s2s_dialback.erl +@@ -33,7 +33,7 @@ + s2s_in_features/2, s2s_out_init/2, s2s_out_closed/2]). + + -include("ejabberd.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + %%%=================================================================== +diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl +index 1c6e5fe8..c295aa45 100644 +--- a/src/mod_service_log.erl ++++ b/src/mod_service_log.erl +@@ -35,7 +35,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + start(Host, _Opts) -> + ejabberd_hooks:add(user_send_packet, Host, ?MODULE, +diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl +index 5f95266b..db641dbb 100644 +--- a/src/mod_shared_roster.erl ++++ b/src/mod_shared_roster.erl +@@ -44,7 +44,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("mod_roster.hrl"). + +diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl +index 66cbebd9..4b431fc4 100644 +--- a/src/mod_shared_roster_ldap.erl ++++ b/src/mod_shared_roster_ldap.erl +@@ -46,7 +46,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_roster.hrl"). + -include("eldap.hrl"). + +diff --git a/src/mod_shared_roster_mnesia.erl b/src/mod_shared_roster_mnesia.erl +index adfbac68..bdd87030 100644 +--- a/src/mod_shared_roster_mnesia.erl ++++ b/src/mod_shared_roster_mnesia.erl +@@ -37,7 +37,7 @@ + -include("mod_roster.hrl"). + -include("mod_shared_roster.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_shared_roster_riak.erl b/src/mod_shared_roster_riak.erl +index 441aafd0..d5545eb1 100644 +--- a/src/mod_shared_roster_riak.erl ++++ b/src/mod_shared_roster_riak.erl +@@ -35,7 +35,7 @@ + + -include("mod_roster.hrl"). + -include("mod_shared_roster.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_shared_roster_sql.erl b/src/mod_shared_roster_sql.erl +index 488e0ec7..f952347a 100644 +--- a/src/mod_shared_roster_sql.erl ++++ b/src/mod_shared_roster_sql.erl +@@ -36,7 +36,7 @@ + add_user_to_group/3, remove_user_from_group/3, import/3, + export/1]). + +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("mod_roster.hrl"). + -include("mod_shared_roster.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_sic.erl b/src/mod_sic.erl +index a2b3256e..da61b2c2 100644 +--- a/src/mod_sic.erl ++++ b/src/mod_sic.erl +@@ -36,7 +36,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + start(Host, Opts) -> + IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)), +diff --git a/src/mod_sip.erl b/src/mod_sip.erl +index 01327c77..70159d17 100644 +--- a/src/mod_sip.erl ++++ b/src/mod_sip.erl +@@ -52,7 +52,7 @@ mod_opt_type(_) -> + locate/1, mod_opt_type/1, depends/2]). + + -include("ejabberd.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("s1_sip/include/esip.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl +index d600da3d..c3dfe874 100644 +--- a/src/mod_sip_proxy.erl ++++ b/src/mod_sip_proxy.erl +@@ -40,7 +40,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("s1_sip/include/esip.hrl"). + + -define(SIGN_LIFETIME, 300). %% in seconds. + +diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl +index a47de697..f89d3cab 100644 +--- a/src/mod_sip_registrar.erl ++++ b/src/mod_sip_registrar.erl +@@ -42,7 +42,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("s1_sip/include/esip.hrl"). + + -define(CALL_TIMEOUT, timer:seconds(30)). + -define(DEFAULT_EXPIRES, 3600). +diff --git a/src/mod_stats.erl b/src/mod_stats.erl +index 2bdbdbd3..2969fbd2 100644 +--- a/src/mod_stats.erl ++++ b/src/mod_stats.erl +@@ -35,7 +35,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + start(Host, Opts) -> + IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)), +diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl +index 658bd504..46b00993 100644 +--- a/src/mod_stream_mgmt.erl ++++ b/src/mod_stream_mgmt.erl +@@ -37,7 +37,7 @@ + -export([get_resume_timeout/1, set_resume_timeout/2]). + + -include("ejabberd.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("p1_queue.hrl"). + +diff --git a/src/mod_time.erl b/src/mod_time.erl +index c54f3d27..20321d36 100644 +--- a/src/mod_time.erl ++++ b/src/mod_time.erl +@@ -38,7 +38,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + start(Host, Opts) -> + IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)), +diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl +index 378b9430..10618c96 100644 +--- a/src/mod_vcard.erl ++++ b/src/mod_vcard.erl +@@ -44,7 +44,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_vcard.hrl"). + + -define(JUD_MATCHES, 30). +diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl +index 88621fc0..e2c741c5 100644 +--- a/src/mod_vcard_ldap.erl ++++ b/src/mod_vcard_ldap.erl +@@ -41,7 +41,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + -include("eldap.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PROCNAME, ejabberd_mod_vcard_ldap). +diff --git a/src/mod_vcard_mnesia.erl b/src/mod_vcard_mnesia.erl +index 3e742ec1..6e9e0e50 100644 +--- a/src/mod_vcard_mnesia.erl ++++ b/src/mod_vcard_mnesia.erl +@@ -33,7 +33,7 @@ + -export([need_transform/1, transform/1]). + + -include("ejabberd.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_vcard.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_vcard_riak.erl b/src/mod_vcard_riak.erl +index e5ad1b3d..5427ec7f 100644 +--- a/src/mod_vcard_riak.erl ++++ b/src/mod_vcard_riak.erl +@@ -31,7 +31,7 @@ + search_fields/1, search_reported/1, import/3, stop/1]). + -export([is_search_supported/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_vcard.hrl"). + + %%%=================================================================== +diff --git a/src/mod_vcard_sql.erl b/src/mod_vcard_sql.erl +index 07d90b69..1dc5d40f 100644 +--- a/src/mod_vcard_sql.erl ++++ b/src/mod_vcard_sql.erl +@@ -33,7 +33,7 @@ + search_fields/1, search_reported/1, import/3, export/1]). + -export([is_search_supported/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_vcard.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_vcard_xupdate.erl b/src/mod_vcard_xupdate.erl +index 7643fed4..19148654 100644 +--- a/src/mod_vcard_xupdate.erl ++++ b/src/mod_vcard_xupdate.erl +@@ -35,7 +35,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(VCARD_XUPDATE_CACHE, vcard_xupdate_cache). + +diff --git a/src/mod_version.erl b/src/mod_version.erl +index 5f613e02..23ac02cd 100644 +--- a/src/mod_version.erl ++++ b/src/mod_version.erl +@@ -37,7 +37,7 @@ + -include("ejabberd.hrl"). + -include("logger.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + start(Host, Opts) -> + IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)), +diff --git a/src/node_dag.erl b/src/node_dag.erl +index 9829c27c..5f399357 100644 +--- a/src/node_dag.erl ++++ b/src/node_dag.erl +@@ -28,7 +28,7 @@ + -author('bjc@kublai.com'). + + -include("pubsub.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -export([init/3, terminate/2, options/0, features/0, + create_node_permission/6, create_node/2, delete_node/1, +diff --git a/src/node_dispatch.erl b/src/node_dispatch.erl +index 92a655b8..00eb55d9 100644 +--- a/src/node_dispatch.erl ++++ b/src/node_dispatch.erl +@@ -34,7 +34,7 @@ + -author('christophe.romain@process-one.net'). + + -include("pubsub.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -export([init/3, terminate/2, options/0, features/0, + create_node_permission/6, create_node/2, delete_node/1, +diff --git a/src/node_flat.erl b/src/node_flat.erl +index bc529e14..571b1b16 100644 +--- a/src/node_flat.erl ++++ b/src/node_flat.erl +@@ -34,7 +34,7 @@ + -author('christophe.romain@process-one.net'). + + -include("pubsub.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -export([init/3, terminate/2, options/0, features/0, + create_node_permission/6, create_node/2, delete_node/1, +diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl +index afbc050a..ae279c4c 100644 +--- a/src/node_flat_sql.erl ++++ b/src/node_flat_sql.erl +@@ -36,7 +36,7 @@ + -compile([{parse_transform, ejabberd_sql_pt}]). + + -include("pubsub.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sql_pt.hrl"). + + -export([init/3, terminate/2, options/0, features/0, +diff --git a/src/node_online.erl b/src/node_online.erl +index 39b08d99..ce71fdb0 100644 +--- a/src/node_online.erl ++++ b/src/node_online.erl +@@ -28,7 +28,7 @@ + -author('christophe.romain@process-one.net'). + + -include("pubsub.hrl"). +--include("jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + + -export([init/3, terminate/2, options/0, features/0, + create_node_permission/6, create_node/2, delete_node/1, +diff --git a/src/nodetree_dag.erl b/src/nodetree_dag.erl +index a44e7155..0c5609c4 100644 +--- a/src/nodetree_dag.erl ++++ b/src/nodetree_dag.erl +@@ -30,7 +30,7 @@ + -include_lib("stdlib/include/qlc.hrl"). + + -include("pubsub.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -export([init/3, terminate/2, options/0, set_node/1, + get_node/3, get_node/2, get_node/1, get_nodes/2, +diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl +index 31724036..0fe1f5e0 100644 +--- a/src/nodetree_tree.erl ++++ b/src/nodetree_tree.erl +@@ -40,7 +40,7 @@ + -include_lib("stdlib/include/qlc.hrl"). + + -include("pubsub.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -export([init/3, terminate/2, options/0, set_node/1, + get_node/3, get_node/2, get_node/1, get_nodes/2, +diff --git a/src/nodetree_tree_sql.erl b/src/nodetree_tree_sql.erl +index b310dd2d..19ff1786 100644 +--- a/src/nodetree_tree_sql.erl ++++ b/src/nodetree_tree_sql.erl +@@ -40,7 +40,7 @@ + -compile([{parse_transform, ejabberd_sql_pt}]). + + -include("pubsub.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sql_pt.hrl"). + + -export([init/3, terminate/2, options/0, set_node/1, +diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl +index 2c7dabb4..b6ba864c 100644 +--- a/src/prosody2ejabberd.erl ++++ b/src/prosody2ejabberd.erl +@@ -28,7 +28,7 @@ + -export([from_dir/1]). + + -include("ejabberd.hrl"). +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_roster.hrl"). + -include("mod_offline.hrl"). +diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl +index 746e39e3..59ee734b 100644 +--- a/src/pubsub_subscription.erl ++++ b/src/pubsub_subscription.erl +@@ -39,7 +39,7 @@ + + -include("pubsub.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(PUBSUB_DELIVER, <<"pubsub#deliver">>). + -define(PUBSUB_DIGEST, <<"pubsub#digest">>). +diff --git a/src/pubsub_subscription_sql.erl b/src/pubsub_subscription_sql.erl +index 3315748c..5700c100 100644 +--- a/src/pubsub_subscription_sql.erl ++++ b/src/pubsub_subscription_sql.erl +@@ -35,7 +35,7 @@ + + -include("pubsub.hrl"). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(PUBSUB_DELIVER, <<"pubsub#deliver">>). + -define(PUBSUB_DIGEST, <<"pubsub#digest">>). +diff --git a/src/xmpp_stream_in.erl b/src/xmpp_stream_in.erl +index 329ebad6..4ce8760c 100644 +--- a/src/xmpp_stream_in.erl ++++ b/src/xmpp_stream_in.erl +@@ -42,7 +42,7 @@ + -define(FSMOPTS, []). + -endif. + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -type state() :: map(). + -type stop_reason() :: {stream, reset | {in | out, stream_error()}} | + {tls, inet:posix() | atom() | binary()} | +diff --git a/src/xmpp_stream_out.erl b/src/xmpp_stream_out.erl +index 7ddc183b..8095bd86 100644 +--- a/src/xmpp_stream_out.erl ++++ b/src/xmpp_stream_out.erl +@@ -44,7 +44,7 @@ + + -define(TCP_SEND_TIMEOUT, 15000). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include_lib("kernel/include/inet.hrl"). + + -type state() :: map(). +diff --git a/src/xmpp_stream_pkix.erl b/src/xmpp_stream_pkix.erl +index 8361999f..a6fe728c 100644 +--- a/src/xmpp_stream_pkix.erl ++++ b/src/xmpp_stream_pkix.erl +@@ -24,7 +24,7 @@ + %% API + -export([authenticate/1, authenticate/2, get_cert_domains/1, format_error/1]). + +--include("xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include_lib("public_key/include/public_key.hrl"). + -include("XmppAddr.hrl"). + +-- +2.14.1 + diff --git a/package/ejabberd/0007-fix-ejabberdctl.patch b/package/ejabberd/0007-fix-ejabberdctl.patch index ab70d8900a..090fcc52d2 100644 --- a/package/ejabberd/0007-fix-ejabberdctl.patch +++ b/package/ejabberd/0007-fix-ejabberdctl.patch @@ -1,28 +1,32 @@ -From 53d7d654026afa163a55b860e33c6901129e8dc1 Mon Sep 17 00:00:00 2001 +From 168d5840dc2a541ec16385e666c1932cf02907e9 Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Wed, 20 Jan 2016 09:35:07 -0500 +Date: Wed, 10 Jan 2018 15:00:07 +0100 Subject: [PATCH] fix ejabberdctl -Change default values so ejabberdctl run commands as ejabberd user +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 +--- + ejabberdctl.template | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ejabberdctl.template b/ejabberdctl.template -index 5b34ebee..51acaca8 100755 +index 83637766..5a8a8795 100755 --- a/ejabberdctl.template +++ b/ejabberdctl.template -@@ -14,9 +14,12 @@ SCRIPT_DIR=`cd ${0%/*} && pwd` - ERL={{erl}} - IEX={{bindir}}/iex - EPMD={{epmd}} --INSTALLUSER={{installuser}} +@@ -15,7 +15,10 @@ SCRIPT_DIR=$(cd "${0%/*}" && pwd) + ERL="{{erl}}" + IEX="{{bindir}}/iex" + 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" + + # check the proper system user is used + case $(id -un) in +-- +2.14.1 + diff --git a/package/ejabberd/0008-handle-error-case-from-lib_dir.patch b/package/ejabberd/0008-handle-error-case-from-lib_dir.patch new file mode 100644 index 0000000000..03a9fefd0e --- /dev/null +++ b/package/ejabberd/0008-handle-error-case-from-lib_dir.patch @@ -0,0 +1,28 @@ +From d0bfcbbfd8a6e7ee6213112e4078b020e4e1d15d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= +Date: Wed, 10 Jan 2018 16:34:01 +0100 +Subject: [PATCH] Handle error case from code:lib_dir in ResolveDepPath in + rebar.config.script + +--- + rebar.config.script | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/rebar.config.script b/rebar.config.script +index 85f918fffd..ba374e5c5f 100644 +--- a/rebar.config.script ++++ b/rebar.config.script +@@ -233,9 +233,10 @@ ResolveDepPath = case {SystemDeps, IsRebar3} of + {true, _} -> + fun("deps/" ++ Rest) -> + Slash = string:str(Rest, "/"), +- code:lib_dir( +- string:sub_string(Rest, 1, Slash -1)) ++ +- string:sub_string(Rest, Slash); ++ case code:lib_dir(string:sub_string(Rest, 1, Slash -1)) of ++ {error, _} -> Rest; ++ V -> V ++ string:sub_string(Rest, Slash) ++ end; + (Path) -> + Path + end; diff --git a/package/ejabberd/0008-rebar-uses-host-dependencies.patch b/package/ejabberd/0008-rebar-uses-host-dependencies.patch deleted file mode 100644 index 45f387993e..0000000000 --- a/package/ejabberd/0008-rebar-uses-host-dependencies.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix location of rebar dependencies. - -Signed-off-by: Christophe Romain - -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) -> diff --git a/package/ejabberd/0009-disable-mod_avatar.patch b/package/ejabberd/0009-disable-mod_avatar.patch new file mode 100644 index 0000000000..ab89ba1a29 --- /dev/null +++ b/package/ejabberd/0009-disable-mod_avatar.patch @@ -0,0 +1,32 @@ +From e6eac74e82975e7d87b1f59c50eb007ab04c1392 Mon Sep 17 00:00:00 2001 +From: Johan Oudinet +Date: Tue, 16 Jan 2018 14:29:56 +0100 +Subject: [PATCH] disable mod_avatar + +This module requires to compile with graphics enabled. + +Signed-off-by: Johan Oudinet +--- + ejabberd.yml.example | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ejabberd.yml.example b/ejabberd.yml.example +index e178e956..7c12b76c 100644 +--- a/ejabberd.yml.example ++++ b/ejabberd.yml.example +@@ -796,9 +796,9 @@ modules: + search: false + mod_vcard_xupdate: {} + ## Convert all avatars posted by Android clients from WebP to JPEG +- mod_avatar: +- convert: +- webp: jpeg ++ ## mod_avatar: ++ ## convert: ++ ## webp: jpeg + mod_version: {} + mod_stream_mgmt: {} + ## Non-SASL Authentication (XEP-0078) is now disabled by default +-- +2.14.1 + diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in index a7542cd12d..0c7212d63a 100644 --- a/package/ejabberd/Config.in +++ b/package/ejabberd/Config.in @@ -27,3 +27,13 @@ config BR2_PACKAGE_EJABBERD comment "ejabberd needs erlang, toolchain w/ C++" depends on !BR2_PACKAGE_ERLANG || !BR2_INSTALL_LIBSTDCPP + +if BR2_PACKAGE_EJABBERD + +config BR2_PACKAGE_EJABBERD_ERLANG_COOKIE + string "Erlang cookie" + help + An alphanumeric string used by Erlang to authenticate nodes. + If empty, erlang creates a random cookie at first execution. + +endif diff --git a/package/ejabberd/ejabberd.hash b/package/ejabberd/ejabberd.hash index 24a26d21d9..6fb90a2300 100644 --- a/package/ejabberd/ejabberd.hash +++ b/package/ejabberd/ejabberd.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b8395bc65b09f135a60320b62338258acd6056cc241e9e245fde267fb18dd3c9 ejabberd-17.04.tgz +sha256 bd16b33a2f1345e5847fd05b70a5fa992181bac756cd6d5d621de9c18cb76801 ejabberd-17.11.tgz diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 35a1027efb..45031bf096 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -4,7 +4,7 @@ # ################################################################################ -EJABBERD_VERSION = 17.04 +EJABBERD_VERSION = 17.11 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 @@ -23,22 +23,38 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM),y) EJABBERD_DEPENDENCIES += linux-pam endif -EJABBERD_ERLANG_LIBS = sasl crypto public_key ssl mnesia inets compiler +# Install check-erlang-lib script to the directory in which the +# package has been uncompressed, so it is available during the +# configure step. +define EJABBERD_INSTALL_CHECK_ERLANG_LIB + $(INSTALL) -m 0755 $(EJABBERD_PKGDIR)/check-erlang-lib \ + $(@D)/check-erlang-lib +endef + +EJABBERD_POST_EXTRACT_HOOKS += EJABBERD_INSTALL_CHECK_ERLANG_LIB + +EJABBERD_ERLANG_LIBS = sasl public_key mnesia inets compiler # Guess answers for these tests, configure will bail out otherwise # saying error: cannot run test program while cross compiling. EJABBERD_CONF_ENV = \ ac_cv_erlang_root_dir="$(HOST_DIR)/lib/erlang" \ $(foreach lib,$(EJABBERD_ERLANG_LIBS), \ - ac_cv_erlang_lib_dir_$(lib)="`package/ejabberd/check-erlang-lib $(lib)`") + ac_cv_erlang_lib_dir_$(lib)="`./check-erlang-lib $(lib)`") + +EJABBERD_CONF_OPTS = \ + --enable-system-deps \ + --disable-erlang-version-check \ + --disable-graphics define EJABBERD_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) install -C $(@D) endef -# Replace HOST_DIR prefix to /usr in ERL path of ejabberctl script. +# Replace HOST_DIR prefix to /usr in environment variables of +# ejabberctl script. define EJABBERD_FIX_EJABBERDCTL - $(SED) 's,ERL=$(HOST_DIR),ERL=/usr,' '$(TARGET_DIR)/usr/sbin/ejabberdctl' + $(SED) 's,="$(HOST_DIR),="/usr,' '$(TARGET_DIR)/usr/sbin/ejabberdctl' endef EJABBERD_POST_INSTALL_TARGET_HOOKS += EJABBERD_FIX_EJABBERDCTL @@ -52,4 +68,16 @@ define EJABBERD_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ejabberd endef +# Install an Erlang cookie if any is provided. +ifneq ($(call qstrip,$(BR2_PACKAGE_EJABBERD_ERLANG_COOKIE)),) +define EJABBERD_INSTALL_ERLANG_COOKIE + echo $(BR2_PACKAGE_EJABBERD_ERLANG_COOKIE) \ + >'$(TARGET_DIR)/var/lib/ejabberd/.erlang.cookie' +endef +EJABBERD_POST_INSTALL_TARGET_HOOKS += EJABBERD_INSTALL_ERLANG_COOKIE +define EJABBERD_PERMISSIONS +/var/lib/ejabberd/.erlang.cookie f 400 ejabberd ejabberd - - - - - +endef +endif + $(eval $(rebar-package))