From patchwork Tue Sep 3 15:13:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2387 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 46N9T91Qr2z3yVX for ; Tue, 3 Sep 2019 15:13:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46N9T60Jt3z3dW; Tue, 3 Sep 2019 15:13:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46N9T538NXz2ydV; Tue, 3 Sep 2019 15:13:45 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46N9T42v5Fz2ych for ; Tue, 3 Sep 2019 15:13:44 +0000 (UTC) Received: from michael.haj.ipfire.org (fw01.haj.ipfire.org [172.28.1.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 46N9T408qyz3QM; Tue, 3 Sep 2019 15:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567523624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=o1y0J83TiyPWq4maoBvj79gFl0gvTBRROU7bZeBikYY=; b=lS4WANvhKE3EJIpX7zUHiKoPY6eTVhsMKCJTXMkQBgaE36ONmlzTzznmYrkvSr4r/L/wKS GoZJR4eGc26b59vX3hb8rZXw8etjqGsxqMJpRZAX8gHTYkBUkeIc44+MKlp2QWaRtR4W2u xIVVMpin6vHPOEux1rIoT5xXUI/Osgpy5DsYd/EP4M0wbCVSfCySeSbukoyE2sJIF3DFxh eNiqJz1QgLpor4R3FXVn98n+oPAyTlFp6nwpsgr2+GZEiDGjYUVu8MC19TcStGLM01GXs9 /MoW5phLl5XklwViih0DKmTMg9M+SwPyhgdwse1kYPNuN3tjb0Do0RIKbQNKaQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567523624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=o1y0J83TiyPWq4maoBvj79gFl0gvTBRROU7bZeBikYY=; b=oSyMBEHBBYNoSrumqLYagtLahAkShD5uyAcGejzqB5y+gfAh2XgyYOUzG3NJc7ZsEQyzI6 aSf4WKjQFqi/mKCA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] haproxy: Update to 2.0.5 Date: Tue, 3 Sep 2019 15:13:35 +0000 Message-Id: <20190903151335.2241-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This release brings a couple of new features and this patch enables using the PCRE Jit. Signed-off-by: Michael Tremer --- lfs/haproxy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lfs/haproxy b/lfs/haproxy index 8917d30c9..308d96edf 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -24,7 +24,7 @@ include Config -VER = 1.8.21 +VER = 2.0.5 THISAPP = haproxy-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = haproxy -PAK_VER = 11 +PAK_VER = 12 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6f86f1272c7daf5ea1d1bae5c9192183 +$(DL_FILE)_MD5 = 497c716adf4b056484601a887f34d152 install : $(TARGET) @@ -82,8 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux2628" \ - USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_REGPARM=1 \ + cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux-glibc" \ + USE_OPENSSL=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \ ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)" cd $(DIR_APP) && make install-bin install-man PREFIX=/usr