diff --git a/haproxy-gcc43-compat.patch b/haproxy-gcc43-compat.patch new file mode 100644 index 0000000..73444fd --- /dev/null +++ b/haproxy-gcc43-compat.patch @@ -0,0 +1,20 @@ +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 + #include + #include ++#include + + /* 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 ++#include + #include + #endif + diff --git a/haproxy.init b/haproxy.init index 53bb8b7..5963b2a 100644 --- a/haproxy.init +++ b/haproxy.init @@ -73,7 +73,7 @@ reload() { return 1 fi echo -n $"Reloading $prog: " - $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid) + $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid) retval=$? echo return $retval diff --git a/haproxy.spec b/haproxy.spec index cb7ed7b..1530fae 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -6,7 +6,7 @@ Name: haproxy Version: 1.3.14.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments Group: System Environment/Daemons @@ -118,6 +118,10 @@ fi %changelog +* Sat Mar 01 2008 Jeremy Hinegardner - 1.3.14.2-3 +- fix gcc 4.3 bug [#434144] +- update init script to properly reload configuration + * Tue Feb 19 2008 Fedora Release Engineering - 1.3.14.2-2 - Autorebuild for GCC 4.3