From patchwork Thu Oct 19 14:55:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 55032 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 B729D27BBEA; Thu, 19 Oct 2023 15:56:56 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 54FEC27BBE2 for ; Thu, 19 Oct 2023 15:56:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtUS1-0008KI-8O; Thu, 19 Oct 2023 10:56:41 -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 1qtURx-0008EP-Lc for guix-patches@gnu.org; Thu, 19 Oct 2023 10:56:37 -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 1qtURv-0007nV-SI for guix-patches@gnu.org; Thu, 19 Oct 2023 10:56:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtUSM-0004L7-Fn for guix-patches@gnu.org; Thu, 19 Oct 2023 10:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66641] [PATCH 1/2] gnu: httpd: Rewrite using G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Oct 2023 14:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66641@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 66641-submit@debbugs.gnu.org id=B66641.169772738316625 (code B ref 66641); Thu, 19 Oct 2023 14:57:02 +0000 Received: (at 66641) by debbugs.gnu.org; 19 Oct 2023 14:56:23 +0000 Received: from localhost ([127.0.0.1]:37476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtURi-0004K4-Un for submit@debbugs.gnu.org; Thu, 19 Oct 2023 10:56:23 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:46648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtURe-0004Jf-N4 for 66641@debbugs.gnu.org; Thu, 19 Oct 2023 10:56:19 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id 29F3020575 for <66641@debbugs.gnu.org>; Thu, 19 Oct 2023 16:55:50 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 94AC08009D; Thu, 19 Oct 2023 16:55:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 0WnLWUv5MWWf; Thu, 19 Oct 2023 16:55:47 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 2707A80097; Thu, 19 Oct 2023 16:55:47 +0200 (CEST) From: Bruno Victal Date: Thu, 19 Oct 2023 15:55:30 +0100 Message-ID: X-Mailer: git-send-email 2.41.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: , 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 (httpd): Rewrite using G-Expressions. --- gnu/packages/web.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b46286c690..95a4d75261 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -290,15 +290,16 @@ (define-public httpd (native-inputs (list `(,pcre "bin"))) ;for 'pcre-config' (inputs (list apr apr-util openssl perl)) ; needed to run bin/apxs (arguments - `(#:test-target "test" - #:configure-flags (list "--enable-rewrite" - "--enable-userdir" - "--enable-vhost-alias" - "--enable-ssl" - "--enable-mime-magic" - (string-append "--sysconfdir=" - (assoc-ref %outputs "out") - "/etc/httpd")))) + (list + #:test-target "test" + #:configure-flags #~(list "--enable-rewrite" + "--enable-userdir" + "--enable-vhost-alias" + "--enable-ssl" + "--enable-mime-magic" + (string-append "--sysconfdir=" + #$output + "/etc/httpd")))) (synopsis "Featureful HTTP server") (description "The Apache HTTP Server Project is a collaborative software development From patchwork Thu Oct 19 14:55:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 55031 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 E232C27BBE2; Thu, 19 Oct 2023 15:56:52 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 E763E27BBE9 for ; Thu, 19 Oct 2023 15:56:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtURy-0008Eq-CX; Thu, 19 Oct 2023 10:56:39 -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 1qtURv-0008DE-Ns for guix-patches@gnu.org; Thu, 19 Oct 2023 10:56:35 -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 1qtURv-0007nQ-F3 for guix-patches@gnu.org; Thu, 19 Oct 2023 10:56:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtUSM-0004L0-2C for guix-patches@gnu.org; Thu, 19 Oct 2023 10:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66641] [PATCH 2/2] gnu: httpd: Update to 2.4.58. [security fixes] Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Oct 2023 14:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66641@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 66641-submit@debbugs.gnu.org id=B66641.169772738016614 (code B ref 66641); Thu, 19 Oct 2023 14:57:02 +0000 Received: (at 66641) by debbugs.gnu.org; 19 Oct 2023 14:56:20 +0000 Received: from localhost ([127.0.0.1]:37474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtURf-0004Ju-Lv for submit@debbugs.gnu.org; Thu, 19 Oct 2023 10:56:19 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]:36472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtURd-0004Jd-31 for 66641@debbugs.gnu.org; Thu, 19 Oct 2023 10:56:18 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 7BA5720F2A for <66641@debbugs.gnu.org>; Thu, 19 Oct 2023 16:55:49 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 052548009F; Thu, 19 Oct 2023 16:55:49 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id rYk-ScAEbQYc; Thu, 19 Oct 2023 16:55:48 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id AB9BA800A3; Thu, 19 Oct 2023 16:55:47 +0200 (CEST) From: Bruno Victal Date: Thu, 19 Oct 2023 15:55:31 +0100 Message-ID: <13299eec47ad5ab3589db5be22bd5599f325d5dd.1697727127.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.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: , 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 Includes fixes for CVE-2023-45802, CVE-2023-43622 and CVE-2023-31122. References: * * gnu/packages/web.scm (httpd): Update to 2.4.58. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 95a4d75261..e6bd7d0fed 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -278,14 +278,14 @@ (define-public qhttp (define-public httpd (package (name "httpd") - (version "2.4.57") + (version "2.4.58") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "0ajdz5f2w9nbmqydip2mv9m4xlnc4swmw7mqzgnrbq4mxr5bik6v")))) + "1id45r2ccgkbjm9i998997ch32lvicpyynyx8x6aa4420wmdf5ps")))) (build-system gnu-build-system) (native-inputs (list `(,pcre "bin"))) ;for 'pcre-config' (inputs (list apr apr-util openssl perl)) ; needed to run bin/apxs