[bind/f18] Fix Makefile.in to include header added by rate limiting patch (#918330)
Tomas Hozza
thozza at fedoraproject.org
Thu Mar 7 08:55:20 UTC 2013
commit 7799e53d040327d3bea19d1d4f4959b4cc80d4c0
Author: Tomas Hozza <thozza at redhat.com>
Date: Wed Mar 6 17:05:09 2013 +0100
Fix Makefile.in to include header added by rate limiting patch (#918330)
Signed-off-by: Tomas Hozza <thozza at redhat.com>
bind.spec | 7 +-
rl-9.9.2-P1.patch | 348 +++++++++++++++++++++++++++--------------------------
2 files changed, 185 insertions(+), 170 deletions(-)
---
diff --git a/bind.spec b/bind.spec
index d9ce978..4b12cb5 100644
--- a/bind.spec
+++ b/bind.spec
@@ -26,7 +26,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.9.2
-Release: 8.%{PATCHVER}%{?dist}
+Release: 9.%{PATCHVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -281,7 +281,7 @@ popd
%patch127 -p1 -b .forward
%patch130 -p1 -b .libdb4
%patch131 -p1 -b .multlib-conflict
-%patch136 -p0 -b .rl
+%patch136 -p1 -b .rl
%if %{SDB}
%patch101 -p1 -b .old-api
@@ -776,6 +776,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Wed Mar 06 2013 Tomas Hozza <thozza at redhat.com> 32:9.9.2-9.P1
+- Fix Makefile.in to include header added by rate limiting patch (#918330)
+
* Mon Feb 18 2013 Adam Tkac <atkac redhat com> 32:9.9.2-8.P1
- include rate limiting patch
diff --git a/rl-9.9.2-P1.patch b/rl-9.9.2-P1.patch
index a41aef5..10067b9 100644
--- a/rl-9.9.2-P1.patch
+++ b/rl-9.9.2-P1.patch
@@ -1,7 +1,7 @@
-diff -r -u bin/named/client.c-orig bin/named/client.c
---- bin/named/client.c-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/named/client.c 2004-01-01 00:00:00.000000000 +0000
-@@ -994,6 +994,11 @@
+diff -up bind-9.9.2-P1/bin/named/client.c.orig bind-9.9.2-P1/bin/named/client.c
+--- bind-9.9.2-P1/bin/named/client.c.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/bin/named/client.c 2013-03-06 16:54:18.869051724 +0100
+@@ -994,6 +994,11 @@ ns_client_send(ns_client_t *client) {
}
if (result != ISC_R_SUCCESS)
goto done;
@@ -13,7 +13,7 @@ diff -r -u bin/named/client.c-orig bin/named/client.c
result = dns_message_rendersection(client->message,
DNS_SECTION_ANSWER,
DNS_MESSAGERENDER_PARTIAL |
-@@ -1134,6 +1139,49 @@
+@@ -1134,6 +1139,49 @@ ns_client_error(ns_client_t *client, isc
#endif
/*
@@ -63,10 +63,10 @@ diff -r -u bin/named/client.c-orig bin/named/client.c
* Message may be an in-progress reply that we had trouble
* with, in which case QR will be set. We need to clear QR before
* calling dns_message_reply() to avoid triggering an assertion.
-diff -r -u bin/named/config.c-orig bin/named/config.c
---- bin/named/config.c-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/named/config.c 2004-01-01 00:00:00.000000000 +0000
-@@ -227,6 +227,13 @@
+diff -up bind-9.9.2-P1/bin/named/config.c.orig bind-9.9.2-P1/bin/named/config.c
+--- bind-9.9.2-P1/bin/named/config.c.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/bin/named/config.c 2013-03-06 16:55:14.236039592 +0100
+@@ -227,6 +227,13 @@ view \"_bind\" chaos {\n\
notify no;\n\
allow-new-zones no;\n\
\n\
@@ -80,10 +80,10 @@ diff -r -u bin/named/config.c-orig bin/named/config.c
zone \"version.bind\" chaos {\n\
type master;\n\
database \"_builtin version\";\n\
-diff -r -u bin/named/include/named/query.h-orig bin/named/include/named/query.h
---- bin/named/include/named/query.h-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/named/include/named/query.h 2004-01-01 00:00:00.000000000 +0000
-@@ -85,6 +85,7 @@
+diff -up bind-9.9.2-P1/bin/named/include/named/query.h.orig bind-9.9.2-P1/bin/named/include/named/query.h
+--- bind-9.9.2-P1/bin/named/include/named/query.h.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/bin/named/include/named/query.h 2013-03-06 16:55:14.237039591 +0100
+@@ -85,6 +85,7 @@ struct ns_query {
#define NS_QUERYATTR_CACHEACLOK 0x2000
#define NS_QUERYATTR_DNS64 0x4000
#define NS_QUERYATTR_DNS64EXCLUDE 0x8000
@@ -91,10 +91,10 @@ diff -r -u bin/named/include/named/query.h-orig bin/named/include/named/query.h
isc_result_t
-diff -r -u bin/named/include/named/server.h-orig bin/named/include/named/server.h
---- bin/named/include/named/server.h-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/named/include/named/server.h 2004-01-01 00:00:00.000000000 +0000
-@@ -165,7 +165,10 @@
+diff -up bind-9.9.2-P1/bin/named/include/named/server.h.orig bind-9.9.2-P1/bin/named/include/named/server.h
+--- bind-9.9.2-P1/bin/named/include/named/server.h.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/bin/named/include/named/server.h 2013-03-06 16:55:14.237039591 +0100
+@@ -165,7 +165,10 @@ enum {
dns_nsstatscounter_updatefail = 34,
dns_nsstatscounter_updatebadprereq = 35,
@@ -106,10 +106,10 @@ diff -r -u bin/named/include/named/server.h-orig bin/named/include/named/server.
};
void
-diff -r -u bin/named/query.c-orig bin/named/query.c
---- bin/named/query.c-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/named/query.c 2004-01-01 00:00:00.000000000 +0000
-@@ -5748,6 +5748,105 @@
+diff -up bind-9.9.2-P1/bin/named/query.c.orig bind-9.9.2-P1/bin/named/query.c
+--- bind-9.9.2-P1/bin/named/query.c.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/bin/named/query.c 2013-03-06 16:55:14.242039589 +0100
+@@ -5748,6 +5748,105 @@ query_find(ns_client_t *client, dns_fetc
resume:
CTRACE("query_find: resume");
@@ -215,7 +215,7 @@ diff -r -u bin/named/query.c-orig bin/named/query.c
if (!ISC_LIST_EMPTY(client->view->rpz_zones) &&
(RECURSIONOK(client) || !client->view->rpz_recursive_only) &&
rpz_ck_dnssec(client, result, rdataset, sigrdataset) &&
-@@ -7170,12 +7269,14 @@
+@@ -7170,12 +7269,14 @@ query_find(ns_client_t *client, dns_fetc
}
if (eresult != ISC_R_SUCCESS &&
@@ -233,10 +233,10 @@ diff -r -u bin/named/query.c-orig bin/named/query.c
*/
query_next(client, eresult);
} else {
-diff -r -u bin/named/server.c-orig bin/named/server.c
---- bin/named/server.c-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/named/server.c 2004-01-01 00:00:00.000000000 +0000
-@@ -1561,6 +1561,199 @@
+diff -up bind-9.9.2-P1/bin/named/server.c.orig bind-9.9.2-P1/bin/named/server.c
+--- bind-9.9.2-P1/bin/named/server.c.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/bin/named/server.c 2013-03-06 16:55:14.246039588 +0100
+@@ -1561,6 +1561,199 @@ configure_rpz(dns_view_t *view, const cf
return (result);
}
@@ -436,7 +436,7 @@ diff -r -u bin/named/server.c-orig bin/named/server.c
/*
* Configure 'view' according to 'vconfig', taking defaults from 'config'
* where values are missing in 'vconfig'.
-@@ -2925,6 +3118,14 @@
+@@ -2925,6 +3118,14 @@ configure_view(dns_view_t *view, cfg_obj
}
}
@@ -451,10 +451,10 @@ diff -r -u bin/named/server.c-orig bin/named/server.c
result = ISC_R_SUCCESS;
cleanup:
-diff -r -u bin/named/statschannel.c-orig bin/named/statschannel.c
---- bin/named/statschannel.c-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/named/statschannel.c 2004-01-01 00:00:00.000000000 +0000
-@@ -202,6 +202,10 @@
+diff -up bind-9.9.2-P1/bin/named/statschannel.c.orig bind-9.9.2-P1/bin/named/statschannel.c
+--- bind-9.9.2-P1/bin/named/statschannel.c.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/bin/named/statschannel.c 2013-03-06 16:55:14.248039587 +0100
+@@ -202,6 +202,10 @@ init_desc(void) {
SET_NSSTATDESC(updatebadprereq,
"updates rejected due to prerequisite failure",
"UpdateBadPrereq");
@@ -465,21 +465,10 @@ diff -r -u bin/named/statschannel.c-orig bin/named/statschannel.c
INSIST(i == dns_nsstatscounter_max);
/* Initialize resolver statistics */
-diff -r -u bin/tests/system/README-orig bin/tests/system/README
---- bin/tests/system/README-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/README 2004-01-01 00:00:00.000000000 +0000
-@@ -17,6 +17,7 @@
- nsupdate/ Dynamic update and IXFR tests
- resolver/ Regression tests for resolver bugs that have been fixed
- (not a complete resolver test suite)
-+ rrl/ query rate limiting
- rpz/ Tests of response policy zone (RPZ) rewriting
- stub/ Tests of stub zone functionality
- unknown/ Unknown type and class tests
-diff -r -u bin/tests/system/conf.sh.in-orig bin/tests/system/conf.sh.in
---- bin/tests/system/conf.sh.in-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/conf.sh.in 2004-01-01 00:00:00.000000000 +0000
-@@ -58,7 +58,7 @@
+diff -up bind-9.9.2-P1/bin/tests/system/conf.sh.in.orig bind-9.9.2-P1/bin/tests/system/conf.sh.in
+--- bind-9.9.2-P1/bin/tests/system/conf.sh.in.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/bin/tests/system/conf.sh.in 2013-03-06 16:55:14.249039586 +0100
+@@ -58,7 +58,7 @@ SUBDIRS="acl allow_query addzone autosig
@CHECKDS@ checknames checkzone database dlv dlvauto dlz dlzexternal
dname dns64 dnssec ecdsa forward glue gost ixfr inline limits
logfileconfig lwresd masterfile masterformat metadata notify
@@ -488,14 +477,20 @@ diff -r -u bin/tests/system/conf.sh.in-orig bin/tests/system/conf.sh.in
rsabigexponent sortlist smartsign staticstub stub tkey tsig
tsiggss unknown upforwd verify views xfer xferquota zonechecks"
-diff -r -u bin/tests/system/rrl/.gitignore-orig bin/tests/system/rrl/.gitignore
---- bin/tests/system/rrl/.gitignore-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/.gitignore 2004-01-01 00:00:00.000000000 +0000
-@@ -0,0 +1 @@
-+flood
-diff -r -u bin/tests/system/rrl/clean.sh-orig bin/tests/system/rrl/clean.sh
---- bin/tests/system/rrl/clean.sh-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/clean.sh 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/README.orig bind-9.9.2-P1/bin/tests/system/README
+--- bind-9.9.2-P1/bin/tests/system/README.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/bin/tests/system/README 2013-03-06 16:55:14.248039587 +0100
+@@ -17,6 +17,7 @@ involving a different DNS setup. They a
+ nsupdate/ Dynamic update and IXFR tests
+ resolver/ Regression tests for resolver bugs that have been fixed
+ (not a complete resolver test suite)
++ rrl/ query rate limiting
+ rpz/ Tests of response policy zone (RPZ) rewriting
+ stub/ Tests of stub zone functionality
+ unknown/ Unknown type and class tests
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/clean.sh.orig bind-9.9.2-P1/bin/tests/system/rrl/clean.sh
+--- bind-9.9.2-P1/bin/tests/system/rrl/clean.sh.orig 2013-03-06 16:55:14.250039587 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/clean.sh 2013-03-06 16:55:14.250039587 +0100
@@ -0,0 +1,21 @@
+# Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
+#
@@ -518,9 +513,14 @@ diff -r -u bin/tests/system/rrl/clean.sh-orig bin/tests/system/rrl/clean.sh
+rm -f dig.out*
+rm -f */named.memstats */named.run */named.stats */log */session.key
+rm -f ns3/bl*.db */*.jnl */*.core */*.pid
-diff -r -u bin/tests/system/rrl/ns1/named.conf-orig bin/tests/system/rrl/ns1/named.conf
---- bin/tests/system/rrl/ns1/named.conf-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/ns1/named.conf 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/.gitignore.orig bind-9.9.2-P1/bin/tests/system/rrl/.gitignore
+--- bind-9.9.2-P1/bin/tests/system/rrl/.gitignore.orig 2013-03-06 16:55:14.249039586 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/.gitignore 2013-03-06 16:55:14.249039586 +0100
+@@ -0,0 +1 @@
++flood
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/ns1/named.conf.orig bind-9.9.2-P1/bin/tests/system/rrl/ns1/named.conf
+--- bind-9.9.2-P1/bin/tests/system/rrl/ns1/named.conf.orig 2013-03-06 16:55:14.250039587 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/ns1/named.conf 2013-03-06 16:55:14.251039587 +0100
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
@@ -554,9 +554,9 @@ diff -r -u bin/tests/system/rrl/ns1/named.conf-orig bin/tests/system/rrl/ns1/nam
+};
+
+zone "." {type master; file "root.db";};
-diff -r -u bin/tests/system/rrl/ns1/root.db-orig bin/tests/system/rrl/ns1/root.db
---- bin/tests/system/rrl/ns1/root.db-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/ns1/root.db 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/ns1/root.db.orig bind-9.9.2-P1/bin/tests/system/rrl/ns1/root.db
+--- bind-9.9.2-P1/bin/tests/system/rrl/ns1/root.db.orig 2013-03-06 16:55:14.251039587 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/ns1/root.db 2013-03-06 16:55:14.251039587 +0100
@@ -0,0 +1,31 @@
+; Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
+;
@@ -589,9 +589,9 @@ diff -r -u bin/tests/system/rrl/ns1/root.db-orig bin/tests/system/rrl/ns1/root.d
+
+; generate SERVFAIL
+tld4. NS ns.tld3.
-diff -r -u bin/tests/system/rrl/ns2/hints-orig bin/tests/system/rrl/ns2/hints
---- bin/tests/system/rrl/ns2/hints-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/ns2/hints 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/ns2/hints.orig bind-9.9.2-P1/bin/tests/system/rrl/ns2/hints
+--- bind-9.9.2-P1/bin/tests/system/rrl/ns2/hints.orig 2013-03-06 16:55:14.252039587 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/ns2/hints 2013-03-06 16:55:14.252039587 +0100
@@ -0,0 +1,18 @@
+; Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
+;
@@ -611,9 +611,9 @@ diff -r -u bin/tests/system/rrl/ns2/hints-orig bin/tests/system/rrl/ns2/hints
+
+. 0 NS ns1.
+ns1. 0 A 10.53.0.1
-diff -r -u bin/tests/system/rrl/ns2/named.conf-orig bin/tests/system/rrl/ns2/named.conf
---- bin/tests/system/rrl/ns2/named.conf-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/ns2/named.conf 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/ns2/named.conf.orig bind-9.9.2-P1/bin/tests/system/rrl/ns2/named.conf
+--- bind-9.9.2-P1/bin/tests/system/rrl/ns2/named.conf.orig 2013-03-06 16:55:14.252039587 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/ns2/named.conf 2013-03-06 16:55:14.252039587 +0100
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
@@ -687,9 +687,9 @@ diff -r -u bin/tests/system/rrl/ns2/named.conf-orig bin/tests/system/rrl/ns2/nam
+zone "." { type hint; file "hints"; };
+
+zone "tld2."{ type master; file "tld2.db"; };
-diff -r -u bin/tests/system/rrl/ns2/tld2.db-orig bin/tests/system/rrl/ns2/tld2.db
---- bin/tests/system/rrl/ns2/tld2.db-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/ns2/tld2.db 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/ns2/tld2.db.orig bind-9.9.2-P1/bin/tests/system/rrl/ns2/tld2.db
+--- bind-9.9.2-P1/bin/tests/system/rrl/ns2/tld2.db.orig 2013-03-06 16:55:14.253039587 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/ns2/tld2.db 2013-03-06 16:55:14.253039587 +0100
@@ -0,0 +1,42 @@
+; Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
+;
@@ -733,9 +733,9 @@ diff -r -u bin/tests/system/rrl/ns2/tld2.db-orig bin/tests/system/rrl/ns2/tld2.d
+
+; a8 for all-per-second limit
+$GENERATE 101-180 all$.a8 A 192.168.2.8
-diff -r -u bin/tests/system/rrl/ns3/hints-orig bin/tests/system/rrl/ns3/hints
---- bin/tests/system/rrl/ns3/hints-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/ns3/hints 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/ns3/hints.orig bind-9.9.2-P1/bin/tests/system/rrl/ns3/hints
+--- bind-9.9.2-P1/bin/tests/system/rrl/ns3/hints.orig 2013-03-06 16:55:14.253039587 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/ns3/hints 2013-03-06 16:55:14.253039587 +0100
@@ -0,0 +1,18 @@
+; Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
+;
@@ -755,9 +755,9 @@ diff -r -u bin/tests/system/rrl/ns3/hints-orig bin/tests/system/rrl/ns3/hints
+
+. 0 NS ns1.
+ns1. 0 A 10.53.0.1
-diff -r -u bin/tests/system/rrl/ns3/named.conf-orig bin/tests/system/rrl/ns3/named.conf
---- bin/tests/system/rrl/ns3/named.conf-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/ns3/named.conf 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/ns3/named.conf.orig bind-9.9.2-P1/bin/tests/system/rrl/ns3/named.conf
+--- bind-9.9.2-P1/bin/tests/system/rrl/ns3/named.conf.orig 2013-03-06 16:55:14.254039586 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/ns3/named.conf 2013-03-06 16:55:14.254039586 +0100
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
@@ -793,9 +793,9 @@ diff -r -u bin/tests/system/rrl/ns3/named.conf-orig bin/tests/system/rrl/ns3/nam
+zone "." { type hint; file "hints"; };
+
+zone "tld3."{ type master; file "tld3.db"; };
-diff -r -u bin/tests/system/rrl/ns3/tld3.db-orig bin/tests/system/rrl/ns3/tld3.db
---- bin/tests/system/rrl/ns3/tld3.db-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/ns3/tld3.db 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/ns3/tld3.db.orig bind-9.9.2-P1/bin/tests/system/rrl/ns3/tld3.db
+--- bind-9.9.2-P1/bin/tests/system/rrl/ns3/tld3.db.orig 2013-03-06 16:55:14.254039586 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/ns3/tld3.db 2013-03-06 16:55:14.254039586 +0100
@@ -0,0 +1,25 @@
+; Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
+;
@@ -822,9 +822,9 @@ diff -r -u bin/tests/system/rrl/ns3/tld3.db-orig bin/tests/system/rrl/ns3/tld3.d
+ns A 10.53.0.3
+
+*.a3 A 192.168.3.3
-diff -r -u bin/tests/system/rrl/setup.sh-orig bin/tests/system/rrl/setup.sh
---- bin/tests/system/rrl/setup.sh-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/setup.sh 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/setup.sh.orig bind-9.9.2-P1/bin/tests/system/rrl/setup.sh
+--- bind-9.9.2-P1/bin/tests/system/rrl/setup.sh.orig 2013-03-06 16:55:14.255039585 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/setup.sh 2013-03-06 16:55:14.255039585 +0100
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
@@ -847,9 +847,9 @@ diff -r -u bin/tests/system/rrl/setup.sh-orig bin/tests/system/rrl/setup.sh
+. $SYSTEMTESTTOP/conf.sh
+. ./clean.sh
+
-diff -r -u bin/tests/system/rrl/tests.sh-orig bin/tests/system/rrl/tests.sh
---- bin/tests/system/rrl/tests.sh-orig 2004-01-01 00:00:00.000000000 +0000
-+++ bin/tests/system/rrl/tests.sh 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/bin/tests/system/rrl/tests.sh.orig bind-9.9.2-P1/bin/tests/system/rrl/tests.sh
+--- bind-9.9.2-P1/bin/tests/system/rrl/tests.sh.orig 2013-03-06 16:55:14.255039585 +0100
++++ bind-9.9.2-P1/bin/tests/system/rrl/tests.sh 2013-03-06 16:55:14.255039585 +0100
@@ -0,0 +1,224 @@
+# Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
+#
@@ -1075,10 +1075,10 @@ diff -r -u bin/tests/system/rrl/tests.sh-orig bin/tests/system/rrl/tests.sh
+
+echo "I:exit status: $ret"
+exit $ret
-diff -r -u doc/arm/Bv9ARM-book.xml-orig doc/arm/Bv9ARM-book.xml
---- doc/arm/Bv9ARM-book.xml-orig 2004-01-01 00:00:00.000000000 +0000
-+++ doc/arm/Bv9ARM-book.xml 2004-01-01 00:00:00.000000000 +0000
-@@ -4803,6 +4803,34 @@
+diff -up bind-9.9.2-P1/doc/arm/Bv9ARM-book.xml.orig bind-9.9.2-P1/doc/arm/Bv9ARM-book.xml
+--- bind-9.9.2-P1/doc/arm/Bv9ARM-book.xml.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/doc/arm/Bv9ARM-book.xml 2013-03-06 16:55:14.268039583 +0100
+@@ -4803,6 +4803,34 @@ category notify { null; };
</para>
</entry>
</row>
@@ -1113,7 +1113,7 @@ diff -r -u doc/arm/Bv9ARM-book.xml-orig doc/arm/Bv9ARM-book.xml
</tbody>
</tgroup>
</informaltable>
-@@ -5334,6 +5362,21 @@
+@@ -5334,6 +5362,21 @@ badresp:1,adberr:0,findfail:0,valfail:0]
<optional> resolver-query-timeout <replaceable>number</replaceable> ; </optional>
<optional> deny-answer-addresses { <replaceable>address_match_list</replaceable> } <optional> except-from { <replaceable>namelist</replaceable> } </optional>;</optional>
<optional> deny-answer-aliases { <replaceable>namelist</replaceable> } <optional> except-from { <replaceable>namelist</replaceable> } </optional>;</optional>
@@ -1135,7 +1135,7 @@ diff -r -u doc/arm/Bv9ARM-book.xml-orig doc/arm/Bv9ARM-book.xml
<optional> response-policy { <replaceable>zone_name</replaceable>
<optional> policy given | disabled | passthru | nxdomain | nodata | cname <replaceable>domain</replaceable> </optional>
<optional> recursive-only <replaceable>yes_or_no</replaceable> </optional> <optional> max-policy-ttl <replaceable>number</replaceable> </optional> ;
-@@ -9737,6 +9780,215 @@
+@@ -9737,6 +9780,215 @@ ns.domain.com.rpz-nsdname CNAME .
48.zz.2.2001.rpz-nsip CNAME .
</programlisting>
</sect3>
@@ -1351,7 +1351,7 @@ diff -r -u doc/arm/Bv9ARM-book.xml-orig doc/arm/Bv9ARM-book.xml
</sect2>
<sect2 id="server_statement_grammar">
-@@ -14385,6 +14637,32 @@
+@@ -14385,6 +14637,32 @@ HOST-127.EXAMPLE. MX 0 .
</para>
</entry>
</row>
@@ -1384,33 +1384,10 @@ diff -r -u doc/arm/Bv9ARM-book.xml-orig doc/arm/Bv9ARM-book.xml
</tbody>
</tgroup>
</informaltable>
-diff -r -u lib/dns/Makefile.in-orig lib/dns/Makefile.in
---- lib/dns/Makefile.in-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/dns/Makefile.in 2004-01-01 00:00:00.000000000 +0000
-@@ -66,8 +66,8 @@
- portlist. at O@ private. at O@ \
- rbt. at O@ rbtdb. at O@ rbtdb64. at O@ rcode. at O@ rdata. at O@ \
- rdatalist. at O@ rdataset. at O@ rdatasetiter. at O@ rdataslab. at O@ \
-- request. at O@ resolver. at O@ result. at O@ rootns. at O@ rpz. at O@ \
-- rriterator. at O@ sdb. at O@ \
-+ request. at O@ resolver. at O@ result. at O@ rootns. at O@ \
-+ rpz. at O@ rrl. at O@ rriterator. at O@ sdb. at O@ \
- sdlz. at O@ soa. at O@ ssu. at O@ ssu_external. at O@ \
- stats. at O@ tcpmsg. at O@ time. at O@ timer. at O@ tkey. at O@ \
- tsec. at O@ tsig. at O@ ttl. at O@ update. at O@ validator. at O@ \
-@@ -93,7 +93,7 @@
- name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
- rbt.c rbtdb.c rbtdb64.c rcode.c rdata.c rdatalist.c \
- rdataset.c rdatasetiter.c rdataslab.c request.c \
-- resolver.c result.c rootns.c rpz.c rriterator.c \
-+ resolver.c result.c rootns.c rpz.c rrl.c rriterator.c \
- sdb.c sdlz.c soa.c ssu.c ssu_external.c \
- stats.c tcpmsg.c time.c timer.c tkey.c \
- tsec.c tsig.c ttl.c update.c validator.c \
-diff -r -u lib/dns/include/dns/log.h-orig lib/dns/include/dns/log.h
---- lib/dns/include/dns/log.h-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/dns/include/dns/log.h 2004-01-01 00:00:00.000000000 +0000
-@@ -43,6 +43,7 @@
+diff -up bind-9.9.2-P1/lib/dns/include/dns/log.h.orig bind-9.9.2-P1/lib/dns/include/dns/log.h
+--- bind-9.9.2-P1/lib/dns/include/dns/log.h.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/lib/dns/include/dns/log.h 2013-03-06 16:55:14.268039583 +0100
+@@ -43,6 +43,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
#define DNS_LOGCATEGORY_DELEGATION_ONLY (&dns_categories[10])
#define DNS_LOGCATEGORY_EDNS_DISABLED (&dns_categories[11])
#define DNS_LOGCATEGORY_RPZ (&dns_categories[12])
@@ -1418,9 +1395,21 @@ diff -r -u lib/dns/include/dns/log.h-orig lib/dns/include/dns/log.h
/* Backwards compatibility. */
#define DNS_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL
-diff -r -u lib/dns/include/dns/rrl.h-orig lib/dns/include/dns/rrl.h
---- lib/dns/include/dns/rrl.h-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/dns/include/dns/rrl.h 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/lib/dns/include/dns/Makefile.in.orig bind-9.9.2-P1/lib/dns/include/dns/Makefile.in
+--- bind-9.9.2-P1/lib/dns/include/dns/Makefile.in.orig 2013-03-06 16:58:02.942000413 +0100
++++ bind-9.9.2-P1/lib/dns/include/dns/Makefile.in 2013-03-06 16:59:41.698976093 +0100
+@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@
+
+ @BIND9_VERSION@
+
+-HEADERS = acl.h adb.h byaddr.h cache.h callbacks.h cert.h compress.h \
++HEADERS = rrl.h acl.h adb.h byaddr.h cache.h callbacks.h cert.h compress.h \
+ clientinfo.h db.h dbiterator.h dbtable.h diff.h dispatch.h dynamic_db.h \
+ dlz.h dnssec.h ds.h events.h fixedname.h iptable.h journal.h \
+ keyflags.h keytable.h keyvalues.h lib.h log.h \
+diff -up bind-9.9.2-P1/lib/dns/include/dns/rrl.h.orig bind-9.9.2-P1/lib/dns/include/dns/rrl.h
+--- bind-9.9.2-P1/lib/dns/include/dns/rrl.h.orig 2013-03-06 16:55:14.269039583 +0100
++++ bind-9.9.2-P1/lib/dns/include/dns/rrl.h 2013-03-06 16:55:14.269039583 +0100
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
@@ -1695,9 +1684,9 @@ diff -r -u lib/dns/include/dns/rrl.h-orig lib/dns/include/dns/rrl.h
+ISC_LANG_ENDDECLS
+
+#endif /* DNS_RRL_H */
-diff -r -u lib/dns/include/dns/view.h-orig lib/dns/include/dns/view.h
---- lib/dns/include/dns/view.h-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/dns/include/dns/view.h 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/lib/dns/include/dns/view.h.orig bind-9.9.2-P1/lib/dns/include/dns/view.h
+--- bind-9.9.2-P1/lib/dns/include/dns/view.h.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/lib/dns/include/dns/view.h 2013-03-06 16:55:14.269039583 +0100
@@ -73,6 +73,7 @@
#include <dns/acl.h>
@@ -1706,7 +1695,7 @@ diff -r -u lib/dns/include/dns/view.h-orig lib/dns/include/dns/view.h
#include <dns/rdatastruct.h>
#include <dns/rpz.h>
#include <dns/types.h>
-@@ -142,6 +143,7 @@
+@@ -142,6 +143,7 @@ struct dns_view {
dns_rbt_t * answeracl_exclude;
dns_rbt_t * denyanswernames;
dns_rbt_t * answernames_exclude;
@@ -1714,10 +1703,10 @@ diff -r -u lib/dns/include/dns/view.h-orig lib/dns/include/dns/view.h
isc_boolean_t provideixfr;
isc_boolean_t requestnsid;
dns_ttl_t maxcachettl;
-diff -r -u lib/dns/log.c-orig lib/dns/log.c
---- lib/dns/log.c-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/dns/log.c 2004-01-01 00:00:00.000000000 +0000
-@@ -45,6 +45,7 @@
+diff -up bind-9.9.2-P1/lib/dns/log.c.orig bind-9.9.2-P1/lib/dns/log.c
+--- bind-9.9.2-P1/lib/dns/log.c.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/lib/dns/log.c 2013-03-06 16:55:14.269039583 +0100
+@@ -45,6 +45,7 @@ LIBDNS_EXTERNAL_DATA isc_logcategory_t d
{ "delegation-only", 0 },
{ "edns-disabled", 0 },
{ "rpz", 0 },
@@ -1725,9 +1714,32 @@ diff -r -u lib/dns/log.c-orig lib/dns/log.c
{ NULL, 0 }
};
-diff -r -u lib/dns/rrl.c-orig lib/dns/rrl.c
---- lib/dns/rrl.c-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/dns/rrl.c 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/lib/dns/Makefile.in.orig bind-9.9.2-P1/lib/dns/Makefile.in
+--- bind-9.9.2-P1/lib/dns/Makefile.in.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/lib/dns/Makefile.in 2013-03-06 16:55:14.268039583 +0100
+@@ -66,8 +66,8 @@ DNSOBJS = acache. at O@ acl. at O@ adb. at O@ bya
+ portlist. at O@ private. at O@ \
+ rbt. at O@ rbtdb. at O@ rbtdb64. at O@ rcode. at O@ rdata. at O@ \
+ rdatalist. at O@ rdataset. at O@ rdatasetiter. at O@ rdataslab. at O@ \
+- request. at O@ resolver. at O@ result. at O@ rootns. at O@ rpz. at O@ \
+- rriterator. at O@ sdb. at O@ \
++ request. at O@ resolver. at O@ result. at O@ rootns. at O@ \
++ rpz. at O@ rrl. at O@ rriterator. at O@ sdb. at O@ \
+ sdlz. at O@ soa. at O@ ssu. at O@ ssu_external. at O@ \
+ stats. at O@ tcpmsg. at O@ time. at O@ timer. at O@ tkey. at O@ \
+ tsec. at O@ tsig. at O@ ttl. at O@ update. at O@ validator. at O@ \
+@@ -93,7 +93,7 @@ DNSSRCS = acache.c acl.c adb.c byaddr.c
+ name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
+ rbt.c rbtdb.c rbtdb64.c rcode.c rdata.c rdatalist.c \
+ rdataset.c rdatasetiter.c rdataslab.c request.c \
+- resolver.c result.c rootns.c rpz.c rriterator.c \
++ resolver.c result.c rootns.c rpz.c rrl.c rriterator.c \
+ sdb.c sdlz.c soa.c ssu.c ssu_external.c \
+ stats.c tcpmsg.c time.c timer.c tkey.c \
+ tsec.c tsig.c ttl.c update.c validator.c \
+diff -up bind-9.9.2-P1/lib/dns/rrl.c.orig bind-9.9.2-P1/lib/dns/rrl.c
+--- bind-9.9.2-P1/lib/dns/rrl.c.orig 2013-03-06 16:55:14.270039582 +0100
++++ bind-9.9.2-P1/lib/dns/rrl.c 2013-03-06 16:55:14.270039582 +0100
@@ -0,0 +1,1321 @@
+/*
+ * Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
@@ -3050,9 +3062,9 @@ diff -r -u lib/dns/rrl.c-orig lib/dns/rrl.c
+ *rrlp = rrl;
+ return (ISC_R_SUCCESS);
+}
-diff -r -u lib/dns/view.c-orig lib/dns/view.c
---- lib/dns/view.c-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/dns/view.c 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/lib/dns/view.c.orig bind-9.9.2-P1/lib/dns/view.c
+--- bind-9.9.2-P1/lib/dns/view.c.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/lib/dns/view.c 2013-03-06 16:55:14.270039582 +0100
@@ -48,6 +48,7 @@
#include <dns/masterdump.h>
#include <dns/order.h>
@@ -3061,7 +3073,7 @@ diff -r -u lib/dns/view.c-orig lib/dns/view.c
#include <dns/rbt.h>
#include <dns/rdataset.h>
#include <dns/request.h>
-@@ -181,6 +182,7 @@
+@@ -181,6 +182,7 @@ dns_view_create(isc_mem_t *mctx, dns_rda
view->answeracl_exclude = NULL;
view->denyanswernames = NULL;
view->answernames_exclude = NULL;
@@ -3069,7 +3081,7 @@ diff -r -u lib/dns/view.c-orig lib/dns/view.c
view->provideixfr = ISC_TRUE;
view->maxcachettl = 7 * 24 * 3600;
view->maxncachettl = 3 * 3600;
-@@ -331,9 +333,11 @@
+@@ -331,9 +333,11 @@ destroy(dns_view_t *view) {
dns_acache_detach(&view->acache);
}
dns_rpz_view_destroy(view);
@@ -3081,10 +3093,10 @@ diff -r -u lib/dns/view.c-orig lib/dns/view.c
#endif
if (view->requestmgr != NULL)
dns_requestmgr_detach(&view->requestmgr);
-diff -r -u lib/dns/win32/libdns.def-orig lib/dns/win32/libdns.def
---- lib/dns/win32/libdns.def-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/dns/win32/libdns.def 2004-01-01 00:00:00.000000000 +0000
-@@ -654,6 +654,9 @@
+diff -up bind-9.9.2-P1/lib/dns/win32/libdns.def.orig bind-9.9.2-P1/lib/dns/win32/libdns.def
+--- bind-9.9.2-P1/lib/dns/win32/libdns.def.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/lib/dns/win32/libdns.def 2013-03-06 16:55:14.271039582 +0100
+@@ -654,6 +654,9 @@ dns_rriterator_init
dns_rriterator_next
dns_rriterator_nextrrset
dns_rriterator_pause
@@ -3094,10 +3106,10 @@ diff -r -u lib/dns/win32/libdns.def-orig lib/dns/win32/libdns.def
dns_sdb_putnamedrr
dns_sdb_putrdata
dns_sdb_putrr
-diff -r -u lib/dns/win32/libdns.dsp-orig lib/dns/win32/libdns.dsp
---- lib/dns/win32/libdns.dsp-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/dns/win32/libdns.dsp 2004-01-01 00:00:00.000000000 +0000
-@@ -346,6 +346,10 @@
+diff -up bind-9.9.2-P1/lib/dns/win32/libdns.dsp.orig bind-9.9.2-P1/lib/dns/win32/libdns.dsp
+--- bind-9.9.2-P1/lib/dns/win32/libdns.dsp.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/lib/dns/win32/libdns.dsp 2013-03-06 16:55:14.271039582 +0100
+@@ -346,6 +346,10 @@ SOURCE=..\include\dns\rpz.h
# End Source File
# Begin Source File
@@ -3108,7 +3120,7 @@ diff -r -u lib/dns/win32/libdns.dsp-orig lib/dns/win32/libdns.dsp
SOURCE=..\include\dns\rriterator.h
# End Source File
# Begin Source File
-@@ -650,6 +654,10 @@
+@@ -650,6 +654,10 @@ SOURCE=..\rpz.c
# End Source File
# Begin Source File
@@ -3119,10 +3131,10 @@ diff -r -u lib/dns/win32/libdns.dsp-orig lib/dns/win32/libdns.dsp
SOURCE=..\rriterator.c
# End Source File
# Begin Source File
-diff -r -u lib/dns/win32/libdns.mak-orig lib/dns/win32/libdns.mak
---- lib/dns/win32/libdns.mak-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/dns/win32/libdns.mak 2004-01-01 00:00:00.000000000 +0000
-@@ -184,6 +184,7 @@
+diff -up bind-9.9.2-P1/lib/dns/win32/libdns.mak.orig bind-9.9.2-P1/lib/dns/win32/libdns.mak
+--- bind-9.9.2-P1/lib/dns/win32/libdns.mak.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/lib/dns/win32/libdns.mak 2013-03-06 16:55:14.271039582 +0100
+@@ -184,6 +184,7 @@ CLEAN :
- at erase "$(INTDIR)\result.obj"
- at erase "$(INTDIR)\rootns.obj"
- at erase "$(INTDIR)\rpz.obj"
@@ -3130,7 +3142,7 @@ diff -r -u lib/dns/win32/libdns.mak-orig lib/dns/win32/libdns.mak
- at erase "$(INTDIR)\sdb.obj"
- at erase "$(INTDIR)\sdlz.obj"
- at erase "$(INTDIR)\soa.obj"
-@@ -309,6 +310,7 @@
+@@ -309,6 +310,7 @@ LINK32_OBJS= \
"$(INTDIR)\result.obj" \
"$(INTDIR)\rootns.obj" \
"$(INTDIR)\rpz.obj" \
@@ -3138,7 +3150,7 @@ diff -r -u lib/dns/win32/libdns.mak-orig lib/dns/win32/libdns.mak
"$(INTDIR)\rriterator.obj" \
"$(INTDIR)\sdb.obj" \
"$(INTDIR)\sdlz.obj" \
-@@ -505,6 +507,8 @@
+@@ -505,6 +507,8 @@ CLEAN :
- at erase "$(INTDIR)\rootns.sbr"
- at erase "$(INTDIR)\rpz.obj"
- at erase "$(INTDIR)\rpz.sbr"
@@ -3147,7 +3159,7 @@ diff -r -u lib/dns/win32/libdns.mak-orig lib/dns/win32/libdns.mak
- at erase "$(INTDIR)\rriterator.obj"
- at erase "$(INTDIR)\rriterator.sbr"
- at erase "$(INTDIR)\sdb.obj"
-@@ -651,6 +655,7 @@
+@@ -651,6 +655,7 @@ BSC32_SBRS= \
"$(INTDIR)\result.sbr" \
"$(INTDIR)\rootns.sbr" \
"$(INTDIR)\rpz.sbr" \
@@ -3155,7 +3167,7 @@ diff -r -u lib/dns/win32/libdns.mak-orig lib/dns/win32/libdns.mak
"$(INTDIR)\rriterator.sbr" \
"$(INTDIR)\sdb.sbr" \
"$(INTDIR)\sdlz.sbr" \
-@@ -748,6 +753,7 @@
+@@ -748,6 +753,7 @@ LINK32_OBJS= \
"$(INTDIR)\result.obj" \
"$(INTDIR)\rootns.obj" \
"$(INTDIR)\rpz.obj" \
@@ -3163,10 +3175,12 @@ diff -r -u lib/dns/win32/libdns.mak-orig lib/dns/win32/libdns.mak
"$(INTDIR)\rriterator.obj" \
"$(INTDIR)\sdb.obj" \
"$(INTDIR)\sdlz.obj" \
-@@ -1726,6 +1732,24 @@
+@@ -1724,6 +1730,24 @@ SOURCE=..\rpz.c
+ $(CPP) $(CPP_PROJ) $(SOURCE)
- !ENDIF
++!ENDIF
++
+SOURCE=..\rrl.c
+
+!IF "$(CFG)" == "libdns - Win32 Release"
@@ -3183,15 +3197,13 @@ diff -r -u lib/dns/win32/libdns.mak-orig lib/dns/win32/libdns.mak
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
-+!ENDIF
-+
- SOURCE=..\rriterator.c
+ !ENDIF
- !IF "$(CFG)" == "libdns - Win32 Release"
-diff -r -u lib/isccfg/namedconf.c-orig lib/isccfg/namedconf.c
---- lib/isccfg/namedconf.c-orig 2004-01-01 00:00:00.000000000 +0000
-+++ lib/isccfg/namedconf.c 2004-01-01 00:00:00.000000000 +0000
-@@ -1244,6 +1244,39 @@
+ SOURCE=..\rriterator.c
+diff -up bind-9.9.2-P1/lib/isccfg/namedconf.c.orig bind-9.9.2-P1/lib/isccfg/namedconf.c
+--- bind-9.9.2-P1/lib/isccfg/namedconf.c.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/lib/isccfg/namedconf.c 2013-03-06 16:55:14.272039581 +0100
+@@ -1244,6 +1244,39 @@ static cfg_type_t cfg_type_rpz = {
};
@@ -3231,7 +3243,7 @@ diff -r -u lib/isccfg/namedconf.c-orig lib/isccfg/namedconf.c
/*%
* dnssec-lookaside
*/
-@@ -1397,6 +1430,7 @@
+@@ -1397,6 +1430,7 @@ view_clauses[] = {
CFG_CLAUSEFLAG_NOTCONFIGURED },
#endif
{ "response-policy", &cfg_type_rpz, 0 },
@@ -3239,9 +3251,9 @@ diff -r -u lib/isccfg/namedconf.c-orig lib/isccfg/namedconf.c
{ NULL, NULL, 0 }
};
-diff -r -u version-orig version
---- version-orig 2004-01-01 00:00:00.000000000 +0000
-+++ version 2004-01-01 00:00:00.000000000 +0000
+diff -up bind-9.9.2-P1/version.orig bind-9.9.2-P1/version
+--- bind-9.9.2-P1/version.orig 2012-10-26 06:50:34.000000000 +0200
++++ bind-9.9.2-P1/version 2013-03-06 16:55:14.272039581 +0100
@@ -5,6 +5,6 @@
#
MAJORVER=9
More information about the scm-commits
mailing list