Changeset 17673


Ignore:
Timestamp:
2009-09-22T10:45:48+02:00 (7 years ago)
Author:
nbd
Message:

djbdns: fix compile errors because of wrong ranlib use, also apply Johnny Halfmoon's update to 1.05-5 (#5764)

Location:
packages/net/djbdns
Files:
11 added
1 deleted
14 edited
7 moved

Legend:

Unmodified
Added
Removed
  • packages/net/djbdns/Changelog

    r15612 r17673  
    11#Changelog for the djbdns port for OpenWRT 
     2 
     35 20090522 jhalfmoon 
     4enhancement - added patch: dnsroots_updated 
     5enhancement - added patch: tinydns_one_second 
     6enhancement - added patch: srv-records-and-axfrget 
     7enhancement - added patch: dnscache_less_chatty_log 
     8enhancement - added patch: tinydns_mmap_leak 
     9enhancement - added patch: dnscache_dpos_tcp_servfail 
     10enhancement - added patch: dnscache_negative_ttls 
     11enhancement - added patch: dnscache_sigpipe_fix 
     12enhancement - added patch: dnscache_big_udp_packets 
     13enhancement - added patch: dnscache_ignoreip2 (Note: disabled in config by default!) 
     14enhancement - added HIDETTL config option 
     15change - Corrected a typo in the axfrdns description in the Makefile. 
     16change - Cleaned up some lines in the Makefile 
     17change - dnsroots.global now gets copied from the djbdns source folder instead of from the package/files folder. 
     18change - The dnscache-multiple-ip patch was removed as it served no purpose 
     19change - Renamed a few patches to be more consistent with the other patches 
     20change - Updated the README file to reflect the changes  
    221 
    3224 20090418 jhalfmoon 
  • packages/net/djbdns/Makefile

    r15612 r17673  
    1414PKG_NAME:=djbdns 
    1515PKG_VERSION:=1.05 
    16 PKG_RELEASE:=4 
     16PKG_RELEASE:=5 
    1717 
    1818PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz 
     
    101101define Package/djbdns-axfrdns/description 
    102102        axfrdns is a DNS zone-transfer server. 
    103         It reads a zone-transfer request in DNS-over-TINSTALL_DATA format 
     103        It reads a zone-transfer request in DNS-over-TCP format 
    104104        from its standard input and responds with locally configured 
    105105        information.  
     
    128128        TARGET_CFLAGS="$(TARGET_CFLAGS)" \ 
    129129        TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ 
     130        TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ 
    130131        $(MAKE) -C $(PKG_BUILD_DIR) 
    131132endef 
     
    139140        $(INSTALL_DIR) $(1)/usr/bin 
    140141        (cd $(PKG_BUILD_DIR); \ 
    141         $(INSTALL_BIN) dnscache pickdns pickdns-data \ 
    142         $(1)/usr/bin) 
    143         $(INSTALL_DIR) $(1)/etc 
     142        $(INSTALL_BIN) dnscache pickdns pickdns-data $(1)/usr/bin) 
     143        $(INSTALL_DIR) $(1)/etc/init.d 
     144        $(INSTALL_BIN) ./files/dnscache.init $(1)/etc/init.d/dnscache 
    144145        $(CP) -r ./files/dnscache $(1)/etc/ 
    145         $(INSTALL_DIR) $(1)/etc/init.d 
    146         $(INSTALL_BIN) ./files/dnscache.init $(1)/etc/init.d/dnscache 
     146        $(CP) $(PKG_BUILD_DIR)/dnsroots.global $(1)/etc/dnscache/ 
     147        $(INSTALL_DIR) $(1)/etc/dnscache/ip 
     148        $(INSTALL_DIR) $(1)/etc/dnscache/servers 
     149        $(CP) $(PKG_BUILD_DIR)/dnsroots.global $(1)/etc/dnscache/servers/@ 
    147150endef 
    148151 
     
    150153        $(INSTALL_DIR) $(1)/usr/bin 
    151154        (cd $(PKG_BUILD_DIR); \ 
    152         $(INSTALL_BIN) tinydns tinydns-data tinydns-edit tinydns-get \ 
    153         $(1)/usr/bin) 
     155        $(INSTALL_BIN) tinydns tinydns-data tinydns-edit tinydns-get $(1)/usr/bin) 
    154156        $(INSTALL_DIR) $(1)/etc/init.d 
    155157        $(INSTALL_BIN) ./files/tinydns.init $(1)/etc/init.d/tinydns 
     
    160162        $(INSTALL_DIR) $(1)/usr/bin 
    161163        (cd $(PKG_BUILD_DIR); \ 
    162         $(INSTALL_BIN) axfrdns axfr-get \ 
    163         $(1)/usr/bin) 
     164        $(INSTALL_BIN) axfrdns axfr-get $(1)/usr/bin) 
    164165        $(INSTALL_DIR) $(1)/etc/init.d 
    165166        $(INSTALL_BIN) ./files/axfrdns.init $(1)/etc/init.d/axfrdns 
     
    170171        $(INSTALL_DIR) $(1)/usr/bin 
    171172        (cd $(PKG_BUILD_DIR); \ 
    172         $(INSTALL_BIN) rbldns rbldns-data \ 
    173         $(1)/usr/bin) 
     173        $(INSTALL_BIN) rbldns rbldns-data $(1)/usr/bin) 
    174174        $(INSTALL_DIR) $(1)/etc/init.d 
    175175        $(INSTALL_BIN) ./files/rbldns.init $(1)/etc/init.d/rbldns 
     
    180180        $(INSTALL_DIR) $(1)/usr/bin 
    181181        (cd $(PKG_BUILD_DIR); \ 
    182         $(INSTALL_BIN) walldns \ 
    183         $(1)/usr/bin) 
     182        $(INSTALL_BIN) walldns $(1)/usr/bin) 
    184183        $(INSTALL_DIR) $(1)/etc/init.d 
    185184        $(INSTALL_BIN) ./files/walldns.init $(1)/etc/init.d/walldns 
  • packages/net/djbdns/README

    r15612 r17673  
    6363- By default, all logging is disabled. Each daemon has a seperate option to activate logging. When logging activated the daemon logs to syslog using facility local1.info. 
    6464- Each djbdns server requires an IP address on which to listen on. This port of djbdns allows you to define an interface on which to listen instead of an IP address. The advantage of this is that an interface can get a different IP address assigned, the djbdns stuff will not break. The dnscache server has a patch applied so that it is possible to define multiple interfaces on which to listen, separated by slashes. Example: wan/lan . 
    65 - By default, dnscache acts as a recursive name server. If you wish to operate in forwardonly mode, then you need to set the forwardonly flag to '1'. Then you need to do either one of the following: Put the ip addresses of the name servers you wish to use as resolvers in the UCI config (djbdns.dnscache.resolver) or alternatively you can set the useresolvconf flag which will cause the dns servers assigned by dhcp to be used. 
     65- By default, dnscache acts as a recursive name server. If you wish to operate in forwardonly mode, then you need to set the forwardonly flag to '1'. Then you need to do either one of the following: Put the ip addresses of the name servers you wish to use as resolvers in the UCI config (djbdns.dnscache.resolver) or alternatively you can set the useresolvconf flag which will cause the dns servers assigned by dhcp to be used. That last option is a so called set-and-forget mode which will work quite well in most home environments. 
    6666- If you want your OpenWRT machine to make use of its own dnscache, then you must make /etc/resolv.conf reflect this. One way of doin this is as follows: uci set network.wan.dns=127.0.0.1 . If you have dnscache listening on some other interface, you would naturally replace 127.0.0.1 by the address of that interface. 
    6767- OpenWRT has several applications that can do DNS serving in one way or another (dnsmasq, Maradns, Bind). Make sure you have none of these apps running when you start running a djbdns name server because having two DNS apps listening on the same address is not something you would usually want. A patch for the dnsmasq configuration script and its config file is included with this package. The patch will allow you to configure dnsmasq to listen only on certain interfaces, instead of on all them as it does by default on OpenWRT. Alternatively, you could completely disable and / or remove dnsmasq, if you do not intend to use any of its functionality (which is serving DNS and DHCP). 
     68- The ignoreip patch also has a script supplied along with it, with which you can update the ignorelist. The script contains an explanation of why you might want to do this. 
     69- The ignoreip functionality is disabled by default. If you want to activate it, you need to set the flag 'useignore' flag to '1' in the config. You might also want to check if you are really blocking what you want to block. Be careful with this feature. Think twice before using it. 
    6870 
    6971To apply the dnsmasq patch 
     
    205207Applied patches 
    206208=============== 
    207 100-crosscompile.patch 
     209crosscompile.patch 
    208210https://dev.openwrt.org/ticket/2497 
    209211Patch to make djbdns compile correctly for OpenWRT. I understand that the original patch comes from FreeWRT and was adapted for OpenWRT by Alexander Tsvyashchenko. 
    210212 
    211 110-cachestats.patch 
     213dnsroots-update.patch 
     214Update the dnsroots.global file to be current. 
     215 
     216srv-records-and-axfrget.patch 
     217http://sol.truespace.ca/Files/djbdns/srv.patch 
     218Adds native support for srv records (not really necessary) and also patches axfr-get to decompose SRV and PTR records and write them out in native format, rather than opaque. This last thing is needed to fix a possible problem with tinydns-data. 
     219 
     220dnscache_less_chatty_log 
     221http://sol.truespace.ca/Files/djbdns/log.patch 
     222Makes dnscache log "stat" entries no more than once per 5 seconds. 
     223 
     224tinydns_mmap_leak 
     225http://marc.info/?l=djbdns&m=116399640808774&w=2 
     226This fixes the following: In the original code if cdb_read encountered an error it returned an error code and the calling function exited without closing the cdb data file resulting in an fd leak, eventually leading to a 'too many files open' error. 
     227 
     228dnscache_big_udp_packets 
     229http://marc.info/?l=djbdns&m=122368590802063&w=2 
     230Patch to support oversized UDP packets up to 4096 bytes in length, while still correctly truncating responses over 512 bytes when sending them to stub resolvers. 
     231 
     232dnscache_dpos_tcp_servfail 
     233http://marc.info/?l=djbdns&m=119998909915985&w=3 
     234Fixes broken tcp dns queries in certain situations. For example: A vanilla 1.05 will fail on "dnstxt aol.com aol.com". 
     235 
     236dnscache-cache-negatives 
     237http://sol.truespace.ca/Files/djbdns/nxdomain.patch 
     238Add support for caching of unsuccessful lookup results. 
     239 
     240tinydns_one_second 
     241http://www.tinydns.org/one-second.patch 
     242Causes tinydns to keep its mmap() of the data.cdb file open for at most one second, instead of the default one hundred queries. This improves throughput on high traffic machines. 
     243 
     244dnscache-cachestats.patch 
    212245http://romana.now.ie/#djbdns-cachestats 
    213246This patch modifies the dnscache program to keep a counter of cache hits and cache misses. Two new fields are added to the stats output line: the fifth number is the number of cache hits; the sixth number is the number of cache misses. 
    214247 
    215 120-compiler-temporary-filename.patch 
     248compiler-temporary-filename.patch 
    216249http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/#compiler-temporary-filename 
    217250A bit of a nit-picky patch that adjusts the names of generated temorary files to be more 'correct'. A bit silly really. 
    218251 
    219 130-dnscache-multiple-ip.patch 
     252dnscache-multiple-ip.patch 
    220253http://danp.net/djbdns/patches.html 
    221 When applied, dnscache will accept a /-delimited list of IP address in $IP and bind to each in turn. NOTE: This patch is only really useful on embedded systems with very limited memory. On 'big' systems, ther are other ways to achieve listening on multiple IP adresses. Example: http://www.faqts.com/knowledge_base/view.phtml/aid/9644/fid/699 
    222  
    223 140-dnsnamex-extra-command.patch 
     254When applied, dnscache will accept a /-delimited list of IP address in $IP and bind to each in turn. NOTE: This patch is only really useful on embedded systems with very limited memory. On big systems, ther are other ways to achieve listening on multiple IP adresses. You can read more on that over here: http://www.faqts.com/knowledge_base/view.phtml/aid/9644/fid/699 
     255 
     256dnsnamex-extra-command.patch 
    224257http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/#dnsnamex 
    225258Not really a patch, but an extra command. dnsnamex prints all of the domain names that the IP address supplied to it maps to, on a single line. 
    226259 
    227 200-dnscache-cname-handling.patch 
     260dnscache-cname-handling.patch 
    228261http://homepages.tesco.net/~J.deBoynePollard/FGA/#DNS 
    229262Fixes mis-handling of client-side aliases 
    230263 
    231 210-dnscache-strict-forwardonly.patch 
     264dnscache-strict-forwardonly.patch 
    232265http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/#dnscache-strict-forwardonly 
    233266This patch modifies the behaviour of dnscache such that "forwardonly" mode is fully enforced. 
    234267 
    235 220-dnscacheip-space-separator.patch 
     268dnscacheip-space-separator.patch 
    236269http://homepages.tesco.net/~J.deBoynePollard/FGA/djbdns-problems.html#dnscacheip-separator-character 
    237270Patch to change the separator in ${DNSCACHEIP} to the space character 
    238271 
    239 230-tinydns-data-semantic-error.patch 
     272tinydns-data-semantic-error.patch 
    240273http://homepages.tesco.net/~J.deBoynePollard/FGA/djbdns-problems.html#tinydns-data-semantic-error 
    241274Fixes the fact that stock tinydns-data doesn't handle semantic errors in its input 
    242275 
    243 240-tinydns-alias-chain-truncation.patch 
     276tinydns-alias-chain-truncation.patch 
    244277http://homepages.tesco.net/~J.deBoynePollard/FGA/djbdns-problems.html#tinydns-alias-chain-truncation 
    245278Fixes truncation of alias chains by tinydns and axfrdns 
    246279 
    247 250-djbdns-1.05-slogging.patch 
     280dnscache-slogging.patch 
    248281http://www.ohse.de/uwe/patches.html 
    249282Patch to enable statistics logging of queried resource records. 
     
    251284http://danp.net/djbdns/ 
    252285 
    253 260-djbdns-1.05-dnsfilter-replace.patch 
     286dnsfilter-replace.patch 
    254287http://www.ohse.de/uwe/patches.html 
    255288This patch adds an option to the dnsfilter program (-r). It's use makes dnsfilter simply replace the IP address by the host name if possible. If the IP address cannot be determined for whatever reason then it will be left alone. -r stands for replace.  
    256289 
    257 300-bugfix1-dempsky.patch 
     290dnscache_sigpipe_fix 
     291http://marc.info/?l=djbdns&m=104804013229536&w=2 
     292This patch tells dnscache to ignore the SIGPIPE signal. 
     293 
     294ignoreip2.patch 
     295http://tinydns.org/djbdns-1.05-ignoreip2.patch 
     296This patch change djbdns's dnscache so that it will ignore thex IP addresses given in the ignoreip file. This patch was made to boycott Verisign, amongst others, who decided to start supplying replies to non-existant and wildcard domains. NOTE: This feature is disabled in the config file by default. Be careful with this one. 
     297 
     298bugfix-dnscache-dempsky-poison.patch 
    258299http://www.securityfocus.com/archive/1/501294/30/0/threaded 
    259300Patch to fix a potential cache-poisoning attack. This bug only affects domains that serve DNS content using tinydns and axfrdns (only for DNS queries over TCP; clients do not need AXFR permissions) from djbdns 1.05 and allow untrusted users to include arbitrary records. 
    260301 
    261 310-bugfix2-merge-outgoing-requests.patch 
     302bugfix-dnscache-merge-outgoing-requests.patch 
    262303http://www.your.org/dnscache/ 
    263304This patch prevents a class of poisoning attack by combining identical requests from clients into one outgoing query. Without this patch, an attacker can coerce dnscache into launching hundreds of identical queries at once, making a specific type of attack several orders of magnitude easier.  
    264305 
    265 320-bugfix3-cache-soa-records.patch 
     306bugfix-dnscache-cache-soa-records.patch 
    266307http://www.your.org/dnscache/ 
    267308This patch allows dnscache to store the responses of "SOA" type queries in its cache. SOA responses are the only type of response unconditionally uncached. dnscache uses its internal cache to prevent certain classes of poisoning attack. Attackers may choose to send floods of SOA requests to bypass these protections.  
  • packages/net/djbdns/files/djbdns.conf

    r15612 r17673  
    99        option 'defaultallowif' 'lan wan' 
    1010        option 'cachesize' '1000000' 
     11        option 'hidettl' '0' 
    1112        option 'forwardonly' '1' 
    1213        option 'useresolvconf' '1' 
    1314        list 'resolver' '208.67.222.222' 
    1415        list 'resolver' '208.67.220.220' 
     16        option 'useignore' '0' 
     17        list 'ignoreip' '203.119.4.28' 
     18        list 'ignoreip' '212.181.91.6' 
     19        list 'ignoreip' '62.4.64.119' 
     20        list 'ignoreip' '64.70.19.33' 
     21        list 'ignoreip' '69.25.75.72' 
    1522        option 'logging' '0' 
    1623 
  • packages/net/djbdns/files/dnscache.init

    r15612 r17673  
    1717    config_foreach get_userids global 
    1818    mkdir -p $ROOT 
    19     cp -fa /etc/dnscache/ip $ROOT 
    20     cp -fa /etc/dnscache/servers $ROOT 
     19    cp -fa /etc/dnscache/* $ROOT 
    2120    rm -f $ROOT/resolvers 
     21    rm -f $ROOT/ignoreip 
    2222    chown -R $UID:$GID $ROOT 
    2323    config_foreach start_dnscache dnscache 
     
    3636} 
    3737 
     38append_ignore() { 
     39    echo $1 >> $ROOT/ignoreip 
     40} 
     41 
    3842start_dnscache() { 
    3943    local cfg="$1" 
    4044    config_get logging        "$cfg" logging 
    4145    config_get useresolvconf  "$cfg" useresolvconf 
    42     config_get ifaces         "$cfg" interface 
     46    config_get iface          "$cfg" interface 
    4347    config_get ifacesend      "$cfg" interfacesend 
    4448    config_get defaultallowif "$cfg" defaultallowif 
    4549    config_get CACHESIZE      "$cfg" cachesize 
    4650    config_get FORWARDONLY    "$cfg" forwardonly 
     51    config_get HIDETTL        "$cfg" hidettl 
    4752    config_list_foreach       "$cfg" "resolver" append_server 
     53    config_get useignore      "$cfg" useignore 
     54    if [ "$useignore" == "1" ] ; then 
     55        config_list_foreach   "$cfg" "ignoreip" append_ignore 
     56    fi 
    4857# Add some interface network addresses to list of allowed IP addresses (assumes /24 networks) 
    4958    include /lib/network 
     
    5968    fi 
    6069# Translate listen interface names to IP addresses 
    61     IP="" 
    62     for iface in $ifaces; do 
    63        config_get ipaddr "$iface" ipaddr 
    64        IP="$ipaddr/$IP" 
    65     done 
    66 # Strip trailing slashes 
    67     IP=`echo $IP|sed 's/\/\+$//g'` 
     70    config_get IP "$iface" ipaddr 
    6871# Translante send interface name to an IP address 
    6972    config_get IPSEND "$ifacesend" ipaddr 
     73# Unset HIDETTL if equal to 0 
     74    if [ "$HIDETTL" == "0" ] ; then 
     75        export -n HIDETTL 
     76    fi 
    7077# If forwardingonly set then activate list of resolvers 
    7178    if [ "$FORWARDONLY" == "0" ] ; then 
     
    9198    export IP  
    9299    export ROOT 
    93 # dnscache likes to receive a 128bit random seed 
     100# dnscache likes to receive a 128 byte random seed 
    94101    dd if=/dev/urandom of=$ROOT/randomseed bs=128 count=1  > /dev/null 2>&1 
    95102    if [ "$DEBUG" == 1 ] ; then 
  • packages/net/djbdns/files/dnscache/dnsroots.global

    r15612 r17673  
    1 198.41.0.4  
    2 192.228.79.201  
    3 192.33.4.12  
    4 128.8.10.90  
    5 192.203.230.10  
    6 192.5.5.241  
    7 192.112.36.4  
    8 128.63.2.53  
    9 192.36.148.17  
    10 192.58.128.30  
    11 193.0.14.129  
    12 199.7.83.42  
    13 202.12.27.33  
  • packages/net/djbdns/files/dnscache/servers/@

    r15612 r17673  
    1 198.41.0.4  
    2 192.228.79.201  
    3 192.33.4.12  
    4 128.8.10.90  
    5 192.203.230.10  
    6 192.5.5.241  
    7 192.112.36.4  
    8 128.63.2.53  
    9 192.36.148.17  
    10 192.58.128.30  
    11 193.0.14.129  
    12 199.7.83.42  
    13 202.12.27.33  
  • packages/net/djbdns/patches/010-crosscompile.patch

    r17672 r17673  
    1 diff -urN djbdns-1.05/Makefile djbdns-1.05.new/Makefile 
    2 --- djbdns-1.05/Makefile        2001-02-11 23:11:45.000000000 +0200 
    3 +++ djbdns-1.05.new/Makefile    2007-09-30 15:09:51.000000000 +0300 
    4 @@ -29,10 +29,6 @@ 
     1--- a/Makefile 
     2+++ b/Makefile 
     3@@ -29,10 +29,6 @@ auto-str.o: \ 
    54 compile auto-str.c buffer.h exit.h 
    65        ./compile auto-str.c 
     
    1312 compile auto_home.c 
    1413        ./compile auto_home.c 
    15 @@ -221,10 +217,6 @@ 
     14@@ -221,10 +217,6 @@ compile dd.c dns.h stralloc.h gen_alloc. 
    1615 uint64.h taia.h dd.h 
    1716        ./compile dd.c 
     
    2423 makelib dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o dns_ipq.o dns_mx.o \ 
    2524 dns_name.o dns_nd.o dns_packet.o dns_random.o dns_rcip.o dns_rcrw.o \ 
    26 @@ -508,12 +500,6 @@ 
     25@@ -508,12 +500,6 @@ systype hasdevtcp.h1 hasdevtcp.h2 
    2726          *) cat hasdevtcp.h1 ;; \ 
    2827        esac ) > hasdevtcp.h 
     
    3736 compile hier.c auto_home.h 
    3837        ./compile hier.c 
    39 @@ -534,10 +520,6 @@ 
     38@@ -534,10 +520,6 @@ instcheck.o: \ 
    4039 compile instcheck.c strerr.h error.h exit.h 
    4140        ./compile instcheck.c 
     
    4847 compile iopause.c taia.h tai.h uint64.h select.h iopause.h taia.h 
    4948        ./compile iopause.c 
    50 @@ -766,10 +748,6 @@ 
     49@@ -590,7 +572,7 @@ warn-auto.sh systype 
     50        dgux-*) ;; \ 
     51        hp-ux-*) ;; \ 
     52        sco*) ;; \ 
     53-       *) echo 'ranlib "$$main"' ;; \ 
     54+       *) echo '$(if $(TARGET_RANLIB),$(TARGET_RANLIB),ranlib) "$$main"' ;; \ 
     55        esac \ 
     56        ) > makelib 
     57        chmod 755 makelib 
     58@@ -766,10 +748,6 @@ seek_set.o: \ 
    5159 compile seek_set.c seek.h 
    5260        ./compile seek_set.c 
     
    5967 compile server.c byte.h case.h env.h buffer.h strerr.h ip4.h uint16.h \ 
    6068 ndelay.h socket.h uint16.h droproot.h qlog.h uint16.h response.h \ 
    61 @@ -1060,10 +1038,6 @@ 
     69@@ -1060,10 +1038,6 @@ uint32_unpack.o: \ 
    6270 compile uint32_unpack.c uint32.h 
    6371        ./compile uint32_unpack.c 
     
    7078 makelib buffer_read.o buffer_write.o error.o error_str.o ndelay_off.o \ 
    7179 ndelay_on.o open_read.o open_trunc.o openreadclose.o readclose.o \ 
    72 diff -urN djbdns-1.05/auto_home.c djbdns-1.05.new/auto_home.c 
    73 --- djbdns-1.05/auto_home.c     1970-01-01 03:00:00.000000000 +0300 
    74 +++ djbdns-1.05.new/auto_home.c 2007-09-30 13:32:06.000000000 +0300 
     80--- /dev/null 
     81+++ b/auto_home.c 
    7582@@ -0,0 +1,3 @@ 
    7683+const char auto_home[] = "\ 
    7784+\057\165\163\162\ 
    7885+"; 
    79 diff -urN djbdns-1.05/conf-cc djbdns-1.05.new/conf-cc 
    80 --- djbdns-1.05/conf-cc 2007-09-30 14:11:35.000000000 +0300 
    81 +++ djbdns-1.05.new/conf-cc     2007-09-30 15:10:46.000000000 +0300 
     86--- a/conf-cc 
     87+++ b/conf-cc 
    8288@@ -1,3 +1,3 @@ 
    8389-gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings 
     
    8591  
    8692 This will be used to compile .c files. 
    87 diff -urN djbdns-1.05/conf-home djbdns-1.05.new/conf-home 
    88 --- djbdns-1.05/conf-home       2001-02-11 23:11:45.000000000 +0200 
    89 +++ djbdns-1.05.new/conf-home   2007-09-30 14:10:46.000000000 +0300 
     93--- a/conf-home 
     94+++ b/conf-home 
    9095@@ -1,4 +1,4 @@ 
    9196-/usr/local 
     
    9499 This is the dnscache home directory. Programs will be installed in 
    95100 .../bin. 
    96 diff -urN djbdns-1.05/conf-ld djbdns-1.05.new/conf-ld 
    97 --- djbdns-1.05/conf-ld 2001-02-11 23:11:45.000000000 +0200 
    98 +++ djbdns-1.05.new/conf-ld     2007-09-30 15:11:00.000000000 +0300 
     101--- a/conf-ld 
     102+++ b/conf-ld 
    99103@@ -1,3 +1,3 @@ 
    100104-gcc -s 
     
    102106  
    103107 This will be used to link .o files into an executable. 
    104 diff -urN djbdns-1.05/direntry.h djbdns-1.05.new/direntry.h 
    105 --- djbdns-1.05/direntry.h      1970-01-01 03:00:00.000000000 +0300 
    106 +++ djbdns-1.05.new/direntry.h  2007-09-30 13:14:14.000000000 +0300 
     108--- /dev/null 
     109+++ b/direntry.h 
    107110@@ -0,0 +1,10 @@ 
    108111+#ifndef DIRENTRY_H 
     
    116119+ 
    117120+#endif 
    118 diff -urN djbdns-1.05/hasshsgr.h djbdns-1.05.new/hasshsgr.h 
    119 --- djbdns-1.05/hasshsgr.h      1970-01-01 03:00:00.000000000 +0300 
    120 +++ djbdns-1.05.new/hasshsgr.h  2007-09-30 13:14:14.000000000 +0300 
     121--- /dev/null 
     122+++ b/hasshsgr.h 
    121123@@ -0,0 +1 @@ 
    122124+/* sysdep: -shortsetgroups */ 
    123 diff -urN djbdns-1.05/iopause.h djbdns-1.05.new/iopause.h 
    124 --- djbdns-1.05/iopause.h       1970-01-01 03:00:00.000000000 +0300 
    125 +++ djbdns-1.05.new/iopause.h   2007-09-30 13:14:14.000000000 +0300 
     125--- /dev/null 
     126+++ b/iopause.h 
    126127@@ -0,0 +1,18 @@ 
    127128+#ifndef IOPAUSE_H 
     
    143144+ 
    144145+#endif 
    145 diff -urN djbdns-1.05/select.h djbdns-1.05.new/select.h 
    146 --- djbdns-1.05/select.h        1970-01-01 03:00:00.000000000 +0300 
    147 +++ djbdns-1.05.new/select.h    2007-09-30 13:14:14.000000000 +0300 
     146--- /dev/null 
     147+++ b/select.h 
    148148@@ -0,0 +1,11 @@ 
    149149+#ifndef SELECT_H 
     
    158158+ 
    159159+#endif 
    160 diff -urN djbdns-1.05/uint64.h djbdns-1.05.new/uint64.h 
    161 --- djbdns-1.05/uint64.h        1970-01-01 03:00:00.000000000 +0300 
    162 +++ djbdns-1.05.new/uint64.h    2007-09-30 13:23:48.000000000 +0300 
     160--- /dev/null 
     161+++ b/uint64.h 
    163162@@ -0,0 +1,8 @@ 
    164163+#ifndef UINT64_H 
  • packages/net/djbdns/patches/110-dnscache-cachestats.patch

    r17672 r17673  
    1212# James Raftery <james@now.ie>  6 Nov. 2003 
    1313# 
    14 --- djbdns-1.05.orig/cache.c    Sun Feb 11 21:11:45 2001 
    15 +++ djbdns-1.05/cache.c Wed Nov  5 17:21:06 2003 
     14--- a/cache.c 
     15+++ b/cache.c 
    1616@@ -7,6 +7,11 @@ 
    1717  
     
    2626 static uint32 size; 
    2727 static uint32 hsize; 
    28 @@ -112,15 +117,20 @@ 
     28@@ -112,15 +117,20 @@ char *cache_get(const char *key,unsigned 
    2929         if (u > size - pos - 20 - keylen) cache_impossible(); 
    3030         *datalen = u; 
     
    4848 } 
    4949  
    50 --- djbdns-1.05.orig/cache.h    Sun Feb 11 21:11:45 2001 
    51 +++ djbdns-1.05/cache.h Wed Nov  5 17:13:36 2003 
     50--- a/cache.h 
     51+++ b/cache.h 
    5252@@ -5,6 +5,12 @@ 
    5353 #include "uint64.h" 
     
    6363 extern void cache_set(const char *,unsigned int,const char *,unsigned int,uint32); 
    6464 extern char *cache_get(const char *,unsigned int,unsigned int *,uint32 *); 
    65 --- djbdns-1.05.orig/log.c      Sun Feb 11 21:11:45 2001 
    66 +++ djbdns-1.05/log.c   Wed Nov  5 17:21:12 2003 
    67 @@ -276,6 +276,12 @@ 
    68  { 
     65--- a/log.c 
     66+++ b/log.c 
     67@@ -279,6 +279,12 @@ void log_stats(void) 
     68   time_t cur = time(NULL); 
    6969   extern uint64 numqueries; 
    7070   extern uint64 cache_motion; 
     
    7878   extern int tactive; 
    7979  
    80 @@ -283,6 +289,8 @@ 
     80@@ -290,6 +296,8 @@ void log_stats(void) 
    8181   number(numqueries); space(); 
    8282   number(cache_motion); space(); 
  • packages/net/djbdns/patches/120-compiler-temporary-filename.patch

    r15612 r17673  
    1 --- djbdns-1.05.original/pickdns-data.c 2001-02-11 21:11:45.000000000 +0000 
    2 +++ djbdns-1.05/pickdns-data.c  2003-10-19 10:47:17.000000000 +0100 
    3 @@ -123,7 +123,7 @@ 
     1--- a/pickdns-data.c 
     2+++ b/pickdns-data.c 
     3@@ -123,7 +123,7 @@ void syntaxerror(const char *why) 
    44 } 
    55 void die_datatmp(void) 
     
    1010  
    1111 int main() 
    12 @@ -142,7 +142,7 @@ 
     12@@ -142,7 +142,7 @@ int main() 
    1313   if (fd == -1) strerr_die2sys(111,FATAL,"unable to open data: "); 
    1414   buffer_init(&b,buffer_unixread,fd,bspace,sizeof bspace); 
     
    1919   if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); 
    2020  
    21 @@ -223,8 +223,8 @@ 
     21@@ -223,8 +223,8 @@ int main() 
    2222   if (cdb_make_finish(&cdb) == -1) die_datatmp(); 
    2323   if (fsync(fdcdb) == -1) die_datatmp(); 
     
    3030   _exit(0); 
    3131 } 
    32 --- djbdns-1.05.original/rbldns-data.c  2001-02-11 21:11:45.000000000 +0000 
    33 +++ djbdns-1.05/rbldns-data.c   2003-10-19 10:47:30.000000000 +0100 
    34 @@ -42,7 +42,7 @@ 
     32--- a/rbldns-data.c 
     33+++ b/rbldns-data.c 
     34@@ -42,7 +42,7 @@ void syntaxerror(const char *why) 
    3535 } 
    3636 void die_datatmp(void) 
     
    4141  
    4242 int main() 
    43 @@ -59,7 +59,7 @@ 
     43@@ -59,7 +59,7 @@ int main() 
    4444   if (fd == -1) strerr_die2sys(111,FATAL,"unable to open data: "); 
    4545   buffer_init(&b,buffer_unixread,fd,bspace,sizeof bspace); 
     
    5050   if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); 
    5151  
    52 @@ -121,8 +121,8 @@ 
     52@@ -121,8 +121,8 @@ int main() 
    5353   if (cdb_make_finish(&cdb) == -1) die_datatmp(); 
    5454   if (fsync(fdcdb) == -1) die_datatmp(); 
     
    6161   _exit(0); 
    6262 } 
    63 --- djbdns-1.05.original/tinydns-data.c 2001-02-11 21:11:45.000000000 +0000 
    64 +++ djbdns-1.05/tinydns-data.c  2003-10-19 11:59:16.000000000 +0100 
     63--- a/tinydns-data.c 
     64+++ b/tinydns-data.c 
    6565@@ -27,7 +27,7 @@ 
    6666  
     
    7272 void nomem(void) 
    7373 { 
    74 @@ -206,7 +206,7 @@ 
     74@@ -207,7 +207,7 @@ int main() 
    7575  
    7676   buffer_init(&b,buffer_unixread,fddata,bspace,sizeof bspace); 
     
    8181   if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); 
    8282  
    83 @@ -449,8 +449,8 @@ 
     83@@ -487,8 +487,8 @@ int main() 
    8484   if (cdb_make_finish(&cdb) == -1) die_datatmp(); 
    8585   if (fsync(fdcdb) == -1) die_datatmp(); 
  • packages/net/djbdns/patches/140-dnsnamex-extra-command.patch

    r15612 r17673  
    1 --- ../djbdns-1.05-original/dnsnamex.c  Tue May 27 02:17:04 2003 
    2 +++ ./dnsnamex.c        Tue May 27 02:18:52 2003 
     1--- /dev/null 
     2+++ b/dnsnamex.c 
    33@@ -0,0 +1,34 @@ 
    44+#include "buffer.h" 
     
    3636+  _exit(0); 
    3737+} 
    38 --- ../djbdns-1.05-original/dns_namex.c Tue May 27 02:17:09 2003 
    39 +++ ./dns_namex.c       Tue May 27 02:15:15 2003 
     38--- /dev/null 
     39+++ b/dns_namex.c 
    4040@@ -0,0 +1,48 @@ 
    4141+#include "stralloc.h" 
     
    8787+  return 0; 
    8888+} 
    89 --- ../djbdns-1.05-original/dns.h       Sun Feb 11 21:11:45 2001 
    90 +++ ./dns.h     Tue May 27 02:10:30 2003 
    91 @@ -69,9 +69,11 @@ 
     89--- a/dns.h 
     90+++ b/dns.h 
     91@@ -70,9 +70,11 @@ extern struct dns_transmit dns_resolve_t 
    9292 extern int dns_ip4_packet(stralloc *,const char *,unsigned int); 
    9393 extern int dns_ip4(stralloc *,const stralloc *); 
     
    101101 extern int dns_txt(stralloc *,const stralloc *); 
    102102 extern int dns_mx_packet(stralloc *,const char *,unsigned int); 
    103 --- ../djbdns-1.05-original/Makefile    Sun Feb 11 21:11:45 2001 
    104 +++ ./Makefile  Tue May 27 02:21:00 2003 
    105 @@ -227,10 +227,10 @@ 
     103--- a/Makefile 
     104+++ b/Makefile 
     105@@ -219,10 +219,10 @@ uint64.h taia.h dd.h 
    106106  
    107107 dns.a: \ 
     
    116116        dns_sortip.o dns_transmit.o dns_txt.o 
    117117  
    118 @@ -269,6 +269,11 @@ 
     118@@ -261,6 +261,11 @@ compile dns_name.c stralloc.h gen_alloc. 
    119119 stralloc.h iopause.h taia.h tai.h uint64.h taia.h 
    120120        ./compile dns_name.c 
     
    128128 compile dns_nd.c byte.h fmt.h dns.h stralloc.h gen_alloc.h iopause.h \ 
    129129 taia.h tai.h uint64.h taia.h 
    130 @@ -402,6 +407,17 @@ 
     130@@ -394,6 +399,17 @@ compile dnsname.c buffer.h exit.h strerr 
    131131 gen_alloc.h iopause.h taia.h tai.h uint64.h taia.h 
    132132        ./compile dnsname.c 
     
    146146 load dnsq.o iopause.o printrecord.o printpacket.o parsetype.o dns.a \ 
    147147 env.a libtai.a buffer.a alloc.a unix.a byte.a socket.lib 
    148 @@ -676,7 +692,7 @@ 
     148@@ -658,7 +674,7 @@ prog: \ 
    149149 dnscache-conf dnscache walldns-conf walldns rbldns-conf rbldns \ 
    150150 rbldns-data pickdns-conf pickdns pickdns-data tinydns-conf tinydns \ 
  • packages/net/djbdns/patches/200-dnscache-cname-handling.patch

    r15612 r17673  
    1 --- djbdns-1.05-original/query.c        Sun Feb 11 21:11:45 2001 
    2 +++ djbdns-1.05/query.c Wed Mar 26 15:48:20 2003 
    3 @@ -91,6 +91,21 @@ 
     1--- a/query.c 
     2+++ b/query.c 
     3@@ -91,6 +91,21 @@ static void cleanup(struct query *z) 
    44   } 
    55 } 
     
    2323 { 
    2424   int i; 
    25 @@ -123,7 +138,6 @@ 
     25@@ -123,7 +138,6 @@ static int globalip(char *d,char ip[4]) 
    2626 static char *t1 = 0; 
    2727 static char *t2 = 0; 
     
    3131 static unsigned int *records = 0; 
    3232  
    33 @@ -179,15 +193,14 @@ 
     33@@ -179,15 +193,14 @@ static int doit(struct query *z,int stat 
    3434   uint16 datalen; 
    3535   char *control; 
     
    4848   int j; 
    4949   int k; 
    50 @@ -252,7 +265,10 @@ 
     50@@ -253,7 +266,10 @@ static int doit(struct query *z,int stat 
    5151  
    5252     byte_copy(key,2,DNS_T_CNAME); 
     
    6060         log_cachedanswer(d,DNS_T_CNAME); 
    6161         if (!rqa(z)) goto DIE; 
    62 @@ -261,8 +277,11 @@ 
     62@@ -262,8 +278,11 @@ static int doit(struct query *z,int stat 
    6363        return 1; 
    6464       } 
     
    7474  
    7575     if (typematch(DNS_T_NS,dtype)) { 
    76 @@ -351,7 +370,7 @@ 
     76@@ -352,7 +371,7 @@ static int doit(struct query *z,int stat 
    7777       } 
    7878     } 
     
    8383       cached = cache_get(key,dlen + 2,&cachedlen,&ttl); 
    8484       if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) { 
    85 @@ -471,29 +490,31 @@ 
    86    if (rcode && (rcode != 3)) goto DIE; /* impossible; see irrelevant() */ 
    87   
     85@@ -473,29 +492,31 @@ static int doit(struct query *z,int stat 
     86  
     87   cachettl = 0; 
    8888   flagout = 0; 
    8989-  flagcname = 0; 
     
    121121  
    122122   for (j = 0;j < numauthority;++j) { 
    123 @@ -515,15 +536,6 @@ 
     123@@ -522,15 +543,6 @@ static int doit(struct query *z,int stat 
    124124   } 
    125125   posglue = pos; 
     
    137137  
    138138   k = numanswers + numauthority + numglue; 
    139 @@ -670,24 +682,36 @@ 
     139@@ -677,24 +689,36 @@ static int doit(struct query *z,int stat 
    140140  
    141141   alloc_free(records); records = 0; 
     
    186186+  /* A "no such name" error applies to the end of any CNAME chain, not to the start. */ 
    187187   if (rcode == 3) { 
    188      log_nxdomain(whichserver,d,soattl); 
    189      cachegeneric(DNS_T_ANY,d,"",0,soattl); 
    190 @@ -700,10 +724,26 @@ 
     188     log_nxdomain(whichserver,d,cachettl); 
     189     cachegeneric(DNS_T_ANY,d,"",0,cachettl); 
     190@@ -707,10 +731,26 @@ static int doit(struct query *z,int stat 
    191191     return 1; 
    192192   } 
     
    217217           save_finish(dtype,d,soattl); 
    218218          log_nodata(whichserver,d,dtype,soattl); 
    219 @@ -815,6 +855,7 @@ 
     219@@ -822,6 +862,7 @@ static int doit(struct query *z,int stat 
    220220   DIE: 
    221221   cleanup(z); 
  • packages/net/djbdns/patches/210-dnscache-strict-forwardonly.patch

    r15612 r17673  
    1 --- djbdns-1.05.original/log.h  2001-02-11 21:11:45.000000000 +0000 
    2 +++ djbdns-1.05/log.h   2003-07-29 17:12:44.000000000 +0100 
    3 @@ -23,6 +23,7 @@ 
     1--- a/log.h 
     2+++ b/log.h 
     3@@ -25,6 +25,7 @@ extern void log_nxdomain(const char *,co 
    44 extern void log_nodata(const char *,const char *,const char *,unsigned int); 
    55 extern void log_servfail(const char *); 
     
    99 extern void log_rr(const char *,const char *,const char *,const char *,unsigned int,unsigned int); 
    1010 extern void log_rrns(const char *,const char *,const char *,unsigned int); 
    11 --- djbdns-1.05.original/log.c  2001-02-11 21:11:45.000000000 +0000 
    12 +++ djbdns-1.05/log.c   2003-07-29 17:12:33.000000000 +0100 
    13 @@ -196,6 +196,13 @@ 
     11--- a/log.c 
     12+++ b/log.c 
     13@@ -197,6 +197,13 @@ void log_lame(const char server[4],const 
    1414   line(); 
    1515 } 
     
    2525 { 
    2626   const char *x = error_str(errno); 
    27 --- djbdns-1.05.original/query.c        2001-02-11 21:11:45.000000000 +0000 
    28 +++ djbdns-1.05/query.c 2003-07-29 17:13:13.000000000 +0100 
    29 @@ -781,6 +781,18 @@ 
     27--- a/query.c 
     28+++ b/query.c 
     29@@ -828,6 +828,18 @@ static int doit(struct query *z,int stat 
    3030  
    3131  
  • packages/net/djbdns/patches/220-dnscacheip-space-separator.patch

    r15612 r17673  
    1 --- djbdns-1.05.original/dns_rcip.c     2001-02-11 21:11:45.000000000 +0000 
    2 +++ djbdns-1.05/dns_rcip.c      2003-11-03 14:55:10.000000000 +0000 
    3 @@ -17,7 +17,7 @@ 
     1--- a/dns_rcip.c 
     2+++ b/dns_rcip.c 
     3@@ -17,7 +17,7 @@ static int init(char ip[64]) 
    44   x = env_get("DNSCACHEIP"); 
    55   if (x) 
  • packages/net/djbdns/patches/230-tinydns-data-semantic-error.patch

    r15612 r17673  
    1 --- djbdns-1.05.orig/tinydns-data.c.orig        2004-01-10 02:20:08.000000000 +0000 
    2 +++ djbdns-1.05/tinydns-data.c  2004-01-10 02:28:50.000000000 +0000 
     1--- a/tinydns-data.c 
     2+++ b/tinydns-data.c 
    33@@ -25,6 +25,14 @@ 
    44  
     
    1515 void die_datatmp(void) 
    1616 { 
    17    strerr_die2sys(111,FATAL,"unable to create data.tmp: "); 
    18 @@ -34,20 +42,39 @@ 
     17   strerr_die2sys(111,FATAL,"unable to create data.cdb.tmp: "); 
     18@@ -34,20 +42,39 @@ void nomem(void) 
    1919   strerr_die1sys(111,FATAL); 
    2020 } 
     
    5959     ttd[i >> 1] |= ch; 
    6060   } 
    61 @@ -55,6 +82,10 @@ 
     61@@ -55,6 +82,10 @@ void ttdparse(stralloc *sa,char ttd[8]) 
    6262  
    6363 void locparse(stralloc *sa,char loc[2]) 
     
    7070   loc[1] = (sa->len > 1) ? sa->s[1] : 0; 
    7171 } 
    72 @@ -187,6 +218,7 @@ 
     72@@ -187,6 +218,7 @@ int main() 
    7373   int i; 
    7474   int j; 
     
    7878   unsigned long ttl; 
    7979   char ttd[8]; 
    80 @@ -266,8 +298,7 @@ 
     80@@ -267,8 +299,7 @@ int main() 
    8181        if (!scan_ulong(f[7].s,&u)) uint32_unpack_big(defaultsoa + 16,&u); 
    8282        uint32_pack_big(soa + 16,u); 
     
    8888        locparse(&f[10],loc); 
    8989  
    90 @@ -282,8 +313,7 @@ 
     90@@ -283,8 +314,7 @@ int main() 
    9191  
    9292       case '.': case '&': 
     
    9898        locparse(&f[5],loc); 
    9999  
    100 @@ -308,24 +338,26 @@ 
     100@@ -309,24 +339,26 @@ int main() 
    101101        rr_addname(d2); 
    102102        rr_finish(d1); 
     
    130130          rr_add(ip,4); 
    131131          rr_finish(d1); 
    132 @@ -336,13 +368,15 @@ 
     132@@ -337,13 +369,15 @@ int main() 
    133133            rr_addname(d1); 
    134134            rr_finish(dptr); 
     
    149149        locparse(&f[6],loc); 
    150150  
    151 @@ -363,18 +397,19 @@ 
     151@@ -401,18 +435,19 @@ int main() 
    152152        rr_addname(d2); 
    153153        rr_finish(d1); 
     
    173173        locparse(&f[4],loc); 
    174174  
    175 @@ -388,8 +423,7 @@ 
     175@@ -426,8 +461,7 @@ int main() 
    176176  
    177177       case '\'': 
     
    183183        locparse(&f[4],loc); 
    184184  
    185 @@ -411,8 +445,7 @@ 
     185@@ -449,8 +483,7 @@ int main() 
    186186  
    187187       case ':': 
  • packages/net/djbdns/patches/240-tinydns-alias-chain-truncation.patch

    r15612 r17673  
    1 --- djbdns-1.05-original/tdlookup.c     Sun Feb 11 21:11:45 2001 
    2 +++ djbdns-1.05/tdlookup.c      Thu Apr  3 11:56:47 2003 
    3 @@ -103,12 +103,13 @@ 
     1--- a/tdlookup.c 
     2+++ b/tdlookup.c 
     3@@ -103,12 +103,13 @@ static int doname(void) 
    44   return response_addname(d1); 
    55 } 
     
    1616   char *wild; 
    1717   int flaggavesoa; 
    18 @@ -122,6 +123,12 @@ 
     18@@ -122,6 +123,12 @@ static int doit(char *q,char qtype[2]) 
    1919   int addrnum; 
    2020   uint32 addrttl; 
     
    2929   anpos = response_len; 
    3030  
    31 @@ -136,7 +143,14 @@ 
     31@@ -136,7 +143,14 @@ static int doit(char *q,char qtype[2]) 
    3232       if (byte_equal(type,2,DNS_T_NS)) flagns = 1; 
    3333     } 
     
    4545     control += 1; 
    4646   } 
    47 @@ -172,8 +186,16 @@ 
     47@@ -172,9 +186,17 @@ static int doit(char *q,char qtype[2]) 
    4848        continue; 
    4949       } 
     
    5151-      if (byte_equal(type,2,DNS_T_NS) || byte_equal(type,2,DNS_T_CNAME) || byte_equal(type,2,DNS_T_PTR)) { 
    5252+      if (byte_equal(type,2,DNS_T_NS) || byte_equal(type,2,DNS_T_PTR)) { 
     53        if (!doname()) return 0; 
     54       } 
     55+      else if (byte_equal(type,2,DNS_T_CNAME)) { 
    5356+       if (!doname()) return 0; 
    54 +      } 
    55 +      else if (byte_equal(type,2,DNS_T_CNAME)) { 
    56         if (!doname()) return 0; 
    5757+        if (byte_diff(type,2,qtype)) { 
    5858+         response_rfinish(RESPONSE_ANSWER); 
     
    6060+         goto RESTART ; 
    6161+       } 
    62        } 
     62+      } 
    6363       else if (byte_equal(type,2,DNS_T_MX)) { 
    6464        if (!dobytes(2)) return 0; 
    65 @@ -275,9 +297,21 @@ 
     65        if (!doname()) return 0; 
     66@@ -275,9 +297,21 @@ static int doit(char *q,char qtype[2]) 
    6667     } 
    6768   } 
     
    8485 int respond(char *q,char qtype[2],char ip[4]) 
    8586 { 
    86    int fd; 
     87   static struct tai cdb_valid = { 0 }; 
  • packages/net/djbdns/patches/250-dnscache-slogging.patch

    r17672 r17673  
    1 --- /home/uwe/djbdns-1.05/server.c      Sun Feb 11 21:11:45 2001 
    2 +++ ./server.c  Fri May  4 07:40:54 2001 
    3 @@ -25,12 +25,63 @@ 
     1--- a/server.c 
     2+++ b/server.c 
     3@@ -25,12 +25,63 @@ static int len; 
    44  
    55 static char *q; 
     
    6565   if (len >= sizeof buf) goto NOQ; 
    6666   pos = dns_packet_copy(buf,len,0,header,12); if (!pos) goto NOQ; 
    67 @@ -56,25 +105,37 @@ 
     67@@ -56,25 +107,37 @@ static int doit(void) 
    6868  
    6969   case_lowerb(q,dns_domain_length(q)); 
     
    104104   return 0; 
    105105 } 
    106 @@ -83,6 +137,7 @@ 
     106@@ -83,6 +146,7 @@ int main() 
    107107 { 
    108108   char *x; 
     
    112112   x = env_get("IP"); 
    113113   if (!x) 
    114 @@ -106,6 +161,8 @@ 
     114@@ -106,6 +170,8 @@ int main() 
    115115   buffer_putsflush(buffer_2,starting); 
    116116  
  • packages/net/djbdns/patches/260-dnsfilter-replace.patch

    r17672 r17673  
    1 --- a/dnsfilter.c       Thu Feb 15 21:29:28 2001 
    2 +++ b/dnsfilter.c       Thu Feb 15 21:57:36 2001 
    3 @@ -41,6 +41,7 @@ 
     1--- a/dnsfilter.c 
     2+++ b/dnsfilter.c 
     3@@ -41,6 +41,7 @@ int inbuflen = 0; 
    44 iopause_fd *inio; 
    55 int flag0 = 1; 
     
    99 int iolen; 
    1010  
    11 @@ -51,12 +52,16 @@ 
     11@@ -51,12 +52,16 @@ char name[DNS_NAME4_DOMAIN]; 
    1212 void errout(int i) 
    1313 { 
     
    3232  
    3333 int main(int argc,char **argv) 
    34 @@ -69,7 +74,7 @@ 
     34@@ -69,7 +74,7 @@ int main(int argc,char **argv) 
    3535   int j; 
    3636   int r; 
     
    4141       case 'c': 
    4242        scan_ulong(optarg,&u); 
    43 @@ -83,8 +88,11 @@ 
     43@@ -83,8 +88,11 @@ int main(int argc,char **argv) 
    4444        if (u > 1000000) u = 1000000; 
    4545        xmax = u; 
     
    5454  
    5555   x = (struct line *) alloc(xmax * sizeof(struct line)); 
    56 @@ -140,8 +148,13 @@ 
     56@@ -140,8 +148,13 @@ int main(int argc,char **argv) 
    5757        else if (r == 1) { 
    5858          if (dns_name_packet(&x[i].middle,x[i].dt.packet,x[i].dt.packetlen) == -1) 
  • packages/net/djbdns/patches/300-bugfix-dnscache-dempsky-poison.patch

    r17672 r17673  
    1 --- a/response.c.orig   2009-02-24 21:04:06.000000000 -0800 
    2 +++ b/response.c        2009-02-24 21:04:25.000000000 -0800 
    3 @@ -34,7 +34,7 @@ 
     1--- a/response.c 
     2+++ b/response.c 
     3@@ -34,7 +34,7 @@ int response_addname(const char *d) 
    44         uint16_pack_big(buf,49152 + name_ptr[i]); 
    55         return response_addbytes(buf,2); 
  • packages/net/djbdns/patches/310-bugfix-dnscache-merge-outgoing-requests.patch

    r17672 r17673  
    1 diff --git a/Makefile b/Makefile 
    2 index 1429643..bc047c0 100644 
    31--- a/Makefile 
    42+++ b/Makefile 
    5 @@ -318,11 +318,11 @@ stralloc.h iopause.h taia.h tai.h uint64.h taia.h 
     3@@ -315,11 +315,11 @@ stralloc.h iopause.h taia.h tai.h uint64 
    64        ./compile dns_txt.c 
    75  
     
    1715        socket.lib` 
    1816  
    19 @@ -343,7 +343,7 @@ compile dnscache.c env.h exit.h scan.h strerr.h error.h ip4.h \ 
     17@@ -340,7 +340,7 @@ compile dnscache.c env.h exit.h scan.h s 
    2018 uint16.h uint64.h socket.h uint16.h dns.h stralloc.h gen_alloc.h \ 
    2119 iopause.h taia.h tai.h uint64.h taia.h taia.h byte.h roots.h fmt.h \ 
     
    2624  
    2725 dnsfilter: \ 
    28 @@ -687,11 +687,16 @@ qlog.o: \ 
     26@@ -685,11 +685,16 @@ qlog.o: \ 
    2927 compile qlog.c buffer.h qlog.h uint16.h 
    3028        ./compile qlog.c 
     
    4442  
    4543 random-ip: \ 
    46 diff --git a/dnscache.c b/dnscache.c 
    47 index 8c899a3..5ccb16a 100644 
    4844--- a/dnscache.c 
    4945+++ b/dnscache.c 
    50 @@ -22,6 +22,7 @@ 
     46@@ -20,6 +20,7 @@ 
     47 #include "response.h" 
     48 #include "cache.h" 
     49 #include "ndelay.h" 
     50+#include "maxclient.h" 
    5151 #include "log.h" 
    5252 #include "okclient.h" 
    5353 #include "droproot.h" 
    54 +#include "maxclient.h" 
    55   
    56  static int packetquery(char *buf,unsigned int len,char **q,char qtype[2],char qclass[2],char id[2]) 
    57  { 
    58 @@ -54,7 +55,6 @@ uint64 numqueries = 0; 
     54@@ -57,7 +58,6 @@ uint64 numqueries = 0; 
    5955  
    6056 static int udp53; 
     
    6460   struct query q; 
    6561   struct taia start; 
    66 @@ -131,7 +131,6 @@ void u_new(void) 
     62@@ -134,7 +134,6 @@ void u_new(void) 
    6763  
    6864 static int tcp53; 
     
    7268   struct query q; 
    7369   struct taia start; 
    74 diff --git a/log.c b/log.c 
    75 index c43e8b0..b8cd7ce 100644 
    7670--- a/log.c 
    7771+++ b/log.c 
    78 @@ -150,6 +150,13 @@ void log_tx(const char *q,const char qtype[2],const char *control,const char ser 
     72@@ -151,6 +151,13 @@ void log_tx(const char *q,const char qty 
    7973   line(); 
    8074 } 
     
    9084 { 
    9185   string("cached "); logtype(type); space(); 
    92 diff --git a/log.h b/log.h 
    93 index fe62fa3..d9a829b 100644 
    9486--- a/log.h 
    9587+++ b/log.h 
    96 @@ -18,6 +18,7 @@ extern void log_cachednxdomain(const char *); 
     88@@ -20,6 +20,7 @@ extern void log_cachednxdomain(const cha 
    9789 extern void log_cachedns(const char *,const char *); 
    9890  
     
    10294 extern void log_nxdomain(const char *,const char *,unsigned int); 
    10395 extern void log_nodata(const char *,const char *,const char *,unsigned int); 
    104 diff --git a/maxclient.h b/maxclient.h 
    105 new file mode 100644 
    106 index 0000000..e52fcd1 
    10796--- /dev/null 
    10897+++ b/maxclient.h 
     
    115104+ 
    116105+#endif /* MAXCLIENT_H */ 
    117 diff --git a/qmerge.c b/qmerge.c 
    118 new file mode 100644 
    119 index 0000000..7c92299 
    120106--- /dev/null 
    121107+++ b/qmerge.c 
     
    236222+  return -1; /* bug */ 
    237223+} 
    238 diff --git a/qmerge.h b/qmerge.h 
    239 new file mode 100644 
    240 index 0000000..9a58157 
    241224--- /dev/null 
    242225+++ b/qmerge.h 
     
    266249+ 
    267250+#endif /* QMERGE_H */ 
    268 diff --git a/query.c b/query.c 
    269 index 46cdc00..f091fdd 100644 
    270251--- a/query.c 
    271252+++ b/query.c 
    272 @@ -81,7 +81,7 @@ static void cleanup(struct query *z) 
     253@@ -83,7 +83,7 @@ static void cleanup(struct query *z) 
    273254   int j; 
    274255   int k; 
     
    279260     dns_domain_free(&z->alias[j]); 
    280261   for (j = 0;j < QUERY_MAXLEVEL;++j) { 
    281 @@ -429,14 +429,8 @@ static int doit(struct query *z,int state) 
     262@@ -452,14 +452,8 @@ static int doit(struct query *z,int stat 
    282263   if (j == 64) goto SERVFAIL; 
    283264  
     
    296277  
    297278  
    298 @@ -450,10 +444,10 @@ static int doit(struct query *z,int state) 
     279@@ -473,10 +467,10 @@ static int doit(struct query *z,int stat 
    299280  
    300281   HAVEPACKET: 
     
    310291   d = z->name[z->level]; 
    311292   dtype = z->level ? DNS_T_A : z->type; 
    312 @@ -836,7 +830,7 @@ int query_start(struct query *z,char *dn,char type[2],char class[2],char localip 
     293@@ -902,7 +896,7 @@ int query_start(struct query *z,char *dn 
    313294  
    314295 int query_get(struct query *z,iopause_fd *x,struct taia *stamp) 
     
    319300       return doit(z,1); 
    320301     case -1: 
    321 @@ -847,5 +841,5 @@ int query_get(struct query *z,iopause_fd *x,struct taia *stamp) 
     302@@ -913,5 +907,5 @@ int query_get(struct query *z,iopause_fd 
    322303  
    323304 void query_io(struct query *z,iopause_fd *x,struct taia *deadline) 
     
    326307+  qmerge_io(z->qm,x,deadline); 
    327308 } 
    328 diff --git a/query.h b/query.h 
    329 index eff68b2..06feab4 100644 
    330309--- a/query.h 
    331310+++ b/query.h 
  • packages/net/djbdns/patches/320-bugfix-dnscache-cache-soa-records.patch

    r17672 r17673  
    1 diff --git a/query.c b/query.c 
    2 index 46cdc00..4574e97 100644 
    31--- a/query.c 
    42+++ b/query.c 
    5 @@ -319,6 +319,29 @@ static int doit(struct query *z,int state) 
     3@@ -342,6 +342,29 @@ static int doit(struct query *z,int stat 
    64       } 
    75     } 
     
    3331       byte_copy(key,2,DNS_T_A); 
    3432       cached = cache_get(key,dlen + 2,&cachedlen,&ttl); 
    35 @@ -351,7 +374,7 @@ static int doit(struct query *z,int state) 
     33@@ -374,7 +397,7 @@ static int doit(struct query *z,int stat 
    3634       } 
    3735     } 
     
    4240       cached = cache_get(key,dlen + 2,&cachedlen,&ttl); 
    4341       if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) { 
    44 @@ -585,15 +608,24 @@ static int doit(struct query *z,int state) 
     42@@ -601,15 +624,24 @@ static int doit(struct query *z,int stat 
    4543     else if (byte_equal(type,2,DNS_T_AXFR)) 
    4644       ; 
     
    6866     else if (byte_equal(type,2,DNS_T_CNAME)) { 
    6967       pos = dns_packet_skipname(buf,len,records[j - 1]); if (!pos) goto DIE; 
    70  
Note: See TracChangeset for help on using the changeset viewer.