[pkgsrc/trunk]: pkgsrc/net/irrd update irrd to version 2.3.9

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/irrd update irrd to version 2.3.9
From: spz <spz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:05:54 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d613100349b5
branches:  trunk
changeset: 572336:d613100349b5
user:      spz <spz%pkgsrc.org@localhost>
date:      Tue Feb 23 20:37:05 2010 +0000

description:
update irrd to version 2.3.9
fixes PR pkg/36813, PR pkg/38002, and the still relevant parts of pkg/36811
(IPv6 is no longer optional)

diffstat:

 net/irrd/MESSAGE          |    6 +
 net/irrd/Makefile         |   86 +++++++++++++-------
 net/irrd/PLIST            |    6 +-
 net/irrd/distinfo         |   18 ++-
 net/irrd/files/irrd.sh    |   24 +++++
 net/irrd/patches/patch-aa |  189 +++++++++++++++++++++++++++++++++++++--------
 net/irrd/patches/patch-ab |   15 ---
 net/irrd/patches/patch-ac |   22 -----
 net/irrd/patches/patch-ae |   13 +++
 net/irrd/patches/patch-af |   17 ++++
 net/irrd/patches/patch-ag |   13 +++
 net/irrd/patches/patch-ah |   13 +++
 net/irrd/patches/patch-ai |   13 +++
 net/irrd/patches/patch-aj |   13 +++
 14 files changed, 337 insertions(+), 111 deletions(-)

diffs (truncated from 581 to 300 lines):

diff -r 187cb0fa043c -r d613100349b5 net/irrd/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrd/MESSAGE  Tue Feb 23 20:37:05 2010 +0000
@@ -0,0 +1,6 @@
+===========================================================================
+
+The useful user documentation is ${PREFIX}/share/doc/irrd/irrd-user.pdf
+                              or ${PREFIX}/share/doc/irrd/irrd-user.sgml
+
+===========================================================================
diff -r 187cb0fa043c -r d613100349b5 net/irrd/Makefile
--- a/net/irrd/Makefile Tue Feb 23 20:32:38 2010 +0000
+++ b/net/irrd/Makefile Tue Feb 23 20:37:05 2010 +0000
@@ -1,55 +1,79 @@
-# $NetBSD: Makefile,v 1.41 2009/08/03 14:20:14 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2010/02/23 20:37:05 spz Exp $
 
-DISTNAME=      irrd2.2.8
-PKGNAME=       irrd-2.2.8
-PKGREVISION=   2
-CATEGORIES=    net
-MASTER_SITES=  http://www.irrd.net/
-EXTRACT_SUFX=  .tgz
+DISTNAME=              irrd2.3.9
+PKGNAME=               irrd-2.3.9
+CATEGORIES=            net
+MASTER_SITES=          http://www.irrd.net/
+EXTRACT_SUFX=          .tgz
 
-MAINTAINER=    kim%tac.nyc.ny.us@localhost
-HOMEPAGE=      http://www.irrd.net/
-COMMENT=       Internet Routing Registry Daemon
+MAINTAINER=            kim%tac.nyc.ny.us@localhost
+HOMEPAGE=              http://www.irrd.net/
+COMMENT=               Internet Routing Registry Daemon
+LICENSE=               original-bsd
 
-MAKE_JOBS_SAFE=        no
+MAKE_JOBS_SAFE=                no
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-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 yacc
+USE_TOOLS+=            automake autoconf flex perl:run yacc
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.irrd
-PKG_SUPPORTED_OPTIONS= inet6
+PKG_SYSCONFSUBDIR=     irrd
+EGDIR=                 ${PREFIX}/share/examples/irrd
+DOCDIR=                        ${PREFIX}/share/doc/irrd
+CONF_FILES+=           ${EGDIR}/irrd.conf ${PKG_SYSCONFDIR}/irrd.conf
 
-.include "../../mk/bsd.options.mk"
+IRRD_USER=             irrd
+IRRD_GROUP=            irrd
+
+PKG_GROUPS=            ${IRRD_USER}
+PKG_USERS=             ${IRRD_USER:Q}:${IRRD_GROUP:Q}
+PKG_GECOS.${IRRD_USER}=        IRRd user
+RCD_SCRIPTS+=          irrd
 
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --disable-thread
-
-#PTHREAD_AUTO_VARS=    yes
+#CONFIGURE_ARGS+=      --enable-thread
 #PTHREAD_OPTS+=                require
-#.include "../../mk/pthread.buildlink3.mk"
 
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --enable-ipv6
-.else
-CONFIGURE_ARGS+=       --disable-ipv6
-.endif
+PTHREAD_AUTO_VARS=     yes
+.include "../../mk/pthread.buildlink3.mk"
 
 REPLACE_PERL+=         programs/irrdcacher/irrdcacher
 REPLACE_PERL+=         programs/irrdcacher/ripe2rpsl
 
-INSTALLATION_DIRS=     ${PKGMANDIR}/man8 sbin
+FILES_SUBST+=          VARBASE=${VARBASE:Q}
+FILES_SUBST+=          DOCDIR=${DOCDIR:Q}
+FILES_SUBST+=          IRRD_USER=${IRRD_USER:Q}
+FILES_SUBST+=          IRRD_GROUP=${IRRD_GROUP:Q}
+
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man8
+INSTALLATION_DIRS+=    sbin
+INSTALLATION_DIRS+=    ${EGDIR}
+INSTALLATION_DIRS+=    ${DOCDIR}
+
+OWN_DIRS_PERMS+=       ${PKG_SYSCONFDIR}/pgp ${IRRD_USER} ${IRRD_GROUP} 750
+OWN_DIRS_PERMS+=       ${VARBASE}/irrd/db ${IRRD_USER} ${IRRD_GROUP} 755
+OWN_DIRS_PERMS+=       ${VARBASE}/irrd/log ${IRRD_USER} ${IRRD_GROUP} 755
 
 pre-configure:
-       cd ${WRKSRC} && aclocal && autoheader && autoconf
+       cd ${WRKSRC} && ${RM} acconfig.h && autoreconf
+
+SUBST_CLASSES+=                confpaths
+SUBST_FILES.confpaths= ../samples/irrd.conf.sample
+SUBST_SED.confpaths=   -e 's,/var/spool/irr_database,'${VARBASE}'/irrd/db,'
+SUBST_SED.confpaths+=  -e 's,/var/log/irrd,'${VARBASE}'/irrd/log/irrd.log,'
+SUBST_STAGE.confpaths= post-patch
 
 post-install:
-       cd ${WRKSRC}/programs/IRRd && ${MAKE} install-man
+       ${INSTALL_DATA} ${WRKSRC}/../samples/irrd.conf.sample ${DESTDIR}${EGDIR}/irrd.conf
+       ${INSTALL_DATA} ${WRKSRC}/../irrd-user.pdf ${DESTDIR}${DOCDIR}/irrd-user.pdf
+       ${INSTALL_DATA} ${WRKSRC}/../irrd-user.sgml ${DESTDIR}${DOCDIR}/irrd-user.sgml
+       cd ${WRKSRC}/programs/IRRd && ${MAKE} DESTDIR=${DESTDIR} install-man
        cd ${WRKSRC}/programs/irrdcacher && \
-       ${INSTALL_SCRIPT} irrdcacher ${PREFIX}/sbin && \
-       ${INSTALL_SCRIPT} ripe2rpsl ${PREFIX}/sbin
+       ${INSTALL_SCRIPT} irrdcacher ${DESTDIR}${PREFIX}/sbin && \
+       ${INSTALL_SCRIPT} ripe2rpsl ${DESTDIR}${PREFIX}/sbin
 
 .include "../../mk/bsd.pkg.mk"
diff -r 187cb0fa043c -r d613100349b5 net/irrd/PLIST
--- a/net/irrd/PLIST    Tue Feb 23 20:32:38 2010 +0000
+++ b/net/irrd/PLIST    Tue Feb 23 20:37:05 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/05/29 16:14:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/02/23 20:37:05 spz Exp $
 man/man8/irrd.8
 sbin/irr_notify
 sbin/irrd
@@ -6,3 +6,7 @@
 sbin/irr_rpsl_submit
 sbin/irrdcacher
 sbin/ripe2rpsl
+share/examples/irrd/irrd.conf
+share/examples/rc.d/irrd
+share/doc/irrd/irrd-user.pdf
+share/doc/irrd/irrd-user.sgml
diff -r 187cb0fa043c -r d613100349b5 net/irrd/distinfo
--- a/net/irrd/distinfo Tue Feb 23 20:32:38 2010 +0000
+++ b/net/irrd/distinfo Tue Feb 23 20:37:05 2010 +0000
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.12 2009/04/07 17:58:19 hasso Exp $
+$NetBSD: distinfo,v 1.13 2010/02/23 20:37:05 spz Exp $
 
-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
-SHA1 (patch-ac) = 5ea304aad5a2b3a2e835e63ac58ebbb83f12a5c3
+SHA1 (irrd2.3.9.tgz) = 73281b1f73bfa2267535d70906ff35c266083ec2
+RMD160 (irrd2.3.9.tgz) = de212320204cde0d05abf848e952f8f1bf06503d
+Size (irrd2.3.9.tgz) = 777722 bytes
+SHA1 (patch-aa) = 5b7c5c9c2183c19b188a98017f526bf71904b1d5
 SHA1 (patch-ad) = 313a1d44c4623123f7c2a37ff2740887fa32bdb2
+SHA1 (patch-ae) = c012cd8e34f9b492bc03593b3598de030c04849b
+SHA1 (patch-af) = aa14907291184040f16561e01ecb9775bcecd702
+SHA1 (patch-ag) = 9b23300fcaf1b1a48547fff2501f1e81ba86ed0c
+SHA1 (patch-ah) = 74a5e88dd79385ebb7bb3cb7a3cd6da46d26fd54
+SHA1 (patch-ai) = d256698195bc90727c54ddb3f55c14e0e4f0437f
+SHA1 (patch-aj) = c357f5da9f127978263b22220ea11e3e650eaaf0
diff -r 187cb0fa043c -r d613100349b5 net/irrd/files/irrd.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrd/files/irrd.sh    Tue Feb 23 20:37:05 2010 +0000
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# PROVIDE: irrd
+# REQUIRE: DAEMON
+
+name="irrd"
+
+if [ -f /etc/rc.subr ]; then
+       . /etc/rc.subr
+else
+       if [ -f @PREFIX@/etc/rc.subr ]; then
+               . @PREFIX@/etc/rc.subr
+       fi
+fi
+
+: ${irrd_conf:="@PKG_SYSCONFDIR@/irrd.conf"}
+
+rcvar=${name}
+required_files="${irrd_conf}"
+command="@PREFIX@/sbin/irrd"
+command_args="-f ${irrd_conf} -l @IRRD_USER@ -g @IRRD_GROUP@"
+
+load_rc_config $name
+run_rc_command "$1"
diff -r 187cb0fa043c -r d613100349b5 net/irrd/patches/patch-aa
--- a/net/irrd/patches/patch-aa Tue Feb 23 20:32:38 2010 +0000
+++ b/net/irrd/patches/patch-aa Tue Feb 23 20:37:05 2010 +0000
@@ -1,16 +1,17 @@
-$NetBSD: patch-aa,v 1.7 2004/12/31 23:01:33 kim Exp $
+$NetBSD: patch-aa,v 1.8 2010/02/23 20:37:06 spz Exp $
 
---- configure.in.orig  2003-11-17 15:29:46.000000000 -0500
-+++ configure.in       2004-12-31 17:55:25.000000000 -0500
-@@ -10,27 +10,23 @@
+--- configure.in.orig  2006-09-12 17:40:57.000000000 +0000
++++ configure.in
+@@ -11,23 +11,23 @@ dnl initializing defaults
  dnl I've seen a report that pthread support is shaky in FreeBSD 2.x releases
  case "${host_os}" in
      freebsd2* )
 -      disable_thread=yes
 +      enable_thread=no
      ;;
-     solaris*|linux*|freebsd* )
+-    solaris*|linux*|freebsd* )
 -      disable_thread=no
++    solaris*|linux*|freebsd*|dragonfly*|netbsd* )
 +      enable_thread=yes
      ;;
      * ) 
@@ -22,50 +23,73 @@
  AC_ARG_ENABLE(thread,
  [  --disable-thread        disable thread always],
 -[disable_thread=yes],)
--
--AC_ARG_ENABLE(thread,
--[  --enable-thread         enable thread (on non-solaris platform)],
++[enable_thread=no],)
+ 
+ AC_ARG_ENABLE(thread,
+ [  --enable-thread         enable thread (on non-solaris platform)],
 -[disable_thread=no],)
-+)
++[enable_thread=yes],)
  
  AC_ARG_ENABLE(wall,
  [  --disable-wall          disable -Wall option always],
--[disable_wall=yes],)
-+)
+@@ -52,7 +52,7 @@ MODULES=""
  
- pwd=`pwd`
- pwd=`basename $pwd`
-@@ -65,7 +61,7 @@
- dnl fi
+ EXTRA_INCLUDE_DIRS=""
+ EXTRA_LIBS=""
+-CPPFLAGS="-DFUNCPROTO -I../../include"
++CPPFLAGS="$CPPFLAGS -DFUNCPROTO -I../../include"
+ 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, 
+@@ -83,7 +83,7 @@ fi
+ QUANTIFY="quantify"
+ PURIFY="purify"
  
- AC_MSG_CHECKING(for -Wall option)
--if test "$disable_wall" = yes; then
-+if test "$enable_wall" != yes; then
-    if test "$GCC" != "yes"; then
- dnl shut up SUN WorkShop Compilers
-        CFLAGS="$CFLAGS -w"
-@@ -115,12 +111,18 @@
+-AC_DEFUN(AC_FILE_EXIST, [
++AC_DEFUN([AC_FILE_EXIST], [
+ if test -f "$1" >/dev/null 2>&1; then
+   ifelse([$2], , :, [$2])
+   ifelse([$3], , , [else $3])
+@@ -109,28 +109,34 @@ dnl      fi
+ esac
+ 
+ case "${host_os}" in
+-    solaris* )
+-      CRYPT_LIB="-lcrypt"
+-    ;;
+     bsdi* )
          LIBS="$LIBS -lipc"
      ;;
-     freebsd*|netbsd*|openbsd* )
+-    freebsd*|netbsd*|openbsd* )
 -        if test "$disable_thread" != yes; then
-+        if test "$enable_thread" = yes; then
-               LDFLAGS="$LDFLAGS -pthread"
-                 THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
-         fi
+-              LDFLAGS="$LDFLAGS -pthread"
+-                THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+-        fi
+-      CRYPT_LIB="-lcrypt"
+-        ac_pthrlib="c_r"
+-    ;;
+-    linux* )
++    solaris*|freebsd*|dragonfly*|netbsd*|openbsd*|linux* )
        CRYPT_LIB="-lcrypt"
--        ac_pthrlib="c_r"
 +      case "${host_os}" in
++          freebsd*|dragonfly*|openbsd* )
++              if test "$enable_thread" = yes; then
++                  LDFLAGS="$LDFLAGS $(PTHREAD_LDFLAGS)"
++                  THREAD_CFLAGS="$(PTHREAD_CFLAGS)"
++                  LIBS="$LIBS $(PTHREAD_LIBS)"
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/p5-Test-YAML-Meta Updating devel/p5-Test-YAML-Me...
Next by Date: [pkgsrc/trunk]: pkgsrc/net/msdl Update msdl to 1.2.7.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/p5-Test-YAML-Meta Updating devel/p5-Test-YAML-Me...
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/msdl Update msdl to 1.2.7.
Indexes:
Home | Main Index | Thread Index | Old Index