Merge pull request #4853 from StevenHessing/noddos

[feed/packages.git] / net / haproxy / Makefile

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 11aca06cdfededb21a7d83d3ded0e37a856c32ec..74334cc5da877d67b02fd94baf12f5b722a7f684 100644 (file)
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
-PKG_VERSION:=1.7.2
-PKG_RELEASE:=01
+PKG_VERSION:=1.7.8
+PKG_RELEASE:=18
 
 PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.7/src/
-PKG_MD5SUM:=7330b36f3764ebe409e9305803dc30e2
+PKG_SOURCE_URL:=http://www.haproxy.org/download/1.7/src/
+PKG_HASH:=ec90153ccedd20ad4015d3eaf76b502ff1f61b431d54c22b8457b5784a9ae142
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0
@@ -33,7 +33,7 @@ endef
 define Download/lua533
        FILE:=lua-5.3.3.tar.gz
        URL:=http://www.lua.org/ftp/
-       MD5SUM:=703f75caa4fdf4a911c1a72e67a27498
+       HASH:=5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2
 endef
 
 define Build/Prepare
@@ -111,6 +111,7 @@ define Build/Compile
        $(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR)/lua \
                INSTALL_TOP="$(STAGING_DIR)/lua-5.3.3/" \
                CC="$(TARGET_CC)" \
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
                LDFLAGS="$(TARGET_LDFLAGS) -lncurses -lreadline" \
                LD="$(TARGET_LD)" \
                linux install
@@ -120,16 +121,16 @@ define Build/Compile
        $(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                CC="$(TARGET_CC)" \
+               PCREDIR="$(STAGING_DIR)/usr/" \
+               SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530 " \
+               USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 USE_REGPARM=1 \
+               USE_ZLIB=yes USE_PCRE=1 USE_PCRE_JIT=1\
+               VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \
                $(ADDON)
                CFLAGS="$(TARGET_CFLAGS) -fno-align-jumps -fno-align-functions -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer -fhonour-copts" \
                LD="$(TARGET_LD)" \
                LDFLAGS="$(TARGET_LDFLAGS) -lcurses -lreadline" \
-               PCREDIR="$(STAGING_DIR)/usr/include" \
-               SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530 " \
-               USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 USE_REGPARM=1 \
-               USE_ZLIB=yes USE_PCRE=1 \
-               VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \
-               IGNOREGIT=1
+               GNOREGIT=1
 
        $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \