diff options
Diffstat (limited to 'net/aiccu')
| -rw-r--r-- | net/aiccu/Makefile | 7 | ||||
| -rw-r--r-- | net/aiccu/PLIST | 3 | ||||
| -rw-r--r-- | net/aiccu/distinfo | 15 | ||||
| -rw-r--r-- | net/aiccu/patches/patch-aa | 40 | ||||
| -rw-r--r-- | net/aiccu/patches/patch-ab | 13 | ||||
| -rw-r--r-- | net/aiccu/patches/patch-ac | 8 | ||||
| -rw-r--r-- | net/aiccu/patches/patch-ad | 23 |
7 files changed, 39 insertions, 70 deletions
diff --git a/net/aiccu/Makefile b/net/aiccu/Makefile index 05bed884e41..9a10e065e65 100644 --- a/net/aiccu/Makefile +++ b/net/aiccu/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2006/11/10 20:58:09 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/18 14:42:17 ghen Exp $ -DISTNAME= aiccu_2006.07.25 +DISTNAME= aiccu_20070115 PKGNAME= ${DISTNAME:S/_/-/:S/.//g} CATEGORIES= net MASTER_SITES= http://www.sixxs.net/archive/sixxs/aiccu/unix/ @@ -10,7 +10,7 @@ HOMEPAGE= http://www.sixxs.net/tools/aiccu/ COMMENT= Automatic IPv6 Connectivity Client Utility USE_TOOLS+= gmake -CHECK_PORTABILITY_SKIP+= debian/* +CHECK_PORTABILITY_SKIP+=debian/* SUBST_CLASSES+= sysconfdir SUBST_STAGE.sysconfdir= post-patch @@ -39,6 +39,7 @@ do-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/README ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/LICENSE ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/COPYRIGHT ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/HOWTO ${DOCDIR} .include "../../mk/pthread.buildlink3.mk" diff --git a/net/aiccu/PLIST b/net/aiccu/PLIST index f63533feb9c..d83af02c44b 100644 --- a/net/aiccu/PLIST +++ b/net/aiccu/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/12/29 14:53:52 ghen Exp $ +@comment $NetBSD: PLIST,v 1.2 2007/01/18 14:42:17 ghen Exp $ man/man1/aiccu.1 sbin/aiccu +share/doc/aiccu/COPYRIGHT share/doc/aiccu/HOWTO share/doc/aiccu/LICENSE share/doc/aiccu/README diff --git a/net/aiccu/distinfo b/net/aiccu/distinfo index 29a00caffe0..cc9806d016a 100644 --- a/net/aiccu/distinfo +++ b/net/aiccu/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.5 2006/09/07 06:18:35 joerg Exp $ +$NetBSD: distinfo,v 1.6 2007/01/18 14:42:17 ghen Exp $ -SHA1 (aiccu_2006.07.25.tar.gz) = c031f4b29a92a0c1b5a0d4b9d9e81d6fe4da92aa -RMD160 (aiccu_2006.07.25.tar.gz) = 599d181bfccb4a1a30d315f60469078bcb269270 -Size (aiccu_2006.07.25.tar.gz) = 64161 bytes -SHA1 (patch-aa) = c2a69b01304f07da05e83a6bf80aebed4803b841 -SHA1 (patch-ab) = 63bab81f2507c2e20042d53086f2cd8c774ae30a -SHA1 (patch-ac) = e7df7fdb83f4898220ca36f4051539c911bfb6b7 -SHA1 (patch-ad) = 1fec51f11a7103bbc690eacdb9191d45b3666f1b +SHA1 (aiccu_20070115.tar.gz) = 7b3c51bfe291c777e74b2688e9339b4fb72e6a39 +RMD160 (aiccu_20070115.tar.gz) = 9415899c98c1f7e84b9711017b82a3a0ea2ae9de +Size (aiccu_20070115.tar.gz) = 70056 bytes +SHA1 (patch-ab_tunsip) = dce6b3b1a99acb0e966772b362d3e9e3a76044e2 +SHA1 (patch-aa) = 373c66c6a7b6a18ad9ab453f4fddf61634e8ad04 +SHA1 (patch-ac) = 105a1845883211a1c101e224c826ffcc630386fd diff --git a/net/aiccu/patches/patch-aa b/net/aiccu/patches/patch-aa index 5d37d229bc9..f4a7e9c271f 100644 --- a/net/aiccu/patches/patch-aa +++ b/net/aiccu/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2006/09/07 06:18:35 joerg Exp $ +$NetBSD: patch-aa,v 1.5 2007/01/18 14:42:17 ghen Exp $ ---- unix-console/Makefile.orig 2006-07-25 09:20:48.000000000 +0000 +--- unix-console/Makefile.orig 2007-01-15 12:04:27.000000000 +0100 +++ unix-console/Makefile -@@ -26,27 +26,15 @@ CWARNS += -W -Wall -Wshadow -Wpointer-ar +@@ -26,25 +26,12 @@ CWARNS += -W -Wall -Wshadow -Wpointer-ar #CFLAGS += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0 CFLAGS += $(CWARNS) -D_GNU_SOURCE @@ -22,35 +22,39 @@ $NetBSD: patch-aa,v 1.4 2006/09/07 06:18:35 joerg Exp $ -# Used by TIC to secure that communication -# Currently defaultly builds only on Linux, but other platforms might easily also support it -ifeq ($(shell uname | grep -c "Linux"),1) --CFLAGS += -D _LINUX -D AICCU_GNUTLS +-CFLAGS += -D AICCU_GNUTLS -LDFLAGS += -lgnutls -endif - # Linux ifeq ($(shell uname | grep -c "Linux"),1) -+CFLAGS += -D _LINUX - CFLAGS += -D AICCU_TYPE="\"linux\"" - SRCS += ../common/aiccu_linux.c - OBJS += ../common/aiccu_linux.o -@@ -74,7 +62,7 @@ endif + CFLAGS += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\"" +@@ -72,7 +59,7 @@ endif # DragonFlyBSD ifeq ($(shell uname | grep -c "DragonFly"),1) --CFLAGS += -D _DFBSD -D AICCU_TYPE="\"dragonfly\"" -+CFLAGS += -D_DFBSD -DAICCU_TYPE="\"dragonfly\"" +-CFLAGS += -D_DFBSD -D NEED_IFHEAD -D AICCU_TYPE="\"dragonfly\"" ++CFLAGS += -D_DFBSD -DNEED_IFHEAD -DAICCU_TYPE="\"dragonfly\"" SRCS += ../common/aiccu_freebsd4.c OBJS += ../common/aiccu_freebsd4.o CFLAGS += -pthread -@@ -82,10 +70,10 @@ endif +@@ -80,15 +67,15 @@ endif # NetBSD ifeq ($(shell uname | grep -c "NetBSD"),1) --CFLAGS += -D _NETBSD -D AICCU_TYPE="\"kame\"" +-CFLAGS += -D_NETBSD -D AICCU_TYPE="\"kame\"" +CFLAGS += -D_NETBSD -DAICCU_TYPE="\"kame\"" - SRCS += ../common/aiccu_kame.c - OBJS += ../common/aiccu_kame.o --CFLAGS += -pthread -D _NETBSD_SOURCE -+CFLAGS += -pthread -D_NETBSD_SOURCE + + # Check if net/if_tun.h has TUNSIFHEAD and enable support for it +-ifneq ($(shell grep -c TUNSIFHEAD /usr/include/net/if_tun.h 2>/dev/null),1) ++ifneq ($(shell grep -c TUNSIFHEAD /usr/include/net/if_tun.h 2>/dev/null),0) + # Supports TUNSIFHEAD -> AYIYA/l2tp available +-CFLAGS += -D NEED_IFHEAD ++CFLAGS += -DNEED_IFHEAD + else + # Doesn't support TUNSIFHEAD -> No AYIYA/l2tp available +-CFLAGS += -D NO_IFHEAD ++CFLAGS += -DNO_IFHEAD endif - # OpenBSD + SRCS += ../common/aiccu_kame.c diff --git a/net/aiccu/patches/patch-ab b/net/aiccu/patches/patch-ab deleted file mode 100644 index c908f2ab625..00000000000 --- a/net/aiccu/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2006/08/31 08:49:34 ghen Exp $ - ---- common/common.h.orig 2006-07-25 11:20:46.000000000 +0200 -+++ common/common.h -@@ -57,7 +57,7 @@ - #include <arpa/nameser_compat.h> - #else - #ifndef _WIN32 --#if defined(_OPENBSD) || defined(_DFBSD) || defined(_FREEBSD) -+#if defined(_OPENBSD) || defined(_DFBSD) || defined(_FREEBSD) || defined(_NETBSD) - #include <sys/endian.h> - #else - #include <endian.h> diff --git a/net/aiccu/patches/patch-ac b/net/aiccu/patches/patch-ac index d3a0e96d74c..4a1496927e7 100644 --- a/net/aiccu/patches/patch-ac +++ b/net/aiccu/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.2 2006/08/31 08:49:34 ghen Exp $ +$NetBSD: patch-ac,v 1.3 2007/01/18 14:42:17 ghen Exp $ ---- doc/aiccu.conf.orig 2006-07-18 23:24:30.000000000 +0200 +--- doc/aiccu.conf.orig 2007-01-07 18:42:29.000000000 +0100 +++ doc/aiccu.conf -@@ -8,7 +8,7 @@ +@@ -12,7 +12,7 @@ # ipv6_interface is the name of the interface that will be used as a tunnel interface. # On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels # or tunX (eg tun0) for AYIYA tunnels. -ipv6_interface sixxs +ipv6_interface gif0 - # The tunnel_id to use + # The tunnel_id to use (default: none) # (only required when there are multiple tunnels in the list) diff --git a/net/aiccu/patches/patch-ad b/net/aiccu/patches/patch-ad deleted file mode 100644 index 4d0dd2e988a..00000000000 --- a/net/aiccu/patches/patch-ad +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2006/08/31 08:49:34 ghen Exp $ - ---- common/aiccu_kame.c.orig 2006-07-23 16:55:14.000000000 +0200 -+++ common/aiccu_kame.c -@@ -45,10 +45,18 @@ bool aiccu_os_setup(struct TIC_Tunnel *h - hTunnel->sIPv6_LinkLocal); - - /* Local side of the tunnel */ -+#ifdef __NetBSD__ -+ aiccu_exec( -+ "ifconfig %s inet6 %s %s prefixlen 128 alias", -+ g_aiccu->ipv6_interface, -+ hTunnel->sIPv6_Local, -+ hTunnel->sIPv6_POP); -+#else - aiccu_exec( - "ifconfig %s inet6 %s prefixlen 128 alias", - g_aiccu->ipv6_interface, - hTunnel->sIPv6_Local); -+#endif - - /* Remote side of the tunnel */ - aiccu_exec( |