From patchwork Wed Aug 19 12:05:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1347761 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=Pm6OoLIP; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BWmk33JTMz9sPB for ; Wed, 19 Aug 2020 22:07:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AE56F87158; Wed, 19 Aug 2020 12:07:18 +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 K5sL1qKjZOzh; Wed, 19 Aug 2020 12:07:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BF63F86E64; Wed, 19 Aug 2020 12:07:16 +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 38CBD1BF33D for ; Wed, 19 Aug 2020 12:07:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 29F3B855F1 for ; Wed, 19 Aug 2020 12:07:15 +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 kDXQplQ2oG8D for ; Wed, 19 Aug 2020 12:07:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2ABD8855D9 for ; Wed, 19 Aug 2020 12:07:13 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id 9so1832003wmj.5 for ; Wed, 19 Aug 2020 05:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gbv+Qo8lBwhzduvcXR4m9bMch8DIKn/pQqaAasGj9qA=; b=Pm6OoLIPCSvtvV5C6gzb8RU4R/NC+qdB3tvU/XLbhv7qYeN6+n8Y8gNTC3yaaKYVLz XmKNDSPEPaDVzZXLC1ZkSeGBYo0vIHXynZLLisMNPHNeXwqs+9ahSfbdUvlVXtlnKeOu Wu53S0Wj3y/rUieq+Ag22Mre6q5I1bWGHpJUSqykubAxVHOWO4ckFI6iNM3t6HP8xN1c P8I26mtU8VwsyeD3m9/UqiIu1/McEFXWa9+jqcar5lhQY8BQibBw+Cph6q7vkDcCqeD/ lrJUmrh2j4GqiZkdbWlVkhc3YogpgL0s9SBieYrmQEntHluxIAqn3V3kfOI+a1DMlJph rAdg== 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:mime-version :content-transfer-encoding; bh=gbv+Qo8lBwhzduvcXR4m9bMch8DIKn/pQqaAasGj9qA=; b=ZHSU3drQDB/Dr5h3xVPGTkvomP4pmniWROXKTr8dboYqCBM46whewVjKomTM6doIET mVaFFY1KA0ijkFTqcaI0WGochr26f9f7uLNjXpuyeGcI4VeuER/1YQld6nzksRu85jOf PwKmTkp5JCgZPJp7/vKNncrC9PzzLS4xeDyK7p+Zi3bKB43a0I2I4MBXtOui9Lwxi7ln dDc5giUAIM3QmGRcJXpLQVDB16ZyLYl82Ibvj4t7JoxW/m3ugXSXssiD2ClF9womvQE4 oKXnQcuBTdB0SQ0Dz5swrJq74hHB+V/OLLWRl2vkTOQjBqCSz7lU8+5LeGsAL2WMse+W i2xg== X-Gm-Message-State: AOAM532XeConFAbdyQeD8y/TR7Xs989S2VQMLNFr4QnGBRLKUfYtbR5U jbRkGFIA2pel7A7/4URTJAqhVDacUl3lqU8S X-Google-Smtp-Source: ABdhPJwPjnlqK2pqDld0Ez37cCA8k3TqhiH11BWgQdEDjeKaDw0h8K/iKld/DtF9ZEAKhjf15NLMhg== X-Received: by 2002:a1c:e10a:: with SMTP id y10mr4509050wmg.1.1597838830992; Wed, 19 Aug 2020 05:07:10 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:5fb9:2a66:a7a8:378f]) by smtp.gmail.com with ESMTPSA id x82sm5522940wmb.30.2020.08.19.05.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 05:07:10 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Wed, 19 Aug 2020 14:05:05 +0200 Message-Id: <20200819120506.137013-1-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/2] package/mosquitto: bump to v1.6.11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Thomas Petazzoni , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Mosquitto 1.6.11 is a bugfix release, read the whole announcement on http://mosquitto.org/blog/2020/08/version-1-6-11-released/ From the changelog of the client library: mosquitto_loop_start() now sets a thread name on Linux, FreeBSD, NetBSD, and OpenBSD. Closes #1777. This is done with pthread_setname_np; so mosquitto now requires BR2_TOOLCHAIN_HAS_THREADS_NPTL when built with threading support. Signed-off-by: Titouan Christophe --- Changes v1 -> v2: * Only depend on NPTL when compiling with threading support, introduce BR2_PACKAGE_MOSQUITTO_WITH_THREADING --- ...thread-when-compiling-without-thread.patch | 40 +++++++++++++++++++ package/mosquitto/Config.in | 5 +++ package/mosquitto/mosquitto.hash | 4 +- package/mosquitto/mosquitto.mk | 4 +- 4 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 package/mosquitto/0001-do-not-include-pthread-when-compiling-without-thread.patch diff --git a/package/mosquitto/0001-do-not-include-pthread-when-compiling-without-thread.patch b/package/mosquitto/0001-do-not-include-pthread-when-compiling-without-thread.patch new file mode 100644 index 0000000000..3bdd73a629 --- /dev/null +++ b/package/mosquitto/0001-do-not-include-pthread-when-compiling-without-thread.patch @@ -0,0 +1,40 @@ +From 6904a7a6e2e0835eda2dcd62fb982f302d7a8ba0 Mon Sep 17 00:00:00 2001 +From: Titouan Christophe +Date: Tue, 18 Aug 2020 01:26:58 +0200 +Subject: do not include pthread when compiling without threading support + +This fixes the following error, when compiling for systems without +pthread support, and when passing WITH_THREADING=no to make: + + thread_mosq.c:24:12: fatal error: pthread.h: No such file or directory + # include + ^~~~~~~~~~~ + compilation terminated. + +[Upstream status: https://github.com/eclipse/mosquitto/pull/1794] +Signed-off-by: Titouan Christophe +--- + lib/thread_mosq.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/thread_mosq.c b/lib/thread_mosq.c +index b05c1d2a..46e19807 100644 +--- a/lib/thread_mosq.c ++++ b/lib/thread_mosq.c +@@ -20,11 +20,13 @@ Contributors: + #include + #endif + ++#if defined(WITH_THREADING) + #if defined(__linux__) || defined(__NetBSD__) + # include + #elif defined(__FreeBSD__) || defined(__OpenBSD__) + # include + #endif ++#endif + + #include "mosquitto_internal.h" + #include "net_mosq.h" +-- +2.25.3 + diff --git a/package/mosquitto/Config.in b/package/mosquitto/Config.in index b4effa36be..078d6ad151 100644 --- a/package/mosquitto/Config.in +++ b/package/mosquitto/Config.in @@ -1,3 +1,8 @@ +config BR2_PACKAGE_MOSQUITTO_WITH_THREADING + bool + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np + default y if BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_MOSQUITTO bool "mosquitto" help diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 482962490e..1470a93aa7 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,6 +1,6 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-1.6.10.tar.gz.asc -sha256 92d1807717f0f6d57d1ac1207ffdb952e8377e916c7b0bb4718f745239774232 mosquitto-1.6.10.tar.gz +# from https://mosquitto.org/files/source/mosquitto-1.6.11.tar.gz.asc +sha256 b02d8f1368c40d5779ee125c37daf9003608eb47d7fbb04c5b938c76c1230a1f mosquitto-1.6.11.tar.gz # License files sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index cdd515e1a4..3718a0721a 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.6.10 +MOSQUITTO_VERSION = 1.6.11 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 @@ -41,7 +41,7 @@ else MOSQUITTO_MAKE_OPTS += WITH_ADNS=no endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_PACKAGE_MOSQUITTO_WITH_THREADING),y) MOSQUITTO_MAKE_OPTS += WITH_THREADING=yes else MOSQUITTO_MAKE_OPTS += WITH_THREADING=no