CVS commit: pkgsrc/net/djbdns

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri May 26 15:16:45 UTC 2017

Modified Files:
        pkgsrc/net/djbdns: distinfo
Added Files:
        pkgsrc/net/djbdns/patches: patch-Makefile patch-dnscache-conf.c
            patch-hier.c patch-response.c
Removed Files:
        pkgsrc/net/djbdns/patches: patch-aa patch-ab patch-ac patch-ad

Log Message:
Modernize patch filenames. No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/djbdns/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/djbdns/patches/patch-Makefile \
    pkgsrc/net/djbdns/patches/patch-dnscache-conf.c \
    pkgsrc/net/djbdns/patches/patch-hier.c \
    pkgsrc/net/djbdns/patches/patch-response.c
cvs rdiff -u -r1.3 -r0 pkgsrc/net/djbdns/patches/patch-aa \
    pkgsrc/net/djbdns/patches/patch-ab
cvs rdiff -u -r1.6 -r0 pkgsrc/net/djbdns/patches/patch-ac
cvs rdiff -u -r1.4 -r0 pkgsrc/net/djbdns/patches/patch-ad

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/djbdns/distinfo
diff -u pkgsrc/net/djbdns/distinfo:1.22 pkgsrc/net/djbdns/distinfo:1.23
--- pkgsrc/net/djbdns/distinfo:1.22     Thu Dec 15 12:04:20 2016
+++ pkgsrc/net/djbdns/distinfo  Fri May 26 15:16:45 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2016/12/15 12:04:20 schmonz Exp $
+$NetBSD: distinfo,v 1.23 2017/05/26 15:16:45 schmonz Exp $
 
 SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
 RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed
@@ -28,7 +28,7 @@ SHA1 (0002-dnscache-cache-soa-records.pa
 RMD160 (0002-dnscache-cache-soa-records.patch) = 0b58e57bc11b36113c5fef73a64c869895f83889
 SHA512 (0002-dnscache-cache-soa-records.patch) = f65ca7dfc8e85f469f22d72a1c79126c35243dc077abf4b688eb7d057f19456dc8a3665f558a8a3c1908f96fa1838792aa1bc317d2e89f4953020828c05926e6
 Size (0002-dnscache-cache-soa-records.patch) = 2944 bytes
-SHA1 (patch-aa) = 873897ad6b97baff363874a6a79c8da44383c283
-SHA1 (patch-ab) = 874af27489ad4597e213cfe05a7f2f919081db20
-SHA1 (patch-ac) = 4f089b63664b7e4685b77fc55b287860c8c68229
-SHA1 (patch-ad) = 0dffb59090ccb4977c65885f062eb37255ccd0d9
+SHA1 (patch-Makefile) = 0dffb59090ccb4977c65885f062eb37255ccd0d9
+SHA1 (patch-dnscache-conf.c) = 873897ad6b97baff363874a6a79c8da44383c283
+SHA1 (patch-hier.c) = 874af27489ad4597e213cfe05a7f2f919081db20
+SHA1 (patch-response.c) = 4f089b63664b7e4685b77fc55b287860c8c68229

Added files:

Index: pkgsrc/net/djbdns/patches/patch-Makefile
diff -u /dev/null pkgsrc/net/djbdns/patches/patch-Makefile:1.1
--- /dev/null   Fri May 26 15:16:45 2017
+++ pkgsrc/net/djbdns/patches/patch-Makefile    Fri May 26 15:16:45 2017
@@ -0,0 +1,42 @@
+$NetBSD: patch-Makefile,v 1.1 2017/05/26 15:16:45 schmonz Exp $
+
+DESTDIR support.
+
+--- Makefile.orig      2001-02-11 21:11:45.000000000 +0000
++++ Makefile
+@@ -29,6 +29,14 @@ auto-str.o: \
+ compile auto-str.c buffer.h exit.h
+       ./compile auto-str.c
+ 
++auto_destdir.c: \
++auto-str conf-destdir
++      ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c
++
++auto_destdir.o: \
++compile auto_destdir.c
++      ./compile auto_destdir.c
++
+ auto_home.c: \
+ auto-str conf-home
+       ./auto-str auto_home `head -1 conf-home` > auto_home.c
+@@ -519,16 +527,16 @@ compile hier.c auto_home.h
+       ./compile hier.c
+ 
+ install: \
+-load install.o hier.o auto_home.o buffer.a unix.a byte.a
+-      ./load install hier.o auto_home.o buffer.a unix.a byte.a 
++load install.o hier.o auto_destdir.o buffer.a unix.a byte.a
++      ./load install hier.o auto_destdir.o buffer.a unix.a byte.a 
+ 
+ install.o: \
+ compile install.c buffer.h strerr.h error.h open.h exit.h
+       ./compile install.c
+ 
+ instcheck: \
+-load instcheck.o hier.o auto_home.o buffer.a unix.a byte.a
+-      ./load instcheck hier.o auto_home.o buffer.a unix.a byte.a 
++load instcheck.o hier.o auto_destdir.o buffer.a unix.a byte.a
++      ./load instcheck hier.o auto_destdir.o buffer.a unix.a byte.a 
+ 
+ instcheck.o: \
+ compile instcheck.c strerr.h error.h exit.h
Index: pkgsrc/net/djbdns/patches/patch-dnscache-conf.c
diff -u /dev/null pkgsrc/net/djbdns/patches/patch-dnscache-conf.c:1.1
--- /dev/null   Fri May 26 15:16:45 2017
+++ pkgsrc/net/djbdns/patches/patch-dnscache-conf.c     Fri May 26 15:16:45 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-dnscache-conf.c,v 1.1 2017/05/26 15:16:45 schmonz Exp $
+
+PKG_SYSCONFDIR support.
+
+--- dnscache-conf.c.orig       2001-02-11 16:11:45.000000000 -0500
++++ dnscache-conf.c
+@@ -89,13 +89,13 @@ int main(int argc,char **argv)
+   if (chdir(auto_home) == -1)
+     strerr_die4sys(111,FATAL,"unable to switch to ",auto_home,": ");
+ 
+-  fdrootservers = open_read("/etc/dnsroots.local");
++  fdrootservers = open_read(PKG_SYSCONFDIR"/dnsroots.local");
+   if (fdrootservers == -1) {
+     if (errno != error_noent)
+-      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.local: ");
+-    fdrootservers = open_read("/etc/dnsroots.global");
++      strerr_die4sys(111,FATAL,"unable to open ",auto_home,PKG_SYSCONFDIR"/dnsroots.local: ");
++    fdrootservers = open_read(PKG_SYSCONFDIR"/dnsroots.global");
+     if (fdrootservers == -1)
+-      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.global: ");
++      strerr_die4sys(111,FATAL,"unable to open ",auto_home,PKG_SYSCONFDIR"/dnsroots.global: ");
+   }
+ 
+   init(dir,FATAL);
Index: pkgsrc/net/djbdns/patches/patch-hier.c
diff -u /dev/null pkgsrc/net/djbdns/patches/patch-hier.c:1.1
--- /dev/null   Fri May 26 15:16:45 2017
+++ pkgsrc/net/djbdns/patches/patch-hier.c      Fri May 26 15:16:45 2017
@@ -0,0 +1,20 @@
+$NetBSD: patch-hier.c,v 1.1 2017/05/26 15:16:45 schmonz Exp $
+
+PKG_SYSCONFDIR support.
+
+--- hier.c.orig        2004-07-23 17:55:45.000000000 -0400
++++ hier.c
+@@ -2,10 +2,10 @@
+ 
+ void hier()
+ {
+-  c("/","etc","dnsroots.global",-1,-1,0644);
++  c(auto_home,"share/examples/djbdns","dnsroots.global",-1,-1,0644);
+ 
+-  h(auto_home,-1,-1,02755);
+-  d(auto_home,"bin",-1,-1,02755);
++  h(auto_home,-1,-1,0755);
++  d(auto_home,"bin",-1,-1,0755);
+ 
+   c(auto_home,"bin","dnscache-conf",-1,-1,0755);
+   c(auto_home,"bin","tinydns-conf",-1,-1,0755);
Index: pkgsrc/net/djbdns/patches/patch-response.c
diff -u /dev/null pkgsrc/net/djbdns/patches/patch-response.c:1.1
--- /dev/null   Fri May 26 15:16:45 2017
+++ pkgsrc/net/djbdns/patches/patch-response.c  Fri May 26 15:16:45 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-response.c,v 1.1 2017/05/26 15:16:45 schmonz Exp $
+
+Fix the security hole found by Matthew Dempsky.
+
+--- response.c.orig    2001-02-11 16:11:45.000000000 -0500
++++ response.c
+@@ -34,7 +34,7 @@ int response_addname(const char *d)
+         uint16_pack_big(buf,49152 + name_ptr[i]);
+         return response_addbytes(buf,2);
+       }
+-    if (dlen <= 128)
++    if ((dlen <= 128) && (response_len < 16384))
+       if (name_num < NAMES) {
+       byte_copy(name[name_num],dlen,d);
+       name_ptr[name_num] = response_len;