Changeset 30206


Ignore:
Timestamp:
2012-02-05T16:16:07+01:00 (5 years ago)
Author:
jow
Message:

[packages_10.03.2] haproxy: merge r28166, r28171, r28179, r28370, r28371, r28960, r29097, r29702, r29703; drop Linux 2.4 support

Location:
branches/packages_10.03.2/net/haproxy
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/haproxy/Makefile

    r26597 r30206  
    11# 
    2 # Copyright (C) 2010 OpenWrt.org 
     2# Copyright (C) 2010-2011 OpenWrt.org 
    33# Copyright (C) 2009-2010 Thomas Heil <heil@terminal-consulting.de>  
    44# 
     
    1010 
    1111PKG_NAME:=haproxy 
    12 PKG_VERSION:=1.4.15 
    13 PKG_RELEASE:=1 
     12PKG_VERSION:=1.4.19 
     13PKG_RELEASE:=2 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src 
    17 PKG_MD5SUM:=c1b4fc6028c6d8e23dde8c91ff47eabe 
     17PKG_MD5SUM:=41392d738460dbf99295fd928031c6a4 
    1818 
    1919include $(INCLUDE_DIR)/package.mk 
     
    2525  TITLE:=The Reliable, High Performance TCP/HTTP Load Balancer 
    2626  URL:=http://haproxy.1wt.eu/ 
    27   DEPENDS:=+libpcre +libltdl 
     27  DEPENDS:=@!LINUX_2_4 +libpcre +libltdl 
     28  MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> 
    2829endef 
    2930 
     
    3738 
    3839define Build/Compile 
    39         $(MAKE) TARGET=$(if $(CONFIG_LINUX_2_4),linux24,linux26) -C $(PKG_BUILD_DIR) \ 
     40        $(MAKE) TARGET=linux26 -C $(PKG_BUILD_DIR) \ 
    4041                DESTDIR="$(PKG_INSTALL_DIR)" \ 
    4142                CC="$(TARGET_CC)" \ 
     
    4344                LD="$(TARGET_CC)" \ 
    4445                LDFLAGS="$(TARGET_LDFLAGS)" \ 
    45                 SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=8192 -DSYSTEM_MAXCONN=65530" USE_LINUX_TPROXY=1 \ 
     46                SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=8192 -DSYSTEM_MAXCONN=65530" USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 \ 
    4647                all install 
    4748endef 
  • branches/packages_10.03.2/net/haproxy/files/haproxy.cfg

    r22523 r30206  
    3030        daemon 
    3131 
     32        nosplice 
    3233        # Enable debugging 
    3334        #debug 
     
    4243listen my_http_proxy 
    4344 
    44         # Bind to port 80 and 443 on all interfaces (0.0.0.0) 
    45         bind :80,:443 
     45        # Bind to port 81 and 444 on all interfaces (0.0.0.0) 
     46        bind :81,:444 
    4647 
    4748        # We're proxying HTTP here... 
     
    6970        disabled 
    7071 
    71         # Bind to port 25 and 587 on localhost 
    72         bind 127.0.0.1:25,127.0.0.1:587 
     72        # Bind to port 26 and 588 on localhost 
     73        bind 127.0.0.1:26,127.0.0.1:588 
    7374 
    7475        # This is a TCP proxy 
  • branches/packages_10.03.2/net/haproxy/files/haproxy.init

    r23275 r30206  
    55STOP=80 
    66 
     7SERVICE_USE_PID=1 
     8 
    79HAPROXY_BIN="/usr/sbin/haproxy" 
    810HAPROXY_CONFIG="/etc/haproxy.cfg" 
    911HAPROXY_PID="/var/run/haproxy.pid" 
    1012 
    11 boot() { 
    12  
    13         #Do nothing on boot 
    14         exit 0 
    15 } 
    16  
    1713start() { 
    18         [ -x "$HAPROXY_BIN" ] || return 1 
    19  
    20         start-stop-daemon -S -x $HAPROXY_BIN -- \ 
    21                 -f "$HAPROXY_CONFIG" -V -D -p "$HAPROXY_PID" 
     14        service_start $HAPROXY_BIN -q -D -f "$HAPROXY_CONFIG" -p "$HAPROXY_PID" 
    2215} 
    2316 
    2417stop() { 
    25         service_kill ${HAPROXY_BIN##*/} $HAPROXY_PID 
    26         rm -f $HAPROXY_PID 
     18        $HAPROXY_BIN -q -f $HAPROXY_CONFIG -p $HAPROXY_PID -st $(cat $HAPROXY_PID) 
     19        service_stop $HAPROXY_BIN 
    2720} 
    2821 
    2922reload() { 
    30         $HAPROXY_BIN -f $HAPROXY_CONFIG -D -V -p $HAPROXY_PID -sf $(cat $HAPROXY_PID) 
     23        $HAPROXY_BIN -q -f $HAPROXY_CONFIG -p $HAPROXY_PID -sf $(cat $HAPROXY_PID) 
    3124} 
Note: See TracChangeset for help on using the changeset viewer.