diff options
| author | hubertf <hubertf@pkgsrc.org> | 2001-03-04 02:53:27 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2001-03-04 02:53:27 +0000 |
| commit | 912af0eecffc40a808025dc4206a786152c6c9b5 (patch) | |
| tree | cd46b8144077b40446c031ccb50904c932285f3e /net | |
| parent | 9563ac7944b2c6f650c277b7d37fc1c0ec37105a (diff) | |
| download | pkgsrc-912af0eecffc40a808025dc4206a786152c6c9b5.tar.gz | |
unbreak this pkg - 1.1 won't run (this is a pkgsrc problem, else I'd
bump the version)
Diffstat (limited to 'net')
| -rw-r--r-- | net/6to4/Makefile | 4 | ||||
| -rwxr-xr-x | net/6to4/files/6to4 | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/net/6to4/Makefile b/net/6to4/Makefile index cc758246f07..2a41bfe40e9 100644 --- a/net/6to4/Makefile +++ b/net/6to4/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2001/03/01 19:07:53 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/04 02:53:27 hubertf Exp $ # -DISTNAME= 6to4-1.1 +DISTNAME= 6to4-1.1nb1 CATEGORIES= net MASTER_SITES= # empty DISTFILES= # empty diff --git a/net/6to4/files/6to4 b/net/6to4/files/6to4 index 8a42c8ecf18..36b3e3f79b0 100755 --- a/net/6to4/files/6to4 +++ b/net/6to4/files/6to4 @@ -126,11 +126,7 @@ if ($ARGV[0] eq "rtadvd-start" or $ARGV[0] eq "start-rtadvd" ) { print "rtadvd already running!\n"; } else { run("sysctl -w net.inet6.ip6.forwarding=1"); -<<<<<<< 6to4 - run("sysctl -w net.inet6.ip6.accept_rtadvd=1"); -======= run("sysctl -w net.inet6.ip6.accept_rtadv=0"); run("rtadvd $in_if"); ->>>>>>> 1.4 } } |