Various small changes.

diff --git a/debian/Makefile.am b/debian/Makefile.am
index 6bb365bbc5a74eaac6c384fc12ce656ab6fcf295..0ed7907e66ef4bcc5ac715689af62c5144ebca76 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1,2 +1,3 @@
 EXTRA_DIST = README.Debian changelog conffiles control copyright dirs \
 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 4e74eb74f0d51e9b60a763fc45a536dceeb41405..fc830435265f805c71fff0439f5277320cb5cb26 100644 (file)
--- 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
   * Added universal tinc-up and tinc-down scripts

+  * 

 
 

- -- Ivo Timmermans <ivo@debian.org>  Wed, 15 Nov 2000 23:26:56 +0100
+ -- Ivo Timmermans <ivo@debian.org>  Sun,  3 Dec 2000 13:24:10 +0100

 
 tinc (1.0pre3-1) unstable; urgency=low
 
 
 tinc (1.0pre3-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 43d6e428c0d0170bc534b829a91b3ab02e155e7c..0b6032c5417a093823b1f504f876722c553e32b6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: non-US/main
 Priority: optional
 Maintainer: Ivo Timmermans <ivo@debian.org>
 Standards-Version: 3.0.1
 Priority: optional
 Maintainer: Ivo Timmermans <ivo@debian.org>
 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
 
 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
 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 0ca5ebe832937e0ac01ee25eb670e6bc9db035f7..0e40d76ac731824eff81ab9f5996301fc1f2e968 100644 (file)
--- a/debian/tinc-up
+++ b/debian/tinc-up
@@ -1,7 +1,7 @@
 #! /usr/bin/perl -w
 #
 # Device configuration script for tinc
 #! /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.
 #
 #
 # Based on Lubomir Bulej's Redhat init script.
 #


@@ -42,8 +42,7 @@ sub vpn_load {
        }
     }
     if(!defined($DEV)) {
        }
     }
     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";
     }
     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));
     $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;
 
     if(!defined($VPNMASK)) {
        $VPNMASK = $MSK;


@@ -83,7 +82,7 @@ sub vpn_load {
     }
     $ADR = join(".", unpack('C4', $ADR));
     $MSK = join(".", unpack('C4', $MSK));
     }
     $ADR = join(".", unpack('C4', $ADR));
     $MSK = join(".", unpack('C4', $MSK));

-    
+

     1;
 }
 
     1;
 }