rpms/haproxy/devel haproxy-gcc43-compat.patch, NONE, 1.1 haproxy.init, 1.1, 1.2 haproxy.spec, 1.6, 1.7

Jeremy Hinegardner (jjh) fedora-extras-commits at redhat.com
Sat Mar 1 20:28:42 UTC 2008


Author: jjh

Update of /cvs/pkgs/rpms/haproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27151

Modified Files:
	haproxy.init haproxy.spec 
Added Files:
	haproxy-gcc43-compat.patch 
Log Message:
gcc 4.3 compilation fix

haproxy-gcc43-compat.patch:

--- NEW FILE haproxy-gcc43-compat.patch ---
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



Index: haproxy.init
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- haproxy.init	21 Sep 2007 17:26:59 -0000	1.1
+++ haproxy.init	1 Mar 2008 20:28:08 -0000	1.2
@@ -73,7 +73,7 @@
         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


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- haproxy.spec	19 Feb 2008 06:17:56 -0000	1.6
+++ haproxy.spec	1 Mar 2008 20:28:08 -0000	1.7
@@ -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 @@
 
 
 %changelog
+* Sat Mar 01 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 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 <rel-eng at fedoraproject.org> - 1.3.14.2-2
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list