[keepalived/f16] Fix IPv4 address comparison (#768119)
rohara
rohara at fedoraproject.org
Tue Mar 20 14:16:00 UTC 2012
commit 23d401a8ab30cb7766a09d37c81fa0e94ed2ee4b
Author: Ryan O'Hara <rohara at redhat.com>
Date: Tue Mar 20 09:15:10 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 144e9f9..0482d6f 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: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://www.keepalived.org/
@@ -10,6 +10,7 @@ Source1: keepalived.service
Patch0: keepalived-1.1.14-installmodes.patch
Patch1: keepalived-1.1.19-fix-ipvs-loading.patch
Patch2: keepalived-1.2.2-ip_vs.h-pathfix.patch
+Patch3: keepalived-1.2.2-fix-ipv4-addr-compare.patch
Requires(post): systemd-sysv
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -49,6 +50,7 @@ healthchecks and LVS directors failover.
%patch0 -p1 -b .installmodes
%patch1 -p1 -b .fix-ipvs-loading
%patch2 -p1 -b .pathfix
+%patch3 -p1 -b .fix-ipv4-addr-compare
%build
@@ -121,6 +123,9 @@ fi
%changelog
+* Tue Mar 20 2012 Ryan O'Hara <rohara at redhat.com> - 1.2.2-4
+- Fix IPv4 address comparison (#768119).
+
* Mon Sep 19 2011 Tom Callaway <spot at fedoraproject.org> - 1.2.2-3
- convert to systemd
- fix ip_vs.h path searching in configure
More information about the scm-commits
mailing list