From f312839e5971170e45a4455341c4a5fdbfe13ced Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 1 Nov 2015 11:57:42 +0000 Subject: [PATCH] haproxy: bump version. * add a git recipe. --- ...roxy-1.6.0.recipe => haproxy-1.6.1.recipe} | 2 +- net-proxy/haproxy/haproxy-1.7.0.git.recipe | 50 ++++++++++++++ .../haproxy/patches/haproxy-1.6.0.patchset | 52 -------------- .../haproxy/patches/haproxy-1.6.1.patchset | 69 +++++++++++++++++++ .../patches/haproxy-1.7.0.git.patchset | 69 +++++++++++++++++++ 5 files changed, 189 insertions(+), 53 deletions(-) rename net-proxy/haproxy/{haproxy-1.6.0.recipe => haproxy-1.6.1.recipe} (92%) create mode 100644 net-proxy/haproxy/haproxy-1.7.0.git.recipe delete mode 100644 net-proxy/haproxy/patches/haproxy-1.6.0.patchset create mode 100644 net-proxy/haproxy/patches/haproxy-1.6.1.patchset create mode 100644 net-proxy/haproxy/patches/haproxy-1.7.0.git.patchset diff --git a/net-proxy/haproxy/haproxy-1.6.0.recipe b/net-proxy/haproxy/haproxy-1.6.1.recipe similarity index 92% rename from net-proxy/haproxy/haproxy-1.6.0.recipe rename to net-proxy/haproxy/haproxy-1.6.1.recipe index 9a9f92e27..ae0f4aa9b 100644 --- a/net-proxy/haproxy/haproxy-1.6.0.recipe +++ b/net-proxy/haproxy/haproxy-1.6.1.recipe @@ -7,7 +7,7 @@ persistence or Layer7 processing. " HOMEPAGE="http://www.haproxy.org/" SOURCE_URI="http://www.haproxy.org/download/1.6/src/haproxy-$portVersion.tar.gz" -CHECKSUM_SHA256="ba221b3eaa4d71233230b156c3000f5c2bd4dace94d9266235517fe42f917fc6" +CHECKSUM_SHA256="71da2abe610ed42afd6678c2e95321db5f3c416fe2803235f75fc459d8246289" REVISION="1" LICENSE="GNU GPL v2" diff --git a/net-proxy/haproxy/haproxy-1.7.0.git.recipe b/net-proxy/haproxy/haproxy-1.7.0.git.recipe new file mode 100644 index 000000000..989b7b96c --- /dev/null +++ b/net-proxy/haproxy/haproxy-1.7.0.git.recipe @@ -0,0 +1,50 @@ +SUMMARY="Reliable, high performace 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. +" +HOMEPAGE="http://www.haproxy.org/" +SOURCE_URI="git://github.com/haproxy/haproxy.git" +REVISION="1" + +LICENSE="GNU GPL v2" +COPYRIGHT="2012 Willy Tarreau" + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + haproxy = $portVersion + cmd:haproxy = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:make + cmd:gcc + " +PATCHES="haproxy-$portVersion.patchset" + + +BUILD() +{ + make TARGET=haiku PREFIX="$prefix" +} + +INSTALL() +{ + mkdir -p "${sbinDir}" + mkdir -p "${manDir}" + mkdir -p "${docDir}" + + + make install DESTDIR="" \ + PREFIX="$prefix"\ + SBINDIR="${sbinDir}" \ + MANDIR="${manDir}" \ + DOCDIR="${docDir}" +} diff --git a/net-proxy/haproxy/patches/haproxy-1.6.0.patchset b/net-proxy/haproxy/patches/haproxy-1.6.0.patchset deleted file mode 100644 index d3bfb48ee..000000000 --- a/net-proxy/haproxy/patches/haproxy-1.6.0.patchset +++ /dev/null @@ -1,52 +0,0 @@ -From f3046782cf4e63218103b0c1cc61ca898f32604a Mon Sep 17 00:00:00 2001 -From: Jerome Duval -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 - diff --git a/net-proxy/haproxy/patches/haproxy-1.6.1.patchset b/net-proxy/haproxy/patches/haproxy-1.6.1.patchset new file mode 100644 index 000000000..6bf6941f2 --- /dev/null +++ b/net-proxy/haproxy/patches/haproxy-1.6.1.patchset @@ -0,0 +1,69 @@ +From 03f8a016d469e11ffc2b67dba9a78048255b5c8e Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 19 Oct 2015 23:01:16 +0000 +Subject: [BUILD] add Haiku as supported target. + +* also replace haproxy-systemd-wrapper with $(EXTRA) in install-bin. + +diff --git a/Makefile b/Makefile +index 4f0aa8a..3af735e 100644 +--- a/Makefile ++++ b/Makefile +@@ -98,7 +98,7 @@ DOCDIR = $(PREFIX)/doc/haproxy + # Use TARGET= to optimize for a specifc target OS among the + # following list (use the default "generic" if uncertain) : + # generic, linux22, linux24, linux24e, linux26, solaris, +-# freebsd, openbsd, netbsd, cygwin, custom, aix51, aix52 ++# freebsd, openbsd, netbsd, cygwin, haiku, custom, aix51, aix52 + TARGET = + + #### TARGET CPU +@@ -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 + + +@@ -805,10 +812,9 @@ install-doc: + 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 + +diff --git a/README b/README +index d376fbf..76e6ed5 100644 +--- a/README ++++ b/README +@@ -48,6 +48,7 @@ and assign it to the TARGET variable : + - aix51 for AIX 5.1 + - aix52 for AIX 5.2 + - cygwin for Cygwin ++ - haiku for Haiku + - generic for any other OS or version. + - custom to manually adjust every setting + +-- +2.2.2 + diff --git a/net-proxy/haproxy/patches/haproxy-1.7.0.git.patchset b/net-proxy/haproxy/patches/haproxy-1.7.0.git.patchset new file mode 100644 index 000000000..6bf6941f2 --- /dev/null +++ b/net-proxy/haproxy/patches/haproxy-1.7.0.git.patchset @@ -0,0 +1,69 @@ +From 03f8a016d469e11ffc2b67dba9a78048255b5c8e Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 19 Oct 2015 23:01:16 +0000 +Subject: [BUILD] add Haiku as supported target. + +* also replace haproxy-systemd-wrapper with $(EXTRA) in install-bin. + +diff --git a/Makefile b/Makefile +index 4f0aa8a..3af735e 100644 +--- a/Makefile ++++ b/Makefile +@@ -98,7 +98,7 @@ DOCDIR = $(PREFIX)/doc/haproxy + # Use TARGET= to optimize for a specifc target OS among the + # following list (use the default "generic" if uncertain) : + # generic, linux22, linux24, linux24e, linux26, solaris, +-# freebsd, openbsd, netbsd, cygwin, custom, aix51, aix52 ++# freebsd, openbsd, netbsd, cygwin, haiku, custom, aix51, aix52 + TARGET = + + #### TARGET CPU +@@ -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 + + +@@ -805,10 +812,9 @@ install-doc: + 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 + +diff --git a/README b/README +index d376fbf..76e6ed5 100644 +--- a/README ++++ b/README +@@ -48,6 +48,7 @@ and assign it to the TARGET variable : + - aix51 for AIX 5.1 + - aix52 for AIX 5.2 + - cygwin for Cygwin ++ - haiku for Haiku + - generic for any other OS or version. + - custom to manually adjust every setting + +-- +2.2.2 +