Changes 2.2.8:

    Fix bug when displaying bad DB names used with !j command.

Changes 2.2.7:
    Fixed file descriptor leak when journal file is corrupted.

Changes 2.2.6:
    Fixed UII "show ip" command so that it does not crash IRRd.  Also
fixed incorrect output when more specific option is used with this command.

Changes 2.2.5:
    Allow more specific expansions for /8's or longer (instead of /16).

4 files changed, 28 insertions, 43 deletions

diff --git a/net/irrd/DESCR b/net/irrd/DESCR
index 5966b3105de..90bfd5acf4c 100644
--- a/net/irrd/DESCR
+++ b/net/irrd/DESCR
@@ -1,3 +1,2 @@
-IRRd is a freely available streamlined, stand-alone Internet
-Routing Registry database server. IRRd supports both RIPE-181
-and RPSL routing registry syntaxes.
+IRRd is a freely available streamlined, stand-alone Internet Routing Registry
+database server. IRRd supports both RIPE-181 and RPSL routing registry syntaxes.
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index ec74dd30932..632104facb5 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.33 2006/02/05 23:10:25 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/05/26 09:20:21 adam Exp $
 
-DISTNAME=		irrd2.2.3
-PKGNAME=		irrd-2.2.3
-PKGREVISION=		1
-CATEGORIES=		net
-MASTER_SITES=		http://www.irrd.net/ \
-			ftp://ftp.merit.edu/radb/irrd/ \
-			ftp://ftp.merit.edu/radb/irrd/old_releases/
-EXTRACT_SUFX=		.tgz
+DISTNAME=	irrd2.2.8
+PKGNAME=	irrd-2.2.8
+CATEGORIES=	net
+MASTER_SITES=	http://www.irrd.net/ \
+		ftp://ftp.merit.edu/radb/irrd/ \
+		ftp://ftp.merit.edu/radb/irrd/old_releases/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		kim@tac.nyc.ny.us
-HOMEPAGE=		http://www.irrd.net/
-COMMENT=		Internet Routing Registry Daemon
+MAINTAINER=	kim@tac.nyc.ny.us
+HOMEPAGE=	http://www.irrd.net/
+COMMENT=	Internet Routing Registry Daemon
 
-DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
-DEPENDS+=		wget-[0-9]*:../../net/wget
+DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
+DEPENDS+=	wget-[0-9]*:../../net/wget
 
 USE_TOOLS+=		automake flex perl:run
 
@@ -25,34 +24,23 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/src
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-thread
+CONFIGURE_ENV+=		ac_cv_path_GZIP_PATH=${GZIP_CMD:Q}
 
 BUILD_DEFS+=		USE_INET6
 
-CPPFLAGS+=		-I${LOCALBASE}/include
-CFLAGS+=		-g
+#CPPFLAGS+=		-I${LOCALBASE}/include
 
-IRRD_CACHER=		irrdcacher ripe2rpsl
+REPLACE_PERL+=		programs/irrdcacher/irrdcacher
+REPLACE_PERL+=		programs/irrdcacher/ripe2rpsl
 
 pre-configure:
 	cd ${WRKSRC} && aclocal && autoheader && autoconf
 
-post-build:
-	@cd ${WRKSRC}/programs/irrdcacher ; \
-	set -x ; \
-	for i in ${IRRD_CACHER} ; \
-	do \
-	    ${MV} $$i $$i.bak ; \
-	    ${SED} -e 's,/usr/bin/perl,${PERL5},' < $$i.bak > $$i ; \
-	done
-
 post-install:
-	@cd ${WRKSRC}/programs/IRRd && ${MAKE} install-man
-	@cd ${WRKSRC}/programs/irrdcacher ; \
-	set -x ; \
-	for i in ${IRRD_CACHER} ; \
-	do \
-	    ${INSTALL_SCRIPT} $$i ${PREFIX}/sbin ; \
-	done
+	cd ${WRKSRC}/programs/IRRd && ${MAKE} install-man
+	cd ${WRKSRC}/programs/irrdcacher && \
+	${INSTALL_SCRIPT} irrdcacher ${PREFIX}/sbin && \
+	${INSTALL_SCRIPT} ripe2rpsl ${PREFIX}/sbin
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/irrd/PLIST b/net/irrd/PLIST
index 438933d48af..230d53a4289 100644
--- a/net/irrd/PLIST
+++ b/net/irrd/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/31 22:31:51 kim Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/05/26 09:20:21 adam Exp $
 man/man8/irrd.8
 sbin/irr_notify
-sbin/irr_rpsl_check
-sbin/irr_rpsl_submit
 sbin/irrd
 sbin/irrdcacher
 sbin/ripe2rpsl
diff --git a/net/irrd/distinfo b/net/irrd/distinfo
index 1627e5d9a6c..b5ad819ea68 100644
--- a/net/irrd/distinfo
+++ b/net/irrd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2006/03/22 22:14:43 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/05/26 09:20:21 adam Exp $
 
-SHA1 (irrd2.2.3.tgz) = 5f1ceb19c630146f5325d475bdf2e04eb5ef187c
-RMD160 (irrd2.2.3.tgz) = 9fd7b87155d2d6d34c3bfe51613418ae959254a7
-Size (irrd2.2.3.tgz) = 689216 bytes
+SHA1 (irrd2.2.8.tgz) = cfaf5fb6e4abdd2bce8de0233231dd2514c5d111
+RMD160 (irrd2.2.8.tgz) = 74688380c6cdcc8ddaa5ebf8705c10922f02fb8b
+Size (irrd2.2.8.tgz) = 693852 bytes
 SHA1 (patch-aa) = 3059131bad8df2071ae64ea5e9d0c6f858a7ae2e
 SHA1 (patch-ab) = d9172a35b907dbaac24ef7b72fcce05310d674bd