From 48cb94d7a3479a47f9cc4d857fd92484cc1455f2 Mon Sep 17 00:00:00 2001 From: Sergey Matveychuk Date: Fri, 15 Feb 2008 14:17:22 +0000 Subject: [PATCH] - Update to 2.3.4 - Take maintainership because of maintainer email is bounced: takano@net-chef.net Recipient address rejected: User unknown in local recipient table --- net/irrd/Makefile | 40 ++++++++++++--------------------- net/irrd/distinfo | 6 ++--- net/irrd/files/irrd.sh | 28 ----------------------- net/irrd/files/patch-configure | 33 +++++++++------------------ net/irrd/files/patch-database.c | 13 ----------- net/irrd/pkg-plist | 4 +--- 6 files changed, 28 insertions(+), 96 deletions(-) delete mode 100644 net/irrd/files/irrd.sh delete mode 100644 net/irrd/files/patch-database.c diff --git a/net/irrd/Makefile b/net/irrd/Makefile index 30f29f3700de..e34b5164a222 100644 --- a/net/irrd/Makefile +++ b/net/irrd/Makefile @@ -6,13 +6,13 @@ # PORTNAME= irrd -PORTVERSION= 2.1.5 +PORTVERSION= 2.3.4 CATEGORIES= net ipv6 MASTER_SITES= http://www.irrd.net/ DISTNAME= ${PORTNAME}${PORTVERSION} EXTRACT_SUFX= .tgz -MAINTAINER= takano@net-chef.net +MAINTAINER= sem@FreeBSD.org COMMENT= Internet Routing Registry database server WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/src @@ -24,10 +24,10 @@ MAN8= irrd.8 IRRD_CONFDIR= ${PREFIX}/etc RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -USE_RC_SUBR= yes +USE_RC_SUBR= irrd.sh GNU_CONFIGURE= yes CONFIGURE_ENV= YACC="${YACC}" -CONFIGURE_ARGS+= --disable-thread +#CONFIGURE_ARGS+= --disable-thread .if defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --disable-ipv6 @@ -36,32 +36,20 @@ CONFIGURE_ARGS+= --enable-ipv6 .endif post-patch: - ${REINPLACE_CMD} -e 's|/etc/irrd.conf|${IRRD_CONFDIR}/irrd.conf|g' \ - ${WRKSRC}/programs/IRRd/irrd.8 \ - ${WRKSRC}/programs/IRRd/main.c \ - ${WRKSRC}/programs/hdr_comm/read_conf.c \ - ${WRKSRC}/programs/irr_notify/main.c \ - ${WRKSRC}/programs/irr_rpsl_check/main.c \ - ${WRKSRC}/programs/irr_submit/main.c \ - ${WRKSRC}/programs/irrdcacher/irrdcacher \ - ${WRKSRC}/programs/rps_dist/rpsdist.c - -post-build: - ${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/irrd.sh > ${WRKDIR}/irrd.sh + ${REINPLACE_CMD} -e 's|/etc/irrd.conf|${IRRD_CONFDIR}/irrd.conf|g' \ + ${WRKSRC}/programs/IRRd/irrd.8 \ + ${WRKSRC}/programs/IRRd/main.c \ + ${WRKSRC}/programs/irr_rpsl_submit/main.c \ + ${WRKSRC}/programs/irr_notify/main.c \ + ${WRKSRC}/programs/irr_rpsl_check/main.c \ + ${WRKSRC}/programs/rps_dist/rpsdist.c \ + ${WRKSRC}/programs/irrdcacher/irrdcacher \ + ${WRKSRC}/programs/hdr_comm/read_conf.c post-install: @${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/irrdcacher ${PREFIX}/sbin @${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/ripe2rpsl ${PREFIX}/sbin - @${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/update_source ${PREFIX}/sbin @${INSTALL_DATA} ${WRKSRC}/../samples/irrd.conf.sample ${IRRD_CONFDIR} @${INSTALL_DATA} ${WRKSRC}/programs/IRRd/irrd.8 ${PREFIX}/man/man8 - @${INSTALL_SCRIPT} ${WRKDIR}/irrd.sh ${PREFIX}/etc/rc.d -.include - -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 -.endif - -.include +.include diff --git a/net/irrd/distinfo b/net/irrd/distinfo index 5690929d79c4..b8fba5121e87 100644 --- a/net/irrd/distinfo +++ b/net/irrd/distinfo @@ -1,3 +1,3 @@ -MD5 (irrd2.1.5.tgz) = 49a6e471b1e9b65ae8ebcdbb9ee4341b -SHA256 (irrd2.1.5.tgz) = 0cd90e34159e90cef5fab1bececc6630078c234e2bc2499ba772f3237837cf44 -SIZE (irrd2.1.5.tgz) = 761652 +MD5 (irrd2.3.4.tgz) = c9e308a3402c505d4efc762315a7412e +SHA256 (irrd2.3.4.tgz) = 2974157b6956250d9e82fa2b8f39d5e0e0d04601d94e321aaa08c1d259ed7079 +SIZE (irrd2.3.4.tgz) = 691907 diff --git a/net/irrd/files/irrd.sh b/net/irrd/files/irrd.sh deleted file mode 100644 index 033b875555b6..000000000000 --- a/net/irrd/files/irrd.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# PROVIDE: irrd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -# Define these irrd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/irrd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -irrd_enable="${irrd_enable:-NO}" # Enable irrd -#irrd_program="%%PREFIX%%/sbin/irrd" # Location of irrd -irrd_flags="${irrd_flags:--u}" # Flags to imapd program - -. %%RC_SUBR%% - -name="irrd" -rcvar=`set_rcvar` -command="%%PREFIX%%/sbin/irrd" -required_files="%%PREFIX%%/etc/irrd.conf" - -load_rc_config $name -run_rc_command "$1" diff --git a/net/irrd/files/patch-configure b/net/irrd/files/patch-configure index 80447baddb67..c34662282724 100644 --- a/net/irrd/files/patch-configure +++ b/net/irrd/files/patch-configure @@ -1,24 +1,11 @@ ---- configure.orig Fri Oct 18 04:32:52 2002 -+++ configure Fri Mar 26 19:57:10 2004 -@@ -1033,14 +1033,16 @@ - # Check whether --enable-thread or --disable-thread was given. - if test "${enable_thread+set}" = set; then - enableval="$enable_thread" -- disable_thread=yes -+ if test "x${enable_thread}" != "xyes"; then -+ disable_thread=yes -+ fi - fi; +--- configure.orig 2006-09-12 21:40:55.000000000 +0400 ++++ configure 2008-02-15 16:23:17.000000000 +0300 +@@ -6011,7 +6011,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include - # Check whether --enable-thread or --disable-thread was given. --if test "${enable_thread+set}" = set; then -- enableval="$enable_thread" -- disable_thread=no --fi; -+#if test "${enable_thread+set}" = set; then -+# enableval="$enable_thread" -+# disable_thread=no -+#fi; - - # Check whether --enable-wall or --disable-wall was given. - if test "${enable_wall+set}" = set; then + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | diff --git a/net/irrd/files/patch-database.c b/net/irrd/files/patch-database.c deleted file mode 100644 index 1b8e2a1cf2ed..000000000000 --- a/net/irrd/files/patch-database.c +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/IRRd/database.c.orig Fri Oct 18 05:02:29 2002 -+++ programs/IRRd/database.c Thu Apr 22 17:13:52 2004 -@@ -61,7 +61,9 @@ - HASH_Clear (db->hash_spec); - - db->radix = New_Radix (128); -- fclose (db->db_fp); -+ -+ if (db->db_fp != NULL) -+ fclose (db->db_fp); - - db->db_fp = NULL; - db->db_syntax = EMPTY_DB; diff --git a/net/irrd/pkg-plist b/net/irrd/pkg-plist index 5d2904f7eca0..717e21a999bd 100644 --- a/net/irrd/pkg-plist +++ b/net/irrd/pkg-plist @@ -1,9 +1,7 @@ sbin/irrd +sbin/irr_rpsl_check sbin/irr_rpsl_submit -sbin/irr_check sbin/irr_notify sbin/irrdcacher sbin/ripe2rpsl -sbin/update_source etc/irrd.conf.sample -etc/rc.d/irrd.sh