Module Name: src
Committed By: msaitoh
Date: Fri Jun 14 04:17:36 UTC 2013
Modified Files:
src/distrib/sets/lists/base [netbsd-6]: ad.mips64eb ad.mips64el
md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/comp [netbsd-6]: ad.mips64eb ad.mips64el
md.amd64 md.sparc64 shl.mi
src/include [netbsd-6]: res_update.h
src/lib/libc/nameser [netbsd-6]: ns_samedomain.c
src/lib/libresolv [netbsd-6]: Makefile shlib_version
Removed Files:
src/lib/libresolv [netbsd-6]: dst_api.c dst_internal.h hmac_link.c
ns_date.c ns_sign.c ns_verify.c res_findzonecut.c res_mkupdate.c
res_mkupdate.h res_private.h res_sendsigned.c res_update.c
support.c
Log Message:
Revert last libresolv change (ticket #887). That commit changed the major
version. It's not good. Discussed in current-users@
To generate a diff of this commit:
cvs rdiff -u -r1.82.2.11 -r1.82.2.12 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.81.2.11 -r1.81.2.12 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.156.2.11 -r1.156.2.12 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.147.2.11 -r1.147.2.12 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.616.2.11 -r1.616.2.12 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.69.2.8 -r1.69.2.9 src/distrib/sets/lists/comp/ad.mips64eb
cvs rdiff -u -r1.69.2.9 -r1.69.2.10 src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.155.2.8 -r1.155.2.9 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.138.2.8 -r1.138.2.9 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.209.2.13 -r1.209.2.14 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.7.10.1 -r1.7.10.2 src/include/res_update.h
cvs rdiff -u -r1.6.8.1 -r1.6.8.2 src/lib/libc/nameser/ns_samedomain.c
cvs rdiff -u -r1.11.50.1 -r1.11.50.2 src/lib/libresolv/Makefile
cvs rdiff -u -r1.3.10.2 -r0 src/lib/libresolv/dst_api.c
cvs rdiff -u -r1.2.10.2 -r0 src/lib/libresolv/dst_internal.h \
src/lib/libresolv/hmac_link.c src/lib/libresolv/ns_verify.c
cvs rdiff -u -r1.1.10.2 -r0 src/lib/libresolv/ns_date.c \
src/lib/libresolv/ns_sign.c src/lib/libresolv/res_findzonecut.c \
src/lib/libresolv/res_mkupdate.h src/lib/libresolv/res_private.h \
src/lib/libresolv/res_sendsigned.c src/lib/libresolv/res_update.c \
src/lib/libresolv/support.c
cvs rdiff -u -r1.2.8.2 -r0 src/lib/libresolv/res_mkupdate.c
cvs rdiff -u -r1.6.10.1 -r1.6.10.2 src/lib/libresolv/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.82.2.11 src/distrib/sets/lists/base/ad.mips64eb:1.82.2.12
--- src/distrib/sets/lists/base/ad.mips64eb:1.82.2.11 Thu Jun 13 04:20:30 2013
+++ src/distrib/sets/lists/base/ad.mips64eb Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.82.2.11 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: ad.mips64eb,v 1.82.2.12 2013/06/14 04:17:36 msaitoh Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -209,8 +209,8 @@
./usr/lib/64/libradius.so.4.0 base-compat-shlib compat,pic
./usr/lib/64/librefuse.so.2 base-compat-shlib compat,pic
./usr/lib/64/librefuse.so.2.0 base-compat-shlib compat,pic
-./usr/lib/64/libresolv.so.3 base-compat-shlib compat,pic
-./usr/lib/64/libresolv.so.3.0 base-compat-shlib compat,pic
+./usr/lib/64/libresolv.so.2 base-compat-shlib compat,pic
+./usr/lib/64/libresolv.so.2.0 base-compat-shlib compat,pic
./usr/lib/64/libroken.so.19 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libroken.so.19.0 base-compat-shlib compat,pic,kerberos
./usr/lib/64/librpcsvc.so.1 base-compat-shlib compat,pic
@@ -517,8 +517,8 @@
./usr/lib/o32/libradius.so.4.0 base-compat-shlib compat,pic
./usr/lib/o32/librefuse.so.2 base-compat-shlib compat,pic
./usr/lib/o32/librefuse.so.2.0 base-compat-shlib compat,pic
-./usr/lib/o32/libresolv.so.3 base-compat-shlib compat,pic
-./usr/lib/o32/libresolv.so.3.0 base-compat-shlib compat,pic
+./usr/lib/o32/libresolv.so.2 base-compat-shlib compat,pic
+./usr/lib/o32/libresolv.so.2.0 base-compat-shlib compat,pic
./usr/lib/o32/libroken.so.19 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libroken.so.19.0 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/librpcsvc.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.81.2.11 src/distrib/sets/lists/base/ad.mips64el:1.81.2.12
--- src/distrib/sets/lists/base/ad.mips64el:1.81.2.11 Thu Jun 13 04:20:30 2013
+++ src/distrib/sets/lists/base/ad.mips64el Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.81.2.11 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: ad.mips64el,v 1.81.2.12 2013/06/14 04:17:36 msaitoh Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -209,8 +209,8 @@
./usr/lib/64/libradius.so.4.0 base-compat-shlib compat,pic
./usr/lib/64/librefuse.so.2 base-compat-shlib compat,pic
./usr/lib/64/librefuse.so.2.0 base-compat-shlib compat,pic
-./usr/lib/64/libresolv.so.3 base-compat-shlib compat,pic
-./usr/lib/64/libresolv.so.3.0 base-compat-shlib compat,pic
+./usr/lib/64/libresolv.so.2 base-compat-shlib compat,pic
+./usr/lib/64/libresolv.so.2.0 base-compat-shlib compat,pic
./usr/lib/64/libroken.so.19 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libroken.so.19.0 base-compat-shlib compat,pic,kerberos
./usr/lib/64/librpcsvc.so.1 base-compat-shlib compat,pic
@@ -517,8 +517,8 @@
./usr/lib/o32/libradius.so.4.0 base-compat-shlib compat,pic
./usr/lib/o32/librefuse.so.2 base-compat-shlib compat,pic
./usr/lib/o32/librefuse.so.2.0 base-compat-shlib compat,pic
-./usr/lib/o32/libresolv.so.3 base-compat-shlib compat,pic
-./usr/lib/o32/libresolv.so.3.0 base-compat-shlib compat,pic
+./usr/lib/o32/libresolv.so.2 base-compat-shlib compat,pic
+./usr/lib/o32/libresolv.so.2.0 base-compat-shlib compat,pic
./usr/lib/o32/libroken.so.19 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libroken.so.19.0 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/librpcsvc.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.156.2.11 src/distrib/sets/lists/base/md.amd64:1.156.2.12
--- src/distrib/sets/lists/base/md.amd64:1.156.2.11 Thu Jun 13 04:20:30 2013
+++ src/distrib/sets/lists/base/md.amd64 Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.156.2.11 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: md.amd64,v 1.156.2.12 2013/06/14 04:17:36 msaitoh Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -216,8 +216,8 @@
./usr/lib/i386/libradius.so.4.0 base-compat-shlib compat,pic
./usr/lib/i386/librefuse.so.2 base-compat-shlib compat,pic
./usr/lib/i386/librefuse.so.2.0 base-compat-shlib compat,pic
-./usr/lib/i386/libresolv.so.3 base-compat-shlib compat,pic
-./usr/lib/i386/libresolv.so.3.0 base-compat-shlib compat,pic
+./usr/lib/i386/libresolv.so.2 base-compat-shlib compat,pic
+./usr/lib/i386/libresolv.so.2.0 base-compat-shlib compat,pic
./usr/lib/i386/libroken.so.19 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libroken.so.19.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/librpcsvc.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.147.2.11 src/distrib/sets/lists/base/md.sparc64:1.147.2.12
--- src/distrib/sets/lists/base/md.sparc64:1.147.2.11 Thu Jun 13 04:20:30 2013
+++ src/distrib/sets/lists/base/md.sparc64 Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.147.2.11 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: md.sparc64,v 1.147.2.12 2013/06/14 04:17:36 msaitoh Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@@ -212,8 +212,8 @@
./usr/lib/sparc/libradius.so.4.0 base-compat-shlib compat,pic
./usr/lib/sparc/librefuse.so.2 base-compat-shlib compat,pic
./usr/lib/sparc/librefuse.so.2.0 base-compat-shlib compat,pic
-./usr/lib/sparc/libresolv.so.3 base-compat-shlib compat,pic
-./usr/lib/sparc/libresolv.so.3.0 base-compat-shlib compat,pic
+./usr/lib/sparc/libresolv.so.2 base-compat-shlib compat,pic
+./usr/lib/sparc/libresolv.so.2.0 base-compat-shlib compat,pic
./usr/lib/sparc/libroken.so.19 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libroken.so.19.0 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/librpcsvc.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.616.2.11 src/distrib/sets/lists/base/shl.mi:1.616.2.12
--- src/distrib/sets/lists/base/shl.mi:1.616.2.11 Thu Jun 13 04:20:30 2013
+++ src/distrib/sets/lists/base/shl.mi Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.616.2.11 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: shl.mi,v 1.616.2.12 2013/06/14 04:17:36 msaitoh Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -402,8 +402,8 @@
./usr/lib/librefuse.so.2 base-refuse-shlib
./usr/lib/librefuse.so.2.0 base-refuse-shlib
./usr/lib/libresolv.so base-net-shlib
-./usr/lib/libresolv.so.3 base-net-shlib
-./usr/lib/libresolv.so.3.0 base-net-shlib
+./usr/lib/libresolv.so.2 base-net-shlib
+./usr/lib/libresolv.so.2.0 base-net-shlib
./usr/lib/libroken.so base-krb5-shlib kerberos
./usr/lib/libroken.so.19 base-krb5-shlib kerberos
./usr/lib/libroken.so.19.0 base-krb5-shlib kerberos
Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.8 src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.9
--- src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.8 Thu Jun 13 04:20:30 2013
+++ src/distrib/sets/lists/comp/ad.mips64eb Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.69.2.8 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: ad.mips64eb,v 1.69.2.9 2013/06/14 04:17:36 msaitoh Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -1365,7 +1365,7 @@
./usr/libdata/debug/usr/lib/64/libquota.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libradius.so.4.0.debug comp-net-debug debug,compat
./usr/libdata/debug/usr/lib/64/librefuse.so.2.0.debug comp-refuse-debug debug,compat
-./usr/libdata/debug/usr/lib/64/libresolv.so.3.0.debug comp-net-debug debug,compat
+./usr/libdata/debug/usr/lib/64/libresolv.so.2.0.debug comp-net-debug debug,compat
./usr/libdata/debug/usr/lib/64/libroken.so.14.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/64/libroken.so.19.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/64/librpcsvc.so.1.0.debug comp-net-debug debug,compat
@@ -1521,7 +1521,7 @@
./usr/libdata/debug/usr/lib/o32/libquota.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libradius.so.4.0.debug comp-net-debug debug,compat
./usr/libdata/debug/usr/lib/o32/librefuse.so.2.0.debug comp-refuse-debug debug,compat
-./usr/libdata/debug/usr/lib/o32/libresolv.so.3.0.debug comp-net-debug debug,compat
+./usr/libdata/debug/usr/lib/o32/libresolv.so.2.0.debug comp-net-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libroken.so.14.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/o32/libroken.so.19.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/o32/librpcsvc.so.1.0.debug comp-net-debug debug,compat
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.69.2.9 src/distrib/sets/lists/comp/ad.mips64el:1.69.2.10
--- src/distrib/sets/lists/comp/ad.mips64el:1.69.2.9 Thu Jun 13 04:20:30 2013
+++ src/distrib/sets/lists/comp/ad.mips64el Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.69.2.9 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: ad.mips64el,v 1.69.2.10 2013/06/14 04:17:36 msaitoh Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -1365,7 +1365,7 @@
./usr/libdata/debug/usr/lib/64/libquota.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libradius.so.4.0.debug comp-net-debug debug,compat
./usr/libdata/debug/usr/lib/64/librefuse.so.2.0.debug comp-refuse-debug debug,compat
-./usr/libdata/debug/usr/lib/64/libresolv.so.3.0.debug comp-net-debug debug,compat
+./usr/libdata/debug/usr/lib/64/libresolv.so.2.0.debug comp-net-debug debug,compat
./usr/libdata/debug/usr/lib/64/libroken.so.14.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/64/libroken.so.19.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/64/librpcsvc.so.1.0.debug comp-net-debug debug,compat
@@ -1521,7 +1521,7 @@
./usr/libdata/debug/usr/lib/o32/libquota.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libradius.so.4.0.debug comp-net-debug debug,compat
./usr/libdata/debug/usr/lib/o32/librefuse.so.2.0.debug comp-refuse-debug debug,compat
-./usr/libdata/debug/usr/lib/o32/libresolv.so.3.0.debug comp-net-debug debug,compat
+./usr/libdata/debug/usr/lib/o32/libresolv.so.2.0.debug comp-net-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libroken.so.14.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/o32/libroken.so.19.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/o32/librpcsvc.so.1.0.debug comp-net-debug debug,compat
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.155.2.8 src/distrib/sets/lists/comp/md.amd64:1.155.2.9
--- src/distrib/sets/lists/comp/md.amd64:1.155.2.8 Thu Jun 13 04:20:30 2013
+++ src/distrib/sets/lists/comp/md.amd64 Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.155.2.8 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: md.amd64,v 1.155.2.9 2013/06/14 04:17:36 msaitoh Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -1139,7 +1139,7 @@
./usr/libdata/debug/usr/lib/i386/libquota.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libradius.so.4.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/librefuse.so.2.0.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libresolv.so.3.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libresolv.so.2.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libroken.so.14.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/i386/libroken.so.19.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/i386/librpcsvc.so.1.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.138.2.8 src/distrib/sets/lists/comp/md.sparc64:1.138.2.9
--- src/distrib/sets/lists/comp/md.sparc64:1.138.2.8 Thu Jun 13 04:20:30 2013
+++ src/distrib/sets/lists/comp/md.sparc64 Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.138.2.8 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: md.sparc64,v 1.138.2.9 2013/06/14 04:17:36 msaitoh Exp $
./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
@@ -977,7 +977,7 @@
./usr/libdata/debug/usr/lib/sparc/libquota.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libradius.so.4.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/librefuse.so.2.0.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libresolv.so.3.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libresolv.so.2.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libroken.so.14.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/sparc/libroken.so.19.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/sparc/librpcsvc.so.1.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.209.2.13 src/distrib/sets/lists/comp/shl.mi:1.209.2.14
--- src/distrib/sets/lists/comp/shl.mi:1.209.2.13 Thu Jun 13 04:20:30 2013
+++ src/distrib/sets/lists/comp/shl.mi Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.209.2.13 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: shl.mi,v 1.209.2.14 2013/06/14 04:17:36 msaitoh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -334,7 +334,7 @@
./usr/libdata/debug/usr/lib/libquota.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libradius.so.4.0.debug comp-net-debug debug
./usr/libdata/debug/usr/lib/librefuse.so.2.0.debug comp-refuse-debug debug
-./usr/libdata/debug/usr/lib/libresolv.so.3.0.debug comp-net-debug debug
+./usr/libdata/debug/usr/lib/libresolv.so.2.0.debug comp-net-debug debug
./usr/libdata/debug/usr/lib/libroken.so.19.0.debug comp-krb5-debug kerberos,debug
./usr/libdata/debug/usr/lib/librpcsvc.so.1.0.debug comp-net-debug debug
./usr/libdata/debug/usr/lib/librt.so.1.0.debug comp-sys-debug debug
Index: src/include/res_update.h
diff -u src/include/res_update.h:1.7.10.1 src/include/res_update.h:1.7.10.2
--- src/include/res_update.h:1.7.10.1 Thu Jun 13 04:20:30 2013
+++ src/include/res_update.h Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: res_update.h,v 1.7.10.1 2013/06/13 04:20:30 msaitoh Exp $ */
+/* $NetBSD: res_update.h,v 1.7.10.2 2013/06/14 04:17:36 msaitoh Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -26,14 +26,14 @@
#include <sys/types.h>
#include <arpa/nameser.h>
-#include <sys/queue.h>
+#include <isc/list.h>
#include <resolv.h>
/*%
* This RR-like structure is particular to UPDATE.
*/
struct ns_updrec {
- TAILQ_ENTRY(ns_updrec) r_link, r_glink;
+ LINK(struct ns_updrec) r_link, r_glink;
ns_sect r_section; /*%< ZONE/PREREQUISITE/UPDATE */
char * r_dname; /*%< owner of the RR */
ns_class r_class; /*%< class number */
@@ -48,7 +48,7 @@ struct ns_updrec {
u_int r_zone; /*%< zone number on server */
};
typedef struct ns_updrec ns_updrec;
-typedef TAILQ_HEAD(ns_updqueu, ns_updrec) ns_updque;
+typedef LIST(ns_updrec) ns_updque;
#define res_mkupdate __res_mkupdate
#define res_update __res_update
Index: src/lib/libc/nameser/ns_samedomain.c
diff -u src/lib/libc/nameser/ns_samedomain.c:1.6.8.1 src/lib/libc/nameser/ns_samedomain.c:1.6.8.2
--- src/lib/libc/nameser/ns_samedomain.c:1.6.8.1 Thu Jun 13 04:20:30 2013
+++ src/lib/libc/nameser/ns_samedomain.c Fri Jun 14 04:17:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ns_samedomain.c,v 1.6.8.1 2013/06/13 04:20:30 msaitoh Exp $ */
+/* $NetBSD: ns_samedomain.c,v 1.6.8.2 2013/06/14 04:17:36 msaitoh Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
#ifdef notdef
static const char rcsid[] = "Id: ns_samedomain.c,v 1.6 2005/04/27 04:56:40 sra Exp";
#else
-__RCSID("$NetBSD: ns_samedomain.c,v 1.6.8.1 2013/06/13 04:20:30 msaitoh Exp $");
+__RCSID("$NetBSD: ns_samedomain.c,v 1.6.8.2 2013/06/14 04:17:36 msaitoh Exp $");
#endif
#endif
@@ -35,7 +35,7 @@ __RCSID("$NetBSD: ns_samedomain.c,v 1.6.
#include "port_after.h"
-#ifdef _LIBRESOLV
+#ifndef _LIBC
/*%
* Check whether a name belongs to a domain.
*
@@ -57,8 +57,8 @@ __RCSID("$NetBSD: ns_samedomain.c,v 1.6.
int
ns_samedomain(const char *a, const char *b) {
- size_t la, lb, i;
- int diff, escaped;
+ size_t la, lb;
+ int diff, i, escaped;
const char *cp;
la = strlen(a);
@@ -68,8 +68,8 @@ ns_samedomain(const char *a, const char
if (la != 0U && a[la - 1] == '.') {
escaped = 0;
/* Note this loop doesn't get executed if la==1. */
- for (i = la - 1; i > 0; i--)
- if (a[i - 1] == '\\') {
+ for (i = la - 2; i >= 0; i--)
+ if (a[i] == '\\') {
if (escaped)
escaped = 0;
else
@@ -84,8 +84,8 @@ ns_samedomain(const char *a, const char
if (lb != 0U && b[lb - 1] == '.') {
escaped = 0;
/* note this loop doesn't get executed if lb==1 */
- for (i = lb - 1; i > 0; i--)
- if (b[i - 1] == '\\') {
+ for (i = lb - 2; i >= 0; i--)
+ if (b[i] == '\\') {
if (escaped)
escaped = 0;
else
@@ -110,7 +110,7 @@ ns_samedomain(const char *a, const char
/* Ok, we know la > lb. */
- diff = (int)(la - lb);
+ diff = la - lb;
/*
* If 'a' is only 1 character longer than 'b', then it can't be
@@ -133,8 +133,8 @@ ns_samedomain(const char *a, const char
* and thus not a really a label separator.
*/
escaped = 0;
- for (i = diff - 1; i > 0; i--)
- if (a[i - 1] == '\\') {
+ for (i = diff - 2; i >= 0; i--)
+ if (a[i] == '\\') {
if (escaped)
escaped = 0;
else
@@ -157,7 +157,7 @@ ns_subdomain(const char *a, const char *
return (ns_samename(a, b) != 1 && ns_samedomain(a, b));
}
#endif
-#ifdef _LIBC
+
/*%
* make a canonical copy of domain name "src"
*
@@ -212,5 +212,5 @@ ns_samename(const char *a, const char *b
else
return (0);
}
-#endif
+
/*! \file */
Index: src/lib/libresolv/Makefile
diff -u src/lib/libresolv/Makefile:1.11.50.1 src/lib/libresolv/Makefile:1.11.50.2
--- src/lib/libresolv/Makefile:1.11.50.1 Thu Jun 13 04:20:30 2013
+++ src/lib/libresolv/Makefile Fri Jun 14 04:17:36 2013
@@ -1,28 +1,17 @@
-# $NetBSD: Makefile,v 1.11.50.1 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: Makefile,v 1.11.50.2 2013/06/14 04:17:36 msaitoh Exp $
# from: @(#)Makefile 5.1 (Berkeley) 6/5/90
.include <bsd.own.mk>
-LIBC= ${NETBSDSRCDIR}/lib/libc
-
LIB=resolv
-CPPFLAGS+=-I${LIBC}/include -I${LIBC}/resolv -D_LIBRESOLV
+CPPFLAGS+=-DLIBC_SCCS -I${NETBSDSRCDIR}/lib/libc/include -D_LIBC
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
.endif
-.PATH: ${LIBC}/net ${LIBC}/resolv ${LIBC}/nameser
+.PATH: ${NETBSDSRCDIR}/lib/libc/net ${NETBSDSRCDIR}/lib/libc/resolv
-SRCS+= res_update.c res_findzonecut.c res_mkupdate.c
-SRCS+= res_sendsigned.c
-SRCS+= ns_date.c ns_samedomain.c ns_sign.c ns_verify.c
-SRCS+= dst_api.c support.c hmac_link.c
-
-# LIBC
-# CPPFLAGS+=-D_LIBC -DCOMPAT__RES -DUSE_POLL -DLIBC_SCCS
-# SRCS+= res_comp.c res_send.c res_data.c res_debug.c res_mkquery.c
-# SRCS+= res_query.c res_mkupdate.c res_init.c res_state.c
-# SRCS+= ns_netint.c ns_name.c ns_print.c ns_parse.c ns_ttl.c ns_samedomain.c
+SRCS=gethnamaddr.c res_mkquery.c res_query.c res_send.c
.include <bsd.lib.mk>
Index: src/lib/libresolv/shlib_version
diff -u src/lib/libresolv/shlib_version:1.6.10.1 src/lib/libresolv/shlib_version:1.6.10.2
--- src/lib/libresolv/shlib_version:1.6.10.1 Thu Jun 13 04:20:30 2013
+++ src/lib/libresolv/shlib_version Fri Jun 14 04:17:36 2013
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.6.10.1 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: shlib_version,v 1.6.10.2 2013/06/14 04:17:36 msaitoh Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
-major=3
+major=2
minor=0
