From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 28 Apr 2020 10:13:19 +0000 (+0200)
Subject: - rel 5; revert commit which breaks responses on some multihomed machines; https... 
X-Git-Tag: auto/th/chrony-3.5-5
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=56bdbca8c0e0465d3b452fb30b1e0b0315eeb054;p=packages%2Fchrony.git

- rel 5; revert commit which breaks responses on some multihomed machines; https://www.mail-archive.com/chrony-dev@chrony.tuxfamily.org/msg02152.html
---

diff --git a/chrony.spec b/chrony.spec
index 18f6cdb..8bff36d 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -3,7 +3,7 @@
 Summary:	An NTP client/server
 Name:		chrony
 Version:	3.5
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		Daemons
 Source0:	http://download.tuxfamily.org/chrony/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@ Source4:	%{name}d.init
 Source5:	%{name}.logrotate
 Patch0:		allow-clock_adjtime.patch
 Patch1:		fix-seccomp-build.patch
+Patch2:		dont-force-index.patch
 URL:		http://chrony.tuxfamily.org/
 BuildRequires:	asciidoc
 BuildRequires:	bison
@@ -55,6 +56,7 @@ in permanently connected environments.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # NOTE: It is not autoconf generated configre
diff --git a/dont-force-index.patch b/dont-force-index.patch
new file mode 100644
index 0000000..32cb39c
--- /dev/null
+++ b/dont-force-index.patch
@@ -0,0 +1,22 @@
+diff --git a/ntp_io.c b/ntp_io.c
+index ec844cb..e92d27e 100644
+--- a/ntp_io.c
++++ b/ntp_io.c
+@@ -827,8 +827,6 @@ NIO_SendPacket(NTP_Packet *packet, NTP_Remote_Address *remote_addr,
+ 
+     ipi = (struct in_pktinfo *) CMSG_DATA(cmsg);
+     ipi->ipi_spec_dst.s_addr = htonl(local_addr->ip_addr.addr.in4);
+-    if (local_addr->if_index != INVALID_IF_INDEX)
+-      ipi->ipi_ifindex = local_addr->if_index;
+   }
+ #endif
+ 
+@@ -847,8 +845,6 @@ NIO_SendPacket(NTP_Packet *packet, NTP_Remote_Address *remote_addr,
+     ipi = (struct in6_pktinfo *) CMSG_DATA(cmsg);
+     memcpy(&ipi->ipi6_addr.s6_addr, &local_addr->ip_addr.addr.in6,
+         sizeof(ipi->ipi6_addr.s6_addr));
+-    if (local_addr->if_index != INVALID_IF_INDEX)
+-      ipi->ipi6_ifindex = local_addr->if_index;
+   }
+ #endif
+