From patchwork Sun Jul 8 07:36:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 940910 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@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; 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="DTJED72W"; 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 41NgK32PK0z9s00 for ; Sun, 8 Jul 2018 17:37:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4E2BF87901; Sun, 8 Jul 2018 07:37:05 +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 TFBlZuK58ksY; Sun, 8 Jul 2018 07:37:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 502D7878F0; Sun, 8 Jul 2018 07:37:02 +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 7DF291C0547 for ; Sun, 8 Jul 2018 07:37:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7BD248694E for ; Sun, 8 Jul 2018 07:37:00 +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 mWjnj3MHT2Gj for ; Sun, 8 Jul 2018 07:36:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id 07ABA8694C for ; Sun, 8 Jul 2018 07:36:59 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id v128-v6so671514wme.5 for ; Sun, 08 Jul 2018 00:36:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=zJIdHKLek79LnBmkZwcjwI8QRszWxICxEC4+EwX9SFU=; b=DTJED72WsCnQeVsvc0bqRQJ3uHcChQDxZgetK+AZab88VusIx+iqvgkZQ2rrhBfRAU 4BWMP9Yyz2xPN3C1b5fVBWaAcIQmjxQ/J7uEQdY/AASY1m7yvOZz92a9YWhw6szznWwW y/1qRjRCjMkfR6s7XGzsCSiBrPZmPpnYYiaQML7Fp2PkpsRHkN/XMdBwmRgvBGxXDC9J qy+F5l/+A9uyt5aAvjnGuRi8jYmq/HBi6z5fvjRWMOq5hK31RxqCFEBUC3LnOZmIOLRo Iwy2ylr5FlCqPp51rWLUxe2f2M374og0+K4T4ZRVe725UeVAYj/xU5eIF/2vp8pfHh2y QkEQ== 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; bh=zJIdHKLek79LnBmkZwcjwI8QRszWxICxEC4+EwX9SFU=; b=gFxy5ogrY8+h6lpC2DjTYXHJurCevx+qWbtSz8FgRdg94ExTR0d09eBMj20ZOucaFU Z5/U8/ZttzevQ6RCp1dboieqxXiu65FEYQaAxELXRalkc7IeDim4V4t1YC5OuAsoNVS7 VEM/z8PKjCljFKjOYKnDteXeXegZ9IQGesYMDzCRk+MGh7EE+69ElzkrnjNW9zuuz/7U 2U+XFE9B8S+UeAJQbS5L3Jcm0ZDPI+ALFM46BdZcj+0NXDiWA+tWqSKfbpZMtQBYXHsX teaGfzwqtJ188NW3LVHozBuAs8GrMFouks8fbJlnk/H1py0CZXN0MLfnV7sHjg+A+YU+ tgYw== X-Gm-Message-State: APt69E1p202erxVeYyRDGJ01IhVglyAyPCaPNOBAijt3N70DzrqpxJXO FX4u+PoxzkLqEeXwz+Nr0YS4WA== X-Google-Smtp-Source: AAOMgpe5hKvAnXjDLuQtKYrrxWALq7CFj5EeC+9SfWoUUxCn3a+HSG4cDy3HINIIHndsDA7KbBZIWA== X-Received: by 2002:a1c:4083:: with SMTP id n125-v6mr9318863wma.32.1531035416935; Sun, 08 Jul 2018 00:36:56 -0700 (PDT) Received: from fabrice-VirtualBox.home (ARennes-656-1-273-34.w109-218.abo.wanadoo.fr. [109.218.73.34]) by smtp.gmail.com with ESMTPSA id f133-v6sm13382803wme.42.2018.07.08.00.36.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jul 2018 00:36:56 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 8 Jul 2018 09:36:45 +0200 Message-Id: <20180708073647.16301-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/3] libzip: bump to version 1.5.1 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: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Remove patch (already in version) - Update hash of license file: AES section has been removed: https://github.com/nih-at/libzip/commit/303fde909ffb1725f9926bed7be33b3abc87a107 Signed-off-by: Fabrice Fontaine --- ...0001-Use-cmake-E-tar-to-extract-test-data.patch | 40 ---------------------- package/libzip/libzip.hash | 4 +-- package/libzip/libzip.mk | 2 +- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch diff --git a/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch b/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch deleted file mode 100644 index 7d40111b1b..0000000000 --- a/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e9244b207c0fc883ff84c1fc46602feb1e2b0347 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Wed, 3 Jan 2018 11:41:57 +0100 -Subject: [PATCH] Use 'cmake -E tar' to extract test data. - -For easier cross-compilation (Github issue #21). - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit e9244b207c0 - - regress/CMakeLists.txt | 12 +++--------- - 1 file changed, 3 insertions(+), 9 deletions(-) - -diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt -index e2ce232c774a..3a0d4f77dcf6 100644 ---- a/regress/CMakeLists.txt -+++ b/regress/CMakeLists.txt -@@ -51,15 +51,9 @@ ADD_CUSTOM_TARGET(cleanup - ADD_CUSTOM_TARGET(testinput - ALL - VERBATIM -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 0 > manyfiles.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 1 > manyfiles-133000.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 2 > manyfiles-65536.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 3 > manyfiles-zip64-modulo.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 4 > manyfiles-zip64.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 5 > manyfiles-fewer.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 6 > manyfiles-more.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip cat 0 > bigzero.zip -- DEPENDS ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip -+ COMMAND cmake -E tar x ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip -+ COMMAND cmake -E tar x ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip -+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip - ) - - SET_PROPERTY(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES --- -2.15.1 - diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash index 0eeb3130c0..e9ed4717c5 100644 --- a/package/libzip/libzip.hash +++ b/package/libzip/libzip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1 libzip-1.4.0.tar.xz -sha256 3c964a7eb1abeb6bd6f40035ed3a014728ff8c5437f107dcf24fbbfab16e227e LICENSE +sha256 04ea35b6956c7b3453f1ed3f3fe40e3ddae1f43931089124579e8384e79ed372 libzip-1.5.1.tar.xz +sha256 04464e729973cf58189051e7a3e8bca2acce9a1058c735e9e2eb1fdbe0fbbf50 LICENSE diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index 537aa1deeb..d46bc17977 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZIP_VERSION = 1.4.0 +LIBZIP_VERSION = 1.5.1 LIBZIP_SITE = http://www.nih.at/libzip LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause From patchwork Sun Jul 8 07:36:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 940912 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@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; 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="g2TX1IjN"; 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 41NgK45trCz9s3R for ; Sun, 8 Jul 2018 17:37:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1FB3D86A3C; Sun, 8 Jul 2018 07:37: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 LTayZXJ6gnEx; Sun, 8 Jul 2018 07:37:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B23FD869B9; Sun, 8 Jul 2018 07:37:06 +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 A3BED1C0547 for ; Sun, 8 Jul 2018 07:37:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A184A8626C for ; Sun, 8 Jul 2018 07:37:05 +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 jbDa0jGc2rfl for ; Sun, 8 Jul 2018 07:37:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0A70E8625D for ; Sun, 8 Jul 2018 07:37:05 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id s11-v6so7792570wra.13 for ; Sun, 08 Jul 2018 00:37:04 -0700 (PDT) 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=hoGwy1wIxvudIp4jQXcJMYnO6PBANtgY2UUUIOiJLY4=; b=g2TX1IjNnV85zOQArHcHjHLiTkdBIzVQbAPrEZpSKq9c5k4i7v2y9WKX5g908DQ7B0 5frtKzymG56eLzyPia1B4w9pGASzxN5RCeXlb94DVBjcIHk7OxMwJ/rHZIGAXuUE+k6d eJ14Py7O8Gbci/UJJiGSBtq2TqclH8rutiLdBKd90dnGpo7fZAa2Z0kmcY3JMfUK+TVV xizJal1Yu8c+Eoc+npW94PB+QKNBbswCZH+S4Z65r1+0OnuqPCZAwd9HSDyH7i8wiCkr 5VVly2hXw0dqKEVCQmNA3oNwUGbBLhzkuHImo2doD6xBBIivZLu+dFl6W0+dSmKchr9H NMOg== 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=hoGwy1wIxvudIp4jQXcJMYnO6PBANtgY2UUUIOiJLY4=; b=MlSNix8kF6DRP0FSbGUelHI/LCgrsSMRaZELragQ55iU3wS3YT3+RNn7taS6Da2CyY mi2ekasO+Fho7Hx7qGBai30CWOc7gPy7qnJcsNBdIv5U/vFlbX2bmi0CMcovDlI3c/xy VAL5OK/RQ22LXP1Bc2XzSHuC13lhpHCZRV0s8Pnl9C3+ZiCQrqiWViwVGgp8LEKJVFJR RVCnWMD3Y61MmskrReJHWjm6aF9jjkD1tjjP7OmPDzZa7vXOKeODnYUnhCxkdo9XGgZD 1LRu2cDLoJEHNIzyrqotL1SKGfWvpoupGUTv6dTr735keNdzi1w5WHOuQNcOG9+/ot/x KQ3g== X-Gm-Message-State: AOUpUlHh1NawmtfFlKSONME/9ddoat6tji5lNCZzVovudb3KCBzVawFc UVVPsp4GEgFixBRgoFwsL+2fmw== X-Google-Smtp-Source: AAOMgpc7acH+fkwn2X6UAR0HLXcTQtLfZZA8kC3j9enNjHYLUMdlyuzcmZqQyDHH7XaNBH/fpDjXdQ== X-Received: by 2002:a5d:4007:: with SMTP id n7-v6mr3373159wrp.258.1531035423424; Sun, 08 Jul 2018 00:37:03 -0700 (PDT) Received: from fabrice-VirtualBox.home (ARennes-656-1-273-34.w109-218.abo.wanadoo.fr. [109.218.73.34]) by smtp.gmail.com with ESMTPSA id f133-v6sm13382803wme.42.2018.07.08.00.37.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jul 2018 00:37:02 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 8 Jul 2018 09:36:47 +0200 Message-Id: <20180708073647.16301-3-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180708073647.16301-1-fontaine.fabrice@gmail.com> References: <20180708073647.16301-1-fontaine.fabrice@gmail.com> Subject: [Buildroot] [PATCH 3/3] libzip: add optional gnutls support 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: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" gnutls support has been added since version 1.5.0 Signed-off-by: Fabrice Fontaine --- package/libzip/libzip.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index 0253a61cda..20c04122ec 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -18,6 +18,13 @@ else LIBZIP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_BZIP2=TRUE endif +ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBZIP_DEPENDENCIES += gnutls +LIBZIP_CONF_OPTS += -DENABLE_GNUTLS=ON +else +LIBZIP_CONF_OPTS += -DENABLE_GNUTLS=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBZIP_DEPENDENCIES += openssl LIBZIP_CONF_OPTS += -DENABLE_OPENSSL=ON