update to 1.3.16.4

.cvsignore

@@ -1 +1 @@
-haproxy-1.3.14.4.tar.gz
+haproxy-1.3.14.6.tar.gz

haproxy-gcc43-compat.patch

@@ -1,20 +0,0 @@
-diff -ru haproxy-1.3.14.2.orig/include/common/compat.h haproxy-1.3.14.2/include/common/compat.h
---- haproxy-1.3.14.2.orig/include/common/compat.h       2008-01-20 16:06:34.000000000 -0700
-+++ haproxy-1.3.14.2/include/common/compat.h    2008-02-26 08:47:47.000000000 -0700
-@@ -35,6 +35,7 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <common/config.h>
-+#include <common/standard.h>
- 
- /* INTBITS
-  * how many bits are needed to code the size of an int on the target platform.
-@@ -63,6 +64,8 @@
- #endif
- 
- #if defined(TPROXY) && defined(NETFILTER)
-+#include <linux/types.h>
-+#include <linux/netfilter_ipv6.h>
- #include <linux/netfilter_ipv4.h>
- #endif
-

haproxy.spec

@@ -5,21 +5,18 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.14.4
+Version:        1.3.14.6
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
-License:        GPLv2+ and MIT
+License:        GPLv2+
 
 URL:            http://haproxy.1wt.eu/
 Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.cfg
 
-Patch0:         haproxy-gcc43-compat.patch
-
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
 
@@ -44,7 +41,6 @@ availability environments. Indeed, it can:
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # No configure script is present, it is all done via make flags
@@ -122,6 +118,11 @@ fi
 
 
 %changelog
+* Sat Jun 28 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.14.6-1
+- update to 1.3.14.6
+- remove gcc 4.3 patch, it has been applied upstream
+- remove MIT license as that code has been removed from upstream
+
 * Mon Apr 14 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.14.4-1
 - update to 1.3.14.4
 

sources

@@ -1 +1 @@
-f7088ea643e0581a54425313a684606d  haproxy-1.3.14.4.tar.gz
+b8977d22ff5467ae56206f79d242223e  haproxy-1.3.14.6.tar.gz