packages: remove dependency on obsolete LINUX_2_4 symbol

[openwrt/svn-archive/archive.git] / net / haproxy / Makefile

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index c06906f6f73f845bca1db82212e96f938c7c611f..205d6d305f5efaba5e72a31c9102ea083dec306e 100644 (file)
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,28 +1,31 @@
 #
-# Copyright (C) 2009 Thomas Heil <heil@terminal-consulting.de>
+# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2009-2010 Thomas Heil <heil@terminal-consulting.de> 
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
-PKG_VERSION:=1.3.22
+PKG_VERSION:=1.4.18
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.3/src/
-PKG_MD5SUM:=b84e0935cfea99eda43645d53bb82367
+PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src
+PKG_MD5SUM:=4ac88bb1a76c4b84ed4f6131183bedbe
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/haproxy
+  SUBMENU:=Web Servers/Proxies
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpcre +libltdl
   TITLE:=The Reliable, High Performance TCP/HTTP Load Balancer
   URL:=http://haproxy.1wt.eu/
-  SUBMENU:=Proxy Servers
+  DEPENDS:=+libpcre +libltdl
+  MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 endef
 
 define Package/haproxy/conffiles
@@ -34,12 +37,13 @@ define Package/haproxy/description
 endef
 
 define Build/Compile
-       $(MAKE) TARGET=$(if $(CONFIG_LINUX_2_4),linux24,linux26) -C $(PKG_BUILD_DIR) \
+       $(MAKE) TARGET=linux26 -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                CC="$(TARGET_CC)" \
                CFLAGS="$(TARGET_CFLAGS)" \
                LD="$(TARGET_CC)" \
                LDFLAGS="$(TARGET_LDFLAGS)" \
+               SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=8192 -DSYSTEM_MAXCONN=65530" USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 \
                all install
 endef
 
@@ -50,6 +54,8 @@ define Package/haproxy/install
        $(INSTALL_CONF) ./files/haproxy.cfg $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/haproxy.init $(1)/etc/init.d/haproxy
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/net
+       $(INSTALL_BIN) ./files/haproxy.hotplug $(1)/etc/hotplug.d/net/90-haproxy
 endef
 
 $(eval $(call BuildPackage,haproxy))