pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q1]: pkgsrc/net/miredo Pullup ticket 1687 - requested by salo
details: https://anonhg.NetBSD.org/pkgsrc/rev/688aa973a722
branches: pkgsrc-2006Q1
changeset: 510327:688aa973a722
user: ghen <ghen%pkgsrc.org@localhost>
date: Wed Jun 07 18:23:42 2006 +0000
description:
Pullup ticket 1687 - requested by salo
security update for miredo
Revisions pulled up:
- pkgsrc/net/miredo/Makefile 1.4, 1.5, 1.6, 1.7, 1.8
- pkgsrc/net/miredo/distinfo 1.3, 1.4, 1.5
- pkgsrc/net/miredo/PLIST 1.2, 1.3
- pkgsrc/net/miredo/patches/patch-aa 1.3
- pkgsrc/net/miredo/patches/patch-ab 1.3, 1.4
- pkgsrc/net/miredo/patches/patch-ac 1.3
- pkgsrc/net/miredo/patches/patch-ad 1.3
- pkgsrc/net/miredo/patches/patch-ae 1.3
- pkgsrc/net/miredo/patches/patch-af removed
Module Name: pkgsrc
Committed By: rpaulo
Date: Fri Mar 31 23:21:33 UTC 2006
Modified Files:
pkgsrc/net/miredo: Makefile
Log Message:
SunOS is not supported. PR 33157.
---
Module Name: pkgsrc
Committed By: rpaulo
Date: Mon Apr 3 23:30:34 UTC 2006
Modified Files:
pkgsrc/net/miredo: Makefile distinfo
pkgsrc/net/miredo/patches: patch-ab
Log Message:
NetBSD needs TUNIFHEAD.
---
Module Name: pkgsrc
Committed By: rpaulo
Date: Tue May 2 15:36:09 UTC 2006
Modified Files:
pkgsrc/net/miredo: Makefile PLIST distinfo
pkgsrc/net/miredo/patches: patch-aa patch-ab patch-ac
Removed Files:
pkgsrc/net/miredo/patches: patch-ad patch-ae patch-af
Log Message:
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.
---
Module Name: pkgsrc
Committed By: rpaulo
Date: Tue May 2 15:36:44 UTC 2006
Modified Files:
pkgsrc/net/miredo: Makefile
Log Message:
Put back NOT_FOR_PLATFORM.
---
Module Name: pkgsrc
Committed By: joerg
Date: Fri May 12 08:25:47 UTC 2006
Modified Files:
pkgsrc/net/miredo: Makefile PLIST distinfo
pkgsrc/net/miredo/patches: patch-ac
Added Files:
pkgsrc/net/miredo/patches: patch-ad patch-ae
Log Message:
Fix PLIST and bump revision. Add DragonFly work arounds for pthread.h
and fix net/if_var.h test as well.
diffstat:
net/miredo/Makefile | 10 ++++-
net/miredo/PLIST | 16 +++++++++-
net/miredo/distinfo | 19 +++++------
net/miredo/patches/patch-aa | 48 +++++++++++-------------------
net/miredo/patches/patch-ab | 58 ++++++------------------------------
net/miredo/patches/patch-ac | 48 ++++++++++++------------------
net/miredo/patches/patch-ad | 70 ++++++++++++++++++--------------------------
net/miredo/patches/patch-ae | 22 ++++++-------
net/miredo/patches/patch-af | 12 -------
9 files changed, 117 insertions(+), 186 deletions(-)
diffs (truncated from 384 to 300 lines):
diff -r 1e5a5e45bb1c -r 688aa973a722 net/miredo/Makefile
--- a/net/miredo/Makefile Wed Jun 07 16:31:39 2006 +0000
+++ b/net/miredo/Makefile Wed Jun 07 18:23:42 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/03/14 01:58:47 joerg Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2006/06/07 18:23:42 ghen Exp $
-DISTNAME= miredo-0.8.0
+DISTNAME= miredo-0.8.4
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.remlab.net/files/miredo/v0.8/
EXTRACT_SUFX= .tar.bz2
@@ -9,13 +10,16 @@
HOMEPAGE= http://www.simphalempin.com/dev/miredo/
COMMENT= Teredo IPv6 tunneling
-NOT_FOR_PLATFORM= Interix-*-* NetBSD-[0-3]*-*
+NOT_FOR_PLATFORM= Interix-*-* NetBSD-[0-3]*-* SunOS-*-*
GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
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 -r 1e5a5e45bb1c -r 688aa973a722 net/miredo/PLIST
--- a/net/miredo/PLIST Wed Jun 07 16:31:39 2006 +0000
+++ b/net/miredo/PLIST Wed Jun 07 18:23:42 2006 +0000
@@ -1,16 +1,28 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2006/06/07 18:23:42 ghen 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-checkconf.8
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
+sbin/miredo-checkconf
share/examples/miredo/miredo.conf-dist
share/examples/miredo/miredo-server.conf-dist
+@dirrm include/libteredo
+@dirrm include/libtun6
@dirrm share/examples/miredo
diff -r 1e5a5e45bb1c -r 688aa973a722 net/miredo/distinfo
--- a/net/miredo/distinfo Wed Jun 07 16:31:39 2006 +0000
+++ b/net/miredo/distinfo Wed Jun 07 18:23:42 2006 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.2 2006/03/14 01:58:47 joerg Exp $
+$NetBSD: distinfo,v 1.2.2.1 2006/06/07 18:23:42 ghen 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) = 88d38658f43c65206bd5c65cf23de596affcd150
-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) = 884e1d2fdadb3aebf096ab99afa1dc8fea2346e9
+SHA1 (patch-ad) = 0b6170f8bb8e3f501de6773e68fd0657036a17bd
+SHA1 (patch-ae) = d6deef1b94ed3e33bb0b0659ba0615416ca2be38
diff -r 1e5a5e45bb1c -r 688aa973a722 net/miredo/patches/patch-aa
--- a/net/miredo/patches/patch-aa Wed Jun 07 16:31:39 2006 +0000
+++ b/net/miredo/patches/patch-aa Wed Jun 07 18:23:42 2006 +0000
@@ -1,33 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2006/03/14 01:58:47 joerg Exp $
+$NetBSD: patch-aa,v 1.2.2.1 2006/06/07 18:23:42 ghen 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>
-
- #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>
+--- 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:
-+#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-data-am:
+ @$(NORMAL_INSTALL)
+- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
- default:
+ install-exec-am:
+
diff -r 1e5a5e45bb1c -r 688aa973a722 net/miredo/patches/patch-ab
--- a/net/miredo/patches/patch-ab Wed Jun 07 16:31:39 2006 +0000
+++ b/net/miredo/patches/patch-ab Wed Jun 07 18:23:42 2006 +0000
@@ -1,51 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2006/03/14 01:58:47 joerg Exp $
+$NetBSD: patch-ab,v 1.2.2.1 2006/06/07 18:23:42 ghen Exp $
---- libtun6/tun6.c.orig 2006-02-02 21:01:54.000000000 +0000
-+++ libtun6/tun6.c
-@@ -70,7 +70,8 @@ struct in6_ifreq {
- static const char *os_driver = "Linux";
-
- #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,18 @@ static const char *os_driver = "Linux";
- # define USE_TUNHEAD
- static const char *os_driver = "FreeBSD";
+--- 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_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)
-+# define USE_TUNHEAD
- static const char *os_driver = "NetBSD";
+ # Name of the network tunneling interface.
+-InterfaceName teredo
++#InterfaceName teredo
- # elif defined (HAVE_DARWIN)
-@@ -705,7 +713,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 +741,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
-
+ # Depending on the local firewall/NAT rules, you might need to force
+ # Miredo to use a fixed UDP port and or IPv4 address.
diff -r 1e5a5e45bb1c -r 688aa973a722 net/miredo/patches/patch-ac
--- a/net/miredo/patches/patch-ac Wed Jun 07 16:31:39 2006 +0000
+++ b/net/miredo/patches/patch-ac Wed Jun 07 18:23:42 2006 +0000
@@ -1,30 +1,22 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+$NetBSD: patch-ac,v 1.1.1.1.2.1 2006/06/07 18:23:42 ghen 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:
+--- libtun6/tun6.c.orig 2006-05-01 12:57:31.000000000 +0000
++++ libtun6/tun6.c
+@@ -94,6 +94,8 @@ static const char *os_driver = "BSD";
- 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 \
+ # if defined (HAVE_NET_IF_TUN_H)
+ # include <net/if_tun.h> // TUNSIFHEAD, TUNSLMODE
++# elif defined(__DragonFly__)
++# include <net/tun/if_tun.h>
+ # elif defined (__APPLE__)
+ # define TUNSIFHEAD _IOW('t', 96, int)
+ # endif
+@@ -213,7 +215,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 -r 1e5a5e45bb1c -r 688aa973a722 net/miredo/patches/patch-ad
--- a/net/miredo/patches/patch-ad Wed Jun 07 16:31:39 2006 +0000
+++ b/net/miredo/patches/patch-ad Wed Jun 07 18:23:42 2006 +0000
@@ -1,44 +1,32 @@
-$NetBSD: patch-ad,v 1.1 2006/03/14 01:59:19 joerg Exp $
+$NetBSD: patch-ad,v 1.1.2.1 2006/06/07 18:23:42 ghen Exp $
---- configure.orig 2006-02-02 21:02:16.000000000 +0000
-+++ configure
-@@ -20613,6 +20613,12 @@ _ACEOF
- _ACEOF
+--- compat/barrier.c.orig 2006-05-01 12:57:31.000000000 +0000
++++ compat/barrier.c
+@@ -30,7 +30,27 @@
+ ***********************************************************************/
- ;;
-+ *dragonfly*)
-+ cat >>confdefs.h <<\_ACEOF
-+#define HAVE_DRAGONFLY 1
-+_ACEOF
+ #include <errno.h>
+
-+ ;;
- *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
Home |
Main Index |
Thread Index |
Old Index