diff options
author | kim <kim> | 2000-10-07 19:24:13 +0000 |
---|---|---|
committer | kim <kim> | 2000-10-07 19:24:13 +0000 |
commit | d5e546b4c7d86e48f667f4b09886effe8967d39e (patch) | |
tree | 99c125241cd7f574b1430ad7d824338a7a117d69 /net | |
parent | cd6fb372a7a0715688a5540f1ae30c368579d8c9 (diff) | |
download | pkgsrc-d5e546b4c7d86e48f667f4b09886effe8967d39e.tar.gz |
Update to irrd-2.0.0.20000822 for Y2K.
Diffstat (limited to 'net')
-rw-r--r-- | net/irrd/Makefile | 49 | ||||
-rw-r--r-- | net/irrd/files/md5 | 4 | ||||
-rw-r--r-- | net/irrd/files/patch-sum | 14 | ||||
-rw-r--r-- | net/irrd/patches/patch-aa | 168 | ||||
-rw-r--r-- | net/irrd/patches/patch-ab | 20 | ||||
-rw-r--r-- | net/irrd/patches/patch-ac | 15 | ||||
-rw-r--r-- | net/irrd/patches/patch-ad | 18 | ||||
-rw-r--r-- | net/irrd/patches/patch-ae | 51 | ||||
-rw-r--r-- | net/irrd/patches/patch-af | 16 | ||||
-rw-r--r-- | net/irrd/patches/patch-ag | 35 | ||||
-rw-r--r-- | net/irrd/patches/patch-ah | 17 | ||||
-rw-r--r-- | net/irrd/patches/patch-ai | 31 | ||||
-rw-r--r-- | net/irrd/patches/patch-aj | 22 | ||||
-rw-r--r-- | net/irrd/pkg/PLIST | 6 |
14 files changed, 309 insertions, 157 deletions
diff --git a/net/irrd/Makefile b/net/irrd/Makefile index dbbb72c563c..ca39ffc0a79 100644 --- a/net/irrd/Makefile +++ b/net/irrd/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2000/10/01 03:25:03 kim Exp $ +# $NetBSD: Makefile,v 1.9 2000/10/07 19:24:13 kim Exp $ # -DISTNAME= irrd-1.5-beta-Sept-24-1999 -PKGNAME= irrd-1.5-beta-19990924 +DISTNAME= irrd2.0a-Aug22-2000 +PKGNAME= irrd-2.0.0.20000822 CATEGORIES= net MASTER_SITES= ftp://ftp.merit.edu/radb/irrd/source/ \ ftp://ftp.merit.edu/radb/irrd/source/old_releases/ @@ -10,28 +10,49 @@ MASTER_SITES= ftp://ftp.merit.edu/radb/irrd/source/ \ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.irrd.net/ +DEPENDS+= gdbm-*:../../databases/gdbm +DEPENDS+= pgp5-*:../../security/pgp5 +DEPENDS+= wget-*:../../net/wget + +USE_PERL5= # defined + BUILD_DEPENDS+= autoreconf:../../devel/autoconf BUILD_DEPENDS+= bison:../../devel/bison -WRKSRC= ${WRKDIR}/irrd-1.5 +WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --without-gdbm --with-db1 -CONFIGURE_ARGS+= --disable-thread +CONFIGURE_ARGS+=--with-gdbm +CONFIGURE_ARGS+=--disable-thread CONFIGURE_ENV+= YACC=bison +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" + +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -g pre-configure: @(cd ${WRKSRC} && autoreconf) -.include "../../mk/bsd.prefs.mk" +IRRD_CACHER= irrdcacher ripe2rpsl update_source -.if defined(IRRD_USE_PGP) && ${IRRD_USE_PGP} == 5 -DEPENDS+= pgp-5.*:../../security/pgp5 -.elif defined(IRRD_USE_PGP) && ${IRRD_USE_PGP} == 2 -DEPENDS+= pgp-2.*:../../security/pgp2 -.else -CONFIGURE_ARGS+= --without-pgp -.endif +post-build: + @cd ${WRKSRC}/programs/irrdcacher ; \ + set -x ; \ + for i in ${IRRD_CACHER} ; \ + do \ + ${MV} $$i $$i.bak ; \ + ${SED} -e 's%/usr/local/bin/perl%${PERL5}%' < $$i.bak > $$i ; \ + done + +post-install: + @cd ${WRKSRC}/programs/irrdcacher ; \ + set -x ; \ + for i in ${IRRD_CACHER} ; \ + do \ + ${INSTALL_SCRIPT} $$i ${PREFIX}/sbin ; \ + done + +.include "../../mk/bsd.prefs.mk" .if defined(USE_INET6) && ${USE_INET6} == "YES" # default diff --git a/net/irrd/files/md5 b/net/irrd/files/md5 index 294d2f9fcc9..206608dfccb 100644 --- a/net/irrd/files/md5 +++ b/net/irrd/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/10/28 19:50:19 kim Exp $ +$NetBSD: md5,v 1.2 2000/10/07 19:24:13 kim Exp $ -MD5 (irrd-1.5-beta-Sept-24-1999.tar.gz) = cf6d25f3d5f17044ce0dfd5b42d25ce7 +MD5 (irrd2.0a-Aug22-2000.tar.gz) = 380d7d7e3bf7f98bb37f31b35cb5222f diff --git a/net/irrd/files/patch-sum b/net/irrd/files/patch-sum index 95fb51aa34a..286dee39136 100644 --- a/net/irrd/files/patch-sum +++ b/net/irrd/files/patch-sum @@ -1,6 +1,10 @@ -$NetBSD: patch-sum,v 1.2 2000/09/13 15:14:41 fredb Exp $ +$NetBSD: patch-sum,v 1.3 2000/10/07 19:24:14 kim Exp $ -MD5 (patch-aa) = 6b4a6411a298dede181a4891780c939e -MD5 (patch-ab) = 63068873063cce05da48ff02a2e8d0f9 -MD5 (patch-ac) = 210e70db5b5ed608f9b950c7b2e5574f -MD5 (patch-ad) = 92713a0b298a9c069ad351be3c117f83 +MD5 (patch-aa) = b2842dec8937905b0c640ead30eef90d +MD5 (patch-ab) = 9f6c4a4c91a88b7570fb625b28b1bf14 +MD5 (patch-ae) = f7e8ef4ae4505d8665be931d76276a89 +MD5 (patch-af) = e6a543c8c2b34f374a1743f43d445f12 +MD5 (patch-ag) = 4eaabc4f083103fdaddd3008ff57f597 +MD5 (patch-ah) = a3edec955492fd8f8e051f3eccfb2afe +MD5 (patch-ai) = 7e40f4a02f986b34defbb41fdab0890c +MD5 (patch-aj) = b69b9f256726145776691071fb8293f1 diff --git a/net/irrd/patches/patch-aa b/net/irrd/patches/patch-aa index 8815531889d..57fcd718f34 100644 --- a/net/irrd/patches/patch-aa +++ b/net/irrd/patches/patch-aa @@ -1,102 +1,82 @@ -$NetBSD: patch-aa,v 1.2 2000/09/13 15:14:41 fredb Exp $ +$NetBSD: patch-aa,v 1.3 2000/10/07 19:24:14 kim Exp $ ---- configure.in.orig Mon Sep 6 14:31:59 1999 -+++ configure.in Wed Sep 13 09:40:58 2000 -@@ -39,7 +39,7 @@ - CRYPT_LIB="-lcrypt" - AC_DEFINE(USE_LOCKF) - ;; -- *freebsd*) IRRD_OPS_LIBS="" -+ *freebsd*|*netbsd*) IRRD_OPS_LIBS="" - CRYPT_LIB="-lcrypt" - AC_DEFINE(USE_FLOCK) - ;; -@@ -91,11 +91,12 @@ +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 -+ AC_PATH_PROG(PGP_PATH,pgp,no) -+ if test $PGP_PATH = no; then - PGPV_PATH="" - AC_DEFINE(PGP,0) - else -+ PGPV_PATH="$PGP_PATH" - AC_DEFINE(PGP,26) - fi +- PGPV_PATH="" +- AC_DEFINE(PGP,0) +- else +- AC_DEFINE(PGP,26) +- fi ++ PGPV_PATH="" ++ AC_DEFINE(PGP,0) else -@@ -178,18 +179,18 @@ - ifelse([$4], , , [else $4]) - fi]) - --case "${host_os}" in -- *bsdi* | *freebsd* | *netbsd* ) --dnl use kernel source if available -- AC_DIR_EXIST(/sys/sys, [ -- CPPFLAGS="$CPPFLAGS -I/sys" -- IN_H="$IN_H /sys/netinet/in.h" -- IF_H="$IF_H /sys/net/if.h"]) -- ;; -- * ) --dnl including header files under /sys makes SIOCGIFCONF confused on sunos. -- ;; --esac -+#case "${host_os}" in -+# *bsdi* | *freebsd* | *netbsd* ) -+#dnl use kernel source if available -+# AC_DIR_EXIST(/sys/sys, [ -+# CPPFLAGS="$CPPFLAGS -I/sys" -+# IN_H="$IN_H /sys/netinet/in.h" -+# IF_H="$IF_H /sys/net/if.h"]) -+# ;; -+# * ) -+#dnl including header files under /sys makes SIOCGIFCONF confused on sunos. -+# ;; -+#esac - - dnl Add the ICMP code; we'll have to turn this into an interactive - dnl question during the configure process later... -@@ -302,9 +303,10 @@ - AC_CHECK_HEADERS(gdbm.h, [exist_gdbm=yes],[exist_gdbm=no]) - fi - --AC_CHECK_LIB(db, dbopen, [exist_db1=yes],[exist_db1=no]) --if test $exist_db1 = yes; then - AC_CHECK_HEADERS(db.h, [exist_db1=yes],[exist_db1=no]) -+if test $exist_db1 = yes; then -+AC_CHECK_FUNC(dbopen,[db1_lib=no], -+ [AC_CHECK_LIB(db, dbopen, [DB_LIB="-ldb"],[exist_db1=no])]) + AC_DEFINE(PGP, 5) fi - - AC_MSG_CHECKING(for GDBM preference) -@@ -349,7 +351,6 @@ - if test "$db1_pref" = "DB1"; then - if test $exist_db1 = yes; then - AC_DEFINE(USE_DB1) -- DB_LIB="-ldb" - db_check=done - AC_MSG_RESULT(using DB1) - fi -@@ -371,7 +372,6 @@ - if test "$db1_pref" != "NODB1"; then - if test $exist_db1 = yes; then - AC_DEFINE(USE_DB1) -- DB_LIB="-ldb" - db_check=done - AC_MSG_RESULT(using DB1) - fi -@@ -435,6 +435,13 @@ - AC_DEFINE(HAVE_LINUX_2_2_5_IPV6) - ] - ) -+ ;; -+ *netbsd0|*netbsd1.[0123]*|*netbsd1.4|*netbsd1.4.*|*netbsd1.4[A-J] ) -+ AC_MSG_RESULT(no) -+ ;; -+ *netbsd* ) -+ AC_DEFINE(HAVE_IPV6) -+ AC_MSG_RESULT(yes... NetBSD IPv6) - ;; - *solaris* ) - AC_FILE_EXIST(/usr/ipv6/sbin/ifconfig, [ diff --git a/net/irrd/patches/patch-ab b/net/irrd/patches/patch-ab index f020ecaf7fc..4cb4b0eac21 100644 --- a/net/irrd/patches/patch-ab +++ b/net/irrd/patches/patch-ab @@ -1,11 +1,17 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/10/28 19:50:19 kim Exp $ +$NetBSD: patch-ab,v 1.2 2000/10/07 19:24:14 kim Exp $ ---- acconfig.h.orig Sat Jun 19 22:47:34 1999 -+++ acconfig.h Fri Oct 22 18:28:26 1999 -@@ -72,3 +72,6 @@ +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 - /* define if using the new linux 2.2.5 kernel (redhat6.0) */ - #undef HAVE_LINUX_2_2_5_IPV6 + #undef PGP + -+/* keep autoreconf happy */ ++#undef FREEBSD4 ++#undef HAVE_CP +#undef HAVE_GZIP ++#undef HAVE_IRRDCACHER ++#undef HAVE_MV ++#undef HAVE_WGET diff --git a/net/irrd/patches/patch-ac b/net/irrd/patches/patch-ac deleted file mode 100644 index ff3bc43b68a..00000000000 --- a/net/irrd/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/10/28 19:50:19 kim Exp $ - ---- programs/IRRd/Makefile.orig Mon Sep 6 15:33:16 1999 -+++ programs/IRRd/Makefile Fri Oct 22 19:10:48 1999 -@@ -5,9 +5,7 @@ - - include ../../Make.include - --CPPFLAGS= -I../../include -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DFUNCPROTO -I/usr/local/include --LDFLAGS= -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -L/usr/local/lib --SYS_LIBS= $(THREADLIBS) -lresolv -lsocket -lnsl -+SYS_LIBS= $(THREADLIBS) $(IRRD_OPS_LIBS) - QUANTIFY= quantify -threads=yes -max-threads=80 -cache-dir="./" - PURIFY= purify -threads=yes -max-threads=80 -cache-dir="./" - diff --git a/net/irrd/patches/patch-ad b/net/irrd/patches/patch-ad deleted file mode 100644 index 59981061b2a..00000000000 --- a/net/irrd/patches/patch-ad +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/10/28 19:50:19 kim Exp $ - ---- programs/irr_submit/Makefile.orig Thu Sep 9 20:38:40 1999 -+++ programs/irr_submit/Makefile Fri Oct 22 19:19:07 1999 -@@ -42,8 +42,11 @@ - lint `echo $(RPSLOBJS) | sed -e 's,\.o,.c,g'` - - install: $(GOAL) -- $(INSTALL) -m 755 $(GOAL) $(DESTDIR)/$(GOAL) -- -+ @set -x; \ -+ for i in $(GOAL); \ -+ do \ -+ $(INSTALL) -m 755 $$i $(DESTDIR)/$$i; \ -+ done - - clean: - $(RM) *.o core *.core *~* *tab.* lex.yy.c $(GOAL) diff --git a/net/irrd/patches/patch-ae b/net/irrd/patches/patch-ae new file mode 100644 index 00000000000..dec27e662b7 --- /dev/null +++ b/net/irrd/patches/patch-ae @@ -0,0 +1,51 @@ +$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 new file mode 100644 index 00000000000..12817aeaa86 --- /dev/null +++ b/net/irrd/patches/patch-af @@ -0,0 +1,16 @@ +$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 new file mode 100644 index 00000000000..31603b644e5 --- /dev/null +++ b/net/irrd/patches/patch-ag @@ -0,0 +1,35 @@ +$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 new file mode 100644 index 00000000000..5e67ad5bac3 --- /dev/null +++ b/net/irrd/patches/patch-ah @@ -0,0 +1,17 @@ +$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 new file mode 100644 index 00000000000..19311113a69 --- /dev/null +++ b/net/irrd/patches/patch-ai @@ -0,0 +1,31 @@ +$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 new file mode 100644 index 00000000000..1b3dab75558 --- /dev/null +++ b/net/irrd/patches/patch-aj @@ -0,0 +1,22 @@ +$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; diff --git a/net/irrd/pkg/PLIST b/net/irrd/pkg/PLIST index 573a799a275..f5f7a0abbbb 100644 --- a/net/irrd/pkg/PLIST +++ b/net/irrd/pkg/PLIST @@ -1,6 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/28 19:50:19 kim Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/10/07 19:24:16 kim Exp $ sbin/irr_check sbin/irr_notify sbin/irr_rpsl_submit -sbin/irr_submit sbin/irrd +sbin/irrdcacher +sbin/ripe2rpsl +sbin/update_source |