Fix IPv4 address comparison (#768119)
This commit is contained in:
parent
e7b7da83c0
commit
5413cb49ad
12
keepalived-1.2.2-fix-ipv4-addr-compare.patch
Normal file
12
keepalived-1.2.2-fix-ipv4-addr-compare.patch
Normal file
@ -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;
|
||||||
|
}
|
@ -1,7 +1,7 @@
|
|||||||
Summary: High Availability monitor built upon LVS, VRRP and service pollers
|
Summary: High Availability monitor built upon LVS, VRRP and service pollers
|
||||||
Name: keepalived
|
Name: keepalived
|
||||||
Version: 1.2.2
|
Version: 1.2.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: http://www.keepalived.org/
|
URL: http://www.keepalived.org/
|
||||||
@ -10,6 +10,7 @@ Source1: keepalived.service
|
|||||||
Patch0: keepalived-1.1.14-installmodes.patch
|
Patch0: keepalived-1.1.14-installmodes.patch
|
||||||
Patch1: keepalived-1.1.19-fix-ipvs-loading.patch
|
Patch1: keepalived-1.1.19-fix-ipvs-loading.patch
|
||||||
Patch2: keepalived-1.2.2-ip_vs.h-pathfix.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-sysv
|
||||||
Requires(post): systemd-units
|
Requires(post): systemd-units
|
||||||
Requires(preun): systemd-units
|
Requires(preun): systemd-units
|
||||||
@ -49,6 +50,7 @@ healthchecks and LVS directors failover.
|
|||||||
%patch0 -p1 -b .installmodes
|
%patch0 -p1 -b .installmodes
|
||||||
%patch1 -p1 -b .fix-ipvs-loading
|
%patch1 -p1 -b .fix-ipvs-loading
|
||||||
%patch2 -p1 -b .pathfix
|
%patch2 -p1 -b .pathfix
|
||||||
|
%patch3 -p1 -b .fix-ipv4-addr-compare
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -121,6 +123,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 08 2012 Ryan O'Hara <rohara@redhat.com> - 1.2.2-5
|
||||||
|
- Fix IPv4 address comparison (#768119).
|
||||||
|
|
||||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-4
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user