From patchwork Sun Oct 4 21:27:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1376543 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.a=rsa-sha256 header.s=20161025 header.b=c1uQFIBH; 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 4C4Gzf6s7Nz9sS8 for ; Mon, 5 Oct 2020 08:27:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D715186FA9; Sun, 4 Oct 2020 21:27:54 +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 Dtu4MhgiMLVq; Sun, 4 Oct 2020 21:27:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3DE2E86FAA; Sun, 4 Oct 2020 21:27:52 +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 A16E31BF4E4 for ; Sun, 4 Oct 2020 21:27:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9B52586FAA for ; Sun, 4 Oct 2020 21:27:50 +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 bl-4PdJ0j8QK for ; Sun, 4 Oct 2020 21:27:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 8E23C86FA9 for ; Sun, 4 Oct 2020 21:27:49 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id z22so549327wmi.0 for ; Sun, 04 Oct 2020 14:27:49 -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:mime-version :content-transfer-encoding; bh=GyX7iVCE7ZdcfJabyia1Wf2IQ1WSXSnAaO4VooBenKY=; b=c1uQFIBH1gqURZgVnSgTXRI6fk4OpE7Mk/mKUhxRghf+pEDv838GAfbHu3cQD8c642 ZDT/9tIXDqdlPp98DCMtmFR+8gKgTYqy//8+7cVMe9FSjAUR2kMkJV594RH8laJ9VG0D wpxWzf/su6yLVIMVvTBJac9Vzq7BdG3JJ0X4ifJ1M1brqCxMHzgxuO7I+eBV1e8dA12N siH2VLh4QdefowoqimDEmLc6Fcew7WUuUXH9ZVdMgZ3jRpL0KXJld2xnk4u8Mn3R4e8r r0HhwV0c9drOZvp5Yxre1FDxqBhnNy3na2dUr7Q3+WLsobA5k9YMPFPYoY/hf2WFYJuV lowg== 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=GyX7iVCE7ZdcfJabyia1Wf2IQ1WSXSnAaO4VooBenKY=; b=SfyE3pYs4Oyim2srceeVc9FXEhmJXnulLSYYoS4bnFkRRDPSNVjWgxF87mS2esgllQ S6gYeZ+JKvf6Svpsg4dyj0zNQvRWxxNV04XrQyPluqa75TEGT9aFT4w2EXQq6lVFmL3s pq5jdm0P4XokanvQmP3au6iaJJQ5kjIQ8U1neO0Vh5i4Mike04LqSNTvpIHS1yklB4tL 1zi7dSXKS1kK7gBDmiIkIc4Rnyc9mqFTsGtMhXZcDcfSBFsVjOFAbe1TGZfzMehlZj83 2FHQ5WBziF9+w6wNkmpuHrE4pDM4SHpO549b903IJgmJbF5rvJvN8qzhd7GONcbeGLMD Y+og== X-Gm-Message-State: AOAM5317plOE6oI4djQyPWsqzYB6oLzd8GvZX6AexSCLdHDZJ24i11+C l0eFG5VavCfKptZD88u5gg2J51YOjq3bhg== X-Google-Smtp-Source: ABdhPJzZdb+PlFrRepCqUky+G/6ZqZV1FyFu+YXTJS2/FQlT3HSSCWXgXpZIa3uuoIZmvN7eooDCHw== X-Received: by 2002:a1c:2dc6:: with SMTP id t189mr13868206wmt.92.1601846867753; Sun, 04 Oct 2020 14:27:47 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id i6sm10990411wra.1.2020.10.04.14.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Oct 2020 14:27:47 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 4 Oct 2020 23:27:37 +0200 Message-Id: <20201004212737.2339125-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/strongswan: bump to version 5.9.0 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: Fabrice Fontaine , =?utf-8?b?SsOpcsO0bWUg?= =?utf-8?b?UG91aWxsZXI=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Drop patches (already in version) - wolfssl is an optional dependency since version 5.8.0 and https://github.com/strongswan/strongswan/commit/c92eade82c814e9f6b55f80d715bb51d28d5e1fb - Update indentation of hash file (two spaces) https://wiki.strongswan.org/versions/78 Signed-off-by: Fabrice Fontaine --- package/strongswan/Config.in | 4 ++++ package/strongswan/strongswan.hash | 12 +++++------- package/strongswan/strongswan.mk | 14 ++++---------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index 0438eeced6..47c7107f59 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -44,6 +44,10 @@ config BR2_PACKAGE_STRONGSWAN_GMP bool "GNU MP (libgmp)" select BR2_PACKAGE_GMP +config BR2_PACKAGE_STRONGSWAN_WOLFSSL + bool "wolfssl" + select BR2_PACKAGE_WOLFSSL + endchoice config BR2_PACKAGE_STRONGSWAN_AF_ALG diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 4d1a593a5c..aa25d81f46 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,9 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.6.3.tar.bz2.md5 -md5 a6a28eeb22aa58080a7581771a5b63f9 strongswan-5.6.3.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.0.tar.bz2.md5 +md5 705628cddd5b7683ef8a688acd9514d8 strongswan-5.9.0.tar.bz2 # Calculated based on the hash above -sha256 c3c7dc8201f40625bba92ffd32eb602a8909210d8b3fac4d214c737ce079bf24 strongswan-5.6.3.tar.bz2 +sha256 72b47a385da5d1532b816d9fe04c50d074c29ed42ea3f0878fbd66335917bb66 strongswan-5.9.0.tar.bz2 # Locally calculated -sha256 e66c243593ee0713f5fd13bcd7f624bc50eebc54bf87f790ced429ff698077e7 strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch -sha256 415d104717cb0781770e9077d00b3df310b11e65e4b9c1d35b62fbba04549263 strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 7f1752ce57..a0290c5bf6 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,12 +4,9 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.6.3 +STRONGSWAN_VERSION = 5.9.0 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org -STRONGSWAN_PATCH = \ - $(STRONGSWAN_SITE)/patches/27_gmp_pkcs1_verify_patch/strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch \ - $(STRONGSWAN_SITE)/patches/28_gmp_pkcs1_overflow_patch/strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch STRONGSWAN_LICENSE = GPL-2.0+ STRONGSWAN_LICENSE_FILES = COPYING LICENSE STRONGSWAN_DEPENDENCIES = host-pkgconf @@ -38,16 +35,12 @@ STRONGSWAN_CONF_OPTS += \ --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no) \ --enable-vici=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ --enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ + --enable-wolfssl=$(if $(BR2_PACKAGE_STRONGSWAN_WOLFSSL),yes,no) \ --with-ipseclibdir=/usr/lib \ --with-plugindir=/usr/lib/ipsec/plugins \ --with-imcvdir=/usr/lib/ipsec/imcvs \ --with-dev-headers=/usr/include -# strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch -STRONGSWAN_IGNORE_CVES += CVE-2018-16151 CVE-2018-16152 -# strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch -STRONGSWAN_IGNORE_CVES += CVE-2018-17540 - ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) STRONGSWAN_CONF_ENV += LIBS='-latomic' endif @@ -80,7 +73,8 @@ STRONGSWAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \ $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \ $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \ - $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite) + $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite) \ + $(if $(BR2_PACKAGE_STRONGSWAN_WOLFSSL),wolfssl) ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y) STRONGSWAN_DEPENDENCIES += \