Hi all, I plan to fix #999143 and #965494 by NMU.
Please see the debdiff as attachment.
My plan is I'll wait for 10 days to see if anyone stops me.
And I'll upload to the delay/10 queue.
The following changes are made:
* Non-maintainer upload.
* Port to DebSrc3.0 (quilt)
* debian/rules: port to debhelper 12 and use dh (Closes: #999143)
- add debian/clean to clean generated manpages.
- add debian/dns-browse.manpages to install manpages.
- remove debian/compat
- debian/control: build-depends on debhelper-compat (Closes: #965494)
- add debian/dns-browse.docs to install README.
* debian/control: dns-browse depends on ${misc:Depends}
* debian/control: Priority: extra -> optional
Yours,
Paul
diff -Nru dns-browse-1.9/debian/changelog dns-browse-1.9/debian/changelog
--- dns-browse-1.9/debian/changelog 2022-12-09 05:27:47.000000000 +0800
+++ dns-browse-1.9/debian/changelog 2022-12-09 01:28:05.000000000 +0800
@@ -1,3 +1,18 @@
+dns-browse (1.9-8.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Port to DebSrc3.0 (quilt)
+ * debian/rules: port to debhelper 12 and use dh (Closes: #999143)
+ - add debian/clean to clean generated manpages.
+ - add debian/dns-browse.manpages to install manpages.
+ - remove debian/compat
+ - debian/control: build-depends on debhelper-compat (Closes: #965494)
+ - add debian/dns-browse.docs to install README.
+ * debian/control: dns-browse depends on ${misc:Depends}
+ * debian/control: Priority: extra -> optional
+
+ -- Ying-Chun Liu (PaulLiu) <paul...@debian.org> Fri, 09 Dec 2022 01:28:05
+0800
+
dns-browse (1.9-8.1) unstable; urgency=medium
* Non maintainer upload by the Reproducible Builds team.
diff -Nru dns-browse-1.9/debian/clean dns-browse-1.9/debian/clean
--- dns-browse-1.9/debian/clean 1970-01-01 08:00:00.000000000 +0800
+++ dns-browse-1.9/debian/clean 2022-12-09 01:28:05.000000000 +0800
@@ -0,0 +1,2 @@
+debian/dns_browse.1
+debian/dns_tree.1
diff -Nru dns-browse-1.9/debian/compat dns-browse-1.9/debian/compat
--- dns-browse-1.9/debian/compat 2022-12-09 05:27:47.000000000 +0800
+++ dns-browse-1.9/debian/compat 1970-01-01 08:00:00.000000000 +0800
@@ -1 +0,0 @@
-5
diff -Nru dns-browse-1.9/debian/control dns-browse-1.9/debian/control
--- dns-browse-1.9/debian/control 2022-12-09 05:27:47.000000000 +0800
+++ dns-browse-1.9/debian/control 2022-12-09 01:28:05.000000000 +0800
@@ -1,14 +1,14 @@
Source: dns-browse
Section: net
-Priority: extra
+Priority: optional
Maintainer: Javier Fernández-Sanguino Peña <j...@debian.org>
-Build-Depends: debhelper (>= 3.0.18), autoconf, tk, docbook-to-man
+Build-Depends: debhelper-compat (= 12), autoconf, tk, docbook-to-man
Standards-Version: 3.7.2
Homepage: http://www.isi.edu/~johnh/SOFTWARE/DNS/
Package: dns-browse
Architecture: all
-Depends: tk, dnsutils
+Depends: tk, dnsutils, ${misc:Depends}
Description: Front-ends to DNS search
This package provides two programs to make user lookups on DNS
servers: dns_tree and dns_browse.
diff -Nru dns-browse-1.9/debian/dns-browse.docs
dns-browse-1.9/debian/dns-browse.docs
--- dns-browse-1.9/debian/dns-browse.docs 1970-01-01 08:00:00.000000000
+0800
+++ dns-browse-1.9/debian/dns-browse.docs 2022-12-09 01:28:05.000000000
+0800
@@ -0,0 +1 @@
+README
diff -Nru dns-browse-1.9/debian/dns-browse.manpages
dns-browse-1.9/debian/dns-browse.manpages
--- dns-browse-1.9/debian/dns-browse.manpages 1970-01-01 08:00:00.000000000
+0800
+++ dns-browse-1.9/debian/dns-browse.manpages 2022-12-09 01:28:05.000000000
+0800
@@ -0,0 +1,2 @@
+debian/dns_browse.1
+debian/dns_tree.1
diff -Nru dns-browse-1.9/debian/patches/0001_fix_makefile_in.patch
dns-browse-1.9/debian/patches/0001_fix_makefile_in.patch
--- dns-browse-1.9/debian/patches/0001_fix_makefile_in.patch 1970-01-01
08:00:00.000000000 +0800
+++ dns-browse-1.9/debian/patches/0001_fix_makefile_in.patch 2022-12-09
01:28:05.000000000 +0800
@@ -0,0 +1,34 @@
+Index: dns-browse-1.9/Makefile.in
+===================================================================
+--- dns-browse-1.9.orig/Makefile.in
++++ dns-browse-1.9/Makefile.in
+@@ -4,6 +4,7 @@
+ # $Id: Makefile.in,v 1.5 1997/12/04 20:10:58 johnh Exp $
+ #
+
++DESTDIR=
+ TOSHAR=README dns_browse dns_tree \
+ Makefile.in configure configure.in install-sh release
+ PACKAGE=dns_browse
+@@ -17,10 +18,8 @@ WISH = @WISH@
+ PERL = @PERL@
+
+ install:
+- { echo "#!$(WISH) -f"; cat dns_browse; } >t
+- $(INSTALL) -m 755 t $(bindir)/dns_browse
+- { echo "#!$(PERL) -w"; cat dns_tree; } >t
+- $(INSTALL) -m 755 t $(bindir)/dns_tree
++ $(INSTALL) -m 755 dns_browse $(DESTDIR)$(bindir)/
++ $(INSTALL) -m 755 dns_tree $(DESTDIR)$(bindir)/
+
+ .tar_files: Makefile release
+ for i in $(TOSHAR); \
+@@ -38,3 +37,8 @@ tar.gz: .tar_files
+ tar cvf - `cat .tar_files` |gzip >$(PACKAGE)-`cat release`.tar.gz
+ rm ./$(PACKAGE)-`cat release`
+
++clean:
++ -rm *~ config.cache config.status config.log t
++
++distclean: clean
++ -rm Makefile
diff -Nru dns-browse-1.9/debian/patches/0002_fix_dns_tree.patch
dns-browse-1.9/debian/patches/0002_fix_dns_tree.patch
--- dns-browse-1.9/debian/patches/0002_fix_dns_tree.patch 1970-01-01
08:00:00.000000000 +0800
+++ dns-browse-1.9/debian/patches/0002_fix_dns_tree.patch 2022-12-09
01:28:05.000000000 +0800
@@ -0,0 +1,146 @@
+Index: dns-browse-1.9/dns_tree
+===================================================================
+--- dns-browse-1.9.orig/dns_tree
++++ dns-browse-1.9/dns_tree
+@@ -1,4 +1,4 @@
+-#!/home/johnh/BIN/perl5 -w
++#!/usr/bin/perl -w
+
+ #
+ # dns_tree
+@@ -23,9 +23,9 @@
+
+ sub usage {
+ print STDERR <<END;
+-usage: $0
++usage: $0 domain
+
+-display a tree-structured view of the dns
++display a tree-structured view of the dns domain 'domain'
+
+ Options:
+ -f override warnings (force)
+@@ -34,6 +34,7 @@ Options:
+ -m MATCH show only records whos first component matches the
+ perl regexp MATCH
+ -v verbose (show all DNS requests)
++ -d debug output (show internal information of the program)
+
+ (Only -f is currently implemented)
+
+@@ -65,6 +66,9 @@ my(@maximal_types) = qw(A CNAME HINFO LO
+ # Temp creation race found by the Debian folks.
+ # http://bugs.debian.org/146591
+ # Fix: make the tmp file in the users home directory.
++# Note: the following check is made just in case, we do not
++# want to leave files in the / directory if the environment is messed up
++die "Environment not properly set up for use in dns_tree" if !
defined($ENV{'HOME'});
+ my($cache_dir) = $ENV{'HOME'} . "/.DNS_TREE";
+ my(@dangereous_names) = qw(com. edu. org. in-addr.arpa. co.uk.); # all lc
+ my(@messages) = ();
+@@ -189,7 +193,7 @@ sub display_level {
+
+ sub dig {
+ my($ah_ref) = @_;
+- my($cmd, $name, $server, $cache_duration) = ($ah_ref->{cmd},
$ah_ref->{name}, $ah_ref->{server}, $ah_ref->{cache_duration});
++ my($cmd, $name, $server, $cache_duration, $options) = ($ah_ref->{cmd},
$ah_ref->{name}, $ah_ref->{server}, $ah_ref->{cache_duration},
$ah_ref->{options});
+ my(@msgs);
+
+ # What should we keep from the dig output?
+@@ -229,10 +233,16 @@ sub dig {
+ };
+ };
+ if (-f $fn) {
++ print STDERR "Reading dig information fron standard input\n" if
defined($opts{'debug'});
+ open(DIG, "< $fn") || croak "cached dig";
+ $from_cache = 1;
+ } else {
+- open(DIG, "dig $cmd $name $server |") || croak "dig";
++ print STDERR "Calling dig $options $cmd $name $server\n" if
defined($opts{'debug'});
++ if ( defined ($options) ) {
++ open(DIG, "dig $options $cmd $name $server |") || croak "dig";
++ } else {
++ open(DIG, "dig $cmd $name $server |") || croak "dig";
++ }
+ open(CACHE, "> $fn") || croak "dig to cache $fn";
+ };
+
+@@ -245,6 +255,7 @@ sub dig {
+ my($origin) = ".";
+ my($lasta) = undef;
+ while (<DIG>) {
++ print STDERR "Reading dig input: $_" if defined($opts{'debug'});
+ print CACHE $_ if (!$from_cache);
+ if ($in_soa) {
+ my($dummy, $n) = split(/\s+/);
+@@ -328,9 +339,9 @@ sub push_msgs {
+ sub fetch_nses {
+ my($name, $cache_duration) = @_;
+
+- my($res_ref, $msgs_ref) = dig({cmd => 'ns', name => $name, types =>
[qw(NS)], cache_duration => $cache_duration});
+- die "fetch_nses: dig ns failed\n" if (!defined($res_ref));
++ my($res_ref, $msgs_ref) = dig({cmd => 'ns', name => $name, types =>
[qw(NS)], cache_duration => $cache_duration, options => ''});
+ push_msgs($msgs_ref) if (defined($opts{'verbose'}));
++ die "fetch_nses: dig ns failed\n" if (!defined($res_ref));
+
+ my(@nses);
+ foreach (@$res_ref) {
+@@ -342,8 +353,9 @@ sub fetch_nses {
+ sub fetch_level_from_ns {
+ my($name, $ns, $types_aref, $cache_duration) = @_;
+
+- my($res_ref, $msgs_ref) = dig({cmd => 'axfr', name => $name, server =>
$ns, types => $types_aref}, cache_duration => $cache_duration);
++ my($res_ref, $msgs_ref) = dig({cmd => 'axfr', name => $name, server =>
$ns, types => $types_aref}, cache_duration => $cache_duration, options => '');
+ push_msgs($msgs_ref);
++ die "fetch_level_from_ns: dig axfr failed\n" if (!defined($res_ref));
+ return $res_ref;
+ }
+
+@@ -361,15 +373,16 @@ sub fetch_level_from_nses {
+ sub fetch_soa {
+ my($name) = @_;
+
+- my($soa_ref, $msgs_ref) = dig({cmd => 'soa', name => $name, types =>
[qw(SOA)]});
+- die "fetch_soa: dig soa failed\n" if (!defined($soa_ref));
++ my($soa_ref, $msgs_ref) = dig({cmd => 'soa', name => $name, types =>
[qw(SOA)], options => '+multiline' });
+ push_msgs($msgs_ref) if (defined($opts{'verbose'}));
++ die "fetch_soa: dig soa failed\n" if (!defined($soa_ref));
+ return $soa_ref->[0];
+ }
+
+ sub fetch_level {
+ my($name, $types_aref) = @_;
+ my($soa_ref) = fetch_soa($name);
++ return undef if (!defined($soa_ref));
+ my($cache_duration) = parse_time_spec($soa_ref->[$SOA_MINIMUM]);
+ my($nses_ref) = fetch_nses($name, $cache_duration);
+ return undef if (!defined($nses_ref));
+@@ -390,14 +403,15 @@ sub dangereous_name {
+ }
+
+ sub main {
+- &usage if ($#ARGV >= 0 && $ARGV[0] eq '-?');
+- &GetOptions(\%opts, qw(f m=s t=s@ v));
++ &usage if ($#ARGV >= 0 && ( $ARGV[0] eq '-?' || $ARGV[0] eq '-h' ));
++ &GetOptions(\%opts, qw(f m=s t=s@ v d));
+ &usage if ($#ARGV != 0);
+
+ $opts{'force'} = $opts{'f'};
+ $opts{'match'} = $opts{'m'};
+ $opts{'types'} = $opts{'t'};
+ $opts{'verbose'} = $opts{'v'};
++ $opts{'debug'} = $opts{'d'};
+ my($types_aref) = $opts{'types'};
+ if (defined($types_aref) && $#$types_aref == 0 && $types_aref->[0] eq
'all') {
+ # special case "all"
+@@ -425,8 +439,8 @@ sub main {
+ } else {
+ foreach (@messages) {
+ print "\ti\t$_\n";
+- };
+- print "\te\terror looking up $name.\n";
++ };
++ print "\te\terror looking up $name\n";
+ exit 1;
+ };
+ }
diff -Nru dns-browse-1.9/debian/patches/0003_fix_dns_browse.patch
dns-browse-1.9/debian/patches/0003_fix_dns_browse.patch
--- dns-browse-1.9/debian/patches/0003_fix_dns_browse.patch 1970-01-01
08:00:00.000000000 +0800
+++ dns-browse-1.9/debian/patches/0003_fix_dns_browse.patch 2022-12-09
01:28:05.000000000 +0800
@@ -0,0 +1,124 @@
+Index: dns-browse-1.9/dns_browse
+===================================================================
+--- dns-browse-1.9.orig/dns_browse
++++ dns-browse-1.9/dns_browse
+@@ -1,4 +1,4 @@
+-#!/home/johnh/BIN/wish -f
++#!/usr/bin/wish -f
+
+ #
+ # dns_browse
+@@ -20,7 +20,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+
+-global dns_tree types
++global dns_tree types
+ set dns_tree "dns_tree"
+ set prog "dns_browse"
+ set maximal_types {A CNAME HINFO LOC MX NS PTR TXT}
+@@ -30,14 +30,14 @@ set required_types {i iz m mx}
+ set www_hosts_only 0
+
+ proc usage {} {
+- puts {usage: gui [-t TYPE ...] starting_domain_name
+-options:
++ global prog dns_tree
++ puts stderr "usage: $prog \[-t TYPE ...\] starting_domain_name"
++ puts stderr {options:
+ -t TYPE show only records of these TYPE (repeat for multiple types)
+ (the ``all'' type does everything I know about)
+ -w match only web hosts
+-
+-Requires dns_tree to be in the path.
+ }
++ puts stderr "Requires $dns_tree to be in the path."
+ exit 1
+ }
+
+@@ -97,12 +97,12 @@ proc formatted_text {w text} {
+ -relief raised -bd 2 -yscrollcommand "$w.f.s set" \
+ -setgrid true -wrap word \
+ -width 60 -padx 4 -pady 4 \
+- -font -*-Times-Medium-R-*-140-*
++ -font -*-Times-Medium-R-*-14-*
+ set defFg [lindex [$wt configure -foreground] 4]
+ set defBg [lindex [$wt configure -background] 4]
+- $wt tag configure italic -font -*-Times-Medium-I-Normal-*-140-*
+- $wt tag configure computer -font -*-Courier-Medium-R-Normal-*-120-*
+- $wt tag configure big -font -*-Times-Bold-R-Normal-*-180-*
++ $wt tag configure italic -font -*-Times-Medium-I-Normal-*-14-*
++ $wt tag configure computer -font -*-Courier-Medium-R-Normal-*-12-*
++ $wt tag configure big -font -*-Times-Bold-R-Normal-*-18-*
+ $wt tag configure reverse -foreground $defBg -background $defFg
+ pack $wt -side left -expand 1 -fill both
+
+@@ -583,7 +583,7 @@ proc build_text w {
+ -setgrid 1 -height 20 \
+ -width 60 \
+ -wrap none \
+- -font {-*-Courier-Medium-R-*-140-*}
++ -font {-*-Courier-Medium-R-*-14-*}
+ scrollbar $w.text.xscroll -command "$w.text.text xview" -orient
horizontal
+ scrollbar $w.text.yscroll -command "$w.text.text yview"
+ pack $w.text.xscroll -side bottom -fill x
+@@ -601,16 +601,16 @@ proc build_text w {
+ $wt tag bind minus <ButtonRelease-2> {if_on_target act_new_window %W
[%W index {@%x,%y}] }
+ #
+ $wt tag bind DEBUG <ButtonRelease-3> {set i [%W index {@%x,%y}]; puts
"%W $i [%W tag names $i]"}
+- $wt tag configure expanding -font {-*-Courier-Bold-R-*-140-*}
+- $wt tag configure target -font {-*-Courier-Bold-R-*-140-*}
+-# $wt tag configure ns -font {-*-Courier-Bold-R-*-140-*}
++ $wt tag configure expanding -font {-*-Courier-Bold-R-*-14-*}
++ $wt tag configure target -font {-*-Courier-Bold-R-*-14-*}
++# $wt tag configure ns -font {-*-Courier-Bold-R-*-14-*}
+
+ return $wt
+ }
+
+ proc fill_text_line {w place line base_depth} {
+ if {![regexp "^(\t*)(\[^\t\]+)\t+(\[^\t\]+)(.*)$" $line dummy new_tabs
type value rest]} {
+- error "fill_text_line: $line"
++ error "fill_text_line: '$line' does not follow expected regular
expression for records"
+ }
+ set new_depth [string length $new_tabs]
+ set depth [expr $base_depth+$new_depth]
+@@ -718,7 +718,7 @@ proc build_browser {dir old_w} {
+ set wid [incr window_next_id]
+ set w [toplevel ".w$wid"]
+ global prog
+- wm iconname $w "$prog: $dir"
++ wm iconname $w "$prog: $dir"
+ wm title $w "$prog: $dir"
+
+ # set options
+@@ -765,8 +765,6 @@ proc main {} {
+ set insertion_next_id 0
+ set window_next_id 0
+
+- wm withdraw .
+-
+ # option processing
+ global user_types maximal_types default_types www_hosts_only
+ if {[llength $argv] < 1} {
+@@ -781,6 +779,7 @@ proc main {} {
+ set optarg {}
+ }
+ switch -exact -- $optc {
++ -h { usage }
+ -t {
+ lappend user_types $optarg
+ set argv [lrange $argv 1 end]
+@@ -798,6 +797,12 @@ proc main {} {
+ set user_types $default_types
+ }
+
++ if [catch { wm withdraw .} ] {
++ puts stderr "DISPLAY variable not set correctly or not running X"
++ exit 1
++ }
++
++
+ # argument processing
+ foreach name $argv {
+ build_browser $name {}
diff -Nru dns-browse-1.9/debian/patches/series
dns-browse-1.9/debian/patches/series
--- dns-browse-1.9/debian/patches/series 1970-01-01 08:00:00.000000000
+0800
+++ dns-browse-1.9/debian/patches/series 2022-12-09 01:28:05.000000000
+0800
@@ -0,0 +1,3 @@
+0001_fix_makefile_in.patch
+0002_fix_dns_tree.patch
+0003_fix_dns_browse.patch
diff -Nru dns-browse-1.9/debian/rules dns-browse-1.9/debian/rules
--- dns-browse-1.9/debian/rules 2022-12-09 05:27:47.000000000 +0800
+++ dns-browse-1.9/debian/rules 2022-12-09 01:28:05.000000000 +0800
@@ -2,54 +2,16 @@
package=dns-browse
-build:
- dh_testdir
- ./configure --prefix /usr
- docbook-to-man debian/dns_browse.sgml >debian/dns_browse.1
- docbook-to-man debian/dns_tree.sgml >debian/dns_tree.1
- touch build
+%:
+ dh $@
-clean:
- dh_testdir
- dh_testroot
- -rm -f build
- if [ -f Makefile ];then make distclean; fi
- -rm -f debian/dns_browse.1 debian/dns_tree.1
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- make install DESTDIR=debian/dns-browse
-
-binary-indep: install
- dh_testdir
- dh_testroot
-# dh_perl
- dh_installchangelogs
- dh_installdocs README*
- dh_installman debian/dns_browse.1 debian/dns_tree.1
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch:
- dh_testdir
- dh_testroot
-# There are no architecture dependent files in this package
+override_dh_auto_build: debian/dns_browse.1 debian/dns_tree.1
-# Below here is fairly generic really
+debian/dns_browse.1: debian/dns_browse.sgml
+ docbook-to-man debian/dns_browse.sgml >debian/dns_browse.1
-binary: binary-indep binary-arch
+debian/dns_tree.1: debian/dns_tree.sgml
+ docbook-to-man debian/dns_tree.sgml >debian/dns_tree.1
source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-
-.PHONY: binary binary-arch binary-indep clean checkroot
-
diff -Nru dns-browse-1.9/debian/source/format
dns-browse-1.9/debian/source/format
--- dns-browse-1.9/debian/source/format 1970-01-01 08:00:00.000000000 +0800
+++ dns-browse-1.9/debian/source/format 2022-12-09 01:28:05.000000000 +0800
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru dns-browse-1.9/dns_browse dns-browse-1.9/dns_browse
--- dns-browse-1.9/dns_browse 2022-12-09 05:27:47.000000000 +0800
+++ dns-browse-1.9/dns_browse 2002-05-14 00:43:24.000000000 +0800
@@ -1,4 +1,4 @@
-#!/usr/bin/wish -f
+#!/home/johnh/BIN/wish -f
#
# dns_browse
@@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-global dns_tree types
+global dns_tree types
set dns_tree "dns_tree"
set prog "dns_browse"
set maximal_types {A CNAME HINFO LOC MX NS PTR TXT}
@@ -30,14 +30,14 @@
set www_hosts_only 0
proc usage {} {
- global prog dns_tree
- puts stderr "usage: $prog \[-t TYPE ...\] starting_domain_name"
- puts stderr {options:
+ puts {usage: gui [-t TYPE ...] starting_domain_name
+options:
-t TYPE show only records of these TYPE (repeat for multiple types)
(the ``all'' type does everything I know about)
-w match only web hosts
+
+Requires dns_tree to be in the path.
}
- puts stderr "Requires $dns_tree to be in the path."
exit 1
}
@@ -97,12 +97,12 @@
-relief raised -bd 2 -yscrollcommand "$w.f.s set" \
-setgrid true -wrap word \
-width 60 -padx 4 -pady 4 \
- -font -*-Times-Medium-R-*-14-*
+ -font -*-Times-Medium-R-*-140-*
set defFg [lindex [$wt configure -foreground] 4]
set defBg [lindex [$wt configure -background] 4]
- $wt tag configure italic -font -*-Times-Medium-I-Normal-*-14-*
- $wt tag configure computer -font -*-Courier-Medium-R-Normal-*-12-*
- $wt tag configure big -font -*-Times-Bold-R-Normal-*-18-*
+ $wt tag configure italic -font -*-Times-Medium-I-Normal-*-140-*
+ $wt tag configure computer -font -*-Courier-Medium-R-Normal-*-120-*
+ $wt tag configure big -font -*-Times-Bold-R-Normal-*-180-*
$wt tag configure reverse -foreground $defBg -background $defFg
pack $wt -side left -expand 1 -fill both
@@ -583,7 +583,7 @@
-setgrid 1 -height 20 \
-width 60 \
-wrap none \
- -font {-*-Courier-Medium-R-*-14-*}
+ -font {-*-Courier-Medium-R-*-140-*}
scrollbar $w.text.xscroll -command "$w.text.text xview" -orient
horizontal
scrollbar $w.text.yscroll -command "$w.text.text yview"
pack $w.text.xscroll -side bottom -fill x
@@ -601,16 +601,16 @@
$wt tag bind minus <ButtonRelease-2> {if_on_target act_new_window %W
[%W index {@%x,%y}] }
#
$wt tag bind DEBUG <ButtonRelease-3> {set i [%W index {@%x,%y}]; puts
"%W $i [%W tag names $i]"}
- $wt tag configure expanding -font {-*-Courier-Bold-R-*-14-*}
- $wt tag configure target -font {-*-Courier-Bold-R-*-14-*}
-# $wt tag configure ns -font {-*-Courier-Bold-R-*-14-*}
+ $wt tag configure expanding -font {-*-Courier-Bold-R-*-140-*}
+ $wt tag configure target -font {-*-Courier-Bold-R-*-140-*}
+# $wt tag configure ns -font {-*-Courier-Bold-R-*-140-*}
return $wt
}
proc fill_text_line {w place line base_depth} {
if {![regexp "^(\t*)(\[^\t\]+)\t+(\[^\t\]+)(.*)$" $line dummy new_tabs
type value rest]} {
- error "fill_text_line: '$line' does not follow expected regular
expression for records"
+ error "fill_text_line: $line"
}
set new_depth [string length $new_tabs]
set depth [expr $base_depth+$new_depth]
@@ -718,7 +718,7 @@
set wid [incr window_next_id]
set w [toplevel ".w$wid"]
global prog
- wm iconname $w "$prog: $dir"
+ wm iconname $w "$prog: $dir"
wm title $w "$prog: $dir"
# set options
@@ -765,6 +765,8 @@
set insertion_next_id 0
set window_next_id 0
+ wm withdraw .
+
# option processing
global user_types maximal_types default_types www_hosts_only
if {[llength $argv] < 1} {
@@ -779,7 +781,6 @@
set optarg {}
}
switch -exact -- $optc {
- -h { usage }
-t {
lappend user_types $optarg
set argv [lrange $argv 1 end]
@@ -797,12 +798,6 @@
set user_types $default_types
}
- if [catch { wm withdraw .} ] {
- puts stderr "DISPLAY variable not set correctly or not running X"
- exit 1
- }
-
-
# argument processing
foreach name $argv {
build_browser $name {}
diff -Nru dns-browse-1.9/dns_tree dns-browse-1.9/dns_tree
--- dns-browse-1.9/dns_tree 2022-12-09 05:27:47.000000000 +0800
+++ dns-browse-1.9/dns_tree 2002-05-14 00:33:34.000000000 +0800
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/home/johnh/BIN/perl5 -w
#
# dns_tree
@@ -23,9 +23,9 @@
sub usage {
print STDERR <<END;
-usage: $0 domain
+usage: $0
-display a tree-structured view of the dns domain 'domain'
+display a tree-structured view of the dns
Options:
-f override warnings (force)
@@ -34,7 +34,6 @@
-m MATCH show only records whos first component matches the
perl regexp MATCH
-v verbose (show all DNS requests)
- -d debug output (show internal information of the program)
(Only -f is currently implemented)
@@ -66,9 +65,6 @@
# Temp creation race found by the Debian folks.
# http://bugs.debian.org/146591
# Fix: make the tmp file in the users home directory.
-# Note: the following check is made just in case, we do not
-# want to leave files in the / directory if the environment is messed up
-die "Environment not properly set up for use in dns_tree" if !
defined($ENV{'HOME'});
my($cache_dir) = $ENV{'HOME'} . "/.DNS_TREE";
my(@dangereous_names) = qw(com. edu. org. in-addr.arpa. co.uk.); # all lc
my(@messages) = ();
@@ -193,7 +189,7 @@
sub dig {
my($ah_ref) = @_;
- my($cmd, $name, $server, $cache_duration, $options) = ($ah_ref->{cmd},
$ah_ref->{name}, $ah_ref->{server}, $ah_ref->{cache_duration},
$ah_ref->{options});
+ my($cmd, $name, $server, $cache_duration) = ($ah_ref->{cmd},
$ah_ref->{name}, $ah_ref->{server}, $ah_ref->{cache_duration});
my(@msgs);
# What should we keep from the dig output?
@@ -233,16 +229,10 @@
};
};
if (-f $fn) {
- print STDERR "Reading dig information fron standard input\n" if
defined($opts{'debug'});
open(DIG, "< $fn") || croak "cached dig";
$from_cache = 1;
} else {
- print STDERR "Calling dig $options $cmd $name $server\n" if
defined($opts{'debug'});
- if ( defined ($options) ) {
- open(DIG, "dig $options $cmd $name $server |") || croak "dig";
- } else {
- open(DIG, "dig $cmd $name $server |") || croak "dig";
- }
+ open(DIG, "dig $cmd $name $server |") || croak "dig";
open(CACHE, "> $fn") || croak "dig to cache $fn";
};
@@ -255,7 +245,6 @@
my($origin) = ".";
my($lasta) = undef;
while (<DIG>) {
- print STDERR "Reading dig input: $_" if defined($opts{'debug'});
print CACHE $_ if (!$from_cache);
if ($in_soa) {
my($dummy, $n) = split(/\s+/);
@@ -339,9 +328,9 @@
sub fetch_nses {
my($name, $cache_duration) = @_;
- my($res_ref, $msgs_ref) = dig({cmd => 'ns', name => $name, types =>
[qw(NS)], cache_duration => $cache_duration, options => ''});
- push_msgs($msgs_ref) if (defined($opts{'verbose'}));
+ my($res_ref, $msgs_ref) = dig({cmd => 'ns', name => $name, types =>
[qw(NS)], cache_duration => $cache_duration});
die "fetch_nses: dig ns failed\n" if (!defined($res_ref));
+ push_msgs($msgs_ref) if (defined($opts{'verbose'}));
my(@nses);
foreach (@$res_ref) {
@@ -353,9 +342,8 @@
sub fetch_level_from_ns {
my($name, $ns, $types_aref, $cache_duration) = @_;
- my($res_ref, $msgs_ref) = dig({cmd => 'axfr', name => $name, server =>
$ns, types => $types_aref}, cache_duration => $cache_duration, options => '');
+ my($res_ref, $msgs_ref) = dig({cmd => 'axfr', name => $name, server =>
$ns, types => $types_aref}, cache_duration => $cache_duration);
push_msgs($msgs_ref);
- die "fetch_level_from_ns: dig axfr failed\n" if (!defined($res_ref));
return $res_ref;
}
@@ -373,16 +361,15 @@
sub fetch_soa {
my($name) = @_;
- my($soa_ref, $msgs_ref) = dig({cmd => 'soa', name => $name, types =>
[qw(SOA)], options => '+multiline' });
- push_msgs($msgs_ref) if (defined($opts{'verbose'}));
+ my($soa_ref, $msgs_ref) = dig({cmd => 'soa', name => $name, types =>
[qw(SOA)]});
die "fetch_soa: dig soa failed\n" if (!defined($soa_ref));
+ push_msgs($msgs_ref) if (defined($opts{'verbose'}));
return $soa_ref->[0];
}
sub fetch_level {
my($name, $types_aref) = @_;
my($soa_ref) = fetch_soa($name);
- return undef if (!defined($soa_ref));
my($cache_duration) = parse_time_spec($soa_ref->[$SOA_MINIMUM]);
my($nses_ref) = fetch_nses($name, $cache_duration);
return undef if (!defined($nses_ref));
@@ -403,15 +390,14 @@
}
sub main {
- &usage if ($#ARGV >= 0 && ( $ARGV[0] eq '-?' || $ARGV[0] eq '-h' ));
- &GetOptions(\%opts, qw(f m=s t=s@ v d));
+ &usage if ($#ARGV >= 0 && $ARGV[0] eq '-?');
+ &GetOptions(\%opts, qw(f m=s t=s@ v));
&usage if ($#ARGV != 0);
$opts{'force'} = $opts{'f'};
$opts{'match'} = $opts{'m'};
$opts{'types'} = $opts{'t'};
$opts{'verbose'} = $opts{'v'};
- $opts{'debug'} = $opts{'d'};
my($types_aref) = $opts{'types'};
if (defined($types_aref) && $#$types_aref == 0 && $types_aref->[0] eq
'all') {
# special case "all"
@@ -439,8 +425,8 @@
} else {
foreach (@messages) {
print "\ti\t$_\n";
- };
- print "\te\terror looking up $name\n";
+ };
+ print "\te\terror looking up $name.\n";
exit 1;
};
}
diff -Nru dns-browse-1.9/Makefile.in dns-browse-1.9/Makefile.in
--- dns-browse-1.9/Makefile.in 2022-12-09 05:27:47.000000000 +0800
+++ dns-browse-1.9/Makefile.in 1997-12-05 04:10:58.000000000 +0800
@@ -4,7 +4,6 @@
# $Id: Makefile.in,v 1.5 1997/12/04 20:10:58 johnh Exp $
#
-DESTDIR=
TOSHAR=README dns_browse dns_tree \
Makefile.in configure configure.in install-sh release
PACKAGE=dns_browse
@@ -18,8 +17,10 @@
PERL = @PERL@
install:
- $(INSTALL) -m 755 dns_browse $(DESTDIR)$(bindir)/
- $(INSTALL) -m 755 dns_tree $(DESTDIR)$(bindir)/
+ { echo "#!$(WISH) -f"; cat dns_browse; } >t
+ $(INSTALL) -m 755 t $(bindir)/dns_browse
+ { echo "#!$(PERL) -w"; cat dns_tree; } >t
+ $(INSTALL) -m 755 t $(bindir)/dns_tree
.tar_files: Makefile release
for i in $(TOSHAR); \
@@ -37,8 +38,3 @@
tar cvf - `cat .tar_files` |gzip >$(PACKAGE)-`cat release`.tar.gz
rm ./$(PACKAGE)-`cat release`
-clean:
- -rm *~ config.cache config.status config.log t
-
-distclean: clean
- -rm Makefile
OpenPGP_0x44173FA13D058888.asc
Description: OpenPGP public key
OpenPGP_signature
Description: OpenPGP digital signature
