[keepalived/el6] Fix IPv4 address comparison (#768119)

[rohara]

commit 35aec5790b557bbe184799238c704385cb2a0285
Author: Ryan O'Hara <rohara at redhat.com>
Date:   Tue Mar 20 09:43:35 2012 -0500

    Fix IPv4 address comparison (#768119)

 keepalived-1.2.2-fix-ipv4-addr-compare.patch |   12 ++++++++++++
 keepalived.spec                              |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/keepalived-1.2.2-fix-ipv4-addr-compare.patch b/keepalived-1.2.2-fix-ipv4-addr-compare.patch
new file mode 100644
index 0000000..08eaefc
--- /dev/null
+++ b/keepalived-1.2.2-fix-ipv4-addr-compare.patch
@@ -0,0 +1,12 @@
+diff -Naupr keepalived-1.2.2.orig/keepalived/include/check_data.h keepalived-1.2.2/keepalived/include/check_data.h
+--- keepalived-1.2.2.orig/keepalived/include/check_data.h	2011-01-16 05:04:51.000000000 -0600
++++ keepalived-1.2.2/keepalived/include/check_data.h	2012-03-20 08:59:33.963288928 -0500
+@@ -163,7 +163,7 @@ static inline int sockstorage_equal(cons
+ 		struct sockaddr_in *a1 = (struct sockaddr_in *) s1;
+ 		struct sockaddr_in *a2 = (struct sockaddr_in *) s2;
+ 
+-		if ((a1->sin_addr.s_addr == a1->sin_addr.s_addr) &&
++		if ((a1->sin_addr.s_addr == a2->sin_addr.s_addr) &&
+ 		    (a1->sin_port == a2->sin_port))
+ 			return 1;
+ 	}
diff --git a/keepalived.spec b/keepalived.spec
index 51773f0..818de09 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -1,7 +1,7 @@
 Summary: High Availability monitor built upon LVS, VRRP and service pollers
 Name: keepalived
 Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
@@ -9,6 +9,7 @@ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.init
 Patch0: keepalived-1.1.14-installmodes.patch
 Patch1: keepalived-1.1.19-fix-ipvs-loading.patch
+Patch2: keepalived-1.2.2-fix-ipv4-addr-compare.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -46,6 +47,7 @@ healthchecks and LVS directors failover.
 %setup -q
 %patch0 -p1 -b .installmodes
 %patch1 -p1 -b .fix-ipvs-loading
+%patch2 -p1 -b .fix-ipv4-addr-compare
 
 
 %build
@@ -109,6 +111,9 @@ fi
 
 
 %changelog
+* Tue Mar 20 2012 Ryan O'Hara <rohara at redhat.com> 1.2.2-3
+- Fix IPv4 address comparison (#768119).
+
 * Tue Jul 23 2011 Matthias Saou <http://freshrpms.net/> 1.2.2-2
 - Build against libnl for Fedora. RHEL's libnl is too old.