- Fixup contrib/fastrpz.patch so that it applies.

git-svn-id: file:///svn/unbound/trunk@4552 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/contrib/fastrpz.patch b/contrib/fastrpz.patch
index 362e07cc6a8dcad18c76f649ed92b914f2d2ad1f..ee7c4f612ffe2922fb286d0a952a2e6796f79d36 100644 (file)
--- a/contrib/fastrpz.patch
+++ b/contrib/fastrpz.patch
@@ -24,13 +24,13 @@ diff -u --unidirectional-new-file -r1.1 ./Makefile.in
  iter_donotq.lo iter_fwd.lo iter_hints.lo iter_priv.lo iter_resptype.lo \
 @@ -137,7 +139,7 @@
  validator.lo val_kcache.lo val_kentry.lo val_neg.lo val_nsec3.lo val_nsec.lo \
- val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo cachedb.lo \
+ val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo cachedb.lo authzone.lo\
  $(SUBNET_OBJ) $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ) $(DNSTAP_OBJ) $(DNSCRYPT_OBJ) \
--$(IPSECMOD_OBJ)
-+$(FASTRPZ_OBJ) $(DNSCRYPT_OBJ)
- COMMON_OBJ_WITHOUT_NETCALL+=respip.lo
+-$(IPSECMOD_OBJ) respip.lo
++$(FASTRPZ_OBJ) $(IPSECMOD_OBJ) respip.lo
  COMMON_OBJ_WITHOUT_UB_EVENT=$(COMMON_OBJ_WITHOUT_NETCALL) netevent.lo listen_dnsport.lo \
  outside_network.lo
+ COMMON_OBJ=$(COMMON_OBJ_WITHOUT_UB_EVENT) ub_event.lo
 @@ -398,6 +401,11 @@
        $(srcdir)/util/config_file.h $(srcdir)/util/log.h \
        $(srcdir)/util/netevent.h
@@ -3263,15 +3263,15 @@ diff -u --unidirectional-new-file -r1.1 ./util/configparser.y
  %token VAR_RESPONSE_IP_TAG VAR_RESPONSE_IP VAR_RESPONSE_IP_DATA
  %token VAR_HARDEN_ALGO_DOWNGRADE VAR_IP_TRANSPARENT
  %token VAR_DISABLE_DNSSEC_LAME_CHECK
-@@ -153,7 +154,7 @@
- toplevelvar: serverstart contents_server | stubstart contents_stub |
+@@ -158,7 +159,7 @@
+ 
+ %%
+ toplevelvars: /* empty */ | toplevelvars toplevelvar ;
+-toplevelvar: serverstart contents_server | stubstart contents_stub |
++toplevelvar: serverstart contents_server | stubstart contents_stub | rpzstart contents_rpz |
        forwardstart contents_forward | pythonstart contents_py | 
-       rcstart contents_rc | dtstart contents_dt | viewstart 
--      contents_view |
-+      contents_view | rpzstart contents_rpz |
-       dnscstart contents_dnsc |
-       cachedbstart contents_cachedb
-       ;
+       rcstart contents_rc | dtstart contents_dt | viewstart contents_view |
+       dnscstart contents_dnsc | cachedbstart contents_cachedb |
 @@ -2160,6 +2161,50 @@
                        (strcmp($2, "yes")==0);
        }
@@ -3468,7 +3468,7 @@ diff -u --unidirectional-new-file -r1.1 ./util/netevent.c
 +#ifdef ENABLE_FASTRPZ
 +              rpz_end(&rep);
 +#endif
-               if(rep.c->fd != fd) /* commpoint closed to -1 or reused for
+               if(!rep.c || rep.c->fd != fd) /* commpoint closed to -1 or reused for
                another UDP port. Note rep.c cannot be reused with TCP fd. */
                        break;
 @@ -2145,6 +2157,9 @@

diff --git a/doc/Changelog b/doc/Changelog
index 35a1958f7c887c927df56f18cc68211d30c5c4e3..4c569d983197e2f48d8cbcb91f296bf31660ff02 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+27 February 2018: Wouter
+       - Fixup contrib/fastrpz.patch so that it applies.
+
 22 February 2018: Ralph
        - Save wildcard RRset from answer with original owner for use in
          aggressive NSEC.