From db59cbfa47aa152bcfa807754189aa18f28cb569 Mon Sep 17 00:00:00 2001 From: Ivo Timmermans Date: Tue, 9 Apr 2002 14:58:14 +0000 Subject: [PATCH] Updating HEAD branch #2; removing debian/ dir. --- debian/Makefile.am | 1 - debian/README.Debian | 10 --- debian/changelog | 42 ---------- debian/conffiles | 2 - debian/control | 18 ----- debian/copyright | 63 --------------- debian/dirs | 3 - debian/docs | 3 - debian/info | 1 - debian/init.d | 189 ------------------------------------------- debian/postinst | 64 --------------- debian/rules | 78 ------------------ debian/shlibs | 1 - 13 files changed, 475 deletions(-) delete mode 100644 debian/Makefile.am delete mode 100644 debian/README.Debian delete mode 100644 debian/changelog delete mode 100644 debian/conffiles delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/dirs delete mode 100644 debian/docs delete mode 100644 debian/info delete mode 100644 debian/init.d delete mode 100644 debian/postinst delete mode 100644 debian/rules delete mode 100644 debian/shlibs diff --git a/debian/Makefile.am b/debian/Makefile.am deleted file mode 100644 index c082aea5..00000000 --- a/debian/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = README.Debian changelog conffiles control copyright dirs docs info init.d postinst rules shlibs diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 5a4c224f..00000000 --- a/debian/README.Debian +++ /dev/null @@ -1,10 +0,0 @@ -tinc for Debian ----------------------- - -The manual for tinc is also available as info pages, type `info tinc' -to read it. - -The system startup script for tinc, /etc/init.d/tinc, uses the file -/etc/tinc/nets.boot to find out which networks have to be started. - - -- Ivo Timmermans , Wed, 31 May 2000, 19:56:05 +0200 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 6c570df1..00000000 --- a/debian/changelog +++ /dev/null @@ -1,42 +0,0 @@ -tinc (1.0pre3-0.1) unstable; urgency=low - - * upgraded to upstream version 1.0pre3 - - -- Ivo Timmermans Sun, 25 Jun 2000 00:00:00 +0200 - -tinc (1.0pre2-1) unstable; urgency=low - - * postinst creates a file /etc/tinc/nets.boot, containing all networks - to be started upon system startup; - * init.d script starts all networks from that list. - * postinst script creates tap devices - - -- Ivo Timmermans Tue, 16 May 2000 00:06:25 +0200 - -tinc (1.0pre1-0.4) unstable; urgency=low - - * postinst script - - -- Ivo Timmermans Mon, 15 May 2000 19:22:05 +0200 - -tinc (1.0pre1-0.3) unstable; urgency=low - - * system startup script - - -- Ivo Timmermans Sun, 14 May 2000 22:58:02 +0200 - -tinc (1.0pre1-0.2) unstable; urgency=low - - * Included the blowfish license - - -- Ivo Timmermans Fri, 21 Apr 2000 17:07:50 +0200 - -tinc (1.0pre1-0.1) unstable; urgency=low - - * Initial Release. - - -- Ivo Timmermans Fri, 21 Apr 2000 17:07:50 +0200 - -Local variables: -mode: debian-changelog -End: diff --git a/debian/conffiles b/debian/conffiles deleted file mode 100644 index 4be7a806..00000000 --- a/debian/conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/tinc/example/tinc.conf -/etc/init.d/tinc diff --git a/debian/control b/debian/control deleted file mode 100644 index c08c622b..00000000 --- a/debian/control +++ /dev/null @@ -1,18 +0,0 @@ -Source: tinc -Section: non-US/main -Priority: optional -Maintainer: Ivo Timmermans -Standards-Version: 3.0.1 -Build-Depends: libc6-dev, libssl095a-dev, autoconf (>= 2.12), automake, - -Package: tinc -Architecture: i386 -Depends: ${shlibs:Depends}, (libssl095a|libssl09), perl5 -Description: Virtual Private Network daemon - tinc is a daemon with which you can create a virtual private network - (VPN). One daemon can handle multiple connections, so you can - create an entire (moderately sized) VPN with only one daemon per - participating computer. - . - You need to have two kernel modules installed, the manual will - explain you how to do that. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 7652f535..00000000 --- a/debian/copyright +++ /dev/null @@ -1,63 +0,0 @@ -This package was debianized by Ivo Timmermans on -Fri, 21 Apr 2000 17:07:50 +0200. - -It was downloaded from http://tinc.nl.linux.org/ - -Upstream Author(s): - Ivo Timmermans - Guus Sliepen - -Copyright: GPL version 2. On Debian GNU/Linux systems, the complete -text of the GNU General Public License can be found in -/usr/share/common-licenses/GPL. - -The blowfish library is from the libssl package by Eric Young. The -copyright notice for this library follows. - ----------------------------------------------------------------------- -Copyright (C) 1995-1997 Eric Young (eay@mincom.oz.au) -All rights reserved. - -This package is an Blowfish implementation written -by Eric Young (eay@mincom.oz.au). - -This library is free for commercial and non-commercial use as long as -the following conditions are aheared to. The following conditions -apply to all code found in this distribution. - -Copyright remains Eric Young's, and as such any Copyright notices in -the code are not to be removed. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by Eric Young (eay@mincom.oz.au) - -THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -The license and distribution terms for any publically available version or -derivative of this code cannot be changed. i.e. this code cannot simply be -copied and put under another distrubution license -[including the GNU Public License.] - -The reason behind this being stated in this direct manner is past -experience in code simply being copied and the attribution removed -from it and then being distributed as part of other packages. This -implementation was a non-trivial and unpaid effort. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index d6cca390..00000000 --- a/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -etc/tinc -etc/tinc/example -etc/tinc/example/passphrases diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 9bdd99cb..00000000 --- a/debian/docs +++ /dev/null @@ -1,3 +0,0 @@ -INSTALL -NEWS -README diff --git a/debian/info b/debian/info deleted file mode 100644 index 5468d6c9..00000000 --- a/debian/info +++ /dev/null @@ -1 +0,0 @@ -doc/tinc.info diff --git a/debian/init.d b/debian/init.d deleted file mode 100644 index 1acbe4a1..00000000 --- a/debian/init.d +++ /dev/null @@ -1,189 +0,0 @@ -#! /usr/bin/perl -w -# -# System startup script for tinc -# $Id: init.d,v 1.15 2000/10/18 20:12:06 zarq Exp $ -# -# Based on Lubomir Bulej's Redhat init script. -# -# Create a file $NETSFILE (/etc/tinc/nets.boot), and put all the names of -# the networks in there. These names must be valid directory names under -# $TCONF (/etc/tinc). Lines starting with a # will be ignored in this -# file. -# - -my $DAEMON="/usr/sbin/tincd"; -my $NAME="tinc"; -my $DESC="tinc daemons"; -my $TCONF="/etc/tinc"; -my $EXTRA=""; -my $NETSFILE="$TCONF/nets.boot"; -my @NETS=(); - - -if (! -f $DAEMON) { exit 0; } - - - -sub find_nets { - if(! open(FH, $NETSFILE)) { - warn "Please create $NETSFILE.\n"; - exit 0; - } - while () { - chomp; - if( /^[ ]*([^ \#]+)/i ) { - push(@NETS, "$1"); - } - } - if($#NETS == -1) { - warn "$NETSFILE doesn't contain any nets.\n"; - exit 0; - } - -} - - -############################################################################## -# vpn_load () Loads VPN configuration -# -# $_[0] ... VPN to load - -sub vpn_load { - my @addr; - $CFG="$TCONF/$_[0]/tinc.conf"; - if(! open($CFG, "< $CFG")) { - warn "tinc: $CFG does not exist\n"; - return 0; - } - - # load TINCD config - while(<$CFG>) { - if( /^[ ]*TapDevice[ =]+([^ \#]+)/i ) { - $DEV=$1; - chomp($DEV); - $DEV =~ s/^.*\/([^\/0-9]+)([0-9]+)$/$1$2/; - $NUM = $2; - } elsif ( /^[ ]*(MyOwnVPNIP|MyVirtualIP)[ =]+([^ \#]+)/i ) { - $VPN=$2; - chomp($VPN); - } elsif ( /^[ ]*VpnMask[ =]+([^ \#]+)/i ) { - $VPNMASK=$1; - chomp($VPNMASK); - } - } - if(!defined($DEV)) { - warn "tinc: There must be a TapDevice\n"; - return 0; - } - if($DEV eq "") { - warn "tinc: TapDevice should be of the form /dev/tapN\n"; - return 0; - } - if(!defined($VPN)) { - warn "tinc: MyVirtualIP required\n"; - return 0; - } - if($VPN eq "") { - warn "tinc: No argument to MyVirtualIP/MyOwnVPNIP\n"; - return 0; - } - if(defined($VPNMASK) && $VPNMASK eq "") { - warn "tinc: Invalid argument to VpnMask\n"; - return 0; - } - - $ADR = $VPN; - $ADR =~ s/^([^\/]+)\/.*$/$1/; - $LEN = $VPN; - $LEN =~ s/^.*\/([^\/]+)$/$1/; - if($ADR eq "" || $LEN eq "") { - warn "tinc: Badly formed MyVirtualIP/MyOwnVPNIP\n"; - return 0; - } - @addr = split(/\./, $ADR); - - $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)); - - if(!defined($VPNMASK)) { - $VPNMASK = $MSK; - $VPNMASK = join(".", unpack('C4', $VPNMASK)); - } - $ADR = join(".", unpack('C4', $ADR)); - $MSK = join(".", unpack('C4', $MSK)); - - 1; -} - - -############################################################################## -# vpn_start () starts specified VPN -# -# $_[0] ... VPN to start - -sub vpn_start { - vpn_load($_[0]) || return 0; - - system("insmod ethertap -s --name=\"ethertap$NUM\" unit=\"$NUM\" >/dev/null"); - system("ifconfig $DEV hw ether $MAC"); - system("ifconfig $DEV $ADR netmask $VPNMASK broadcast $BRD mtu 1448 -arp"); - system("start-stop-daemon --start --quiet --pidfile /var/run/$NAME.$_[0].pid --exec $DAEMON -- -n $_[0] $EXTRA"); -} - - - - -############################################################################## -# vpn_stop () Stops specified VPN -# -# $_[0] ... VPN to stop - -sub vpn_stop { - vpn_load($_[0]) || return 1; - - system("start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.$_[0].pid --exec $DAEMON -- -n $_[0] $EXTRA -k"); - - system("ifconfig $DEV down"); - system("rmmod ethertap$NUM -s"); -} - - -if(!defined($ARGV[0])) { - die "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}\n"; -} - -if($ARGV[0] eq "start") { - find_nets; - print "Starting $DESC:"; - foreach $n (@NETS) { - print " $n"; - vpn_start($n); - } - print ".\n"; -} elsif ($ARGV[0] eq "stop") { - find_nets; - print "Stopping $DESC:"; - foreach $n (@NETS) { - print " $n"; - vpn_stop($n); - } - print ".\n"; -} elsif ($ARGV[0] eq "restart" || $ARGV[0] eq "force-reload") { - find_nets; - print "Stopping $DESC:"; - foreach $n (@NETS) { - print " $n"; - vpn_stop($n); - } - print ".\n"; - print "Starting $DESC:"; - foreach $n (@NETS) { - print " $n"; - vpn_start($n); - } - print ".\n"; -} else { - die "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}\n"; -} diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index 1debdae0..00000000 --- a/debian/postinst +++ /dev/null @@ -1,64 +0,0 @@ -#! /bin/sh -# postinst script for tinc -# -# $Id: postinst,v 1.6 2000/05/21 23:01:28 zarq Exp $ -# -# see: dh_installdeb(1) - -TCONF="/etc/tinc" -NETSFILE="$TCONF/nets.boot" - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see /usr/doc/packaging-manual/ -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - if [ ! -e /dev/.devfs ] ; then - devices_exist=1 - for d in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 ; do - test -e /dev/tap$d || devices_exist=0 - done - if [ $devices_exist -eq 0 ] ; then - cd /dev && ./MAKEDEV netlink || true - fi - fi - - if [ ! -e $NETSFILE ] ; then - echo "## This file contains all names of the networks to be started on system startup." > $NETSFILE - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/rules b/debian/rules deleted file mode 100644 index 397e998b..00000000 --- a/debian/rules +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This is the debhelper compatability version to use. -export DH_COMPAT=1 - -build: build-stamp -build-stamp: - dh_testdir - - ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - -$(MAKE) distclean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) install DESTDIR=`pwd`/debian/tmp - mkdir -p `pwd`/debian/tmp/etc/tinc/example - cp doc/tinc.conf.sample `pwd`/debian/tmp/etc/tinc/example/tinc.conf - ln -s /usr/share/doc/tinc/README.Debian `pwd`/debian/tmp/etc/tinc/example/README - rm -f `pwd`/debian/tmp/usr/lib/tinc/libblowfish.so - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install -# dh_testversion - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs - dh_installexamples -# dh_installmenu -# dh_installemacsen -# dh_installpam - dh_installinit -# dh_installcron - dh_installmanpages - dh_installinfo -# dh_undocumented - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms -# # You may want to make some executables suid here. -# dh_suidregister -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/shlibs b/debian/shlibs deleted file mode 100644 index 70162689..00000000 --- a/debian/shlibs +++ /dev/null @@ -1 +0,0 @@ -libblowfish 0 libc6 -- 2.20.1