haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

haproxy: really bump version.

Browse Source
This commit is contained in:
Jerome Duval
2015-10-20 22:37:22 +00:00
parent 72f1ba8891
commit 8de99d589e
3 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net-proxy/haproxy/haproxy-1.4.22.recipe → net-proxy/haproxy/haproxy-1.6.0.recipe
View File

@@ -5,8 +5,8 @@ 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.
"
HOMEPAGE="http://haproxy.1wt.eu/"
SOURCE_URI="http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz"
HOMEPAGE="http://www.haproxy.org/"
SOURCE_URI="http://www.haproxy.org/download/1.6/src/haproxy-$portVersion.tar.gz"
CHECKSUM_SHA256="ba221b3eaa4d71233230b156c3000f5c2bd4dace94d9266235517fe42f917fc6"
REVISION="1"
@@ -28,7 +28,7 @@ BUILD_PREREQUIRES="
cmd:make
cmd:gcc
"
PATCHES="haproxy-1.4.22.patch"
PATCHES="haproxy-$portVersion.patchset"
BUILD()

47
net-proxy/haproxy/patches/haproxy-1.4.22.patch
View File

@@ -1,47 +0,0 @@
diff -ur haproxy-1.4.22/Makefile haproxy-1.4.22-haiku/Makefile
--- haproxy-1.4.22/Makefile 2012-08-14 07:09:31.000000000 +0000
+++ haproxy-1.4.22-haiku/Makefile 2012-12-28 02:09:24.868483072 +0000
@@ -176,6 +176,12 @@
USE_POLL = implicit
USE_TPROXY = implicit
else
+ifeq ($(TARGET),haiku)
+ # For Haiku
+ TARGET_LDFLAGS = -lnetwork
+ USE_POLL = implicit
+ USE_TPROXY = implicit
+else
ifeq ($(TARGET),linux22)
# This is for Linux 2.2
USE_GETSOCKNAME = implicit
@@ -269,6 +275,7 @@
endif # linux24e
endif # linux24
endif # linux22
+endif # haiku
endif # generic
diff -ur haproxy-1.4.22/src/proto_http.c haproxy-1.4.22-haiku/src/proto_http.c
--- haproxy-1.4.22/src/proto_http.c 2012-08-14 07:09:31.000000000 +0000
+++ haproxy-1.4.22-haiku/src/proto_http.c 2012-12-28 02:09:24.873988096 +0000
@@ -3973,13 +3973,15 @@
int http_send_name_header(struct http_txn *txn, struct http_msg *msg, struct buffer *buf, struct proxy* be, const char* srv_name) {
struct hdr_ctx ctx;
-
+ char *hdr_name = 0;
+ char *hdr_val;
+ int hdr_name_len;
ctx.idx = 0;
- char *hdr_name = be->server_id_hdr_name;
- int hdr_name_len = be->server_id_hdr_len;
+ hdr_name = be->server_id_hdr_name;
+ hdr_name_len = be->server_id_hdr_len;
- char *hdr_val;
+
while (http_find_header2(hdr_name, hdr_name_len, msg->sol, &txn->hdr_idx, &ctx)) {
/* remove any existing values from the header */

52
net-proxy/haproxy/patches/haproxy-1.6.0.patchset Normal file
View File

@@ -0,0 +1,52 @@
From f3046782cf4e63218103b0c1cc61ca898f32604a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 Oct 2015 23:01:16 +0000
Subject: Haiku patch
diff --git a/Makefile b/Makefile
index a7da80b..45cac40 100644
--- a/Makefile
+++ b/Makefile
@@ -220,6 +220,12 @@ ifeq ($(TARGET),generic)
USE_POLL = implicit
USE_TPROXY = implicit
else
+ifeq ($(TARGET),haiku)
+ # For Haiku
+ TARGET_LDFLAGS = -lnetwork
+ USE_POLL = implicit
+ USE_TPROXY = implicit
+else
ifeq ($(TARGET),linux22)
# This is for Linux 2.2
USE_GETSOCKNAME = implicit
@@ -347,6 +353,7 @@ endif # linux26
endif # linux24e
endif # linux24
endif # linux22
+endif # haiku
endif # generic
@@ -798,14 +805,13 @@ install-man:
install-doc:
install -d "$(DESTDIR)$(DOCDIR)"
- for x in configuration architecture haproxy-en haproxy-fr; do \
+ for x in configuration architecture; do \
install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
done
-install-bin: haproxy haproxy-systemd-wrapper
+install-bin: haproxy $(EXTRA)
install -d "$(DESTDIR)$(SBINDIR)"
- install haproxy "$(DESTDIR)$(SBINDIR)"
- install haproxy-systemd-wrapper "$(DESTDIR)$(SBINDIR)"
+ install haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)"
install: install-bin install-man install-doc
--
2.2.2