aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorsumikawa <sumikawa@FreeBSD.org>2012-08-24 11:51:30 +0800
committersumikawa <sumikawa@FreeBSD.org>2012-08-24 11:51:30 +0800
commit291dc0b41759909ca46c22eaad6320b990b0ac28 (patch)
treef1d9727ce691f6b3f6fbeaf3527c89ece44d5f07 /net
parent26deaef64e387f56133ac6a5d98e70f00314730f (diff)
downloadfreebsd-ports-gnome-291dc0b41759909ca46c22eaad6320b990b0ac28.tar.gz
freebsd-ports-gnome-291dc0b41759909ca46c22eaad6320b990b0ac28.tar.zst
freebsd-ports-gnome-291dc0b41759909ca46c22eaad6320b990b0ac28.zip
Upgrade to 1.2.5
Diffstat (limited to 'net')
-rw-r--r--net/miredo/Makefile5
-rw-r--r--net/miredo/distinfo4
-rw-r--r--net/miredo/files/ip6addrctl.conf18
-rw-r--r--net/miredo/files/patch-src-main.c20
-rw-r--r--net/miredo/pkg-plist4
5 files changed, 15 insertions, 36 deletions
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index ceef854f7d43..277d4ed83e75 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= miredo
-PORTVERSION= 1.2.2
-PORTREVISION= 3
+PORTVERSION= 1.2.5
CATEGORIES= net ipv6
MASTER_SITES= http://www.remlab.net/files/miredo/archive/
@@ -16,7 +15,7 @@ COMMENT= Opensource Teredo (IPv6 tunneling) implementation
LIB_DEPENDS= Judy.1:${PORTSDIR}/devel/judy
-USE_BZIP2= yes
+USE_XZ= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var
USE_LDCONFIG= yes
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index a9d4e41bc093..9ba62a086059 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (miredo-1.2.2.tar.bz2) = c0f597e3272975544c4d6f6296494ab17ff1e2dbdf58bd28d54e7fe1be365f9a
-SIZE (miredo-1.2.2.tar.bz2) = 529200
+SHA256 (miredo-1.2.5.tar.xz) = 9d6c6aacfbde0e152481273cda4dc9a62f8724c4c941fa8e0806e89ab9992262
+SIZE (miredo-1.2.5.tar.xz) = 474236
diff --git a/net/miredo/files/ip6addrctl.conf b/net/miredo/files/ip6addrctl.conf
index 79aedc314340..c779d303b587 100644
--- a/net/miredo/files/ip6addrctl.conf
+++ b/net/miredo/files/ip6addrctl.conf
@@ -1,11 +1,11 @@
# Revised default policy table to support teredo defined in the below draft
-# http://tools.ietf.org/id/draft-ietf-6man-rfc3484-revise-01.txt
-::1/128 60 0
-fc00::/7 50 1
-::/0 40 2
-::ffff:0:0/96 30 3
-2002::/16 20 4
-2001::/32 10 5
-::/96 1 10
-fec::/16 1 11
+# http://tools.ietf.org/id/draft-ietf-6man-rfc3484bis-06.txt
+::1/128 50 0
+::/0 40 1
+::ffff:0:0/96 35 4
+2002::/16 30 2
+2001::/32 5 5
+fc00::/7 3 13
+::/96 1 3
+fec0::/10 1 11
3ffe::/16 1 12
diff --git a/net/miredo/files/patch-src-main.c b/net/miredo/files/patch-src-main.c
deleted file mode 100644
index ea8e3de01515..000000000000
--- a/net/miredo/files/patch-src-main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.c~ 2009-12-02 11:09:42.000000000 +0900
-+++ src/main.c 2009-12-02 11:10:23.000000000 +0900
-@@ -218,15 +218,13 @@
- * Those last 3 handles will be opened as /dev/null
- * by later daemon().
- */
-- errno = 0;
-- if (closefrom (3) && (errno != EBADF))
-- return -1;
-+ closefrom (3);
-
- /*
- * Make sure 0, 1 and 2 are open.
- */
- val = dup (2);
-- if (val < 3)
-+ if (val != 3)
- return -1;
- close (val);
-
diff --git a/net/miredo/pkg-plist b/net/miredo/pkg-plist
index 658d1b750efb..3e7f847739d0 100644
--- a/net/miredo/pkg-plist
+++ b/net/miredo/pkg-plist
@@ -1,5 +1,5 @@
bin/teredo-mire
-lib/miredo/miredo-privproc
+libexec/miredo/miredo-privproc
sbin/miredo
sbin/miredo-server
sbin/miredo-checkconf
@@ -28,6 +28,6 @@ etc/miredo/client-hook
@dirrmtry etc/miredo
@dirrm include/libtun6
@dirrm include/libteredo
-@dirrm lib/miredo
+@dirrm libexec/miredo
%%POLICYTABLE%%@cwd /
%%POLICYTABLE%%/etc/ip6addrctl.conf