update to 1.4.6

.cvsignore

@@ -1,5 +1 @@
-haproxy-1.3.19.tar.gz
+haproxy-1.4.6.tar.gz
-haproxy-1.3.20.tar.gz
-haproxy-1.3.21.tar.gz
-haproxy-1.3.22.tar.gz
-haproxy-1.3.23.tar.gz

haproxy.cfg

@@ -40,18 +40,22 @@ global
 # use if not designated in their block
 #---------------------------------------------------------------------
 defaults
-    mode        http
+    mode                    http
-    log         global
+    log                     global
-    option      dontlognull
+    option                  httplog
-    option      httpclose
+    option                  dontlognull
-    option      httplog
+    option http-server-close
-    option      forwardfor
+    option forward-for      except 127.0.0.0/8
-    option      redispatch
+    option                  redispatch
-    timeout connect 10000 # default 10 second time out if a backend is not found
+    retries                 3
-    timeout client 300000
+    timeout http-request    10s
-    timeout server 300000
+    timeout queue           1m
-    maxconn     60000
+    timeout connect         10s
-    retries     3
+    timeout client          1m
+    timeout server          1m
+    timeout http-keep-alive 10s
+    timeout check           10s
+    maxconn                 3000
 
 #---------------------------------------------------------------------
 # main frontend which proxys to the backends

haproxy.spec

@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.23
+Version:        1.4.6
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -54,8 +54,20 @@ regparm_opts=
 regparm_opts="USE_REGPARM=1"
 %endif
 
-make %{?_smp_mflags} CPU="generic" TARGET="linux26" USE_PCRE=1 ${regparm_opts} ADDINC="%{optflags}"
+make %{?_smp_mflags} CPU="generic" TARGET="linux26" USE_PCRE=1 ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1
 
+# build the halog contrib program.  It has 2 version halog64 and halog.  Make
+# sure it is installed as 'halog' no matter what.
+halog="halog"
+%ifarch x86_64
+halog="halog64"
+%endif
+
+pushd contrib/halog
+make ${halog}
+mv ${halog} halog.tmp
+mv halog.tmp halog
+popd
 
 %install
 rm -rf %{buildroot}
@@ -67,6 +79,8 @@ make install-man DESTDIR=%{buildroot} PREFIX=%{_prefix}
 %{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_home}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
+%{__install} -d -m 0755 %{buildroot}%{_bindir}
+%{__install} -p -m 0755 ./contrib/halog/halog %{buildroot}%{_bindir}/halog
 
 for httpfile in $(find ./examples/errorfiles/ -type f) 
 do
@@ -116,8 +130,7 @@ fi
 %doc examples/cttproxy-src.cfg
 %doc examples/haproxy.cfg
 %doc examples/tarpit.cfg
-%doc examples/tcp-splicing-sample.cfg
+%doc CHANGELOG LICENSE README
-%doc CHANGELOG CONTRIB LICENSE README
 %dir %{haproxy_datadir}
 %dir %{haproxy_datadir}/*
 %dir %{haproxy_confdir}
@@ -125,11 +138,15 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}
+%{_bindir}/halog
 %{_mandir}/man1/%{name}.1.gz
 %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}
 
 
 %changelog
+* Sun May 30 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.6-1
+- update to 1.4.6
+
 * Thu Feb 18 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.23-1
 - update to 1.3.23
 

sources

@@ -1 +1 @@
-4ffe926ccf4f4d53f149290eb001fad5  haproxy-1.3.23.tar.gz
+dc354ea451762135fa45657ddef67734  haproxy-1.4.6.tar.gz