From patchwork Wed Jun 30 17:36:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1499033 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=2605:bc80:3010::133; helo=smtp2.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.a=rsa-sha256 header.s=20161025 header.b=nMGuy8AI; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GFT7x3PBnz9sRR for ; Thu, 1 Jul 2021 03:37:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1B9C640129; Wed, 30 Jun 2021 17:37:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tYA1BYnhEAGk; Wed, 30 Jun 2021 17:37:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 7CCBC400D2; Wed, 30 Jun 2021 17:37:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3A1311BF2A6 for ; Wed, 30 Jun 2021 17:37:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 28B08415C6 for ; Wed, 30 Jun 2021 17:37:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id niWI7kch5mjO for ; Wed, 30 Jun 2021 17:37:06 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by smtp4.osuosl.org (Postfix) with ESMTPS id 0A8FD415C5 for ; Wed, 30 Jun 2021 17:37:05 +0000 (UTC) Received: by mail-pf1-x42d.google.com with SMTP id d12so3172147pfj.2 for ; Wed, 30 Jun 2021 10:37:05 -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 :mime-version:content-transfer-encoding; bh=8hmi4mil7Vj5nDoIamt/sg+i2cdYEt2XdznAmgpmMXs=; b=nMGuy8AICMByens4QRHLEyFL5U8K+vfOWvJfHycVqYdD6KKTXIgE9i/3BLa26f40Id fIDNOw5Z3fSBrBOV7vZIbmBxIvA7G7Utd4OkpEayUyqjWrmYmJUtCvHMXYH3DqPK1Ed0 +wMUl4O/Jr/K2q8Y4VA3O4rulH9W0Z/TWGazaIRyLXb+RzacIhXQ8DHo5kw3uJWbqfuP 7dE0+NLNciyizXA6hXbT0FrjsQ+yNt5TjKkBTsfV7K451S7tPTdxhqEUDdFKCjWJNPyt QHvPPPNaLY9BDARo7fYAy0XCOI4IGngiNkRHBGXMu66W94Q/Qibb/1TVQETG2U+tYAbC yg8g== 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=8hmi4mil7Vj5nDoIamt/sg+i2cdYEt2XdznAmgpmMXs=; b=ISrbutARJq5hJb4LFR0b5778Ejn2faVjBIyPvztULR67BtDLzV+xbdS191beh4z+VC 2ELk1dO+JF+Oml8MKJUnaZ7ZSlOzV5nnXKLrvcoGopKbEFSdfKkrexdPd31kVwWix/kO rBRfmTlDyT8Ry+KctCDsNdMJziX/Ys1YCwdWMFE8pSCltz+Hftf2rjpC9gmfm/snO3wO sYzRsK/jzn7HVOgEmG4d331v+mz/9YhKoDGRUFcWggGlb2zIgV1e6Wrr9qCQ+NdudTNe 1K0vCKu/+VwJKPYrA4lkOrQj7yOzKsBVINPvhO7bgq73wXcfAP6gP4uZg0vKatljzBwn xslA== X-Gm-Message-State: AOAM5306bUzXkOFB1d8f+TofxXx23DdVYVteXfgBJMGqFLApiu8n4ljE J9Tff1I3XBAPPpXrmW0rgZ64/urpDSmPAg== X-Google-Smtp-Source: ABdhPJw8fWxrEr3PhNcsQc3gXaRNPaiuH6iQqC2HCQCzxvg6lZwls0Uy6JvLaDNHY39RhgNEmLDaTA== X-Received: by 2002:a63:f01:: with SMTP id e1mr35444304pgl.232.1625074625318; Wed, 30 Jun 2021 10:37:05 -0700 (PDT) Received: from adam.duskett ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id d6sm23050200pgq.88.2021.06.30.10.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 10:37:05 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Wed, 30 Jun 2021 10:36:58 -0700 Message-Id: <20210630173700.30975-4-aduskett@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210630173700.30975-1-aduskett@gmail.com> References: <20210630173700.30975-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/5] package/nginx-naxsi: bump version to 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: Frank Vanbever , Samuel Martin , Adam Duskett , Johan Oudinet Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Other changes: - Change license to GPL-3.0 and BSD-3c - Change license file to LICENSE and naxsi_src/ext/libinjection/COPYING - Update license hash's in nginx-naxsi.hash Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Add pcre as a dependency (Yann) - Add naxsi_src/ext/libinjection/COPYING license file (Yann) - Drop "with OpenSSL exception" (yann) package/nginx-naxsi/nginx-naxsi.hash | 5 +++-- package/nginx-naxsi/nginx-naxsi.mk | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/nginx-naxsi/nginx-naxsi.hash b/package/nginx-naxsi/nginx-naxsi.hash index 1f289c56cd..4712ede2af 100644 --- a/package/nginx-naxsi/nginx-naxsi.hash +++ b/package/nginx-naxsi/nginx-naxsi.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4 nginx-naxsi-0.56.tar.gz -sha256 046812ddc8f250f85b5d6e04218c185849c618b309271ef9d8b01e92c6f7a6ac naxsi_src/naxsi_json.c +sha256 439c8677372d2597b4360bbcc10bc86490de1fc75695b193ad5df154a214d628 nginx-naxsi-1.3.tar.gz +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE +sha256 d0732bc23658db5b9749e3f9cd4fe0f9b3e132b5955adccb08821845fe2a21c8 naxsi_src/ext/libinjection/COPYING diff --git a/package/nginx-naxsi/nginx-naxsi.mk b/package/nginx-naxsi/nginx-naxsi.mk index 7cfa94a5d4..c599ebf3be 100644 --- a/package/nginx-naxsi/nginx-naxsi.mk +++ b/package/nginx-naxsi/nginx-naxsi.mk @@ -4,9 +4,11 @@ # ################################################################################ -NGINX_NAXSI_VERSION = 0.56 +NGINX_NAXSI_VERSION = 1.3 NGINX_NAXSI_SITE = $(call github,nbs-system,naxsi,$(NGINX_NAXSI_VERSION)) -NGINX_NAXSI_LICENSE = GPL-2.0+ with OpenSSL exception -NGINX_NAXSI_LICENSE_FILES = naxsi_src/naxsi_json.c +NGINX_NAXSI_LICENSE = GPL-3.0 BSD-3c +NGINX_NAXSI_LICENSE_FILES = LICENSE naxsi_src/ext/libinjection/COPYING +NGINX_NAXSI_DEPENDENCIES = pcre + $(eval $(generic-package))