From patchwork Fri Mar 17 22:03:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 48086 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 4203D16ECB; Fri, 17 Mar 2023 22:05:30 +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 B881E16EAA 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 1pdICB-00031C-2Q; Fri, 17 Mar 2023 18:05:07 -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 1pdIC7-0002xt-6A for guix-patches@gnu.org; Fri, 17 Mar 2023 18:05:03 -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-0007cy-Sq 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-0002Mo-Ny for guix-patches@gnu.org; Fri, 17 Mar 2023 18:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62247] [PATCH 2/2] gnu: haproxy: Move to (gnu packages high-availability). 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.16790906509011 (code B ref 62247); Fri, 17 Mar 2023 22:05:02 +0000 Received: (at 62247) by debbugs.gnu.org; 17 Mar 2023 22:04:10 +0000 Received: from localhost ([127.0.0.1]:45831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdIBF-0002LG-GB for submit@debbugs.gnu.org; Fri, 17 Mar 2023 18:04:10 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:40934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdIBB-0002KL-Qt for 62247@debbugs.gnu.org; Fri, 17 Mar 2023 18:04:07 -0400 Received: by mail-wm1-f54.google.com with SMTP id fm20-20020a05600c0c1400b003ead37e6588so5905050wmb.5 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=1679090640; 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=fVNLa564QKHfh4kYmd9KnL9RyLqglVTZivSEFSMvIAM=; b=jm97WoMcYiFcDkmMtAm+p/wbCpFS9CGlBIGtGPpp0ffyeFrgsKNPdSS+zuQyxX+joS aSHJjRwe1nc7Mwdhk3YJsaKktq6uAcOqWG4OB41844zaVIdvPiQb50qk1S2TDUMc4O2P fV6ok5mYr/23WRlZ8OrS2QrYiRFFadNPYAwDxiyqw40TYyc581tyzIPEr24pp/VFdMlt BjE1AXUS9VjS9drPaJbkj3xTfPRc0eF01ORhemkF8gt6w3WWfk8zhxXB19IREWqrUXZY YxFbPLIJ/mICvbZ6Af6lBdUhq0L+BXre9fTbZxLJTXDEW2qczugatwqO2sKL8aNnU5VC ZgVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679090640; 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=fVNLa564QKHfh4kYmd9KnL9RyLqglVTZivSEFSMvIAM=; b=Wc41/enVBwhrQ6Hj4bfro7AbRDWH5tY06oE31oFJvBxkjW+nziSeBq1cI4XGqoAQen HmRNwWNoRDDbAdH4SgJ//UGbCpvh/4pxuySvhG/CHWukAQTuBXDJJEBvFuSGBo+QWGfS PkYBbu+bg5twoeHoT6k3AoF3QOTWe9/J0k7iT03dHNyVnNgeU04cEUyCR07h/hQS38KV soV74wpLr8F12eHy2z8amrjobxpiUEXogxjCRqT03WfRY3A8nTDy7Y/E20qssMlDjaQ/ 3B738pXrZbIIewJR6qYTxmvfMWVvD7gyqjjKmF9EV8eCZvguQJJtClv1b5hujF2eHq5y 4DmA== X-Gm-Message-State: AO0yUKXHPyqdwSsuMQwtTjQkze5TCvf5Cc9NpP7e7xB772CzzVHPek9j iOXIkc5hABwMUuJFj7kQUMWaoPs2Ttc= X-Google-Smtp-Source: AK7set+BY3AB5PGKOKZx2KOGUuEesK4y9CVrFrN3XAlu+KOaF3cLE5qRVSJAErOOR+xzQOVgiv/LUQ== X-Received: by 2002:a1c:7915:0:b0:3ed:9212:b505 with SMTP id l21-20020a1c7915000000b003ed9212b505mr2523467wme.19.1679090639894; 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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 15:03:59 -0700 (PDT) From: Sharlatan Hellseher Date: Fri, 17 Mar 2023 22:03:57 +0000 Message-Id: <20230317220357.7471-2-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230317220357.7471-1-sharlatanus@gmail.com> References: <20230317220357.7471-1-sharlatanus@gmail.com> 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 Copyright records were synchronized based on commit history. * gnu/packages/networking.scm (haproxy): Move this variable from here... * gnu/packages/high-availability.scm (haproxy): ...to here. --- gnu/packages/high-availability.scm | 53 +++++++++++++++++++++++++++++- gnu/packages/networking.scm | 48 +-------------------------- 2 files changed, 53 insertions(+), 48 deletions(-) diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index 108ea553ef..ad6db537e5 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -1,4 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2022 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. @@ -34,8 +36,10 @@ (define-module (gnu packages high-availability) #:use-module (gnu packages glib) #:use-module (gnu packages hardware) #:use-module (gnu packages linux) + #:use-module (gnu packages lua) #:use-module (gnu packages networking) #:use-module (gnu packages nss) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages rsync) @@ -45,13 +49,60 @@ (define-module (gnu packages high-availability) #:use-module (gnu packages xml) #:use-module (gnu packages) #:use-module (guix build-system gnu) - #:use-module (guix gexp) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:)) +(define-public haproxy + (package + (name "haproxy") + (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 + (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/") + (synopsis "Reliable, high performance TCP/HTTP load balancer") + (description "HAProxy offers @acronym{HA, high availability}, load +balancing, and proxying for TCP and HTTP-based applications. It is particularly +suited to Web sites crawling under very high loads while needing persistence or +Layer 7 processing. Supporting tens of thousands of connections is clearly +realistic with today's hardware.") + (license (list license:gpl2+ + license:lgpl2.1 + license:lgpl2.1+)))) + (define-public libqb (package (name "libqb") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index feff20afb1..5962da3d0d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2019 Vasile Dumitrascu ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar -;;; Copyright © 2019, 2020, 2021 Brice Waegeneire +;;; Copyright © 2019, 2021 Brice Waegeneire ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019, 2020 Jan Wielkiewicz ;;; Copyright © 2019 Daniel Schaefer @@ -4240,52 +4240,6 @@ (define-public vde2 "file://COPYING.slirpvde" "See COPYING.slirpvde in the distribution.")))))) -(define-public haproxy - (package - (name "haproxy") - (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 - (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/") - (synopsis "Reliable, high performance TCP/HTTP load balancer") - (description "HAProxy offers @acronym{HA, high availability}, load -balancing, and proxying for TCP and HTTP-based applications. It is particularly -suited to Web sites crawling under very high loads while needing persistence or -Layer 7 processing. Supporting tens of thousands of connections is clearly -realistic with today's hardware.") - (license (list license:gpl2+ - license:lgpl2.1 - license:lgpl2.1+)))) - (define-public lldpd (package (name "lldpd")