From patchwork Tue Jun 18 05:52:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 65449 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 3866227BBE9; Tue, 18 Jun 2024 06:54:22 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 0CAFA27BBE2 for ; Tue, 18 Jun 2024 06:54:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJRn8-0006DH-Nf; Tue, 18 Jun 2024 01:54:02 -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 1sJRn5-0006D3-Ro for guix-patches@gnu.org; Tue, 18 Jun 2024 01:53:59 -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 1sJRn5-0006Zl-Jp for guix-patches@gnu.org; Tue, 18 Jun 2024 01:53:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJRn7-0004t9-P1 for guix-patches@gnu.org; Tue, 18 Jun 2024 01:54:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71530] [PATCH v2] gnu: nginx: Update to 1.27.0. References: <84150942d81c8fd5be91c7724514fd19112c7e7f.1718260747.git.atai@atai.org> In-Reply-To: <84150942d81c8fd5be91c7724514fd19112c7e7f.1718260747.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jun 2024 05:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71530 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71530@debbugs.gnu.org Cc: Andy Tai Received: via spool by 71530-submit@debbugs.gnu.org id=B71530.171869002718761 (code B ref 71530); Tue, 18 Jun 2024 05:54:01 +0000 Received: (at 71530) by debbugs.gnu.org; 18 Jun 2024 05:53:47 +0000 Received: from localhost ([127.0.0.1]:40254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJRmt-0004sW-7o for submit@debbugs.gnu.org; Tue, 18 Jun 2024 01:53:47 -0400 Received: from mail-pl1-f179.google.com ([209.85.214.179]:52467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJRmq-0004sD-E3 for 71530@debbugs.gnu.org; Tue, 18 Jun 2024 01:53:45 -0400 Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1f6fabe9da3so41585155ad.0 for <71530@debbugs.gnu.org>; Mon, 17 Jun 2024 22:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718689956; x=1719294756; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=yQSfpk4G4RERlue2YWNpZZwg+nX23VYU0utumxL40+k=; b=PZWwjKRnW+KgpvwCFuqfcTXHSXOfCy1OU3cJRljtYj5eW6A8kcPTMyCHFybIooYEif VnRUpuvlObyOpqYePBE8louEe5UnGiRN1BrUxi25NAijL1o4hKCA4ST25XSG2Hv8JVpN /1mQs6JG1n1asokJLLQkerpMjboHgXKpNxwvRZy1ZMoBcQ3xi6ZtYbVbJfcuV+oO+q2p rwPD8Yflfy5EMMAuiNuuWwFmxy4fcr3ltCjfAogeUVsPW6ahYnya3zoIsbBzykRB+kes UgePsaQDQqVw+dwSmh7ynelpiIzPG4ck1SxYEFqZrnEqrnHY5Si1icG6VkO2wkEqF2R8 ybGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718689956; x=1719294756; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yQSfpk4G4RERlue2YWNpZZwg+nX23VYU0utumxL40+k=; b=R+gIP5aMu8IEfZSBvKrX4YW/tw63/JrzffET4lYJDMkz2imAiNFd7BmfPSDqMTotxt Ki3hTFkmzrkMPM+twUnOaJMhKEspsBRrgjLeBFFfyLQuprWsItCRAqp1vSdih09xS3T0 O3GeE9PHKKCejbJ9AjuSR4BlfTtz/Ln5WEPfN3rL8Q5upYyd/ZuJxYMpN0s5nZw+q8Q5 EJjsRVOHvJydLEn8KIVc8bn37fpYfHZFpZZiEmMABjpM5cwm98XLg9z0bgqOQbHSCMPC AY4jO++ZF3Ombs28cUV3Wvzb0IaXz6B9nkzWwUiSPWcXDkN+SgDnDqwrWbYLuGdS0TNo lB6g== X-Gm-Message-State: AOJu0Yw4J14xtTT+Nms6nFUZTDryWu383adGUYZutJux/pxVla5r1tRt JiZKCHdKKXgrzGKoynrCkzOVqwP5vfQ76+BGZ8HNklNUEXUWQzEZevHjcw== X-Google-Smtp-Source: AGHT+IHGYZDFELepr33SWP/UKm+gYKx2d+u3bw0kKn2tPCJoRZYkDDsbRqcefd6HdYjT10wTvgiWeg== X-Received: by 2002:a17:902:ce0c:b0:1f8:63d1:7820 with SMTP id d9443c01a7336-1f863d17a48mr115034345ad.51.1718689955496; Mon, 17 Jun 2024 22:52:35 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net. [98.37.226.154]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855e6debasm88790015ad.65.2024.06.17.22.52.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 22:52:34 -0700 (PDT) From: Andy Tai Date: Mon, 17 Jun 2024 22:52:32 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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: , 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 * gnu/packages/web.scm (nginx): Update to 1.27.0. (nginx-documentation): Update to 1.27.0. (nginx-accept-language-module)[arguments]: Add configure flags to enable compatibility and fix build. Change-Id: I447e0bb8677d3f3b14c3a8948c625bcad437ca73 --- gnu/packages/web.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) base-commit: b993f4735d41e690dbafb8ee2e17fce996a8cf20 diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b9991bb9c1..84235df2ee 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -510,14 +510,14 @@ (define-public nginx ;; Track the ‘mainline’ branch. Upstream considers it more reliable than ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) - (version "1.23.3") + (version "1.27.0") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "0m5s8a04jlpv6qhk09sfqbj4rxj38g6923w12j5y3ymrvf3mgjvm")))) + "170ja338zh7wdyva34cr7f3wfq59434sssn51d5jvakyz0y0w8xp")))) (build-system gnu-build-system) (inputs (list libxml2 libxslt openssl pcre zlib)) (arguments @@ -607,9 +607,9 @@ (define-public nginx (define-public nginx-documentation ;; This documentation should be relevant for the current nginx package. - (let ((version "1.23.3") - (revision 2916) - (changeset "178f55cf631a")) + (let ((version "1.27.0") + (revision 3081) + (changeset "1b23e39a3b94")) (package (name "nginx-documentation") (version (simple-format #f "~A-~A-~A" version revision changeset)) @@ -621,7 +621,7 @@ (define-public nginx-documentation (file-name (string-append name "-" version)) (sha256 (base32 - "0b03dnniwm3p3gd76vqs6lj2z4blqmb7y4lhn9vg7xjz0yqgzvn2")))) + "0xnfda8xh8mv00fsycqbwicm8bb7rsvdqmmwv0h372kiwxnazjkh")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite @@ -631,7 +631,7 @@ (define-public nginx-documentation (replace 'build (lambda* (#:key outputs #:allow-other-keys) (let ((output (assoc-ref outputs "out"))) - (substitute* "umasked.sh" + (substitute* "tools/umasked.sh" ((" /bin/sh") (string-append " " (which "sh")))) ;; The documentation includes a banner, which makes sense on ;; the NGinx website, but doesn't make much sense when @@ -733,6 +733,7 @@ (define-public nginx-accept-language-module "--with-http_v2_module" "--with-pcre-jit" "--with-debug" + "--with-compat" ;; Even when not cross-building, we pass the ;; --crossbuild option to avoid customizing for the ;; kernel version on the build machine.