From patchwork Wed May 7 19:37:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 42373 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CFFA827BC4B; Wed, 7 May 2025 20:38:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C62FC27BC49 for ; Wed, 7 May 2025 20:38:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCkal-00060M-W1; Wed, 07 May 2025 15:38:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCkai-0005zq-22 for guix-patches@gnu.org; Wed, 07 May 2025 15:38:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCkah-0002hA-Og for guix-patches@gnu.org; Wed, 07 May 2025 15:38:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=7Ca57ZSFuUgNlHysQwjfdljXA0weSqluHq/6TW5W0YY=; b=fUBv/Q+T1OuZ4cOmT+89Gtn0FEZb0TEZ8ieWjbMYS10yZIj32KYTio6wcAEFrRXhTH0+fRAcqaSb6flHqdXBg0rNljXz+25ElfUem7QFgChynkAn+nVaywFIYFl4xORj/5CetHfFYs0fawPY+XFmSSadwfk1zpNiN7AJz+p85mbna+5PqzQDlUrr6ZcY/qd9YOLfJi8NFFXR6+1R4YS9WFn7JD//llsvn/W9qRi3JlGakrm5u5jiJvqotYMvydxXf5J10Z9fAYxPDHTpP/g9ahJuDWSiy2CtXLyami3f2EqdK1fF2HyfwAdrG6xkbjEmx98y8K9U6oPoD0wi7iorDQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCkah-0001aH-9T for guix-patches@gnu.org; Wed, 07 May 2025 15:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78302] [PATCH 3/3] gnu: Add nginx-http3. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 May 2025 19:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78302 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78302@debbugs.gnu.org Cc: Ashish SHUKLA Received: via spool by 78302-submit@debbugs.gnu.org id=B78302.17466466636047 (code B ref 78302); Wed, 07 May 2025 19:38:03 +0000 Received: (at 78302) by debbugs.gnu.org; 7 May 2025 19:37:43 +0000 Received: from localhost ([127.0.0.1]:48009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCkaM-0001ZJ-AZ for submit@debbugs.gnu.org; Wed, 07 May 2025 15:37:43 -0400 Received: from anamika.lostca.se ([2a01:4f9:3b:505c::2]:53642) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uCkaF-0001YJ-NA for 78302@debbugs.gnu.org; Wed, 07 May 2025 15:37:36 -0400 Received: from localhost.localdomain (2a02-9140-3881-3600-1869-abbf-d3fd-8ceb.red-2a02-914.customerbaf.ipv6.rima-tde.net [IPv6:2a02:9140:3881:3600:1869:abbf:d3fd:8ceb]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id CFF471FD4C; Wed, 7 May 2025 19:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1746646648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Ca57ZSFuUgNlHysQwjfdljXA0weSqluHq/6TW5W0YY=; b=r7pdwaR0lvzgEXoOVpi9RsPKL9h/qlmt9ss8Ss9BS1xYOaoFztHmb7hfgx/+v+CTdgLfbM rROgGATRbvnUMd/qbJWeYD2bE4HqnmlU1G/iKj44wJskl2zS6NPsTlmdgjc+RFK3PF9mm7 xm+eOVgzUvV+zrfMzcoMmDYETpxD0FM= Date: Wed, 7 May 2025 21:37:14 +0200 Message-ID: <14148955ed0a90c32ce2daedd3854e9cc8391a6d.1746646353.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches X-Patchwork-Original-From: Ashish SHUKLA via Guix-patches via From: Ashish SHUKLA Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This package uses boringssl for QUIC support in nginx. * gnu/packages/web.scm: Add nginx-http3. Change-Id: I05348d57d5fcd4be661c3500b186df5e05f24160 --- gnu/packages/web.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cab378e582..b4b33fa2f4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -123,6 +123,7 @@ (define-module (gnu packages web) #:use-module (gnu packages build-tools) #:use-module (gnu packages certs) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages crates-crypto) @@ -712,6 +713,49 @@ (define-public nginx-documentation "This package provides HTML documentation for the nginx web server.") (license license:bsd-2)))) +(define-public nginx-http3 + (let* ((boringssl-commit "864a235afcf4d2575b1eab8de96fbf0d84f6cda9") + (boringssl (origin + (method git-fetch) + (uri + (git-reference + (url "https://boringssl.googlesource.com/boringssl") + (commit boringssl-commit))) + (file-name (git-file-name "boringssl" boringssl-commit)) + (sha256 (base32 "0ayd3519zyrwn9ccmlch3j7qvkg80az7z278n2vhrrl977dakyny"))))) + (package + (inherit nginx) + (name "nginx-http3") + (inputs + (modify-inputs (package-inputs nginx) + (replace "openssl" boringssl))) + (native-inputs + (modify-inputs (package-native-inputs nginx) + (append cmake-minimal))) + (arguments + (substitute-keyword-arguments (package-arguments nginx) + ((#:phases phases #~(list)) + #~(modify-phases #$phases + (add-before 'configure 'build-boringssl + (lambda* (#:key inputs parallel-build? #:allow-other-keys) + (mkdir-p "boringssl-build") + (let ((boringssl-build-dir (string-append (getcwd) "/boringssl-build"))) + (with-directory-excursion (assoc-ref inputs "openssl") + (invoke "cmake" (string-append "-B" boringssl-build-dir) + "-DCMAKE_BUILD_TYPE=RelWithDebInfo") + (invoke "make" "-C" boringssl-build-dir + (string-append "-j" + (if parallel-build? + (number->string (parallel-job-count)) + "1"))))))))) + + ((#:configure-flags flags #~(list)) + #~(cons* "--with-http_v3_module" + (string-append "--with-cc-opt=-I" + (assoc-ref %build-inputs "openssl") "/include") + (string-append "--with-ld-opt=-Lboringssl-build -lstdc++") + #$flags))))))) + (define-public nginx-accept-language-module ;; Upstream has never made a release; use current commit instead. (let ((commit "2f69842f83dac77f7d98b41a2b31b13b87aeaba7")