Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/unbound merge conflicts



details:   https://anonhg.NetBSD.org/src/rev/8af1a37806da
branches:  trunk
changeset: 456735:8af1a37806da
user:      christos <christos%NetBSD.org@localhost>
date:      Sat May 25 21:31:28 2019 +0000

description:
merge conflicts

diffstat:

 external/bsd/unbound/dist/config.guess                             |     2 +-
 external/bsd/unbound/dist/config.sub                               |     2 +-
 external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.conf   |    15 -
 external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.dsc    |    16 -
 external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.post   |    10 -
 external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.pre    |    30 -
 external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.test   |    24 -
 external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.testns |    14 -
 external/bsd/unbound/dist/testdata/pylib.tdir/pylib.conf           |    19 -
 external/bsd/unbound/dist/testdata/pylib.tdir/pylib.py             |   159 -
 external/bsd/unbound/dist/winrc/unbound16.ico                      |   Bin 
 external/bsd/unbound/dist/winrc/unbound48.ico                      |   Bin 
 external/bsd/unbound/dist/winrc/unbound64.ico                      |   Bin 
 external/bsd/unbound/dist/winrc/unbound64.png                      |   Bin 
 external/bsd/unbound/include/config-1.0.h                          |  1259 ---------
 external/bsd/unbound/include/config-1.1.h                          |  1260 ---------
 external/bsd/unbound/include/config.h                              |  1304 +++++++++-
 17 files changed, 1302 insertions(+), 2812 deletions(-)

diffs (truncated from 4182 to 300 lines):

diff -r e7cc8a6af2e6 -r 8af1a37806da external/bsd/unbound/dist/config.guess
--- a/external/bsd/unbound/dist/config.guess    Sat May 25 21:17:56 2019 +0000
+++ b/external/bsd/unbound/dist/config.guess    Sat May 25 21:31:28 2019 +0000
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
diff -r e7cc8a6af2e6 -r 8af1a37806da external/bsd/unbound/dist/config.sub
--- a/external/bsd/unbound/dist/config.sub      Sat May 25 21:17:56 2019 +0000
+++ b/external/bsd/unbound/dist/config.sub      Sat May 25 21:31:28 2019 +0000
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/sh
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
diff -r e7cc8a6af2e6 -r 8af1a37806da external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.conf
--- a/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.conf  Sat May 25 21:17:56 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-server:
-       verbosity: 2
-       # num-threads: 1
-       interface: 127.0.0.1
-       port: @PORT@
-       use-syslog: no
-       directory: ""
-       pidfile: "unbound.pid"
-       chroot: ""
-       username: ""
-       do-not-query-localhost: no
-forward-zone:
-       name: "."
-       forward-addr: "127.0.0.1@@TOPORT@"
-
diff -r e7cc8a6af2e6 -r 8af1a37806da external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.dsc
--- a/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.dsc   Sat May 25 21:17:56 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-BaseName: edns_lame
-Version: 1.0
-Description: Forward UDP but EDNS packets time out
-CreationDate: Mon Sep 29 16:39:15 CEST 2008
-Maintainer: dr. W.C.A. Wijngaards
-Category: 
-Component:
-CmdDepends: 
-Depends: 
-Help:
-Pre: edns_lame.pre
-Post: edns_lame.post
-Test: edns_lame.test
-AuxFiles: 
-Passed:
-Failure:
diff -r e7cc8a6af2e6 -r 8af1a37806da external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.post
--- a/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.post  Sat May 25 21:17:56 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# #-- edns_lame.post --#
-# source the master var file when it's there
-[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
-# source the test var file when it's there
-[ -f .tpkg.var.test ] && source .tpkg.var.test
-#
-# do your teardown here
-. ../common.sh
-kill_pid $FWD_PID
-kill_pid $UNBOUND_PID
diff -r e7cc8a6af2e6 -r 8af1a37806da external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.pre
--- a/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.pre   Sat May 25 21:17:56 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# #-- edns_lame.pre--#
-# source the master var file when it's there
-[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
-# use .tpkg.var.test for in test variable passing
-[ -f .tpkg.var.test ] && source .tpkg.var.test
-
-. ../common.sh
-get_random_port 2
-UNBOUND_PORT=$RND_PORT
-FWD_PORT=$(($RND_PORT + 1))
-echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
-echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test
-
-# start forwarder
-get_ldns_testns
-$LDNS_TESTNS -p $FWD_PORT -v edns_lame.testns >fwd.log 2>&1 &
-FWD_PID=$!
-echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
-
-# make config file
-sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < edns_lame.conf > ub.conf
-# start unbound in the background
-PRE="../.."
-$PRE/unbound -d -vvvv -c ub.conf >unbound.log 2>&1 &
-UNBOUND_PID=$!
-echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
-
-cat .tpkg.var.test
-wait_ldns_testns_up fwd.log
-wait_unbound_up unbound.log
diff -r e7cc8a6af2e6 -r 8af1a37806da external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.test
--- a/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.test  Sat May 25 21:17:56 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-# #-- edns_lame.test --#
-# source the master var file when it's there
-[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
-# use .tpkg.var.test for in test variable passing
-[ -f .tpkg.var.test ] && source .tpkg.var.test
-
-PRE="../.."
-# do the test
-echo "> dig www.example.com."
-dig @localhost -p $UNBOUND_PORT www.example.com. | tee outfile
-echo "> dig www.example.com."
-dig @localhost -p $UNBOUND_PORT www.example.com. | tee outfile
-echo "> cat logfiles"
-cat fwd.log 
-cat unbound.log
-echo "> check answer"
-if grep "10.20.30.40" outfile; then
-       echo "OK"
-else
-       echo "Not OK"
-       exit 1
-fi
-
-exit 0
diff -r e7cc8a6af2e6 -r 8af1a37806da external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.testns
--- a/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.testns        Sat May 25 21:17:56 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-; nameserver test file
-$ORIGIN example.com.
-$TTL 3600
-
-ENTRY_BEGIN
-MATCH opcode qtype qname noedns
-REPLY QR AA NOERROR
-ADJUST copy_id
-SECTION QUESTION
-www    IN      A
-SECTION ANSWER
-www    IN      A       10.20.30.40
-ENTRY_END
-
diff -r e7cc8a6af2e6 -r 8af1a37806da external/bsd/unbound/dist/testdata/pylib.tdir/pylib.conf
--- a/external/bsd/unbound/dist/testdata/pylib.tdir/pylib.conf  Sat May 25 21:17:56 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-server:
-       verbosity: 2
-       # num-threads: 1
-       #port: @PORT@
-       use-syslog: no
-       directory: ""
-       pidfile: "unbound.pid"
-       chroot: ""
-       username: ""
-       do-not-query-localhost: no
-       module-config: "validator iterator"
-
-#python:
-       #python-script: "pylib.py"
-
-forward-zone:
-       name: "."
-       forward-addr: "127.0.0.1@@TOPORT@"
-
diff -r e7cc8a6af2e6 -r 8af1a37806da external/bsd/unbound/dist/testdata/pylib.tdir/pylib.py
--- a/external/bsd/unbound/dist/testdata/pylib.tdir/pylib.py    Sat May 25 21:17:56 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
- ubmodule-msg.py: simple response packet logger
-
- Authors: Zdenek Vasicek (vasicek AT fit.vutbr.cz)
-          Marek Vavrusa  (xvavru00 AT stud.fit.vutbr.cz)
-
- Copyright (c) 2008. All rights reserved.
-
- This software is open source.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 
- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
- Modified for unit test by Wouter Wijngaards, NLnet Labs, 2009.
-'''
-import os
-
-def init(id, cfg):
-    log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, cfg.port, cfg.python_script))
-    return True
-
-def deinit(id):
-    log_info("pythonmod: deinit called, module id is %d" % id)
-    return True
-
-def inform_super(id, qstate, superqstate, qdata):
-    return True
-
-def setTTL(qstate, ttl):
-    """Sets return_msg TTL and all the RRs TTL"""
-    if qstate.return_msg:
-        qstate.return_msg.rep.ttl = ttl
-        if (qstate.return_msg.rep):
-            for i in range(0,qstate.return_msg.rep.rrset_count):
-                d = qstate.return_msg.rep.rrsets[i].entry.data
-                for j in range(0,d.count+d.rrsig_count):
-                    d.rr_ttl[j] = ttl
-
-def dataHex(data, prefix=""):
-    res = ""
-    for i in range(0, (len(data)+15)/16):
-        res += "%s0x%02X | " % (prefix, i*16)
-        d = map(lambda x:ord(x), data[i*16:i*16+17])
-        for ch in d:
-            res += "%02X " % ch
-        for i in range(0,17-len(d)):
-            res += "   "
-        res += "| "
-        for ch in d:
-            if (ch < 32) or (ch > 127):
-                res += ". "
-            else:
-                res += "%c " % ch
-        res += "\n"
-    return res
-
-def printReturnMsg(qstate):
-    print "Return MSG rep   :: flags: %04X, QDcount: %d, Security:%d, TTL=%d" % (qstate.return_msg.rep.flags, qstate.return_msg.rep.qdcount,qstate.return_msg.rep.security, qstate.return_msg.rep.ttl)
-    print "           qinfo :: qname:",qstate.return_msg.qinfo.qname_list, qstate.return_msg.qinfo.qname_str, "type:",qstate.return_msg.qinfo.qtype_str, "class:",qstate.return_msg.qinfo.qclass_str
-    if (qstate.return_msg.rep):
-        print "RRSets:",qstate.return_msg.rep.rrset_count
-        prevkey = None
-        for i in range(0,qstate.return_msg.rep.rrset_count):
-            r = qstate.return_msg.rep.rrsets[i]
-            rk = r.rk
-            print i,":",rk.dname_list, rk.dname_str, "flags: %04X" % rk.flags,
-            print "type:",rk.type_str,"(%d)" % ntohs(rk.type), "class:",rk.rrset_class_str,"(%d)" % ntohs(rk.rrset_class)
-
-            d = r.entry.data
-            print "    RRDatas:",d.count+d.rrsig_count
-            for j in range(0,d.count+d.rrsig_count):
-                print "    ",j,":","TTL=",d.rr_ttl[j],"RR data:"
-                print dataHex(d.rr_data[j],"         ")
-
-
-def operate(id, event, qstate, qdata):
-    log_info("pythonmod: operate called, id: %d, event:%s" % (id, strmodulevent(event)))
-    #print "pythonmod: per query data", qdata
-
-    print "Query:", ''.join(map(lambda x:chr(max(32,ord(x))),qstate.qinfo.qname)), qstate.qinfo.qname_list, qstate.qinfo.qname_str,
-    print "Type:",qstate.qinfo.qtype_str,"(%d)" % qstate.qinfo.qtype,
-    print "Class:",qstate.qinfo.qclass_str,"(%d)" % qstate.qinfo.qclass
-    print
-
-    if (event == MODULE_EVENT_NEW or event == MODULE_EVENT_PASS) and (qstate.qinfo.qname_str.endswith("www2.example.com.")):
-        print qstate.qinfo.qname_str
-
-        qstate.ext_state[id] = MODULE_FINISHED 
-
-        msg = DNSMessage(qstate.qinfo.qname_str, RR_TYPE_A, RR_CLASS_IN, PKT_QR | PKT_RA | PKT_AA) #, 300)
-        #msg.authority.append("xxx.seznam.cz. 10 IN A 192.168.1.1")
-        #msg.additional.append("yyy.seznam.cz. 10 IN A 1.1.1.2.")
-
-       # answer can be returned to the client without further checking.
-
-        if qstate.qinfo.qtype == RR_TYPE_A:
-            msg.answer.append("%s 10 IN A 192.168.1.1" % qstate.qinfo.qname_str)
-        if (qstate.qinfo.qtype == RR_TYPE_SRV) or (qstate.qinfo.qtype == RR_TYPE_ANY):
-            msg.answer.append("%s 10 IN SRV 0 0 80 neinfo.example.com." % qstate.qinfo.qname_str)
-        if (qstate.qinfo.qtype == RR_TYPE_TXT) or (qstate.qinfo.qtype == RR_TYPE_ANY):
-            msg.answer.append("%s 10 IN TXT path=/" % qstate.qinfo.qname_str)



Home | Main Index | Thread Index | Old Index