diff options
author | rpaulo <rpaulo> | 2006-05-02 15:36:09 +0000 |
---|---|---|
committer | rpaulo <rpaulo> | 2006-05-02 15:36:09 +0000 |
commit | 1b48e79265ea0c25c1750bcb4b38e9f955777a84 (patch) | |
tree | 6d67d84b3c1eba41e9bc54dd55e84439cf5e78c6 /net/miredo | |
parent | ff702c88bbed9452ab34ac1d1492773adefea4c8 (diff) | |
download | pkgsrc-1b48e79265ea0c25c1750bcb4b38e9f955777a84.tar.gz |
Update to version 0.8.4.
Changes include the fix for this security problem:
http://www.simphalempin.com/dev/miredo/mtfl-sa-0601.shtml.en
and the additon of most pkgsrc patches.
Diffstat (limited to 'net/miredo')
-rw-r--r-- | net/miredo/Makefile | 9 | ||||
-rw-r--r-- | net/miredo/PLIST | 14 | ||||
-rw-r--r-- | net/miredo/distinfo | 17 | ||||
-rw-r--r-- | net/miredo/patches/patch-aa | 46 | ||||
-rw-r--r-- | net/miredo/patches/patch-ab | 59 | ||||
-rw-r--r-- | net/miredo/patches/patch-ac | 41 | ||||
-rw-r--r-- | net/miredo/patches/patch-ad | 44 | ||||
-rw-r--r-- | net/miredo/patches/patch-ae | 14 | ||||
-rw-r--r-- | net/miredo/patches/patch-af | 12 |
9 files changed, 63 insertions, 193 deletions
diff --git a/net/miredo/Makefile b/net/miredo/Makefile index e63e2de35d4..1c45ca44f2a 100644 --- a/net/miredo/Makefile +++ b/net/miredo/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2006/04/03 23:30:34 rpaulo Exp $ +# $NetBSD: Makefile,v 1.6 2006/05/02 15:36:09 rpaulo Exp $ -DISTNAME= miredo-0.8.0 +DISTNAME= miredo-0.8.4 CATEGORIES= net -PKGREVISION= 1 MASTER_SITES= http://www.remlab.net/files/miredo/v0.8/ EXTRACT_SUFX= .tar.bz2 @@ -10,13 +9,15 @@ MAINTAINER= rpaulo@NetBSD.org HOMEPAGE= http://www.simphalempin.com/dev/miredo/ COMMENT= Teredo IPv6 tunneling -NOT_FOR_PLATFORM= Interix-*-* NetBSD-[0-3]*-* SunOS-*-* +#NOT_FOR_PLATFORM= Interix-*-* NetBSD-[0-3]*-* SunOS-*-* GNU_CONFIGURE= yes USE_LIBTOOL= yes EGDIR= ${PREFIX}/share/examples/miredo CONF_FILES= ${EGDIR}/miredo.conf-dist ${PKG_SYSCONFDIR}/miredo.conf +CONF_FILES+= ${EGDIR}/miredo-server.conf-dist \ + ${PKG_SYSCONFDIR}/miredo-server.conf INSTALLATION_DIRS= share/examples/miredo diff --git a/net/miredo/PLIST b/net/miredo/PLIST index 8a3e0871280..bbed15375e3 100644 --- a/net/miredo/PLIST +++ b/net/miredo/PLIST @@ -1,16 +1,26 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/05/02 15:36:09 rpaulo Exp $ sbin/miredo sbin/miredo-server include/libteredo/teredo.h -include/tun6.h +include/libteredo/teredo-udp.h +include/libteredo/tunnel.h +include/libtun6/tun6.h man/man5/miredo-server.conf.5 man/man5/miredo.conf.5 man/man8/miredo-server.8 man/man8/miredo.8 lib/libteredo.a lib/libteredo.la +lib/libteredo.so +lib/libteredo.so.0 +lib/libteredo.so.0.0.0 lib/libtun6.a lib/libtun6.la +lib/libtun6.so +lib/libtun6.so.0 +lib/libtun6.so.0.0.0 share/examples/miredo/miredo.conf-dist share/examples/miredo/miredo-server.conf-dist +@dirrm include/libteredo +@dirrm include/libtun6 @dirrm share/examples/miredo diff --git a/net/miredo/distinfo b/net/miredo/distinfo index 5d1df6fe16b..6bafa5fa4cf 100644 --- a/net/miredo/distinfo +++ b/net/miredo/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.3 2006/04/03 23:30:34 rpaulo Exp $ +$NetBSD: distinfo,v 1.4 2006/05/02 15:36:09 rpaulo Exp $ -SHA1 (miredo-0.8.0.tar.bz2) = 806a96730ef2687e8fbaea7c5bce7a9ffc2e7367 -RMD160 (miredo-0.8.0.tar.bz2) = ef9cc7c8db0188c5e5f364dbc8d24112e75a106f -Size (miredo-0.8.0.tar.bz2) = 397357 bytes -SHA1 (patch-aa) = a5d3876d3e23681a3dae58867619c75434cbd0a9 -SHA1 (patch-ab) = 31a6367610995e2a366bab773cff9c4a52bc049d -SHA1 (patch-ac) = b9bd7176a9a89956447b5cf4ae4e48d2c262f37b -SHA1 (patch-ad) = 67f36caf1eca4909eb3a9c9d0c769d962cf1247c -SHA1 (patch-ae) = 67341ce2087881d22b8f6a95666cd12c1a1c07ab -SHA1 (patch-af) = d25bdc8544abd5fa3579c7901673e560447afa40 +SHA1 (miredo-0.8.4.tar.bz2) = 57b2f3880c2e6ec0342478fd6fd329f457250de9 +RMD160 (miredo-0.8.4.tar.bz2) = f72409d4f63800e7f9adc833a1916c7a2939db07 +Size (miredo-0.8.4.tar.bz2) = 407550 bytes +SHA1 (patch-aa) = 864290fea0303cf82bacace2cf955408983bbf18 +SHA1 (patch-ab) = 9299baae1f7741ddec743159aa871999eff8228a +SHA1 (patch-ac) = 47f281a8f5088d0c5082a6a2d854b8aae8018641 diff --git a/net/miredo/patches/patch-aa b/net/miredo/patches/patch-aa index 789bd7f8056..21d40efb42c 100644 --- a/net/miredo/patches/patch-aa +++ b/net/miredo/patches/patch-aa @@ -1,33 +1,21 @@ -$NetBSD: patch-aa,v 1.2 2006/03/14 01:58:47 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2006/05/02 15:36:09 rpaulo Exp $ ---- libteredo/server.c 2006-02-28 00:48:07.000000000 +0000 -+++ libteredo/server.c.new 2006-02-28 00:47:56.000000000 +0000 -@@ -39,6 +39,7 @@ - #include <stdlib.h> +--- Makefile.in.orig 2006-05-01 13:58:04.000000000 +0100 ++++ Makefile.in 2006-05-02 16:10:03.000000000 +0100 +@@ -215,7 +215,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = po doc misc compat libtun6 libteredo src ++SUBDIRS = po doc compat libtun6 libteredo src + DIST_SUBDIRS = m4 $(SUBDIRS) + noinst_HEADERS = include/gettext.h + EXTRA_DIST = bootstrap autopackage/default.apspec.in +@@ -615,7 +615,6 @@ info-am: - #include <sys/types.h> -+#include <sys/uio.h> - #include <unistd.h> // close() - #include <sys/socket.h> - #include <netinet/in.h> // struct in6_addr -@@ -49,6 +50,10 @@ - #include <pthread.h> - #include <syslog.h> + install-data-am: + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook -+#ifdef __NetBSD__ -+#include <machine/limits.h> -+#endif -+ - #include "server.h" - #include "v4global.h" - #include "checksum.h" -@@ -253,7 +258,9 @@ libteredo_send_ipv6 (const void *p, size - /* ICMPv6 time exceeded */ - case ECONNREFUSED: /* ICMPv6 unreach port unreachable */ - case EMSGSIZE: /* ICMPv6 packet too big */ -+#ifdef EPROTO - case EPROTO: /* ICMPv6 param prob (and other errors) */ -+#endif - break; + install-exec-am: - default: diff --git a/net/miredo/patches/patch-ab b/net/miredo/patches/patch-ab index bc9de909b48..fb56019c84a 100644 --- a/net/miredo/patches/patch-ab +++ b/net/miredo/patches/patch-ab @@ -1,52 +1,13 @@ -$NetBSD: patch-ab,v 1.3 2006/04/03 23:30:34 rpaulo Exp $ +$NetBSD: patch-ab,v 1.4 2006/05/02 15:36:09 rpaulo Exp $ ---- libtun6/tun6.c.orig 2006-02-02 21:01:54.000000000 +0000 -+++ libtun6/tun6.c 2006-04-04 00:26:58.000000000 +0100 -@@ -70,7 +70,8 @@ struct in6_ifreq { - static const char *os_driver = "Linux"; +--- misc/miredo.conf-dist.orig 2006-05-02 16:29:45.000000000 +0100 ++++ misc/miredo.conf-dist 2006-05-02 16:29:51.000000000 +0100 +@@ -7,7 +7,7 @@ + #RelayType client - #elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || \ -- defined (HAVE_NETBSD) || defined (HAVE_DARWIN) -+ defined (HAVE_NETBSD) || defined (HAVE_DARWIN) || \ -+ defined (HAVE_DRAGONFLY) - /* - * BSD tunneling driver - * NOTE: the driver does NOT really work on NetBSD -@@ -84,11 +85,19 @@ static const char *os_driver = "Linux"; - # define USE_TUNHEAD - static const char *os_driver = "FreeBSD"; - -+# elif defined(HAVE_DRAGONFLY) -+# include <net/if_var.h> -+# include <net/tun/if_tun.h> -+# define USE_TUNHEAD -+static const char *os_driver = "DragonFly"; -+ - # elif defined (HAVE_OPENBSD) - # define USE_TUNHEAD - static const char *os_driver = "OpenBSD"; - - # elif defined (HAVE_NETBSD) -+# include <net/if_tun.h> -+# define USE_TUNHEAD - static const char *os_driver = "NetBSD"; - - # elif defined (HAVE_DARWIN) -@@ -705,7 +714,7 @@ tun6_recv (const tun6 *t, const fd_set * - /* TUNTAP driver */ - if (head.tun_linux.proto != htons (ETH_P_IPV6)) - return -1; /* only accept IPv6 packets */ --#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) -+#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || defined (HAVE_NETBSD) || defined(HAVE_DRAGONFLY) - /* FreeBSD driver */ - if (head.tun_bsd != htonl (AF_INET6)) - return -1; -@@ -733,7 +742,7 @@ tun6_send (const tun6 *t, const void *pa - uint16_t flags; - uint16_t proto; - } head = { 0, htons (ETH_P_IPV6) }; --#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) -+#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || defined (HAVE_NETBSD) || defined(HAVE_DRAGONFLY) - uint32_t head = htonl (AF_INET6); - #endif + # Name of the network tunneling interface. +-InterfaceName teredo ++#InterfaceName teredo + # Depending on the local firewall/NAT rules, you might need to force + # Miredo to use a fixed UDP port and or IPv4 address. diff --git a/net/miredo/patches/patch-ac b/net/miredo/patches/patch-ac index e48db9567d1..b826b83d43c 100644 --- a/net/miredo/patches/patch-ac +++ b/net/miredo/patches/patch-ac @@ -1,30 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $ +$NetBSD: patch-ac,v 1.2 2006/05/02 15:36:09 rpaulo Exp $ ---- Makefile.in 2006-02-02 21:02:15.000000000 +0000 -+++ Makefile.in.new 2006-02-28 01:08:36.000000000 +0000 -@@ -222,7 +222,7 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = m4 po libtun6 libteredo src misc -+SUBDIRS = m4 po libtun6 libteredo src - man5_MANS = doc/miredo.conf.5 doc/miredo-server.conf.5 - man8_MANS = doc/miredo.8 doc/miredo-server.8 - noinst_HEADERS = include/gettext.h -@@ -722,7 +722,6 @@ info-am: - - install-data-am: install-man - @$(NORMAL_INSTALL) -- $(MAKE) $(AM_MAKEFLAGS) install-data-hook - - install-exec-am: - -@@ -764,7 +763,7 @@ uninstall-man: uninstall-man5 uninstall- - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ -- install-data-hook install-exec install-exec-am install-info \ -+ install-exec install-exec-am install-info \ - install-info-am install-man install-man5 install-man8 \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ +--- libtun6/tun6.c.orig 2006-05-02 16:30:58.000000000 +0100 ++++ libtun6/tun6.c 2006-05-02 16:31:08.000000000 +0100 +@@ -213,7 +213,7 @@ tun6 *tun6_create (const char *req_name) + * Some BSD variants or older kernel versions do not support /dev/tun, + * so fallback to the old scheme. + */ +- for (unsigned i = 0; (fd == -1) && (errno != ENOENT); i++) ++ for (unsigned i = 0; (fd == -1) && (errno == ENOENT); i++) + { + char tundev[5 + IFNAMSIZ]; + snprintf (tundev, sizeof (tundev), "/dev/tun%u", i); diff --git a/net/miredo/patches/patch-ad b/net/miredo/patches/patch-ad deleted file mode 100644 index f7ffc136732..00000000000 --- a/net/miredo/patches/patch-ad +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/03/14 01:59:19 joerg Exp $ - ---- configure.orig 2006-02-02 21:02:16.000000000 +0000 -+++ configure -@@ -20613,6 +20613,12 @@ _ACEOF - _ACEOF - - ;; -+ *dragonfly*) -+ cat >>confdefs.h <<\_ACEOF -+#define HAVE_DRAGONFLY 1 -+_ACEOF -+ -+ ;; - *openbsd*) - cat >>confdefs.h <<\_ACEOF - #define HAVE_OPENBSD 1 -@@ -21878,8 +21884,7 @@ fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$ac_cv_search_pthread_create" = no; then -- for ac_lib in pthread c_r; do -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -21923,7 +21928,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_search_pthread_create="-l$ac_lib" -+ ac_cv_search_pthread_create="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" - break - else - echo "$as_me: failed program was:" >&5 -@@ -21932,7 +21937,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- done - fi - LIBS=$ac_func_search_save_LIBS - fi diff --git a/net/miredo/patches/patch-ae b/net/miredo/patches/patch-ae deleted file mode 100644 index 1334def2bd1..00000000000 --- a/net/miredo/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2006/03/14 01:59:19 joerg Exp $ - ---- config.h.in.orig 2006-03-14 01:37:13.000000000 +0000 -+++ config.h.in -@@ -31,6 +31,9 @@ - /* Define to 1 if the host kernel is FreeBSD. */ - #undef HAVE_FREEBSD - -+/* Define to 1 if the host kernel is DragonFly. */ -+#undef HAVE_DRAGONFLY -+ - /* Define to 1 if you have the <getopt.h> header file. */ - #undef HAVE_GETOPT_H - diff --git a/net/miredo/patches/patch-af b/net/miredo/patches/patch-af deleted file mode 100644 index f3a0d448aa2..00000000000 --- a/net/miredo/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.1 2006/03/14 01:59:19 joerg Exp $ - ---- libteredo/teredo.c.orig 2006-03-14 01:40:28.000000000 +0000 -+++ libteredo/teredo.c -@@ -32,6 +32,7 @@ - # include <stdint.h> /* Mac OS X needs that */ - #endif - #include <sys/types.h> -+#include <sys/uio.h> - #include <netinet/in.h> - #include <netinet/ip6.h> - |