From 8a4daf4ea7758270a47a358f43ad97a64eb1c3ff Mon Sep 17 00:00:00 2001 From: Ivo Timmermans Date: Fri, 22 Dec 2000 16:54:56 +0000 Subject: [PATCH] Various small changes. --- debian/Makefile.am | 3 ++- debian/changelog | 6 ++++-- debian/control | 6 +++--- debian/tinc-up | 9 ++++----- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/debian/Makefile.am b/debian/Makefile.am index 6bb365bb..0ed7907e 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -1,2 +1,3 @@ EXTRA_DIST = README.Debian changelog conffiles control copyright dirs \ - docs info init.d postinst rules doc-base.tinc + docs info init.d postinst rules doc-base.tinc tinc-up tinc-down \ + tinc.modules diff --git a/debian/changelog b/debian/changelog index 4e74eb74..fc830435 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -tinc (1.0pre3-2) unstable; urgency=low +tinc (1.0pre4-1) unstable; urgency=low + * New upstream version * Added universal tinc-up and tinc-down scripts + * - -- Ivo Timmermans Wed, 15 Nov 2000 23:26:56 +0100 + -- Ivo Timmermans Sun, 3 Dec 2000 13:24:10 +0100 tinc (1.0pre3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 43d6e428..0b6032c5 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Section: non-US/main Priority: optional Maintainer: Ivo Timmermans Standards-Version: 3.0.1 -Build-Depends: libc6-dev, libssl095a-dev, autoconf (>= 2.12), - automake, debhelper, libtool, gettext +Build-Depends: libc6-dev, libssl096-dev, autoconf (>= 2.12), + automake, debhelper, gettext Package: tinc -Architecture: i386 +Architecture: i386 alpha Depends: ${shlibs:Depends}, ${perl:Depends} Description: Virtual Private Network daemon tinc is a daemon with which you can create a virtual private network diff --git a/debian/tinc-up b/debian/tinc-up index 0ca5ebe8..0e40d76a 100644 --- a/debian/tinc-up +++ b/debian/tinc-up @@ -1,7 +1,7 @@ #! /usr/bin/perl -w # # Device configuration script for tinc -# $Id: tinc-up,v 1.1.2.1 2000/11/24 16:52:57 zarq Exp $ +# $Id: tinc-up,v 1.1.2.2 2000/12/22 16:54:56 zarq Exp $ # # Based on Lubomir Bulej's Redhat init script. # @@ -42,8 +42,7 @@ sub vpn_load { } } if(!defined($DEV)) { - warn "tinc: There must be a TapDevice\n"; - return 0; + $DEV = "/dev/tap0"; } if($DEV eq "") { warn "tinc: TapDevice should be of the form /dev/tapN\n"; @@ -75,7 +74,7 @@ sub vpn_load { $ADR = pack('C4', @addr); $MSK = pack('N4', -1 << (32 - $LEN)); $BRD = join(".", unpack('C4', $ADR | ~$MSK)); - $MAC = "fe:fd:" . join(":", map { sprintf "%02x", $_ } unpack('C4', $ADR)); + $MAC = "fe:fd:00:00:00:00"; if(!defined($VPNMASK)) { $VPNMASK = $MSK; @@ -83,7 +82,7 @@ sub vpn_load { } $ADR = join(".", unpack('C4', $ADR)); $MSK = join(".", unpack('C4', $MSK)); - + 1; } -- 2.39.5