From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D6845159C96 for ; Mon, 29 Jul 2024 21:57:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C772A2BC1B1; Mon, 29 Jul 2024 21:53:01 +0000 (UTC) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 6D2A62BC1AC for ; Mon, 29 Jul 2024 21:53:01 +0000 (UTC) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a7aabb71bb2so557574066b.2 for ; Mon, 29 Jul 2024 14:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722289980; x=1722894780; darn=lists.gentoo.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cXlgi1uJGTPvaEcC+pTSgKHgFfBD6ySrFCmjA9iMjSQ=; b=LxxLu9FJDNahtUOrWHnS2nvZh72G4F3bFjx9m0tuG4VbRb9s/GDu034Zuy051JmZlb aBj6dXM3JzGqPSaKLjeub3H8vWhEkhB4WiHLIJsv0QmRDWbBhFbMFrnfOVZHatbb96k1 XLjPAz3U6K6wivVtGyIUZEuS0iihT2JfU32lOTfvgCaaJScCLxD5dP0UWzidc8CIdyIJ wbdbypEMVl9S3sgLwDh6et7Tq6jya3ISZq9UMS9Kcn9u5O4x6PuwqD9hkLtzcXygb5au x++riE1mveN/H2OTi5v/TCpwYdmRb5rVwa/QWtQI43V7fXScikj3TEJRHP5W7lbVXRyi PEAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722289980; x=1722894780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cXlgi1uJGTPvaEcC+pTSgKHgFfBD6ySrFCmjA9iMjSQ=; b=nza6EheAoZlccz5nt3bUdsMdzGREgP223p62A2ZpTCuQJT1Zn9wkQZRHISlwxeJZWw nHCGROUk2xY6Y4RWFjEd0KrVtfCqJXC1GRNWXYRsWMgxdkw8SV0UTiK9tmE4H1W5BTyv kvS/4/WwjAVp1Tm7AiLM4BgGp0D+wd581HyZrQ97CGneiNLVc82y8S9znsFgGOxmUfX3 BR2Y13EJHDZmcmg9r1AY0cJlyt5W1AW7BbGl6sGGeS3L7Ud7u78eIwYqsCvioTtpqRJa nKAk1Z3fnhp3F/9ZdqNXsz0g37MNP3wQQSvSS0U4rV9QiqtVagMrKppARoCdO9FxPB89 kGZw== X-Gm-Message-State: AOJu0Ywc3N/VW8bEiywn9Xb0cx9JUqFDsBFgLFxpetcnshKdUWNmJYe5 6x1f9nb4tmwofCRYY3nvzBzcNkGC11KbRyy5Mx8Lc70OWoeeE1h0Z5zlBw== X-Google-Smtp-Source: AGHT+IFhBkoHMeXY/uZph1nBe3ArSJ2CxoSoHQKpUqEa8F6UOxBAkCDwgcvHG5AzAmFDcBq8QFYUSA== X-Received: by 2002:a17:907:874c:b0:a7a:b781:60ee with SMTP id a640c23a62f3a-a7d401654ecmr651492666b.48.1722289979958; Mon, 29 Jul 2024 14:52:59 -0700 (PDT) Received: from localhost.localdomain ([62.244.50.57]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acad9046fsm564748266b.147.2024.07.29.14.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 14:52:59 -0700 (PDT) From: Zurab Kvachadze To: gentoo-dev@lists.gentoo.org Cc: conikost@gentoo.org, Zurab Kvachadze Subject: [gentoo-dev] [RFC PATCH v2 20/20] www-nginx/ngx-set-misc: new package, add 0.33 Date: Tue, 30 Jul 2024 00:52:36 +0300 Message-ID: <20240729215241.13243-21-zurabid2016@gmail.com> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240729215241.13243-1-zurabid2016@gmail.com> References: <20240729215241.13243-1-zurabid2016@gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 29a97166-9623-4427-9961-b725bf057de3 X-Archives-Hash: ba55f26e8aee36ca15b4e98665b18f8a The build system of this package automagically enables HMAC support based on SSL functionality being enabled in the installed NGINX. In order to enable this support independently, via a USE flag, a "hack" is applied: only if GENTOO_USE_HMAC environmental variable and preprocessor definition are defined, HMAC support is enabled. Signed-off-by: Zurab Kvachadze --- www-nginx/ngx-set-misc/Manifest | 1 + .../ngx-set-misc}/metadata.xml | 9 ++-- .../ngx-set-misc/ngx-set-misc-0.33.ebuild | 50 +++++++++++++++++++ 3 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 www-nginx/ngx-set-misc/Manifest copy {app-containers/apptainer => www-nginx/ngx-set-misc}/metadata.xml (54%) create mode 100644 www-nginx/ngx-set-misc/ngx-set-misc-0.33.ebuild diff --git a/www-nginx/ngx-set-misc/Manifest b/www-nginx/ngx-set-misc/Manifest new file mode 100644 index 000000000000..34be9e483747 --- /dev/null +++ b/www-nginx/ngx-set-misc/Manifest @@ -0,0 +1 @@ +DIST ngx-set-misc-0.33.tar.gz 30084 BLAKE2B 1aabf47e86946054d128a10290c36829152d427cf415378f5042e00e428baaf94a91e1d8ee1037b8a40197637c721492b01a82c800064decb9471149ad47bcff SHA512 1ff4c947538a5bd5f9d6adcd87b37f2702f5cc90e3342bc08359cbe8f290b705a3a2daa3dedfb1df3ce4bc19478c8fcac07081c4a53a804fc2862d50078278dc diff --git a/app-containers/apptainer/metadata.xml b/www-nginx/ngx-set-misc/metadata.xml similarity index 54% copy from app-containers/apptainer/metadata.xml copy to www-nginx/ngx-set-misc/metadata.xml index c461d956342a..4a396a61a564 100644 --- a/app-containers/apptainer/metadata.xml +++ b/www-nginx/ngx-set-misc/metadata.xml @@ -2,11 +2,10 @@ - - Install network plug-ins - Install SUID helper binary - - apptainer/apptainer + openresty/set-misc-nginx-module + + Enable support for generating HMAC digests using dev-libs/openssl + diff --git a/www-nginx/ngx-set-misc/ngx-set-misc-0.33.ebuild b/www-nginx/ngx-set-misc/ngx-set-misc-0.33.ebuild new file mode 100644 index 000000000000..9869cf207c11 --- /dev/null +++ b/www-nginx/ngx-set-misc/ngx-set-misc-0.33.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +DESCRIPTION="An NGINX module that adds various set_xxx directives to NGINX's rewrite module" +HOMEPAGE="https://github.com/openresty/set-misc-nginx-module" + +SRC_URI=" + https://github.com/openresty/set-misc-nginx-module/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz +" +LICENSE="BSD-2" + +SLOT=0 + +MY_PN="set-misc-nginx-module" + +inherit nginx-module + +NGINX_MOD_S="${WORKDIR}/${MY_PN}-${PV}" + +IUSE="+hmac" + +DEPEND=" + www-nginx/ngx_devel_kit + hmac? ( dev-libs/openssl ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -E -i 's/USE_OPENSSL|MAIL_SSL/GENTOO_USE_HMAC/g' \ + "${NGINX_MOD_S}/config" || die "sed failed" + sed -i 's/NGX_OPENSSL/GENTOO_USE_HMAC/g' \ + "${NGINX_MOD_S}/src/ngx_http_set_misc_module.c" || die "sed failed" + if use hmac; then + sed -E -i 's/^(\s*ngx_module_libs)=$/\1=-lcrypto/' \ + "${NGINX_MOD_S}/config" || die "sed failed" + fi + nginx-module_src_prepare +} + +src_configure() { + append-cflags -DNDK + export NDK_SRCS="ndk.c" + export GENTOO_USE_HMAC=NO + if use hmac; then + export GENTOO_USE_HMAC=YES + append-cflags -DGENTOO_USE_HMAC=1 + fi + nginx-module_src_configure +} -- 2.44.2