rpms/bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Fix binary compatibility after serve-stale patch (#1770492)

Browse Source 
Move new entry to the end. Do not break already compiled bind-dyndb-ldap
compatibility.
This commit is contained in:
Petr Menšík 2019-11-12 11:17:43 +01:00
parent 8f4225c8a7
commit 9bef003ee5
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bind-9.11-serve-stale-dbfix.patch Normal file
View File

@ -0,0 +1,42 @@
From 20848d8284951481051f6ebdeb8128c05c7e82e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Mon, 11 Nov 2019 16:56:52 +0100
Subject: [PATCH] Move stale_ttl from middle to the end
bind-dyndb-ldap is using rdataset structure. Do not modify its body,
move stale_ttl to the end. Make it binary compatible.
---
lib/dns/include/dns/rdataset.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 97071ed496..a0c6afe624 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -137,11 +137,6 @@ struct dns_rdataset {
dns_rdataclass_t rdclass;
dns_rdatatype_t type;
dns_ttl_t ttl;
- /*
- * Stale ttl is used to see how long this RRset can still be used
- * to serve to clients, after the TTL has expired.
- */
- dns_ttl_t stale_ttl;
dns_trust_t trust;
dns_rdatatype_t covers;
@@ -178,6 +173,11 @@ struct dns_rdataset {
void * private7;
/*@}*/
+ /*
+ * Stale ttl is used to see how long this RRset can still be used
+ * to serve to clients, after the TTL has expired.
+ */
+ dns_ttl_t stale_ttl;
};
/*!
--
2.20.1

7
bind.spec
View File

@ -61,7 +61,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: MPLv2.0 License: MPLv2.0
Version: 9.11.12 Version: 9.11.12
Release: 4%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Release: 5%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32 Epoch: 32
Url: https://www.isc.org/downloads/bind/ Url: https://www.isc.org/downloads/bind/
# #
@ -159,6 +159,7 @@ Patch174:bind-9.11-json-c.patch
Patch175:bind-9.11-fips-disable.patch Patch175:bind-9.11-fips-disable.patch
Patch176: bind-9.11-rh1768258.patch Patch176: bind-9.11-rh1768258.patch
Patch177: bind-9.11-serve-stale.patch Patch177: bind-9.11-serve-stale.patch
Patch178: bind-9.11-serve-stale-dbfix.patch
# SDB patches # SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch Patch11: bind-9.3.2b2-sdbsrc.patch
@ -552,6 +553,7 @@ are used for building ISC DHCP.
%patch175 -p1 -b .rh1709553 %patch175 -p1 -b .rh1709553
%patch176 -p1 -b .rh1768258 %patch176 -p1 -b .rh1768258
%patch177 -p1 -b .serve-stale %patch177 -p1 -b .serve-stale
%patch178 -p1 -b .rh1770492
mkdir lib/dns/tests/testdata/dstrandom mkdir lib/dns/tests/testdata/dstrandom
cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data
@ -1567,6 +1569,9 @@ fi;
%changelog %changelog
* Tue Nov 12 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.12-5
- Fix binary compatibility after serve-stale patch (#1770492)
* Wed Nov 06 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.12-4 * Wed Nov 06 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.12-4
- Backported serve-stale feature - Backported serve-stale feature