From 4998c80937a7396d6d31397e838d1d35a7c7195c Mon Sep 17 00:00:00 2001 From: /jedi/ Date: Mon, 19 Jun 2017 05:09:04 +0200 Subject: [PATCH 1/5] debian/control --- debian/control | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 debian/control diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..2a04d786 --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: tinc +Section: net +Priority: optional +Maintainer: Guus Sliepen +Standards-Version: 3.9.8 +Build-Depends: libssl-dev, debhelper (>= 10), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev, dh-systemd +Homepage: http://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. From a272115969dabb0b75d2b22f09e0854c58bf6f00 Mon Sep 17 00:00:00 2001 From: /jedi/ Date: Mon, 19 Jun 2017 05:52:36 +0200 Subject: [PATCH 2/5] debian --- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/copyright | 34 ++++++++++++++++++++++++++++++++++ debian/rules | 21 +++++++++++++++++++++ debian/source/format | 1 + 5 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 debian/changelog create mode 100644 debian/copyright create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..5a6af509 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +tinc (1.1-1) jessie; urgency=low + + * Initial release + + -- jedi Mon, 23 May 2016 19:20:41 +0200 + diff --git a/debian/control b/debian/control index 2a04d786..204178d9 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Source: tinc Section: net Priority: optional -Maintainer: Guus Sliepen +Maintainer: jedi Standards-Version: 3.9.8 -Build-Depends: libssl-dev, debhelper (>= 10), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev, dh-systemd +Build-Depends: libssl-dev, debhelper (>= 10), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev, libncurses5-dev, libreadline-dev, libssl-dev, dh-systemd Homepage: http://www.tinc-vpn.org/ Package: tinc diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..09fa649f --- /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 http://www.tinc-vpn.org/ + +Upstream Authors: + Guus Sliepen + Ivo Timmermans + +Copyright (C) 1998-2005 Ivo Timmermans + 1998-2008 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 +(http://tinc.nl.linux.org/) to link the LZO library with the OpenSSL library +(http://www.openssl.org). + +Markus F.X.J. Oberhumer diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..2a820454 --- /dev/null +++ b/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + +%: + dh $@ --with autotools_dev + +override_dh_auto_configure: + dh_auto_configure -- --enable-uml --enable-vde --with-systemdsystemunitdir=/lib/systemd/system + +override_dh_auto_install: + dh_auto_install -- install-html + # Remove info dir file + rm -f debian/tinc/usr/share/info/dir + +override_dh_installinit: + dh_installinit -R + +override_dh_systemd_start: + dh_systemd_start --restart-after-upgrade diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) From 38fffafd48122b275cda9dd676756e4d1be959ef Mon Sep 17 00:00:00 2001 From: /jedi/ Date: Mon, 19 Jun 2017 20:49:47 +0200 Subject: [PATCH 3/5] debian --- debian/compat | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 debian/compat diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..f599e28b --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/rules b/debian/rules index 2a820454..d58ec931 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ #export DH_VERBOSE = 1 %: - dh $@ --with autotools_dev + dh $@ override_dh_auto_configure: dh_auto_configure -- --enable-uml --enable-vde --with-systemdsystemunitdir=/lib/systemd/system From 17a237d5e3738d22aedf95522cb5ecff744586ac Mon Sep 17 00:00:00 2001 From: /jedi/ Date: Mon, 19 Jun 2017 21:43:04 +0200 Subject: [PATCH 4/5] debian --- debian/patches/series | 0 debian/postinst | 30 ++++++++++++++++++++++++++++++ debian/tinc.default | 7 +++++++ debian/tinc.dirs | 7 +++++++ debian/tinc.files | 7 +++++++ 5 files changed, 51 insertions(+) create mode 100644 debian/patches/series create mode 100644 debian/postinst create mode 100644 debian/tinc.default create mode 100644 debian/tinc.dirs create mode 100644 debian/tinc.files diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..e69de29b diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 00000000..c6769fa5 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,30 @@ +#! /bin/sh + +NETSFILE="/etc/tinc/nets.boot" + +set -e + +case "$1" in + configure) + if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then + if [ ! -e /dev/net/tun ] ; then if [ ! -e /dev/tun ] ; then if [ -e /dev/MAKEDEV ]; then + echo "Creating tun device..." + cd /dev && ./MAKEDEV net/tun 2>/dev/null || ./MAKEDEV tun 2>/dev/null || echo "Failed to create tun device." + fi; fi; fi + 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 + +#DEBHELPER# diff --git a/debian/tinc.default b/debian/tinc.default new file mode 100644 index 00000000..bca24321 --- /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 1024" diff --git a/debian/tinc.dirs b/debian/tinc.dirs new file mode 100644 index 00000000..1eae2e2d --- /dev/null +++ b/debian/tinc.dirs @@ -0,0 +1,7 @@ +usr/sbin +usr/share +etc +etc/init.d +usr/share/locale +usr/share/doc/tinc +etc/tinc diff --git a/debian/tinc.files b/debian/tinc.files new file mode 100644 index 00000000..ed7bd233 --- /dev/null +++ b/debian/tinc.files @@ -0,0 +1,7 @@ +usr/sbin/tincd +usr/sbin/tinc +usr/share/man +etc +usr/share/doc/tinc +usr/share/locale +usr/share/info From 2c6cbe9b7dd93969d8457636ab0271df7cefbbb7 Mon Sep 17 00:00:00 2001 From: jedi Date: Mon, 14 Dec 2020 21:53:17 +0100 Subject: [PATCH 5/5] debian --- Makefile.am | 2 +- debian/changelog | 2 +- debian/compat | 1 - debian/control | 6 +++--- debian/{tinc.dirs => dirs} | 0 debian/patches/series | 0 debian/rules | 20 ++++++++++---------- debian/tinc.default | 7 ------- debian/tinc.files | 7 ------- 9 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 debian/compat rename debian/{tinc.dirs => dirs} (100%) delete mode 100644 debian/patches/series delete mode 100644 debian/tinc.default delete mode 100644 debian/tinc.files diff --git a/Makefile.am b/Makefile.am index 85a37975..6a4f55a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = src doc gui test systemd +SUBDIRS = src doc gui systemd ACLOCAL_AMFLAGS = -I m4 diff --git a/debian/changelog b/debian/changelog index 5a6af509..40c1e0e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,5 +2,5 @@ tinc (1.1-1) jessie; urgency=low * Initial release - -- jedi Mon, 23 May 2016 19:20:41 +0200 + -- jedi Mon, 23 May 2016 19:20:41 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 204178d9..fcab4359 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Source: tinc Section: net Priority: optional -Maintainer: jedi -Standards-Version: 3.9.8 -Build-Depends: libssl-dev, debhelper (>= 10), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev, libncurses5-dev, libreadline-dev, libssl-dev, dh-systemd +Maintainer: jedi +Build-Depends: debhelper-compat (= 13), texinfo, zlib1g-dev, liblzo2-dev, libncurses-dev, libreadline-dev, libssl-dev, libcmocka-dev +Standards-Version: 4.5.1 Homepage: http://www.tinc-vpn.org/ Package: tinc diff --git a/debian/tinc.dirs b/debian/dirs similarity index 100% rename from debian/tinc.dirs rename to debian/dirs diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e69de29b..00000000 diff --git a/debian/rules b/debian/rules index d58ec931..91c23720 100755 --- a/debian/rules +++ b/debian/rules @@ -6,16 +6,16 @@ %: dh $@ -override_dh_auto_configure: - dh_auto_configure -- --enable-uml --enable-vde --with-systemdsystemunitdir=/lib/systemd/system +#override_dh_auto_configure: +# dh_auto_configure -- --enable-uml --enable-vde --with-systemdsystemunitdir=/lib/systemd/system -override_dh_auto_install: - dh_auto_install -- install-html - # Remove info dir file - rm -f debian/tinc/usr/share/info/dir +#override_dh_auto_install: +# dh_auto_install -- install-html +# # Remove info dir file +# rm -f debian/tinc/usr/share/info/dir -override_dh_installinit: - dh_installinit -R +#override_dh_installinit: +# dh_installinit -R -override_dh_systemd_start: - dh_systemd_start --restart-after-upgrade +#override_dh_systemd_start: +# dh_systemd_start --restart-after-upgrade diff --git a/debian/tinc.default b/debian/tinc.default deleted file mode 100644 index bca24321..00000000 --- a/debian/tinc.default +++ /dev/null @@ -1,7 +0,0 @@ -# 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 1024" diff --git a/debian/tinc.files b/debian/tinc.files deleted file mode 100644 index ed7bd233..00000000 --- a/debian/tinc.files +++ /dev/null @@ -1,7 +0,0 @@ -usr/sbin/tincd -usr/sbin/tinc -usr/share/man -etc -usr/share/doc/tinc -usr/share/locale -usr/share/info