diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..903f27d --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,43 @@ +tinc (1.1~pre11-1) experimental; urgency=medium + + This package now provides a native systemd service file, allowing multiple + instances of tinc to be managed. Existing networks listed in + /etc/tinc/nets.boot will be converted to service instances once during this + upgrade. Afterwards, you can enable and disable networks using: + + systemctl enable tinc@ + systemctl disable tinc@ + + If you do not have systemd installed, the SysV init script will continue to + work as usual. For more information, see README.Debian. + + Please note that tinc 1.1pre11 is backwards compatible with tinc 1.0.x, but + is not backwards compatible with 1.1pre1 to 1.1pre10 nodes if + ExperimentalProtocol is enabled, which is the default. + + If you have more than one node running an 1.1 prerelease version in your VPN, + make sure you upgrade them all at the same time, or disable the new protocol + by adding the following line to tinc.conf: + + ExperimentalProtocol = no + + If you do want to use the new protocol, be aware that this version of tinc + switched to Ed25519 keys. You can generate a new Ed25519 keypair by running + the following command: + + tinc -n generate-ed25519-keys + + You have to manually restart tinc after this upgrade. + + -- Guus Sliepen Sat, 08 Jan 2015 14:02:27 +0100 + +tinc (1.1~pre2-1) experimental; urgency=low + + tinc-1.1 has separate control utility, tinc (without the d), which is now + used to start/stop tinc instances, to reload configuration, to get various + information about running tincd (including dump of nodes and connections) + and so on. tincd still reacts to some signals as before, but this usage is + deprecated. In particular, -k option is now gone. Also, node/connection/etc + dumps are produced on tincctl stdout, not into syslog. + + -- Michael Tokarev Sun, 07 Aug 2011 13:16:17 +0400 diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..e2f9da1 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,78 @@ +tinc for Debian +--------------- + +The manual for tinc is also available as info pages, type `info tinc' +to read it. + +There are several ways in which tinc may be automatically started at boot: + +Systemd +------- + +Since 1.1~pre11-1, the tinc package comes with native systemd service files. +To enable and start a net, call: + +systemctl enable tinc@ +systemctl start tinc@ + +This will cause a tincd to be started which uses the configuration from +/etc/tinc/, and also makes sure that it will be started next time your +system boots. + +Apart from controlling individual instances, you can also start/stop/reload all +enabled instances simultaneously by omitting @, for example: + +systemctl reload tinc + +Note that when you have systemd installed on your system, the file +/etc/tinc/nets.boot will not be used anymore to automatically start tinc +daemons. If the variable EXTRA is defined in /etc/default/tinc, it will be +passed on to tinc. The variable LIMITS is however not used. + +The service files that come with this package start tinc unconditionally. +However, tinc does support socket activation. If you wish to write a socket +unit for tinc, use the ListenStream option to specify on which port(s) and +address(es) tinc should listen. + +SysVinit +-------- + +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. Use one +netname per line. Lines starting with a # are ignored. + +/etc/network/interfaces +----------------------- + +You can create a stanza in /etc/network/interfaces, and add a line with +"tinc-net ". This will cause a tincd to be started which uses the +configuration from /etc/tinc/. You can use an inet static (with +address and netmask options) or inet dhcp stanza, in which case the ifup will +configure the VPN interface and you do not need to have a tinc-up script. + +The following options are also recognized and map directly to the corresponding +command line options for tincd: + +tinc-config +tinc-debug +tinc-mlock yes +tinc-logfile +tinc-chroot yes +tinc-user + +An example stanza: + +iface vpn inet static + address 192.168.2.42 + netmask 255.255.0.0 + tinc-net myvpn + tinc-debug 1 + tinc-mlock yes + tinc-user nobody + +This will start a tinc daemon that reads its configuration from +/etc/tinc/myvpn, logs at debug level 1, locks itself in RAM, runs as user +nobody, and creates a network interface called "vpn". Ifup then sets the +address and netmask on that interface. + + -- Guus Sliepen , Thu, 8 January 2015, 13:37:46 +0100 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..bf8eefe --- /dev/null +++ b/debian/changelog @@ -0,0 +1,629 @@ +tinc (1.1~pre15-1) experimental; urgency=medium + + * New upstream release. + * Bump Standards-Version. + * Bump debian/compat. + * Don't use while loops checking PID files anymore, the tinc CLI will + wait properly for the daemon to start or stop. Closes: #772379, #832784 + * Clean up scripts as suggested by Dominik George. Closes: #832781 + * Test for /etc/default/tinc before trying to source it. Closes: #777262 + + -- Guus Sliepen Tue, 05 Sep 2017 21:03:51 +0200 + +tinc (1.1~pre12-1) experimental; urgency=medium + + * New upstream release. + * Bump Standards-Version. + * Depend on python-wxgtk3.0 for the GUI. + * Use dh --with python2. + * Add Build-Depends for dh-python. + * Update links in debian/control and debian/copyright. + + -- Guus Sliepen Sun, 24 Apr 2016 14:51:14 +0200 + +tinc (1.1~pre11-1) experimental; urgency=medium + + * New upstream release. + * Update NEWS.Debian to reflect that tincctl has been renamed to tinc. + Closes: #729889 + * Warn about incompatibility with previous 1.1preX releases, and that new + Ed25519 keys should be generated. + * Add native systemd service files. + * Automatically convert networks listed in nets.boot to systemd service + instances on upgrade. + * Don't restart tinc on upgrade for now. + + -- Guus Sliepen Thu, 08 Jan 2015 14:51:34 +0100 + +tinc (1.1~pre9-1) experimental; urgency=low + + * New upstream release. + + -- Guus Sliepen Sun, 08 Sep 2013 18:00:28 +0200 + +tinc (1.1~pre8-2) experimental; urgency=low + + * Run make clean after the configure step to get rid of .o files that were + accidentily left in the orig.tar.gz. + + -- Guus Sliepen Wed, 14 Aug 2013 16:13:43 +0200 + +tinc (1.1~pre8-1) experimental; urgency=low + + * New upstream release. + - Handles whitespace between command line flags and optional arguments. + Closes: #710267 + * Bump Standards-Version. + * Source /lib/lsb/init-functions in the init.d script. + * Don't use texi2html anymore, use automake's install-html target which uses + makeinfo. + + -- Guus Sliepen Wed, 14 Aug 2013 15:34:41 +0200 + +tinc (1.1~pre7-2) experimental; urgency=low + + [ Gian Piero Carrubba ] + * Init script fails to pass extra arguments to tincd. Closes: #704701 + + Remove the '--' as it is passed unaltered to tincd, preventing it to read + trailing parameters. + + Pass extra arguments also when restarting the daemon. + * Set process limits when started by ifupdown. Closes: #704702 + + [ Guus Sliepen ] + * Check whether the tincd process is still running in the if-post-down script. + Closes: #704708 + + -- Guus Sliepen Wed, 01 May 2013 10:41:31 +0200 + +tinc (1.1~pre7-1) experimental; urgency=high + + * New upstream release. + - Drop packets forwarded via TCP if they are too big (CVE-2013-1428). + + -- Guus Sliepen Tue, 23 Apr 2013 11:37:38 +0200 + +tinc (1.1~pre6-1) experimental; urgency=low + + * New upstream release. + + -- Guus Sliepen Wed, 20 Feb 2013 16:53:33 +0100 + +tinc (1.1~pre4-1) experimental; urgency=low + + [ Gian Piero Carrubba ] + * Allow resource limits to be set in /etc/default/tinc. Closes: #690685 + + [ Guus Sliepen ] + * New upstream release. + + -- Guus Sliepen Wed, 05 Dec 2012 23:05:01 +0100 + +tinc (1.1~pre3-1) experimental; urgency=low + + * New upstream release. + * Bump Standards-Version. + * Enable parallel builds. + * Bump debian/compat to 9, so tinc gets build with hardening flags. + * Move tinc-gui to its own package. + + -- Guus Sliepen Sun, 14 Oct 2012 23:51:21 +0200 + +tinc (1.1~pre2-2) experimental; urgency=low + + * add forgotten build-depend on libncurses5-dev for new `tincctl top' + * add libevent-dev build dependency + * remove build dependency on gettext + + -- Michael Tokarev Sun, 07 Aug 2011 17:32:39 +0400 + +tinc (1.1~pre2-1) experimental; urgency=low + + * first cut of 1.1-tobe. + Rewrote control scripts et al to use tincctl. + * build-depend on libssl >>1.0.0 to get proper EC support + * remove crypto-related symlinks from src/ in clean -- + probably should go into upstream makefile instead + + -- Michael Tokarev Sun, 07 Aug 2011 12:57:15 +0400 + +tinc (1.0.19-2) unstable; urgency=low + + * Fix behaviour of tinc-pidfile. Closes: #679130 + * Enable parallel building in debian/rules. + + -- Guus Sliepen Tue, 26 Jun 2012 18:28:34 +0200 + +tinc (1.0.19-1) unstable; urgency=low + + * New upstream release. + * Bump debian/compat so tinc gets built with hardening flags. + * Allow tinc-pidfile in /etc/network/interfaces. + + -- Guus Sliepen Mon, 25 Jun 2012 20:29:22 +0200 + +tinc (1.0.18-1) unstable; urgency=low + + * New upstream release. + + -- Guus Sliepen Sun, 25 Mar 2012 18:52:15 +0200 + +tinc (1.0.17-1) unstable; urgency=low + + * New upstream release. + * Enable support for UML and VDE. + + -- Guus Sliepen Sat, 10 Mar 2012 14:50:00 +0100 + +tinc (1.0.16-1) unstable; urgency=low + + * New upstream release. + * Mention alarm option in /etc/init.d/tinc's usage information. + Closes: #631761 + + -- Guus Sliepen Sat, 23 Jul 2011 14:37:56 +0200 + +tinc (1.0.15-1) unstable; urgency=low + + * New upstream release. + * Send SIGALRM to running tinc daemons whenever an interface is brought up + with the ifupdown framework. Based on a patch from Joachim Breitner. + Closes: #629880 + * Allow tinc daemons to be started using ifupdown. + + -- Guus Sliepen Fri, 24 Jun 2011 18:21:51 +0200 + +tinc (1.0.14-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version. + + -- Guus Sliepen Mon, 09 May 2011 00:25:37 +0200 + +tinc (1.0.13-1) unstable; urgency=low + + * New upstream release. + + -- Guus Sliepen Tue, 13 Apr 2010 12:06:36 +0200 + +tinc (1.0.12-2) unstable; urgency=low + + * Remove debconf questions. Closes: #572116 + Apparently debconf may not be used to ask a question at install time and + use the answer at upgrade time. Instead of kludging around this + restriction, no questions are asked anymore, and tinc will now always be + restarted when upgrading. + * Wait up to 5 seconds for tinc daemon to stop before restarting it. + + -- Guus Sliepen Tue, 02 Mar 2010 14:01:36 +0100 + +tinc (1.0.12-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version. + * Migrate from CDBS to debhelper. + * Convert source package to 3.0 (quilt) format. + * Remove useless tinc.modules. + * Use init.d script from Michael Tokarev, allowing per-network arguments to + tincd. + * Remove update-rc.d calls from postinst and postrm. + * Let the init.d script depend on $remote_fs. + + -- Guus Sliepen Thu, 04 Feb 2010 00:56:45 +0100 + +tinc (1.0.11-1) unstable; urgency=low + + * New upstream release. + * Cope with texi2html arbitrarily changing its output directory. + Closes: #552927 + * Do not stop tinc when configuring a new version, just restart after + the upgrade. + + -- Guus Sliepen Sun, 01 Nov 2009 20:37:16 +0100 + +tinc (1.0.10-1) unstable; urgency=low + + * New upstream release. + * Include Russian debconf translation. Closes: #548759 + + -- Guus Sliepen Sun, 18 Oct 2009 16:31:49 +0200 + +tinc (1.0.9-1) unstable; urgency=low + + * New upstream release. + - Binds IPv6 sockets only to IPv6. Closes: #440150 + * Update copyright file. Closes: #482566 + + -- Guus Sliepen Fri, 26 Dec 2008 13:25:05 +0100 + +tinc (1.0.8-2) unstable; urgency=low + + * Include Portugese debconf translation. Closes: #434191 + + -- Guus Sliepen Tue, 14 Aug 2007 13:50:27 +0200 + +tinc (1.0.8-1) unstable; urgency=low + + * New upstream release. Closes: #173987 + * Include german debconf translation. Closes: #412351 + * Build-Depend on texinfo. Closes: #424209 + + -- Guus Sliepen Wed, 16 May 2007 17:59:16 +0200 + +tinc (1.0.7-1) unstable; urgency=low + + * New upstream release. + + -- Guus Sliepen Fri, 5 Jan 2007 15:55:42 +0100 + +tinc (1.0.6-1) unstable; urgency=low + + * New upstream release. + + -- Guus Sliepen Mon, 18 Dec 2006 15:41:03 +0100 + +tinc (1.0.5-1) unstable; urgency=low + + * New upstream release. Closes: #391610 + * Add an LSB section to the init script. + + -- Guus Sliepen Tue, 14 Nov 2006 16:32:20 +0100 + +tinc (1.0.4-4) unstable; urgency=low + + * Include swedish debconf translation. Closes: #332963 + * Remove nets.boot on purge. Closes: #333303 + + -- Guus Sliepen Mon, 17 Oct 2005 12:34:32 +0200 + +tinc (1.0.4-3) unstable; urgency=low + + * Depend on debconf | debconf-2.0. + * Include vietnamese debconf translation. Closes: #322305 + * Include japanese debconf translation. Closes: #319591 + + -- Guus Sliepen Thu, 29 Sep 2005 11:15:34 +0200 + +tinc (1.0.4-2) unstable; urgency=low + + * Compensate for change in texinfo's output directory. Closes: #318562 + * Include Czech translation of the debconf questions. Closes: #312982 + + -- Guus Sliepen Sat, 16 Jul 2005 11:42:04 +0200 + +tinc (1.0.4-1) unstable; urgency=low + + * New upstream release. Closes: #294819 + * Update french translation of debconf template. Closes: #293371, #296148 + * Allow dashes in nets.boot. Closes: #296281 + + -- Guus Sliepen Wed, 4 May 2005 21:56:22 +0200 + +tinc (1.0.3-4) unstable; urgency=low + + * Call debconf early in postinst so it won't get confused by output + from other commands in the postinst script. Closes: #292920 + * If MAKEDEV doesn't know about net/tun, fall back to tun. + + -- Guus Sliepen Mon, 31 Jan 2005 13:27:16 +0100 + +tinc (1.0.3-3) unstable; urgency=low + + * Fix clean rule in debian/rules. + + -- Guus Sliepen Thu, 27 Jan 2005 23:16:59 +0000 + +tinc (1.0.3-2) unstable; urgency=low + + * Don't check for /dev/tap* in postinst if we don't create them anyway. + * MAKEDEV expects net/tun instead of tun. + * Don't ask if /dev/net/tun should be created, just do it. + Closes: #259489, #292450 + * Move $EXTRA from init.d/tinc to /etc/default/tinc. Closes: #281366 + + -- Guus Sliepen Thu, 27 Jan 2005 14:10:02 +0100 + +tinc (1.0.3-1) unstable; urgency=low + + * New upstream release. + * Adopting the package from Ivo. + * Use invoke-rc.d, and tell user to do so as well. Closes: #223276 + * Let force-reload do the same thing as reload. Closes: #230180 + + -- Guus Sliepen Fri, 1 Oct 2004 21:04:14 +0200 + +tinc (1.0.2-2) unstable; urgency=low + + * debian/control: Oops, really make that automake1.7. + + -- Ivo Timmermans Sat, 8 Nov 2003 21:53:04 +0100 + +tinc (1.0.2-1) unstable; urgency=low + + * New upstream release: + * Fix broken replies to CHAL_RESP. (Closes: #217646) + * debian/control: Updated automake build dependency to automake1.7. + (Closes: #219360) + + -- Ivo Timmermans Sat, 8 Nov 2003 19:56:04 +0100 + +tinc (1.0.1-2) unstable; urgency=low + + * debian/dirs: Removed, moved contents to tinc.dirs. + (Closes: #208591) + * debian/docs: Renamed to tinc.docs. + * debian/rules: Install the contents of doc/sample-config.tar.gz in + /usr/share/doc/tinc/examples instead of /etc/tinc. + * debian/Makefile*: Removed. + + -- Ivo Timmermans Wed, 10 Sep 2003 12:19:32 +0200 + +tinc (1.0.1-1) unstable; urgency=low + + * New upstream release. + * debian/patches/001_openbsd_device.c.patch: Removed. + + -- Ivo Timmermans Thu, 14 Aug 2003 17:03:28 +0200 + +tinc (1.0release-1) unstable; urgency=low + + * New upstream version. (Closes: #204639) + * Fixes switching back to normal logging mode when killing with + SIGINT twice. (Closes: #175633) + * Uses one SSL context struct for each connection, speeding up + encrypting/decrypting data; don't throw away out of sequence + packets. (Closes: #188874) + * Fixes handling of broadcast messages. (Closes: #175632) + * debian/rules: Use cdbs. + * debian/control: Build-Depend on cdbs, liblzo-dev. + * debian/patches/001_openbsd_device.c.patch: Sync openbsd/device.c to + latest CVS version. + + -- Ivo Timmermans Sun, 10 Aug 2003 16:13:29 +0200 + +tinc (1.0pre8-6) unstable; urgency=low + + * debian/po/fr.po: Added French debconf translation. (Closes: #201803) + + -- Ivo Timmermans Fri, 18 Jul 2003 10:03:20 +0200 + +tinc (1.0pre8-5) unstable; urgency=low + + * debian/*: Change to po-debconf, thanks to From: Michel Grentzinger + for the patch: + - change debhelper dependency to 4.1.16 (according to man + po-debconf), + - manually add nl translation in old tinc.templates (master), + - run debconf-gettextize debian/tinc.templates, + - move old templates files (debian/tinc.templates.*), + - change construction "If you say no" to "If you refuse", + * debian/rules: Call po2debconf. + * debian/rules: Don't copy COPYING.README to the package. + * debian/control: Update Standards-Version. + * debian/conffiles: Removed. + * debian/postinst: No longer use mknod directly, use MAKEDEV. + + -- Ivo Timmermans Tue, 15 Jul 2003 20:13:47 +0200 + +tinc (1.0pre8-4) unstable; urgency=low + + * src/net.h, src/net_packet.c, src/net_setup.c: Apply fix from CVS + for OpenSSL-related memory leaks. (Closes: #189432) + + -- Ivo Timmermans Mon, 5 May 2003 15:00:29 +0200 + +tinc (1.0pre8-3) unstable; urgency=low + + * m4/openssl.m4: Updated to CVS version. (Closes: #184400) + + -- Ivo Timmermans Thu, 13 Mar 2003 17:24:42 +0100 + +tinc (1.0pre8-2) unstable; urgency=low + + * debian/postinst: Create /dev/net/tun if it doesn't exist. + * debian/tinc.modules: Add alias for /dev/net/tun. + * debian/rules: Install tinc.modules. + * These things together: (Closes: #151967, #153156) + + -- Ivo Timmermans Wed, 13 Nov 2002 22:45:38 +0100 + +tinc (1.0pre8-1) unstable; urgency=low + + * New upstream version. + * debian/rules: + - DEB_BUILD_OPTIONS support. + - Enable --enable-tracing by default. + + -- Ivo Timmermans Tue, 17 Sep 2002 13:50:44 +0200 + +tinc (1.0pre7-3) unstable; urgency=low + + * Properly install _all_ info pages. (Closes: #144718) + + -- Ivo Timmermans Wed, 29 May 2002 14:01:21 +0200 + +tinc (1.0pre7-2) unstable; urgency=low + + * Dutch translation wasn't being installed. + + -- Ivo Timmermans Thu, 11 Apr 2002 09:26:14 +0200 + +tinc (1.0pre7-1) unstable; urgency=medium + + * New upstream release. + + -- Ivo Timmermans Tue, 9 Apr 2002 16:04:46 +0200 + +tinc (1.0pre6-3) unstable; urgency=medium + + * Synched with upstream CVS. + * Added build dependency on zlib1g-dev. (Closes: #141705) + + -- Ivo Timmermans Mon, 8 Apr 2002 21:19:31 +0200 + +tinc (1.0pre6-2) unstable; urgency=low + + * The Section was non-US again, so changed it back to main/net. + + -- Ivo Timmermans Thu, 28 Mar 2002 07:26:10 +0100 + +tinc (1.0pre6-1) unstable; urgency=low + + * New upstream release. + * Fixed text in debian/copyright + + -- Ivo Timmermans Wed, 27 Mar 2002 23:10:07 +0100 + +tinc (1.0pre5-4) unstable; urgency=low + + * Added a debconf question for restarting on upgrade. + * Added reload option to init.d, start with EXTRA='-d' default. + * Moved from non-US to main. + * Install example configuration files. + * The HTML documentation wasn't installed; fixed. + + -- Ivo Timmermans Tue, 26 Mar 2002 20:14:19 +0100 + +tinc (1.0pre5-3) unstable; urgency=low + + * Config variables are now treated case sentitivly again. + * Added a forgotten xstrdup. + + -- Ivo Timmermans Fri, 15 Feb 2002 12:35:17 +0100 + +tinc (1.0pre5-2) unstable; urgency=low + + * MaxTimeout accidentally wasn't configurable. (Closes: #119653) + + -- Ivo Timmermans Wed, 13 Feb 2002 13:36:54 +0100 + +tinc (1.0pre5-1) unstable; urgency=low + + * New upstream version. (Closes: #119653) + * Init script redone in sh. + + -- Ivo Timmermans Sun, 10 Feb 2002 16:39:53 +0100 + +tinc (1.0pre4-1.cvs010621.6) unstable; urgency=low + + * Somehow po-Makefile.in.in.diff got lost, readded. (Closes: #119157) + + -- Ivo Timmermans Thu, 15 Nov 2001 17:00:03 +0100 + +tinc (1.0pre4-1.cvs010621.5) unstable; urgency=low + + * Fix a typo in postinst that let it MAKEDEV even on devfs. + (Closes: #116034) + + -- Ivo Timmermans Thu, 18 Oct 2001 09:35:16 +0200 + +tinc (1.0pre4-1.cvs010621.4) unstable; urgency=low + + * Ask before creating the device files. (Closes: #111099) + * Add a section to the info file. + + -- Ivo Timmermans Fri, 12 Oct 2001 20:47:09 +0200 + +tinc (1.0pre4-1.cvs010621.3) unstable; urgency=low + + * Build and install html documentation. (Closes: #106843) + * Remove build-time dependency on libc6-dev. + + -- Ivo Timmermans Mon, 30 Jul 2001 22:03:52 +0200 + +tinc (1.0pre4-1.cvs010621.2) unstable; urgency=low + + * Changed location of the pidfile. (Closes: #102798) + + -- Ivo Timmermans Sun, 1 Jul 2001 01:57:43 +0200 + +tinc (1.0pre4-1.cvs010621.1) unstable; urgency=low + + * New upstream version. (Closes: #98730) + * Rebuilding automatically inserted new config.{sub|guess}. + (Closes: #98165) + * Updated Standards-Version. + * Don't include a sample configuration file. + + -- Ivo Timmermans Thu, 21 Jun 2001 14:08:49 +0200 + +tinc (1.0pre3-5) unstable; urgency=low + + * Fixed an error in the init script that prevented tinc from + starting correctly. + + -- Ivo Timmermans Thu, 8 Feb 2001 02:45:09 +0100 + +tinc (1.0pre3-4) unstable; urgency=low + + * Change build-depends for OpenSSL to libssl096-dev + (Closes: #84197, #84873). + + -- Ivo Timmermans Sun, 4 Feb 2001 22:43:22 +0100 + +tinc (1.0pre3-3) unstable; urgency=low + + * Set architecture to any (really this time!) (Closes: #80451). + * Section set to non-US + + -- Ivo Timmermans Tue, 23 Jan 2001 22:52:53 +0100 + +tinc (1.0pre3-2) unstable; urgency=low + + * Set architecture to any (Closes: #80451). + * Added tinc.modules with some useful module aliases. + + -- Ivo Timmermans Sat, 13 Jan 2001 16:10:57 +0100 + +tinc (1.0pre3-1) unstable; urgency=low + + * New upstream version (1.0pre3) (Closes: #71274). + * Better Depends and Build-Depends lines. + * Dropped dependencies on libgmp, added libssl. + * doc-base.tinc: New file. + * Deleted the file shlibs, as there on longer is a libblowfish. + * Patch po/Makefile.in.in from po-Makefile.in.in.diff if necessary. + * Use dh_perl to get accurate perl dependencies. + + -- Ivo Timmermans Thu, 9 Nov 2000 21:58:40 +0100 + +tinc (1.0pre2-1.1) unstable; urgency=low + + * NMU at Ivo's request as his application is being processed, and his + sponsor is based in the US. + + -- J.H.M. Dassen (Ray) Wed, 28 Jun 2000 21:52:30 +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 + + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..15b4cca --- /dev/null +++ b/debian/control @@ -0,0 +1,28 @@ +Source: tinc +Section: net +Priority: optional +Maintainer: Guus Sliepen +Standards-Version: 4.0.0 +Build-Depends: libssl-dev (>>1.0.0), debhelper (>= 10), texinfo, zlib1g-dev, liblzo2-dev, libncurses5-dev, libreadline-dev, libvdeplug-dev, python | python-all | python-dev | python-all-dev, dh-python +Homepage: https://www.tinc-vpn.org/ + +Package: tinc +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +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. + +Package: tinc-gui +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk3.0, tinc (>= 1.1~pre3-1) +Description: graphical user interface for tinc + 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. + . + This package contains a GUI that can interact with a running tinc daemon, + showing the known nodes, edges and subnets of a VPN. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..02e3a92 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Ivo Timmermans on +Fri, 21 Apr 2000 17:07:50 +0200. + +It was downloaded from https://www.tinc-vpn.org/ + +Upstream Authors: + Guus Sliepen + Ivo Timmermans + +Copyright (C) 1998-2005 Ivo Timmermans + 1998-2016 Guus Sliepen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License version 2 can be found in /usr/share/common-licenses/GPL-2. + +The following applies to tinc: + +This program is released under the GPL with the additional exemption +that compiling, linking, and/or using OpenSSL is allowed. You may +provide binary packages linked to the OpenSSL libraries, provided that +all other requirements of the GPL are met. + +The following applies to the LZO library: + +Hereby I grant a special exception to the tinc VPN project +(https://wwww.tinc-vpn.org/) to link the LZO library with the OpenSSL library +(https://openssl.org). + +Markus F.X.J. Oberhumer diff --git a/debian/doc-base.tinc b/debian/doc-base.tinc new file mode 100644 index 0000000..a37f46a --- /dev/null +++ b/debian/doc-base.tinc @@ -0,0 +1,10 @@ +Document: tinc +Title: tinc Manual +Author: Ivo Timmermans, Guus Sliepen +Abstract: This manual describes how to set up a Virtual Private + Network with tinc. +Section: System/Security + +Format: HTML +Files: /usr/share/doc/tinc/tinc.html/* +Index: /usr/share/doc/tinc/tinc.html/index.html diff --git a/debian/info b/debian/info new file mode 100644 index 0000000..5468d6c --- /dev/null +++ b/debian/info @@ -0,0 +1 @@ +doc/tinc.info diff --git a/debian/patches/fix-version-number b/debian/patches/fix-version-number new file mode 100644 index 0000000..ff120af --- /dev/null +++ b/debian/patches/fix-version-number @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + + AC_PREREQ(2.61) +-AC_INIT([tinc], m4_esyscmd_s((git describe || echo UNKNOWN) | sed 's/release-//')) ++AC_INIT([tinc], [1.1~pre15]) + AC_CONFIG_SRCDIR([src/tincd.c]) + AC_GNU_SOURCE + AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall]) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..02fa232 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-version-number diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..e05f787 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,23 @@ +#! /bin/sh + +NETSFILE="/etc/tinc/nets.boot" + +set -e + +case "$1" in + configure) + 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 + +#DEBHELPER# diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..dc3247b --- /dev/null +++ b/debian/postrm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = purge ]; then + rm -f /etc/tinc/nets.boot +fi + +#DEBHELPER# diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..030c1d0 --- /dev/null +++ b/debian/preinst @@ -0,0 +1,28 @@ +#!/bin/sh + +NETSFILE="/etc/tinc/nets.boot" +SYSTEM="/lib/systemd/system" +WANTS="/etc/systemd/system/multi-user.target.wants" + +set -e + +case "$1" in + upgrade) + if dpkg --compare-versions "$2" '<<' "1.1~pre11-1"; then + if [ -f "$NETSFILE" ]; then + echo -n "Creating systemd service instances from nets.boot:" + mkdir -p "$WANTS" + egrep '^[ ]*[a-zA-Z0-9_-]+' $NETSFILE | while read net args; do + echo -n " $net" + ln -s "$SYSTEM/tinc@.service" "$WANTS/tinc@$net.service" 2>/dev/null || true + done + echo "." + fi + fi + ;; + + *) + ;; +esac + +#DEBHELPER# diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..2a66183 --- /dev/null +++ b/debian/rules @@ -0,0 +1,20 @@ +#!/usr/bin/make -f + +%: + dh $@ --parallel --with python2 + +override_dh_auto_configure: + dh_auto_configure -- --enable-vde --with-systemd + $(MAKE) clean + +override_dh_auto_install: + dh_auto_install -- install-html + # Remove info dir file + rm -f debian/tinc/usr/share/info/dir + +override_dh_auto_test: + # Don't run the tests, it involves starting tinc daemons and making network connections. + # I don't think the autobuilders will like this. + +override_dh_installinit: + dh_installinit -r diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tinc-gui.install b/debian/tinc-gui.install new file mode 100644 index 0000000..5f6113f --- /dev/null +++ b/debian/tinc-gui.install @@ -0,0 +1,2 @@ +usr/bin/tinc-gui +usr/share/man/man8/tinc-gui.* diff --git a/debian/tinc.default b/debian/tinc.default new file mode 100644 index 0000000..5c63ac5 --- /dev/null +++ b/debian/tinc.default @@ -0,0 +1,7 @@ +# Extra options to be passed to tincd. +# EXTRA="-d" + +# Limits to be configured for the tincd process. Please read your shell +# (pointed by /bin/sh) documentation for ulimit. You probably want to raise the +# max locked memory value if using both --mlock and --user flags. +# LIMITS="-l 128" diff --git a/debian/tinc.dirs b/debian/tinc.dirs new file mode 100644 index 0000000..a056c9a --- /dev/null +++ b/debian/tinc.dirs @@ -0,0 +1,6 @@ +usr/sbin +usr/share +etc +etc/init.d +usr/share/doc/tinc +etc/tinc diff --git a/debian/tinc.docs b/debian/tinc.docs new file mode 100644 index 0000000..eb9b151 --- /dev/null +++ b/debian/tinc.docs @@ -0,0 +1,3 @@ +NEWS +README +AUTHORS diff --git a/debian/tinc.files b/debian/tinc.files new file mode 100644 index 0000000..c329bce --- /dev/null +++ b/debian/tinc.files @@ -0,0 +1,6 @@ +usr/sbin/tincd +usr/sbin/tinc +usr/share/man +etc +usr/share/doc/tinc +usr/share/info diff --git a/debian/tinc.if-post-down b/debian/tinc.if-post-down new file mode 100755 index 0000000..0a3602b --- /dev/null +++ b/debian/tinc.if-post-down @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +test "$METHOD" != loopback -a -n "$IF_TINC_NET" || exit 0 + +if test -z "$IF_TINC_PIDFILE"; then + /usr/sbin/tinc -n "$IF_TINC_NET" stop $EXTRA +else + /usr/sbin/tinc -n "$IF_TINC_NET" --pidfile="$IF_TINC_PIDFILE" stop +fi + +exit 0 diff --git a/debian/tinc.if-pre-up b/debian/tinc.if-pre-up new file mode 100755 index 0000000..06a863b --- /dev/null +++ b/debian/tinc.if-pre-up @@ -0,0 +1,46 @@ +#!/bin/sh + +set -e + +test -n "$IF_TINC_NET" || exit 0 + +# Read options from /etc/default + +if test -e /etc/default/tinc; then + . /etc/default/tinc +fi + +# Set process limits + +setlimits() { + while [ $# -gt 0 ]; do + parm=$1 ; shift + if [ -n "$1" -a "${1#-}" = "$1" ]; then + value=$1 ; shift + ulimit $parm $value + else + ulimit $parm + fi + done +} +test -n "$LIMITS" && setlimits $LIMITS + +# Read options from /etc/network/interfaces + +test -z "$IF_TINC_CONFIG" || EXTRA="$EXTRA -c $IF_TINC_CONFIG" +test -z "$IF_TINC_DEBUG" || EXTRA="$EXTRA -d$IF_TINC_DEBUG" +test -z "$IF_TINC_MLOCK" || EXTRA="$EXTRA --mlock" +test -z "$IF_TINC_LOGFILE" || EXTRA="$EXTRA --logfile=$IF_TINC_LOGFILE" +test -z "$IF_TINC_PIDFILE" || EXTRA="$EXTRA --pidfile=$IF_TINC_PIDFILE" || IF_TINC_PIDFILE=/var/run/tinc.$IF_TINC_NET.pid +test -z "$IF_TINC_CHROOT" || EXTRA="$EXTRA --chroot" +test -z "$IF_TINC_USER" || EXTRA="$EXTRA --user=$IF_TINC_USER" + +# Start tinc daemon + +if test -z "$IF_TINC_PIDFILE"; then + /usr/sbin/tinc -n "$IF_TINC_NET" start -o "Interface=$IFACE" $EXTRA +else + /usr/sbin/tinc -n "$IF_TINC_NET" --pidfile="$IF_TINC_PIDFILE" start -o "Interface=$IFACE" $EXTRA +fi + +exit 0 diff --git a/debian/tinc.if-up b/debian/tinc.if-up new file mode 100755 index 0000000..5c5cb43 --- /dev/null +++ b/debian/tinc.if-up @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +test "$METHOD" != loopback -a -n "$IF_TINC_NET" || exit 0 + +if test -z "$IF_TINC_PIDFILE"; then + /usr/sbin/tinc -n "$IF_TINC_NET" retry +else + /usr/sbin/tinc -n "$IF_TINC_NET" --pidfile="$IF_TINC_PIDFILE" retry +fi diff --git a/debian/tinc.install b/debian/tinc.install new file mode 100644 index 0000000..090d65a --- /dev/null +++ b/debian/tinc.install @@ -0,0 +1,8 @@ +usr/sbin/tincd +usr/sbin/tinc +usr/share/doc/tinc/tinc.html +usr/share/man/man5 +usr/share/man/man8/tincd.* +usr/share/man/man8/tinc.* +usr/share/info +lib/systemd/system diff --git a/debian/tinc.noinit b/debian/tinc.noinit new file mode 100644 index 0000000..5ec9721 --- /dev/null +++ b/debian/tinc.noinit @@ -0,0 +1,103 @@ +#! /bin/sh +# +### BEGIN INIT INFO +# Provides: tinc +# Required-Start: $remote_fs $network +# Required-Stop: $remote_fs $network +# Should-Start: $syslog $named +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start tinc daemons +# Description: 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. +### END INIT INFO +# +# Based on Lubomir Bulej's Redhat init script. + +. /lib/lsb/init-functions + +DAEMON="/usr/sbin/tincd" +CONTROL="/usr/sbin/tinc" +NAME="tinc" +DESC="tinc daemons" +TCONF="/etc/tinc" +NETSFILE="$TCONF/nets.boot" +NETS="" + +test -f $DAEMON || exit 0 + +[ -r /etc/default/tinc ] && . /etc/default/tinc + +# foreach_net "what-to-say" action [arguments...] +foreach_net() { + if [ ! -f $NETSFILE ] ; then + echo "Please create $NETSFILE." + exit 0 + fi + echo -n "$1" + shift + egrep '^[ ]*[a-zA-Z0-9_-]+' $NETSFILE | while read net args; do + echo -n " $net" + case "$1" in + start|restart) $CONTROL -n $net $1 $EXTRA $args ;; + *) $CONTROL -n $net $1 ;; + esac + done + echo "." +} + +signal_running() { + for i in /var/run/tinc.*pid; do + if [ -f "$i" ]; then + head -1 $i | while read pid junk; do + kill -$1 $pid + done + fi + done +} + +setlimits() { + while [ $# -gt 0 ]; do + parm=$1 ; shift + if [ -n "$1" -a "${1#-}" = "$1" ]; then + value=$1 ; shift + ulimit $parm $value + else + ulimit $parm + fi + done +} + +test -n "$LIMITS" && setlimits $LIMITS + +case "$1" in + start) + foreach_net "Starting $DESC:" start + ;; + stop) + foreach_net "Stopping $DESC:" stop + ;; + reload|force-reload) + foreach_net "Reloading $DESC configuration:" reload + ;; + restart) + foreach_net "Restarting $DESC:" restart + ;; + force-restart) + $0 stop + $0 start + ;; + retry) + signal_running ALRM + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload|retry}" + exit 1 + ;; +esac + +exit 0