From patchwork Thu Feb 13 12:49:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 20236 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 D8EF327BBEA; Thu, 13 Feb 2020 12:50:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9BB0627BBE4 for ; Thu, 13 Feb 2020 12:50:15 +0000 (GMT) Received: from localhost ([::1]:51630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Dwd-0004EE-5U for patchwork@mira.cbaines.net; Thu, 13 Feb 2020 07:50:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43410) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2DwR-00046C-HD for guix-patches@gnu.org; Thu, 13 Feb 2020 07:50:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2DwQ-0003Xt-8J for guix-patches@gnu.org; Thu, 13 Feb 2020 07:50:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53427) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2DwQ-0003Xj-4Y for guix-patches@gnu.org; Thu, 13 Feb 2020 07:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j2DwQ-0004Cf-0w for guix-patches@gnu.org; Thu, 13 Feb 2020 07:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39587] [PATCH v2] gnu: Add haproxy. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Feb 2020 12:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39587 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39587@debbugs.gnu.org Received: via spool by 39587-submit@debbugs.gnu.org id=B39587.158159817216117 (code B ref 39587); Thu, 13 Feb 2020 12:50:01 +0000 Received: (at 39587) by debbugs.gnu.org; 13 Feb 2020 12:49:32 +0000 Received: from localhost ([127.0.0.1]:59400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j2Dvs-0004Bp-QX for submit@debbugs.gnu.org; Thu, 13 Feb 2020 07:49:32 -0500 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:59713) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j2Dvq-0004Bf-8y for 39587@debbugs.gnu.org; Thu, 13 Feb 2020 07:49:27 -0500 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 87F491BF20C for <39587@debbugs.gnu.org>; Thu, 13 Feb 2020 12:49:21 +0000 (UTC) From: Brice Waegeneire Date: Thu, 13 Feb 2020 13:49:09 +0100 Message-Id: <20200213124909.21523-1-brice@waegenei.re> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213090615.29979-1-brice@waegenei.re> References: <20200213090615.29979-1-brice@waegenei.re> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (haproxy): New variable. --- Keep haproxy binary in /sbin, add lgpl2.1+ license and explain why the test are disabled. gnu/packages/networking.scm | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ed339524c0..dd0c7010c5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2019 Daniel Schaefer ;;; Copyright © 2019 Diego N. Barbato +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,6 +65,7 @@ #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages adns) @@ -2853,3 +2855,46 @@ cables.") (license:non-copyleft ; slirpvde "file://COPYING.slirpvde" "See COPYING.slirpvde in the distribution."))))) + +(define-public haproxy + (package + (name "haproxy") + (version "2.1.3") + (source (origin + (method url-fetch) + (uri (string-append "https://www.haproxy.org/download/" + (version-major+minor version) + "/src/haproxy-" version ".tar.gz")) + (sha256 + (base32 + "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv")))) + (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 is only regression tests, using varnishtest + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("lua" ,lua) + ("openssl" ,openssl) + ("pcre2" ,pcre2) + ("zlib" ,zlib))) + (home-page "https://www.haproxy.org/") + (synopsis "Reliable, high performance TCP/HTTP load balancer") + (description "HAProxy is a free, very fast and reliable solution offering +high availability, load balancing, and proxying for TCP and HTTP-based +applications. It is particularly suited for web sites crawling under very +high loads while needing persistence or Layer7 processing. Supporting tens of +thousands of connections is clearly realistic with todays hardware.") + (license (list license:gpl2+ + license:lgpl2.1 + license:lgpl2.1+))))