From patchwork Fri Mar 17 22:03:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 48085 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 00D1B16ECE; Fri, 17 Mar 2023 22:05:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 B59BD16EA6 for ; Fri, 17 Mar 2023 22:05:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdIC7-0002yO-H5; Fri, 17 Mar 2023 18:05:03 -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 1pdIC6-0002wD-Pf for guix-patches@gnu.org; Fri, 17 Mar 2023 18:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdIC6-0007YY-DK for guix-patches@gnu.org; Fri, 17 Mar 2023 18:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pdIC6-0002Mh-8a for guix-patches@gnu.org; Fri, 17 Mar 2023 18:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62247] [PATCH 1/2] gnu: haproxy: Update to 2.7.5. References: <20230317220247.7388-1-sharlatanus@gmail.com> In-Reply-To: <20230317220247.7388-1-sharlatanus@gmail.com> Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Mar 2023 22:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62247 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62247@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 62247-submit@debbugs.gnu.org id=B62247.16790906479001 (code B ref 62247); Fri, 17 Mar 2023 22:05:02 +0000 Received: (at 62247) by debbugs.gnu.org; 17 Mar 2023 22:04:07 +0000 Received: from localhost ([127.0.0.1]:45829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdIBD-0002L1-32 for submit@debbugs.gnu.org; Fri, 17 Mar 2023 18:04:07 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:53179) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdIBB-0002KK-EG for 62247@debbugs.gnu.org; Fri, 17 Mar 2023 18:04:06 -0400 Received: by mail-wm1-f53.google.com with SMTP id w11so3124276wmo.2 for <62247@debbugs.gnu.org>; Fri, 17 Mar 2023 15:04:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679090639; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=QVjP7jiEX7bvOejcPpiiPl0BDMHaSAZZoYZ5HpODTew=; b=NF6+9qS3N5+0pwEucejHk7dKgH90HHGipbgeC9csh9kXCpgg4V+rXzbL9vFFU+yDYY x311WDEXlU4kTlT0aDh5sDFFO2+IXBK5ka2qzEgospd2+UHlZNKulKTi2WaDa/+Q8rm8 Z+w5fuMWsymFxjU2oj0Re7knr0bEfRLTzqNayBufFVoVT0PPr2tMuXIn5SCyiLJz25I/ QD9td2fAeldkFPHuYFM9YP55bpuM0D+ZXDE+XV/B2FyPSHiEwdxplD7QIGkVKGdw0LGZ ipoub3J/1BjrCCAM+zrWvGoZhznjaGRS60pmj5GZuuLFdBByOUFALyJehj93HfCdrNGJ UPJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679090639; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QVjP7jiEX7bvOejcPpiiPl0BDMHaSAZZoYZ5HpODTew=; b=XULVen5UWUxsETUeZBlzQP9B2coYhDpij06AiBN8yrYYreLAwDmg/F2+l8AhBgxKko WeeBAQIpaqdEuHBuzZf3dRG4Z0Amu2YoolP6UhfFNNL23B2YHQQVGBM6sdjrCxro5jyk +3BRSY1heYMmc7VHCZPRu8a+0QHQnBXLB239xtkFTZMw7qqu6/DJA1OmqQPf2yTuyMNQ jWb1DPXUf0oPMawMFw9qZy4VLHn9EtPyUON73OynsfiN1yOEhubK8Kt8rZANDPyAFR1i 6Btod6St25SZaMz4TzOukn9n5BnoqmzYq+FXaWWlYz6pXpBPaJKHIbWfEUkvkbmC2jZY M1OQ== X-Gm-Message-State: AO0yUKXAWfiBCc9ndWk1lSRMkikKXN4kCi3KU5yakB5G5+UUyW2Wlf2T wbiEo5ydOVMqgYPOsnO8m9bbE3ANbGg= X-Google-Smtp-Source: AK7set8cP9lgGij5PYM1V17K3s0An4xRiHsLcIbV5P+RZnjrTOfLno2uciI8d3kBmOiifSkJ4qscpQ== X-Received: by 2002:a05:600c:4f55:b0:3ed:454d:36ab with SMTP id m21-20020a05600c4f5500b003ed454d36abmr8065947wmq.16.1679090639296; Fri, 17 Mar 2023 15:03:59 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id q7-20020a7bce87000000b003e8dc7a03basm8771255wmj.41.2023.03.17.15.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:03:58 -0700 (PDT) From: Sharlatan Hellseher Date: Fri, 17 Mar 2023 22:03:56 +0000 Message-Id: <20230317220357.7471-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.2 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/networking.scm (haproxy): Update to 2.7.4. [arguments]: Use Gexp. : Add extra build options 'USE_PCRE2_JIT' enables JIT for faster regex on libpcre2, 'USE_PROMEX' enables the Prometheus exporter. Set CC to use cc-for-target, point 'LUA_INC' and 'LUA_LIB' to corresponded '/include' and '/lib' outputs of Lua. Replace 'USE_PCRE_2' by correct option 'USE_PCRE2'. --- gnu/packages/networking.scm | 50 +++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3fac05c411..feff20afb1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4243,30 +4243,36 @@ (define-public vde2 (define-public haproxy (package (name "haproxy") - (version "2.1.7") - (source (origin - (method url-fetch) - (uri (string-append "https://www.haproxy.org/download/" - (version-major+minor version) - "/src/haproxy-" version ".tar.gz")) - (sha256 - (base32 - "0fd3c1znid5a9w3gcf77b85hm2a2558w9s02c4b7xzkmivqnqbir")))) + (version "2.7.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.haproxy.org/download/" + (version-major+minor version) + "/src/haproxy-" version ".tar.gz")) + (sha256 + (base32 "00j5lwvrf8lgfid3108gclxbd46v3mnd4lh0lw4l0nn3f0rf9ip2")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (let* ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out) - (string-append "DOCDIR=" out "/share/" ,name) - "TARGET=linux-glibc" - "USE_LUA=1" - "USE_OPENSSL=1" - "USE_ZLIB=1" - "USE_PCRE_2=1")) - #:tests? #f ; there are only regression tests, using varnishtest - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list + #:tests? #f ; there are only regression tests, using varnishtest + #:make-flags + #~(list "LUA_LIB_NAME=lua" + "TARGET=linux-glibc" + "USE_LUA=1" + "USE_OPENSSL=1" + "USE_PCRE2=1" + "USE_PCRE2_JIT=1" + "USE_PROMEX=1" + "USE_ZLIB=1" + (string-append "CC=" #$(cc-for-target)) + (string-append "DOCDIR=" #$output "/share/" #$name) + (string-append "LUA_INC=" #$(this-package-input "lua") "/include") + (string-append "LUA_LIB=" #$(this-package-input "lua") "/lib") + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) (inputs (list lua openssl pcre2 zlib)) (home-page "https://www.haproxy.org/")