From patchwork Fri Dec 20 13:53:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1214114 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bxroMmFI"; 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 47fVbD48ZWz9sP3 for ; Sat, 21 Dec 2019 00:54:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B025A8873B; Fri, 20 Dec 2019 13:53:58 +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 mDIub7n6yeDJ; Fri, 20 Dec 2019 13:53:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BD3778877D; Fri, 20 Dec 2019 13:53:57 +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 C4CB91BF321 for ; Fri, 20 Dec 2019 13:53:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C12D3881D2 for ; Fri, 20 Dec 2019 13:53:53 +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 ZVGLBjTuPOrj for ; Fri, 20 Dec 2019 13:53:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8FC46881C0 for ; Fri, 20 Dec 2019 13:53:52 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id j42so9462706wrj.12 for ; Fri, 20 Dec 2019 05:53:52 -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 :mime-version:content-transfer-encoding; bh=xzMT5y/LKnQ8bWb2zBtRGXRnnI0vFuQYCk+UT/ypP7c=; b=bxroMmFIXVWE87nrqMwyqUxhncUOpV3hXkm7EI2PykwEVZhqetevlFfmOy88jJ+8r9 5qh3SYLrhMjzHRfDU2s574Lfai/+jelfCgqdL+B+BsQWiPa2Xxp0lgJTlhayzhepfmVk Cs4kvEK2L/FhubTiHDV8tbf98yM2fUiWC1zlepT+E5DGh7LmA+0dojpAOO1PK8hpgVEQ hR+4mEQrATxBHJ3ngoISGYEO0yheu7IHuwGW8Tg49AnpAB3wWHXSjHWv4XabqHB7mf/z 02jhhro5TxCQwXoamoB6zzNw74crFVBf28ko8O7sRNUPkNRUQPYHx9XZ5LstEFC1hliY Lg8A== 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:mime-version:content-transfer-encoding; bh=xzMT5y/LKnQ8bWb2zBtRGXRnnI0vFuQYCk+UT/ypP7c=; b=PwwoHj2paBtyo+Y2OvlvV0qSiVWmmev6H8i37SVaRmLLtobss/9bEyrlgu7NeCOty2 AyiDej84QsNnObIvjo5A691K3JcSML9RQ4O8eDnLo+KHKxeGa6SdchcSAXCdz3n7ESm1 N7BOU/Br8DC2JQ7HR05pcnHi2sYKyh4VrbAdbUX5i+/XLUW2JXYzjzV5FGCDQ2AHKdTB PrUzLnICRX4ahCVPEcdMQXUsIorMqYfBgBCvLsfbj7Iw5a5WkXetqKaZY/5EJ6UqRKew PdI72f5ZxeI8IeRLRfM4Rd4eW75424VlXscjzw5CwWWeVcYDDw8t8nAtW69/cD+zk3Yc pfzg== X-Gm-Message-State: APjAAAWeWWbueijGV4tX0J2oPx4sXYCklBdRYZe84OJNTd3fCzKrw6mT 8KOcf7VDNGlf0cAIwSkROnVrFqzC X-Google-Smtp-Source: APXvYqx+fJZVhk9vE6kURUtgIK6ULFPfGj43e4ITvquPQfLnrMc3tLGsNhlkJFp2cBX+T9kl1xogHQ== X-Received: by 2002:a5d:5487:: with SMTP id h7mr15030750wrv.18.1576850030749; Fri, 20 Dec 2019 05:53:50 -0800 (PST) Received: from hthiery01.sab.local ([213.135.10.150]) by smtp.gmail.com with ESMTPSA id t190sm9830138wmt.44.2019.12.20.05.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 05:53:50 -0800 (PST) From: Heiko Thiery To: buildroot@buildroot.org, =?utf-8?q?Jan_Kundr=C3=A1t?= Date: Fri, 20 Dec 2019 14:53:44 +0100 Message-Id: <20191220135345.16045-3-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191220135345.16045-1-heiko.thiery@gmail.com> References: <20191220135345.16045-1-heiko.thiery@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/3] package/libnetconf2: bump to version 1.1.3 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: Heiko Thiery , Heiko Thiery Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Other changes: - Remove patch (already in upstream version) Signed-off-by: Heiko Thiery Signed-off-by: Heiko Thiery --- .../0001-Add-support-for-musl-libc.patch | 65 ------------------- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 3 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 package/libnetconf2/0001-Add-support-for-musl-libc.patch diff --git a/package/libnetconf2/0001-Add-support-for-musl-libc.patch b/package/libnetconf2/0001-Add-support-for-musl-libc.patch deleted file mode 100644 index 44023a391d..0000000000 --- a/package/libnetconf2/0001-Add-support-for-musl-libc.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 153fe40bd60499677e825e66501e8601536e0323 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Mon, 15 Jul 2019 18:15:28 -0700 -Subject: [PATCH] Add support for musl libc - -musl does not support pthread_rwlockattr_setkind_np. Don't use it if it is -not available. - -Patch comes from upstream commit: -https://github.com/CESNET/libnetconf2/commit/153fe40bd60499677e825e66501e8601536e0323 - -Signed-of-by: Heiko Thiery ---- - CMakeLists.txt | 1 + - src/config.h.in | 3 +++ - src/session_server.c | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 624b8c8..c05cd03 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -176,6 +176,7 @@ target_link_libraries(netconf2 ${CMAKE_THREAD_LIBS_INIT}) - set(CMAKE_REQUIRED_LIBRARIES pthread) - check_include_file(stdatomic.h HAVE_STDATOMIC) - check_function_exists(pthread_mutex_timedlock HAVE_PTHREAD_MUTEX_TIMEDLOCK) -+check_function_exists(pthread_rwlockattr_setkind_np HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP) - - # dependencies - openssl - if(ENABLE_TLS OR ENABLE_DNSSEC OR ENABLE_SSH) -diff --git a/src/config.h.in b/src/config.h.in -index 96d33c5..30dd8a3 100644 ---- a/src/config.h.in -+++ b/src/config.h.in -@@ -73,4 +73,7 @@ - */ - #define NC_PS_QUEUE_SIZE @MAX_PSPOLL_THREAD_COUNT@ - -+/* Portability feature-check macros. */ -+#cmakedefine HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP -+ - #endif /* NC_CONFIG_H_ */ -diff --git a/src/session_server.c b/src/session_server.c -index 636b1a2..3b747ed 100644 ---- a/src/session_server.c -+++ b/src/session_server.c -@@ -560,6 +560,7 @@ nc_server_init(struct ly_ctx *ctx) - errno=0; - - if (pthread_rwlockattr_init(&attr) == 0) { -+#if defined(HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP) - if (pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP) == 0) { - if (pthread_rwlock_init(&server_opts.endpt_lock, &attr) != 0) { - ERR("%s: failed to init rwlock(%s).", __FUNCTION__, strerror(errno)); -@@ -570,6 +571,7 @@ nc_server_init(struct ly_ctx *ctx) - } else { - ERR("%s: failed set attribute (%s).", __FUNCTION__, strerror(errno)); - } -+#endif - pthread_rwlockattr_destroy(&attr); - } else { - ERR("%s: failed init attribute (%s).", __FUNCTION__, strerror(errno)); --- -2.20.1 - diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 9b78049ffb..5cd9b99062 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,2 +1,2 @@ -sha256 760061fb1c1fe87a2a068d5a9e5affcef280044c5940ef344854e9ea7ec26452 libnetconf2-0.12-r2.tar.gz +sha256 38e780cdd0135e9c7fe44b5190a1acc8c33cb28aa395c329893b019a57b1f783 libnetconf2-1.1.3.tar.gz sha256 085122ea91161812dda9cd2f42d8c50ecc3a48cc1a4f15044d86cfc5aa887577 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 49a6de60a9..bd25c69e0e 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 0.12-r2 +LIBNETCONF2_VERSION = 1.1.3 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause