Upgrade to irrd-2.1.4 -- the old one did not compile anymore.

Note: uses gnupg instead of pgp5 now.

11 files changed, 14 insertions, 296 deletions

diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 70d3f164dab..76b01fd0bba 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.17 2001/09/27 23:18:27 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2002/09/01 15:30:11 kim Exp $
 
-DISTNAME=	irrd2.0a-Aug22-2000
-PKGNAME=	irrd-2.0.0.20000822
+DISTNAME=	irrd2.1.4
+PKGNAME=	irrd-2.1.4
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.merit.edu/radb/irrd/source/ \
-		ftp://ftp.merit.edu/radb/irrd/source/old_releases/
+MASTER_SITES=	http://www.irrd.net/ \
+		ftp://ftp.merit.edu/radb/irrd/ \
+		ftp://ftp.merit.edu/radb/irrd/old_releases/
 
 MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.irrd.net/
 COMMENT=	Internet Routing Registry Daemon
 
-BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-DEPENDS+=	gdbm-[0-9]*:../../databases/gdbm
-DEPENDS+=	pgp5-[0-9]*:../../security/pgp5
+DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
 DEPENDS+=	wget-[0-9]*:../../net/wget
 
 USE_PERL5=	# defined
@@ -28,9 +26,6 @@ CONFIGURE_ENV+=	YACC=bison
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-g
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
-
 IRRD_CACHER=	irrdcacher ripe2rpsl update_source
 
 post-build:
@@ -39,10 +34,11 @@ post-build:
 	for i in ${IRRD_CACHER} ; \
 	do \
 	    ${MV} $$i $$i.bak ; \
-	    ${SED} -e 's%/usr/local/bin/perl%${PERL5}%' < $$i.bak > $$i ; \
+	    ${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} ; \
diff --git a/net/irrd/PLIST b/net/irrd/PLIST
index 347ec15634f..ff9ef667264 100644
--- a/net/irrd/PLIST
+++ b/net/irrd/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/01 15:30:11 kim Exp $
+man/man8/irrd.8
 sbin/irr_check
 sbin/irr_notify
 sbin/irr_rpsl_submit
diff --git a/net/irrd/distinfo b/net/irrd/distinfo
index dada0b4463e..c03241b4bf0 100644
--- a/net/irrd/distinfo
+++ b/net/irrd/distinfo
@@ -1,12 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:18 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/09/01 15:30:11 kim Exp $
 
-SHA1 (irrd2.0a-Aug22-2000.tar.gz) = 8bf38353ca4ecabf2c3c15a3e19d594b3525af20
-Size (irrd2.0a-Aug22-2000.tar.gz) = 770952 bytes
-SHA1 (patch-aa) = 3b90b04a0e2666c3b84164986cd821770504ddf0
-SHA1 (patch-ab) = 82c07e323a16ddfe8676fddb25421c5aabf19660
-SHA1 (patch-ae) = aec63d911f69a4741baa9255b045fca3ccfe7e50
-SHA1 (patch-af) = 470beee00d9c02c742af46a73fd03e66fb8d775f
-SHA1 (patch-ag) = c88716c1786f527bc0012d6744e4e7b61cca2af1
-SHA1 (patch-ah) = 86ec84cf693825b240c7d5880fb55ff9d038907a
-SHA1 (patch-ai) = e75e2fa3e43bc8abe166eddbccd36493a2087c23
-SHA1 (patch-aj) = 4c4705b8f3e7ca38368eb2ea6a52f912237c1081
+SHA1 (irrd2.1.4.tar.gz) = 78135fa33cc8fe9fbdd0a290299d343e62ac748c
+Size (irrd2.1.4.tar.gz) = 855272 bytes
diff --git a/net/irrd/patches/patch-aa b/net/irrd/patches/patch-aa
deleted file mode 100644
index 57fcd718f34..00000000000
--- a/net/irrd/patches/patch-aa
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2000/10/07 19:24:14 kim Exp $
-
-It seems autoconf makes all switches "enable" even if the check is for
-a "disable" switch, which confuses the logic in configure.in and thus
-we disable the second test with the problematic default.
-
-Don't completely override CPPFLAGS so we get -I${LOCALBASE}/include there.
-
-Don't get anything from /usr/local ever!
-
-There is no support for PGP 2.6x in the source anymore.
-
---- configure.in.orig	Thu Aug 10 22:53:55 2000
-+++ configure.in	Sat Oct  7 04:02:30 2000
-@@ -29,9 +29,9 @@
- [  --disable-thread        disable thread always],
- [disable_thread=yes],)
- 
--AC_ARG_ENABLE(thread,
--[  --enable-thread         enable thread (on non-solaris platform)],
--[disable_thread=no],)
-+dnl AC_ARG_ENABLE(thread,
-+dnl [  --enable-thread         enable thread (on non-solaris platform)],
-+dnl [disable_thread=no],)
- 
- AC_ARG_ENABLE(mrouting,
- [  --disable-mrouting      disable multicast routing always],
-@@ -76,7 +76,8 @@
- 
- EXTRA_INCLUDE_DIRS=""
- EXTRA_LIBS=""
--CPPFLAGS="-DFUNCPROTO -I../../include"
-+#CPPFLAGS="-DFUNCPROTO -I../../include"
-+CPPFLAGS="-I../../include ${CPPFLAGS}"
- dnl defining FUNCPROTO ensures that struct library uses portotype
- dnl we don't expect non-ANSI (K&R) C compilers to be used
- dnl Some compiles may define __STDC__ by itself which makes it enable, 
-@@ -311,12 +312,12 @@
- dnl AC_CHECK_LIB(resolv, inet_pton, [LIBS="$LIBS -lresolv"])
- 
- 
--if test -d /usr/local/include; then
--    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--fi
--if test -d /usr/local/lib; then
--    LDFLAGS="$LDFLAGS -L/usr/local/lib"
--fi
-+dnl if test -d /usr/local/include; then
-+dnl     CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-+dnl fi
-+dnl if test -d /usr/local/lib; then
-+dnl     LDFLAGS="$LDFLAGS -L/usr/local/lib"
-+dnl fi
- 
- dnl find flex and bixon
- AC_PATH_PROG(FLEX_PATH,flex,no)
-@@ -426,21 +427,16 @@
- fi
- AC_PATH_PROG(PGPK_PATH,pgpk,no)
- if test $PGPK_PATH = no; then
--	PGPK_PATH=""
-+    PGPK_PATH=""
- fi
- AC_PATH_PROG(PGPS_PATH,pgps,no)
- if test $PGPS_PATH = no; then
--	PGPS_PATH=""
-+    PGPS_PATH=""
- fi
- AC_PATH_PROG(PGPV_PATH,pgpv,no)
- if test $PGPV_PATH = no; then
--    AC_PATH_PROG(PGPV_PATH,pgp,no)
--    if test $PGPV_PATH = no; then
--        PGPV_PATH=""
--        AC_DEFINE(PGP,0)
--    else
--        AC_DEFINE(PGP,26)
--    fi
-+    PGPV_PATH=""
-+    AC_DEFINE(PGP,0)
- else
-     AC_DEFINE(PGP, 5)        
- fi
diff --git a/net/irrd/patches/patch-ab b/net/irrd/patches/patch-ab
deleted file mode 100644
index 4cb4b0eac21..00000000000
--- a/net/irrd/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/10/07 19:24:14 kim Exp $
-
-These are needed so autoreconf will not barf.
-
---- acconfig.h.orig	Tue Feb 29 17:28:29 2000
-+++ acconfig.h	Fri Oct  6 20:04:29 2000
-@@ -83,3 +83,10 @@
- #undef HAVE_SENDMAIL
- 
- #undef PGP
-+
-+#undef FREEBSD4
-+#undef HAVE_CP
-+#undef HAVE_GZIP
-+#undef HAVE_IRRDCACHER
-+#undef HAVE_MV
-+#undef HAVE_WGET
diff --git a/net/irrd/patches/patch-ae b/net/irrd/patches/patch-ae
deleted file mode 100644
index dec27e662b7..00000000000
--- a/net/irrd/patches/patch-ae
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/10/07 19:24:15 kim Exp $
-
-NetBSD has no sigwait() available.
-
---- lib/timer/signal.c.orig	Tue Feb 29 17:28:54 2000
-+++ lib/timer/signal.c	Fri Oct  6 20:59:25 2000
-@@ -30,7 +30,7 @@
-     sigset_t set;
- 
-     sigemptyset (&set);
--#ifndef __linux__
-+#if !defined(__linux__) && !defined(__NetBSD__)
-     sigaddset (&set, SIGALRM);
- #endif /* __linux__ */
-     sigaddset (&set, SIGHUP);
-@@ -57,7 +57,7 @@
- /* function where alarm is delivered */
- static void_fn_t timer_fire_fn = NULL;
- 
--#if !defined(HAVE_LIBPTHREAD) || defined (__linux__)
-+#if !defined(HAVE_LIBPTHREAD) || defined (__linux__) || defined(__NetBSD__)
- /* Thread uses sigwait(), instead */
- 
- static int alarm_pending = 0;
-@@ -88,7 +88,7 @@
- void
- mrt_alarm (void)
- {
--#if defined(HAVE_LIBPTHREAD) && !defined(__linux__)
-+#if defined(HAVE_LIBPTHREAD) && !defined(__linux__) && !defined(__NetBSD__)
-     int sig;
-     sigset_t set;
- 
-@@ -164,7 +164,7 @@
-     sigset_t set;
- #endif /* NT */
- 
--#if !defined(HAVE_LIBPTHREAD) || defined(__linux__)
-+#if !defined(HAVE_LIBPTHREAD) || defined(__linux__) || defined(__NetBSD__)
- #ifdef HAVE_SIGACTION /* POSIX actually */
-     {
-     	struct sigaction act;
-@@ -191,7 +191,7 @@
-     sigemptyset (&set);
-     sigaddset (&set, SIGALRM);
- #endif /* NT */
--#if defined(HAVE_LIBPTHREAD) && !defined(__linux__)
-+#if defined(HAVE_LIBPTHREAD) && !defined(__linux__) && !defined(__NetBSD__)
-     /* sigwait() will be used so that ALARM must be blocked 
-        even in the main thread */
-     pthread_sigmask (SIG_BLOCK, &set, NULL);
diff --git a/net/irrd/patches/patch-af b/net/irrd/patches/patch-af
deleted file mode 100644
index 12817aeaa86..00000000000
--- a/net/irrd/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/10/07 19:24:15 kim Exp $
-
-We don't need rps_dist.  We could build it if we always enable
-threads and fix the Makefile to get CPPFLAGS and CFLAGS right.
-
---- programs/Makefile.orig	Mon Aug 21 14:08:05 2000
-+++ programs/Makefile	Fri Oct  6 21:13:15 2000
-@@ -8,7 +8,7 @@
- INSTALL_DIRS= IRRd irr_submit irr_rpsl_check irr_notify 
- #DIRS=$(PROGRAM_DIRS)
- DIRS=atomic_ops IRRd hdr_comm pgp irr_rpsl_check irrd_ops \
--	irr_notify irr_submit rps_dist
-+	irr_notify irr_submit # rps_dist
- 
- all:  make-programs
- 
diff --git a/net/irrd/patches/patch-ag b/net/irrd/patches/patch-ag
deleted file mode 100644
index 31603b644e5..00000000000
--- a/net/irrd/patches/patch-ag
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2000/10/07 19:24:15 kim Exp $
-
-Avoid conflict with libpgp.a from pgp5.
-
---- programs/irr_notify/Makefile.orig	Mon Jul 24 21:06:15 2000
-+++ programs/irr_notify/Makefile	Sat Oct  7 04:20:47 2000
-@@ -6,7 +6,7 @@
- include ../../Make.include
- 
- GOAL   = irr_notify
--IRR_LIBS = -L../irrd_ops -lirrd_ops -L../hdr_comm -lhdrs -L../pgp -lpgp -L$(EXEC_PREFIX)/lib 
-+IRR_LIBS = ../irrd_ops/libirrd_ops.a ../hdr_comm/libhdrs.a ../pgp/libpgp.a
- LIBOBJS= notify.o trans_hdrs.o notify_msgs.o util.o 
- OBJS   = $(LIBOBJS) main.o
- #CFLAGS = -I../hdr_comm -I../irrd_ops -g -O2 -Wall -DSMALL_ENDIAN -DBSDOS
-@@ -14,8 +14,8 @@
- all:  $(GOAL) libnfy.a
- 
- $(GOAL): $(OBJS)
--	@echo "Linking: $(LDFLAGS) $(LD) $(OBJS) -o $@ $(IRR_LIBS) $(IRRD_OPS_LIBS)"
--	@$(LD) $(LDFLAGS) $(OBJS) -o $@ $(IRR_LIBS) $(IRRD_OPS_LIBS)  -L../../lib/ $(SYS_LIBS)
-+	@echo "Linking: $(LD) $(LDFLAGS) $(OBJS) -o $@ $(IRR_LIBS) $(IRRD_OPS_LIBS) $(SYS_LIBS)"
-+	@$(LD) $(LDFLAGS) $(OBJS) -o $@ $(IRR_LIBS) $(IRRD_OPS_LIBS) $(SYS_LIBS)
- 
- 
- $(GOAL).purify:	$(OBJS) $(MRT_LIBS)
-@@ -29,7 +29,7 @@
- 	$(RANLIB) $@
- 
- install: $(GOAL)
--	$(INSTALL) -m 755 -o root -g bin $(GOAL) $(DESTDIR)/$(GOAL)
-+	$(INSTALL) $(GOAL) $(DESTDIR)/$(GOAL)
- 
- clean:
- 	$(RM) *.a *.o core *.core *~*  *.purify $(GOAL)
diff --git a/net/irrd/patches/patch-ah b/net/irrd/patches/patch-ah
deleted file mode 100644
index 5e67ad5bac3..00000000000
--- a/net/irrd/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2000/10/07 19:24:15 kim Exp $
-
-Avoid conflict with libpgp.a from pgp5.
-
---- programs/irr_rpsl_check/Makefile.orig	Mon Jul 24 21:06:19 2000
-+++ programs/irr_rpsl_check/Makefile	Sat Oct  7 04:16:37 2000
-@@ -16,8 +16,8 @@
- all:  $(GOAL) librpslchk.a
- 
- $(GOAL): $(OBJS)
--	@echo "Linking: $(LD) $(LDFLAGS) $(OBJS) $(IRRD_OPS_LIBS) -o $@ -L../hdr_comm -lhdrs -L../pgp -lpgp"
--	@$(LD) $(LDFLAGS) $(OBJS) $(IRRD_OPS_LIBS) -o $@ -L../hdr_comm -lhdrs  -L../pgp -lpgp
-+	@echo "Linking: $(LD) $(LDFLAGS) $(OBJS) $(IRRD_OPS_LIBS) -o $@ ../hdr_comm/libhdrs. ../pgp/libpgp.a"
-+	@$(LD) $(LDFLAGS) $(OBJS) $(IRRD_OPS_LIBS) -o $@ ../hdr_comm/libhdrs.a  ../pgp/libpgp.a
- 
- #	@$(CP) ./$@ $(EXEC_PREFIX)/bin/
- 
diff --git a/net/irrd/patches/patch-ai b/net/irrd/patches/patch-ai
deleted file mode 100644
index 19311113a69..00000000000
--- a/net/irrd/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2000/10/07 19:24:15 kim Exp $
-
-According to pipe(2) this pipe was backwards, which caused
-fdopen(3) to fail immediately.
-
---- programs/irr_submit/pgpchk.c.orig	Thu Aug 17 17:57:08 2000
-+++ programs/irr_submit/pgpchk.c	Sat Oct  7 05:11:56 2000
-@@ -120,9 +120,9 @@
- 	  /* time to muck around with stdin and stdout... */;

- 	  pipe(p);

-           if (fork() == 0) { /* Child */

--            dup2(p[0], 1);

--            dup2(p[0], 2);

--            close(p[1]);

-+            dup2(p[1], 1);

-+            dup2(p[1], 2);

-+            close(p[0]);

- 

- 	    /* Sample v5 invokation

- 	       % /usr/local/bin/pgpv --pubring=/irr/etc/.pgp/pubring.pkr \

-@@ -152,8 +152,8 @@
-             /* parent */ 

- 	    regcomp(&pgpkeyidre, pgpkeyid, REG_EXTENDED);

-             

--            close(p[0]);

--            if ((pgppipe = fdopen(p[1], "r")) == NULL) {

-+            close(p[1]);

-+            if ((pgppipe = fdopen(p[0], "r")) == NULL) {

- 	      trace (NORM, tr, "fdopen in PGP decode failed\n");

- 	      return (-1);

- 	    }

diff --git a/net/irrd/patches/patch-aj b/net/irrd/patches/patch-aj
deleted file mode 100644
index 1b3dab75558..00000000000
--- a/net/irrd/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2000/10/07 19:24:16 kim Exp $
-
-Do not try to fclose(NULL).
-
---- programs/IRRd/database.c.orig	Fri Aug 18 14:42:18 2000
-+++ programs/IRRd/database.c	Sat Oct  7 14:59:02 2000
-@@ -93,9 +93,13 @@
-     HASH_Clear (db->hash_spec);
-   }
- 
--  trace (NORM, default_trace, "Creating new radix and closing db->fd\n");
-+  trace (NORM, default_trace, "Creating new db->radix\n");
-   db->radix = New_Radix (128);
--  fclose (db->fd);
-+
-+  if (db->fd != NULL) {
-+    trace (NORM, default_trace, "Closing db->fd\n");
-+    fclose (db->fd);
-+  }
- 
-   db->fd = NULL;
-   db->db_syntax = EMPTY_DB;