- Fix contrib/fastrpz.patch to apply cleanly.

diff --git a/contrib/fastrpz.patch b/contrib/fastrpz.patch
index aacd5ab826b8254cf98040f7315c7ebe25a251aa..e85ea505570f8a2a06b078f9690178b41f398b88 100644 (file)
--- a/contrib/fastrpz.patch
+++ b/contrib/fastrpz.patch
@@ -27,8 +27,8 @@ index a20058cc..495779cc 100644
  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 redis.lo authzone.lo \
  $(SUBNET_OBJ) $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ) $(DNSTAP_OBJ) $(DNSCRYPT_OBJ) \
--$(IPSECMOD_OBJ) $(IPSET_OBJ) respip.lo
-+$(FASTRPZ_OBJ) $(IPSECMOD_OBJ) $(IPSET_OBJ) respip.lo
+-$(IPSECMOD_OBJ) $(IPSET_OBJ) $(DYNLIBMOD_OBJ) respip.lo
++$(FASTRPZ_OBJ) $(IPSECMOD_OBJ) $(IPSET_OBJ) $(DYNLIBMOD_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

diff --git a/doc/Changelog b/doc/Changelog
index 7ed21c876aff65acfcc5386db65dceea4c72db54..a010517cf7317ae08d8f248dd81d36419e9acced 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 20 July 2020: Wouter
        - Fix streamtcp to print packet data to stdout.  This makes the
          stdout and stderr not mix together lines, when parsing its output.
+       - Fix contrib/fastrpz.patch to apply cleanly.
 
 17 July 2020: Wouter
        - Fix libnettle compile for session ticket key callback function