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 96686158170 for ; Wed, 17 Jul 2024 12:11:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 704022BC1D6; Wed, 17 Jul 2024 12:06:15 +0000 (UTC) Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) (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 9CCEA2BC1D1 for ; Wed, 17 Jul 2024 12:06:14 +0000 (UTC) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2eecb63de15so74782651fa.0 for ; Wed, 17 Jul 2024 05:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721217973; x=1721822773; 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=AaaPBVHxM1oXh6UXopc/i46+pPe/2EAOAUcZGl7Y3FdrNsLwJyYKBJOm45z6ttK/+z VXoaDsHJKeycpfbFBROJN5bmU2mFM0IbQyq6Rs0Yuoux0sETWAIRcBzYkoU/UBy6pWwG m7M0MTAXaAxVcSWMFuR0O8BlByaVXiBOCmEmQb31fwBSnFxlA4x2fFzMqF2hccevTpCm IogoCpWCRNbpN95r3THJXHau8H9rVigMVS4B6CJ8u+NAgdz7z8tAGdKh9bH7yfQDhUTD ZAX6zBYyWuAQm2lYxCvto2KeYpEcukJWnby51O2/DTZOSVhbtP4zQDA2FS0E394FEyiw RsIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721217973; x=1721822773; 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=YcYOEAiOUjuQpUwSSYT3pftFEnMTmKrKLy6P6ndUYJ7IHjhwsz/d/rsb7ar1XgZNNU KyOfv+OgM3FtNALR1cnOtm2mP/e4gDEYdS09vV0W8zeBvjzu0Ar2Gpg0RDxWkbEEk/hP e0nQs5bCXON1bmpg0buxqqsqYmHMYY27mvImyP6uzpppq4rq/6FJmOZ5j5xQDS7og/NE VjVUAjmeNeqainEoWKfYIdqo/izUmisnC9nxKNDhWZQ6T5cG/7C1WKNEYw/s+fql2X8F eOjtWpYZ6rAbPqx5dmCVGhkFZlTIOGaWeQcdCAO1n2HJ0BQUtadA75zfMW1ZxixmnRqs cgmw== X-Gm-Message-State: AOJu0Yy2LsP1pkNCo22JnRHM7OsqnwfRzxIP0UAwgojUyLhiu0Tp1k0w 8avw3q3m45RPK3voJ8lWXu9/IaxD03uFi+JCJnpRXgWP7A04vY7NscWy6w== X-Google-Smtp-Source: AGHT+IFRUor6QNIoCbN58yJScvU/7iG5HsLCRUoPjSuyAngKelPq5/nELpStR7ZC3IuhTtuXSuNQ8g== X-Received: by 2002:a2e:9611:0:b0:2ee:8bc6:6826 with SMTP id 38308e7fff4ca-2eefd0c1492mr10051911fa.26.1721217973166; Wed, 17 Jul 2024 05:06:13 -0700 (PDT) Received: from localhost.localdomain ([62.244.50.57]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee1914ad5sm14636941fa.79.2024.07.17.05.06.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 05:06:12 -0700 (PDT) From: Zurab Kvachadze To: gentoo-dev@lists.gentoo.org Cc: Zurab Kvachadze Subject: [gentoo-dev] [RFC PATCH 19/19] www-nginx/ngx-set-misc: new package, add 0.33 Date: Wed, 17 Jul 2024 15:05:51 +0300 Message-ID: <20240717120553.31866-20-zurabid2016@gmail.com> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240717120553.31866-1-zurabid2016@gmail.com> References: <20240717120553.31866-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: d6ee0cc9-234a-4e6b-b3e9-582a2cacfcc8 X-Archives-Hash: 901ab0865b369f482b54c79eccc18a4f 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