Date: Tue, 4 Nov 2003 15:24:47 +0100 (CET) From: Janos Mohacsi <mohacsi@niif.hu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Sergei Kolobov <sergei@FreeBSD.org> Subject: ports/58921: maintainer update: dns/zonecheck to version 2.0.0b9 Message-ID: <200311041424.hA4EOlqs040758@skye.ki.iif.hu> Resent-Message-ID: <200311041430.hA4EUIhB010730@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58921
>Category: ports
>Synopsis: maintainer update: dns/zonecheck to version 2.0.0b9
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 04 06:30:18 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Janos Mohacsi
>Release: FreeBSD 4.9-RC i386
>Organization:
NIIF
>Environment:
System: FreeBSD skye.ki.iif.hu 4.9-RC FreeBSD 4.9-RC #1: Mon Oct 6 10:29:17 CEST 2003 root@skye.ki.iif.hu:/usr/obj/mirror/src/sys/SKYE i386
>Description:
Maintainer update to dns/zonecheck to version 2.0.0b9
Port changes:
- Broken dependency fixed
- handling docs files properly
- incorporated the chnanges proposed in the feedback of
PR=ports/58277
Original package changes:
check for non recursive server (chk_not_recursive)
checking of delegation response size (chk_delegation_udp512*)
use of alternative rootserver possible in chk_root_server_*
chk_root_server_* now give detailed information
fix chk_aaaa test
use -n to disable name resolution for ping commande
able to encode NS, A, AAAA records
fixed wrong exit code when 'no stop on fatal' was enabled
time the execution of test
new installation procedure (using ruby only)
added zonecheck.spec for building rpm
>How-To-Repeat:
apply this diff. do not use ports/58277 anymore.
>Fix:
diff -ruN zonecheck.bak/Makefile zonecheck/Makefile
--- zonecheck.bak/Makefile Tue Nov 4 08:46:04 2003
+++ zonecheck/Makefile Tue Nov 4 13:35:51 2003
@@ -6,30 +6,34 @@
#
PORTNAME= zonecheck
-PORTVERSION= 2.0.0b7
+PORTVERSION= 2.0.0b9
CATEGORIES= dns ipv6 ruby
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}/src
EXTRACT_SUFX= .tgz
MAINTAINER= janos.mohacsi@bsd.hu
-COMMENT= Perform consistency checks on DNS zone files
+COMMENT= Perform consistency checks on DNS zones
-RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
-
-BROKEN= "Broken dependency; will be removed after Feb 2"
+.if defined(WITH_X11)
+RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
+.endif
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GMAKE= yes
USE_RUBY= yes
NO_BUILD= yes
RUBY_VER= 1.8
+DOC_FILES= BUGS INSTALL README TODO
+USE_RUBY_FEATURES= ruby18
MAN1= zonecheck.1
-.include <bsd.port.pre.mk>
-
-.if ${RUBY_DEFAULT_VER} != ${RUBY_VER}
-BROKEN= Broken dependency. This might be only a package building issue. The problem is that the default Ruby version for i386 is ${RUBY_DEFAULT_VER}, while the default version for the other architectures is ${RUBY_VER}. This port requires Ruby ${RUBY_VER}. If you are using the right Ruby version, please remove the BROKEN line from the Makefile and try again.
+post-install:
+.ifndef(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for file in ${DOC_FILES}
+ @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN zonecheck.bak/distinfo zonecheck/distinfo
--- zonecheck.bak/distinfo Tue Sep 2 15:56:37 2003
+++ zonecheck/distinfo Tue Nov 4 09:57:11 2003
@@ -1 +1 @@
-MD5 (zonecheck-2.0.0b7.tgz) = bd31515da6e27206d8383948c375378c
+MD5 (zonecheck-2.0.0b9.tgz) = fb3e21e94d155a3a949498d513a829ae
diff -ruN zonecheck.bak/files/patch-Makefile zonecheck/files/patch-Makefile
--- zonecheck.bak/files/patch-Makefile Tue Sep 2 15:56:37 2003
+++ zonecheck/files/patch-Makefile Tue Nov 4 10:09:04 2003
@@ -1,51 +1,11 @@
---- Makefile.orig Wed Aug 27 10:51:19 2003
-+++ Makefile Tue Sep 2 15:10:51 2003
-@@ -37,7 +37,7 @@
- #
+--- Makefile.orig Fri Oct 24 15:55:25 2003
++++ Makefile Tue Nov 4 10:07:49 2003
+@@ -9,7 +9,7 @@
+ # DATE : $Date: 2003/10/24 13:55:25 $
+ #
+
+-RUBY ?=ruby
++RUBY ?=ruby18
+ ZC_INSTALLER=$(RUBY) ./installer.rb
- PREFIX ?= /usr/local
--RUBY ?= $(shell which ruby)
-+RUBY ?= $(shell which ruby18)
- HTML_PATH ?= /zc
-
- LIBEXEC=$(PREFIX)/libexec
-@@ -84,7 +84,7 @@
- @echo "Not automatized yet"
-
-
--install: install-common install-cli install-cgi install-doc
-+install: install-common install-cli install-doc
-
-
- install-common:
-@@ -115,12 +115,11 @@
-
- @echo "==> Installing default configuration file"
- $(INSTALL) -d $(ETCDIR)
-- $(INSTALL) -b -m 0644 etc/zc.conf $(ETCDIR)
-- $(INSTALL) -b -m 0644 etc/zc.conf.fr $(ETCDIR)
-- $(INSTALL) -b -m 0644 etc/zc.conf.arpa $(ETCDIR)
-+ $(INSTALL) -b -m 0644 etc/zc.conf $(ETCDIR)/zc.conf-dist
-+ $(INSTALL) -b -m 0644 etc/zc.conf.fr $(ETCDIR)/zc.conf.fr-dist
-+ $(INSTALL) -b -m 0644 etc/zc.conf.arpa $(ETCDIR)/zc.conf.arpa-dist
- @echo "*************************"
-- @echo "** If you already had a zc.conf file it has been renamed"
-- @echo "** to zc.conf.old"
-+ @echo "** zc.conf file installed as zc.conf-dist. "
- @echo "** Don't forget to edit the zc.conf to reflect your system"
- @echo "** configuration"
- @echo "*************************"
-@@ -142,10 +141,10 @@
- install-cli:
- @echo "==> Installing CLI"
- $(INSTALL) -d $(BINDIR)
-- $(LN) -f $(LIBEXEC)/zc/zc/zc.rb $(BINDIR)/zc
-- $(LN) -f $(LIBEXEC)/zc/zc/zc.rb $(BINDIR)/zonecheck
-+ #$(LN) -f $(LIBEXEC)/zc/zc/zc.rb $(BINDIR)/zc
-+ $(LN) -s $(LIBEXEC)/zc/zc/zc.rb $(BINDIR)/zonecheck
- $(INSTALL) -d $(MANDIR)/man1
-- $(INSTALL) -m 0644 man/zonecheck.1 $(MANDIR)/man1/zc.1
-+ #$(INSTALL) -m 0644 man/zonecheck.1 $(MANDIR)/man1/zc.1
- $(INSTALL) -m 0644 man/zonecheck.1 $(MANDIR)/man1/zonecheck.1
- @echo
diff -ruN zonecheck.bak/files/patch-installer.rb zonecheck/files/patch-installer.rb
--- zonecheck.bak/files/patch-installer.rb Thu Jan 1 01:00:00 1970
+++ zonecheck/files/patch-installer.rb Tue Nov 4 13:07:29 2003
@@ -0,0 +1,11 @@
+--- installer.rb.orig Mon Oct 27 17:42:01 2003
++++ installer.rb Tue Nov 4 13:06:14 2003
+@@ -190,8 +190,6 @@
+ def rule_all
+ inst_common ; patch_common
+ inst_cli
+- inst_cgi ; patch_cgi
+- inst_doc
+ end
+ def rule_cli
+ inst_common ; patch_common
diff -ruN zonecheck.bak/pkg-descr zonecheck/pkg-descr
--- zonecheck.bak/pkg-descr Tue Sep 2 15:56:37 2003
+++ zonecheck/pkg-descr Tue Nov 4 09:36:12 2003
@@ -6,7 +6,7 @@
* Does not depend on policies
* Fine grained test selection (by test, by categories, by zones)
* Full IPv6 support (connectivity and AAAA records)
- * Supports several input/output interfaces such as CLI, CGI, GUI
+ * Supports several input/output interfaces such as CLI, GUI
* Dedicated mode for use inside shell scripts
* Batch mode available (ideal when dealing with several domains)
* Multi-threaded application in order to cut down checking time
diff -ruN zonecheck.bak/pkg-plist zonecheck/pkg-plist
--- zonecheck.bak/pkg-plist Tue Sep 2 15:56:37 2003
+++ zonecheck/pkg-plist Tue Nov 4 12:58:56 2003
@@ -1,120 +1,128 @@
bin/zonecheck
-libexec/zc/lib/address.rb
-libexec/zc/lib/address/common.rb
-libexec/zc/lib/address/ipv4.rb
-libexec/zc/lib/address/ipv6.rb
-libexec/zc/lib/nresolv.rb
-libexec/zc/lib/nresolv/compatibility.rb
-libexec/zc/lib/nresolv/config.rb
-libexec/zc/lib/nresolv/constants.rb
-libexec/zc/lib/nresolv/dbg.rb
-libexec/zc/lib/nresolv/dig_output.rb
-libexec/zc/lib/nresolv/dns.rb
-libexec/zc/lib/nresolv/dns_message.rb
-libexec/zc/lib/nresolv/dns_name.rb
-libexec/zc/lib/nresolv/dns_resource.rb
-libexec/zc/lib/nresolv/host.rb
-libexec/zc/lib/nresolv/resolver.rb
-libexec/zc/lib/nresolv/transport.rb
-libexec/zc/lib/nresolv/wire.rb
-libexec/zc/lib/textfmt.rb
-libexec/zc/lib/whois.rb
-libexec/zc/locale/cgi.en
-libexec/zc/locale/cgi.fr
-libexec/zc/locale/cli.en
-libexec/zc/locale/cli.fr
-libexec/zc/locale/gtk.en
-libexec/zc/locale/gtk.fr
-libexec/zc/locale/inetd.en
-libexec/zc/locale/inetd.fr
-libexec/zc/locale/test/axfr.en
-libexec/zc/locale/test/axfr.fr
-libexec/zc/locale/test/connectivity.en
-libexec/zc/locale/test/connectivity.fr
-libexec/zc/locale/test/generic.en
-libexec/zc/locale/test/generic.fr
-libexec/zc/locale/test/loopback.en
-libexec/zc/locale/test/loopback.fr
-libexec/zc/locale/test/mail.en
-libexec/zc/locale/test/mail.fr
-libexec/zc/locale/test/misc.en
-libexec/zc/locale/test/misc.fr
-libexec/zc/locale/test/mx.en
-libexec/zc/locale/test/mx.fr
-libexec/zc/locale/test/nameserver.en
-libexec/zc/locale/test/nameserver.fr
-libexec/zc/locale/test/ns.en
-libexec/zc/locale/test/ns.fr
-libexec/zc/locale/test/rootserver.en
-libexec/zc/locale/test/rootserver.fr
-libexec/zc/locale/test/soa.en
-libexec/zc/locale/test/soa.fr
-libexec/zc/locale/zc.en
-libexec/zc/locale/zc.fr
-libexec/zc/test/axfr.rb
-libexec/zc/test/connectivity.rb
-libexec/zc/test/generic.rb
-libexec/zc/test/loopback.rb
-libexec/zc/test/mail.rb
-libexec/zc/test/misc.rb
-libexec/zc/test/mx.rb
-libexec/zc/test/nameserver.rb
-libexec/zc/test/ns.rb
-libexec/zc/test/rootserver.rb
-libexec/zc/test/soa.rb
-libexec/zc/zc/cache.rb
-libexec/zc/zc/cachemanager.rb
-libexec/zc/zc/config.rb
-libexec/zc/zc/config/lexer.rb
-libexec/zc/zc/config/parser.rb
-libexec/zc/zc/config/pos.rb
-libexec/zc/zc/config/token.rb
-libexec/zc/zc/console.rb
-libexec/zc/zc/data/logo.rb
-libexec/zc/zc/data/xpm.rb
-libexec/zc/zc/data/zonecheck.dtd
-libexec/zc/zc/dbg.rb
-libexec/zc/zc/ext/array.rb
-libexec/zc/zc/ext/gtk.rb
-libexec/zc/zc/framework.rb
-libexec/zc/zc/input/cgi.rb
-libexec/zc/zc/input/cli.rb
-libexec/zc/zc/input/gtk.rb
-libexec/zc/zc/input/inetd.rb
-libexec/zc/zc/instructions.rb
-libexec/zc/zc/locale.rb
-libexec/zc/zc/mail.rb
-libexec/zc/zc/msgcat.rb
-libexec/zc/zc/param.rb
-libexec/zc/zc/publisher.rb
-libexec/zc/zc/publisher/gtk.rb
-libexec/zc/zc/publisher/html.rb
-libexec/zc/zc/publisher/text.rb
-libexec/zc/zc/publisher/xml.rb
-libexec/zc/zc/report.rb
-libexec/zc/zc/report/byhost.rb
-libexec/zc/zc/report/byseverity.rb
-libexec/zc/zc/testmanager.rb
-libexec/zc/zc/zc.rb
-share/doc/zc/BUGS
-share/doc/zc/INSTALL
-share/doc/zc/README
-share/doc/zc/TODO
-etc/zc.conf-dist
-etc/zc.conf.arpa-dist
-etc/zc.conf.fr-dist
-@dirrm share/doc/zc
-@dirrm libexec/zc/zc/report
-@dirrm libexec/zc/zc/publisher
-@dirrm libexec/zc/zc/input
-@dirrm libexec/zc/zc/ext
-@dirrm libexec/zc/zc/data
-@dirrm libexec/zc/zc/config
-@dirrm libexec/zc/zc
-@dirrm libexec/zc/test
-@dirrm libexec/zc/locale/test
-@dirrm libexec/zc/locale
-@dirrm libexec/zc/lib/nresolv
-@dirrm libexec/zc/lib/address
-@dirrm libexec/zc/lib
-@dirrm libexec/zc
+libexec/zonecheck/zc/config/lexer.rb
+libexec/zonecheck/zc/config/parser.rb
+libexec/zonecheck/zc/config/pos.rb
+libexec/zonecheck/zc/config/token.rb
+libexec/zonecheck/zc/cache.rb
+libexec/zonecheck/zc/cachemanager.rb
+libexec/zonecheck/zc/config.rb
+libexec/zonecheck/zc/console.rb
+libexec/zonecheck/zc/dbg.rb
+libexec/zonecheck/zc/framework.rb
+libexec/zonecheck/zc/instructions.rb
+libexec/zonecheck/zc/locale.rb
+libexec/zonecheck/zc/mail.rb
+libexec/zonecheck/zc/msgcat.rb
+libexec/zonecheck/zc/param.rb
+libexec/zonecheck/zc/publisher.rb
+libexec/zonecheck/zc/report.rb
+libexec/zonecheck/zc/testmanager.rb
+libexec/zonecheck/zc/zc.rb
+libexec/zonecheck/zc/zonecheck.rb
+libexec/zonecheck/zc/data/logo.rb
+libexec/zonecheck/zc/data/xpm.rb
+libexec/zonecheck/zc/data/zonecheck.dtd
+libexec/zonecheck/zc/ext/array.rb
+libexec/zonecheck/zc/ext/gtk.rb
+libexec/zonecheck/zc/input/inetd.rb
+libexec/zonecheck/zc/input/cgi.rb
+libexec/zonecheck/zc/input/cli.rb
+libexec/zonecheck/zc/input/gtk.rb
+libexec/zonecheck/zc/publisher/html.rb
+libexec/zonecheck/zc/publisher/gtk.rb
+libexec/zonecheck/zc/publisher/text.rb
+libexec/zonecheck/zc/publisher/xml.rb
+libexec/zonecheck/zc/report/byhost.rb
+libexec/zonecheck/zc/report/byseverity.rb
+libexec/zonecheck/lib/address/common.rb
+libexec/zonecheck/lib/address/ipv4.rb
+libexec/zonecheck/lib/address/ipv6.rb
+libexec/zonecheck/lib/address.rb
+libexec/zonecheck/lib/nresolv.rb
+libexec/zonecheck/lib/textfmt.rb
+libexec/zonecheck/lib/whois.rb
+libexec/zonecheck/lib/nresolv/compatibility.rb
+libexec/zonecheck/lib/nresolv/config.rb
+libexec/zonecheck/lib/nresolv/constants.rb
+libexec/zonecheck/lib/nresolv/dbg.rb
+libexec/zonecheck/lib/nresolv/dig_output.rb
+libexec/zonecheck/lib/nresolv/dns.rb
+libexec/zonecheck/lib/nresolv/dns_message.rb
+libexec/zonecheck/lib/nresolv/dns_name.rb
+libexec/zonecheck/lib/nresolv/dns_resource.rb
+libexec/zonecheck/lib/nresolv/host.rb
+libexec/zonecheck/lib/nresolv/resolver.rb
+libexec/zonecheck/lib/nresolv/transport.rb
+libexec/zonecheck/lib/nresolv/wire.rb
+libexec/zonecheck/test/axfr.rb
+libexec/zonecheck/test/connectivity.rb
+libexec/zonecheck/test/generic.rb
+libexec/zonecheck/test/interop.rb
+libexec/zonecheck/test/loopback.rb
+libexec/zonecheck/test/mail.rb
+libexec/zonecheck/test/misc.rb
+libexec/zonecheck/test/mx.rb
+libexec/zonecheck/test/nameserver.rb
+libexec/zonecheck/test/ns.rb
+libexec/zonecheck/test/rootserver.rb
+libexec/zonecheck/test/soa.rb
+libexec/zonecheck/locale/inetd.en
+libexec/zonecheck/locale/cgi.en
+libexec/zonecheck/locale/cgi.fr
+libexec/zonecheck/locale/cli.en
+libexec/zonecheck/locale/cli.fr
+libexec/zonecheck/locale/gtk.en
+libexec/zonecheck/locale/gtk.fr
+libexec/zonecheck/locale/test/axfr.en
+libexec/zonecheck/locale/test/axfr.fr
+libexec/zonecheck/locale/test/connectivity.en
+libexec/zonecheck/locale/test/connectivity.fr
+libexec/zonecheck/locale/test/generic.en
+libexec/zonecheck/locale/test/generic.fr
+libexec/zonecheck/locale/test/interop.en
+libexec/zonecheck/locale/test/interop.fr
+libexec/zonecheck/locale/test/loopback.en
+libexec/zonecheck/locale/test/loopback.fr
+libexec/zonecheck/locale/test/mail.en
+libexec/zonecheck/locale/test/mail.fr
+libexec/zonecheck/locale/test/misc.en
+libexec/zonecheck/locale/test/misc.fr
+libexec/zonecheck/locale/test/mx.en
+libexec/zonecheck/locale/test/mx.fr
+libexec/zonecheck/locale/test/nameserver.en
+libexec/zonecheck/locale/test/nameserver.fr
+libexec/zonecheck/locale/test/ns.en
+libexec/zonecheck/locale/test/ns.fr
+libexec/zonecheck/locale/test/rootserver.en
+libexec/zonecheck/locale/test/rootserver.fr
+libexec/zonecheck/locale/test/soa.en
+libexec/zonecheck/locale/test/soa.fr
+libexec/zonecheck/locale/inetd.fr
+libexec/zonecheck/locale/zc.en
+libexec/zonecheck/locale/zc.fr
+etc/zonecheck-dist/zc.conf
+etc/zonecheck-dist/rootservers
+etc/zonecheck-dist/de.rules
+etc/zonecheck-dist/default.rules
+etc/zonecheck-dist/fr.rules
+etc/zonecheck-dist/reverse.rules
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+@dirrm libexec/zonecheck/zc/config
+@dirrm libexec/zonecheck/zc/data
+@dirrm libexec/zonecheck/zc/ext
+@dirrm libexec/zonecheck/zc/input
+@dirrm libexec/zonecheck/zc/publisher
+@dirrm libexec/zonecheck/zc/report
+@dirrm libexec/zonecheck/zc
+@dirrm libexec/zonecheck/lib/address
+@dirrm libexec/zonecheck/lib/nresolv
+@dirrm libexec/zonecheck/lib
+@dirrm libexec/zonecheck/test
+@dirrm libexec/zonecheck/locale/test
+@dirrm libexec/zonecheck/locale
+@dirrm libexec/zonecheck
+@dirrm etc/zonecheck-dist/
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311041424.hA4EOlqs040758>