head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.2.0.36 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.34 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.32 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.30 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.28 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.26 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.24 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.22 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.20 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.18 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.2 pkgsrc-2004Q4-base:1.1; locks; strict; comment @# @; 1.4 date 2011.02.07.05.45.17; author obache; state dead; branches; next 1.3; 1.3 date 2011.02.06.14.22.29; author mlelstv; state Exp; branches; next 1.2; 1.2 date 2005.02.28.12.53.53; author wiz; state dead; branches; next 1.1; 1.1 date 2004.12.04.15.46.41; author peter; state Exp; branches; next ; desc @@ 1.4 log @* remove patch-aa, one patch for multple files, not registerd in distinfo. split to multiple patches with new style patch file name, and regist. * set LICENSE=modified-bsd. * dependency on devel/check is just a build-depend, for test only. @ text @--- configure.in.orig 2011-02-06 14:20:17.000000000 +0100 +++ configure.in 2011-02-06 14:20:51.000000000 +0100 @@@@ -186,6 +186,9 @@@@ if test "$ac_cv_header_sys_socket_h" = yes ; then AC_DNET_SOCKADDR_SA_LEN fi +if test "$ac_cv_header_net_if_h" = yes ; then + AC_DNET_IFREQ_IFR_SPACE +fi if test "$ac_cv_header_net_if_arp_h" = yes ; then AC_DNET_ARPREQ_ARP_DEV fi --- aclocal.m4.orig 2011-02-06 14:02:01.000000000 +0100 +++ aclocal.m4 2011-02-06 14:08:47.000000000 +0100 @@@@ -6776,6 +6776,30 @@@@ fi]) dnl +dnl Check for NetBSD ifreq structure +dnl +dnl usage: AC_DNET_IFREQ_IFR_SPACE +dnl results: HAVE_IFREQ_IFR_SPACE (defined) +dnl +AC_DEFUN(AC_DNET_IFREQ_IFR_SPACE, + [AC_MSG_CHECKING(for ifr_space in ifreq struct) + AC_CACHE_VAL(ac_cv_dnet_ifreq_has_ifr_space, + AC_TRY_COMPILE([ +# ifndef _IFREQ_IFR_SPACE +# define _IFREQ_IFR_SPACE 1 +# endif +# include +# include ], + [u_int i = sizeof(((struct ifreq *)0)->ifr_space)], + ac_cv_dnet_ifreq_has_ifr_space=yes, + ac_cv_dnet_ifreq_has_ifr_space=no)) + AC_MSG_RESULT($ac_cv_dnet_ifreq_has_ifr_space) + if test $ac_cv_dnet_ifreq_has_ifr_space = yes ; then + AC_DEFINE(HAVE_IFREQ_IFR_SPACE, 1, + [Define if ifreq struct has ifr_space.]) + fi]) + +dnl dnl Check for sockaddr_in6 struct in dnl dnl usage: AC_DNET_SOCKADDR_IN6 --- include/config.h.in.orig 2011-02-06 14:54:20.000000000 +0100 +++ include/config.h.in 2011-02-06 14:55:18.000000000 +0100 @@@@ -142,6 +142,9 @@@@ /* Define if sockaddr struct has sa_len. */ #undef HAVE_SOCKADDR_SA_LEN +/* Define if ifreq struct has ifr_space. */ +#undef HAVE_IFREQ_IFR_SPACE + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H --- src/intf.c.orig 2011-02-06 14:08:54.000000000 +0100 +++ src/intf.c 2011-02-06 14:09:57.000000000 +0100 @@@@ -55,6 +55,9 @@@@ # define ifr_mtu ifr_metric #endif +#ifdef HAVE_IFREQ_IFR_SPACE +# define NEXTIFR(i) (i + 1) +#else #ifdef HAVE_SOCKADDR_SA_LEN # define NEXTIFR(i) ((struct ifreq *)((u_char *)&i->ifr_addr + \ (i->ifr_addr.sa_len ? i->ifr_addr.sa_len : \ @@@@ -62,6 +65,7 @@@@ #else # define NEXTIFR(i) (i + 1) #endif +#endif /* XXX - superset of ifreq, for portable SIOC{A,D}IFADDR */ struct dnet_ifaliasreq { @ 1.3 log @add autoconf test for new SIOCGIFCONF interface that uses a ifru_space member to store larger addresses and parse interface list accordingly. @ text @@ 1.2 log @Update to 1.10. Changes in 1.10: quick bugfix release, for non-Python install, and to add some minor updates to the Python module. Changes in 1.9: this long overdue libdnet release includes the following changes: - Tru64 now fully supported - new tun(3) tunnel device interface - improved Python module support - win32 MinGW and VC++ developer's pack @ text @d1 56 a56 1 $NetBSD: patch-aa,v 1.1 2004/12/04 15:46:41 peter Exp $ d58 20 a77 13 --- src/fw-pf.c.orig 2004-12-04 15:50:08.000000000 +0100 +++ src/fw-pf.c 2004-12-04 15:57:49.000000000 +0100 @@@@ -29,8 +29,8 @@@@ /* * XXX - cope with moving pf API */ -#if defined(DIOCRINABEGIN) -/* OpenBSD 3.3 */ +#if defined(DIOCRINABEGIN) || defined(DIOCXCOMMIT) +/* OpenBSD 3.3 and higher */ /* $OpenBSD: pfvar.h,v 1.130 2003/01/09 10:40:45 cedric Exp $ */ /* $OpenBSD: pfvar.h,v 1.127 2003/01/05 22:14:23 dhartmei Exp $ */ # define PFRA_ADDR(ra) (ra)->addr.v.a.addr.v4.s_addr @ 1.1 log @Update to 1.8 and include a patch to make it compile on systems with a new pf(4) version. Approved by wiz. Changes: unknown @ text @d1 1 a1 1 $NetBSD$ @