From 0f3c45c5cc7f9a5a460e48334e1937fcd057c8e8 Mon Sep 17 00:00:00 2001 From: Ivo Timmermans Date: Thu, 11 Apr 2002 09:26:14 +0200 Subject: [PATCH 01/31] Import Debian changes 1.0pre7-2 tinc (1.0pre7-2) unstable; urgency=low * Dutch translation wasn't being installed. tinc (1.0pre7-1) unstable; urgency=medium * New upstream release. tinc (1.0pre6-3) unstable; urgency=medium * Synched with upstream CVS. * Added build dependency on zlib1g-dev. (Closes: #141705) tinc (1.0pre6-2) unstable; urgency=low * The Section was non-US again, so changed it back to main/net. tinc (1.0pre6-1) unstable; urgency=low * New upstream release. * Fixed text in debian/copyright 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. tinc (1.0pre5-3) unstable; urgency=low * Config variables are now treated case sentitivly again. * Added a forgotten xstrdup. tinc (1.0pre5-2) unstable; urgency=low * MaxTimeout accidentally wasn't configurable. (Closes: #119653) tinc (1.0pre5-1) unstable; urgency=low * New upstream version. (Closes: #119653) * Init script redone in sh. tinc (1.0pre4-1.cvs010621.6) unstable; urgency=low * Somehow po-Makefile.in.in.diff got lost, readded. (Closes: #119157) tinc (1.0pre4-1.cvs010621.5) unstable; urgency=low * Fix a typo in postinst that let it MAKEDEV even on devfs. (Closes: #116034) tinc (1.0pre4-1.cvs010621.4) unstable; urgency=low * Ask before creating the device files. (Closes: #111099) * Add a section to the info file. tinc (1.0pre4-1.cvs010621.3) unstable; urgency=low * Build and install html documentation. (Closes: #106843) * Remove build-time dependency on libc6-dev. tinc (1.0pre4-1.cvs010621.2) unstable; urgency=low * Changed location of the pidfile. (Closes: #102798) 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. tinc (1.0pre3-5) unstable; urgency=low * Fixed an error in the init script that prevented tinc from starting correctly. tinc (1.0pre3-4) unstable; urgency=low * Change build-depends for OpenSSL to libssl096-dev (Closes: #84197, #84873). tinc (1.0pre3-3) unstable; urgency=low * Set architecture to any (really this time!) (Closes: #80451). * Section set to non-US tinc (1.0pre3-2) unstable; urgency=low * Set architecture to any (Closes: #80451). * Added tinc.modules with some useful module aliases. 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. 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. 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. tinc (1.0pre1-0.4) unstable; urgency=low * postinst script. tinc (1.0pre1-0.3) unstable; urgency=low * system startup script. tinc (1.0pre1-0.2) unstable; urgency=low * Included the blowfish license. tinc (1.0pre1-0.1) unstable; urgency=low * Initial Release. --- debian/Makefile | 202 ++++++++++++++++++++++++++++++++++ debian/Makefile.am | 2 + debian/Makefile.in | 202 ++++++++++++++++++++++++++++++++++ debian/README.Debian | 10 ++ debian/changelog | 186 +++++++++++++++++++++++++++++++ debian/conffiles | 1 + debian/config | 9 ++ debian/control | 19 ++++ debian/copyright | 20 ++++ debian/dirs | 3 + debian/doc-base.tinc | 10 ++ debian/docs | 3 + debian/info | 1 + debian/init.d | 77 +++++++++++++ debian/po-Makefile.in.in.diff | 32 ++++++ debian/postinst | 108 ++++++++++++++++++ debian/postrm | 9 ++ debian/prerm | 18 +++ debian/rules | 81 ++++++++++++++ debian/tinc-down | 7 ++ debian/tinc-up | 14 +++ debian/tinc.dirs | 6 + debian/tinc.files | 5 + debian/tinc.modules | 11 ++ debian/tinc.templates | 14 +++ debian/tinc.templates.nl | 13 +++ 26 files changed, 1063 insertions(+) create mode 100644 debian/Makefile create mode 100644 debian/Makefile.am create mode 100644 debian/Makefile.in create mode 100644 debian/README.Debian create mode 100644 debian/changelog create mode 100644 debian/conffiles create mode 100644 debian/config create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/dirs create mode 100644 debian/doc-base.tinc create mode 100644 debian/docs create mode 100644 debian/info create mode 100644 debian/init.d create mode 100644 debian/po-Makefile.in.in.diff create mode 100644 debian/postinst create mode 100644 debian/postrm create mode 100644 debian/prerm create mode 100755 debian/rules create mode 100644 debian/tinc-down create mode 100644 debian/tinc-up create mode 100644 debian/tinc.dirs create mode 100644 debian/tinc.files create mode 100644 debian/tinc.modules create mode 100644 debian/tinc.templates create mode 100644 debian/tinc.templates.nl diff --git a/debian/Makefile b/debian/Makefile new file mode 100644 index 0000000..948aa39 --- /dev/null +++ b/debian/Makefile @@ -0,0 +1,202 @@ +# Generated automatically from Makefile.in by configure. +# Makefile.in generated automatically by automake 1.4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = /bin/sh + +srcdir = . +top_srcdir = .. +prefix = /usr +exec_prefix = ${prefix} + +bindir = ${exec_prefix}/bin +sbindir = ${exec_prefix}/sbin +libexecdir = ${exec_prefix}/libexec +datadir = ${prefix}/share +sysconfdir = /etc +sharedstatedir = ${prefix}/com +localstatedir = /var +libdir = ${exec_prefix}/lib +infodir = ${prefix}/share/info +mandir = ${prefix}/share/man +includedir = ${prefix}/include +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/tinc +pkglibdir = $(libdir)/tinc +pkgincludedir = $(includedir)/tinc + +top_builddir = .. + +ACLOCAL = aclocal -I m4 +AUTOCONF = autoconf +AUTOMAKE = automake +AUTOHEADER = autoheader + +INSTALL = /usr/bin/install -c +INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_SCRIPT = ${INSTALL_PROGRAM} +transform = s,x,x, + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = i586-pc-linux-gnu +host_triplet = i586-pc-linux-gnu +AS = @AS@ +AWK = mawk +CATALOGS = es.gmo nl.gmo +CATOBJEXT = .gmo +CC = gcc +CPP = gcc -E +DATADIRNAME = share +DLLTOOL = @DLLTOOL@ +GENCAT = +GMOFILES = es.gmo nl.gmo +GMSGFMT = /usr/bin/msgfmt +GT_NO = +GT_YES = #YES# +HAVE_TUNTAP = +INCLUDE_LOCALE_H = #include +INSTOBJEXT = .mo +INTLDEPS = +INTLLIBS = +INTLOBJS = +LIBTOOL = @LIBTOOL@ +LINUX_IF_TUN_H = +LN_S = ln -s +MAKEINFO = makeinfo +MKINSTALLDIRS = ./mkinstalldirs +MSGFMT = /usr/bin/msgfmt +OBJDUMP = @OBJDUMP@ +PACKAGE = tinc +PERL = perl +POFILES = es.po nl.po +POSUB = po +RANLIB = ranlib +USE_INCLUDED_LIBINTL = no +USE_NLS = yes +VERSION = 1.0-cvs +l = + +EXTRA_DIST = README.Debian changelog conffiles control copyright dirs docs info init.d postinst rules doc-base.tinc + +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps debian/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +tags: TAGS +TAGS: + + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = debian + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-generic clean-am + -rm -f libtool + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: tags distdir info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/debian/Makefile.am b/debian/Makefile.am new file mode 100644 index 0000000..6bb365b --- /dev/null +++ b/debian/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = README.Debian changelog conffiles control copyright dirs \ + docs info init.d postinst rules doc-base.tinc diff --git a/debian/Makefile.in b/debian/Makefile.in new file mode 100644 index 0000000..b5008fa --- /dev/null +++ b/debian/Makefile.in @@ -0,0 +1,202 @@ +# Makefile.in generated automatically by automake 1.4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = .. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AS = @AS@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CPP = @CPP@ +DATADIRNAME = @DATADIRNAME@ +DLLTOOL = @DLLTOOL@ +GENCAT = @GENCAT@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GT_NO = @GT_NO@ +GT_YES = @GT_YES@ +HAVE_TUNTAP = @HAVE_TUNTAP@ +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INSTOBJEXT = @INSTOBJEXT@ +INTLDEPS = @INTLDEPS@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +LIBTOOL = @LIBTOOL@ +LINUX_IF_TUN_H = @LINUX_IF_TUN_H@ +LN_S = @LN_S@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +OBJDUMP = @OBJDUMP@ +PACKAGE = @PACKAGE@ +PERL = @PERL@ +POFILES = @POFILES@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +l = @l@ + +EXTRA_DIST = README.Debian changelog conffiles control copyright dirs docs info init.d postinst rules doc-base.tinc + +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps debian/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +tags: TAGS +TAGS: + + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = debian + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-generic clean-am + -rm -f libtool + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: tags distdir info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..5a4c224 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,10 @@ +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 new file mode 100644 index 0000000..fbb00c9 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,186 @@ +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/conffiles b/debian/conffiles new file mode 100644 index 0000000..7983a3c --- /dev/null +++ b/debian/conffiles @@ -0,0 +1 @@ +/etc/init.d/tinc diff --git a/debian/config b/debian/config new file mode 100644 index 0000000..ab660b8 --- /dev/null +++ b/debian/config @@ -0,0 +1,9 @@ +#!/bin/sh -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +db_title tinc configuration + +db_input medium tinc/restart_on_upgrade || true +db_go diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..9c18ccf --- /dev/null +++ b/debian/control @@ -0,0 +1,19 @@ +Source: tinc +Section: net +Priority: optional +Maintainer: Ivo Timmermans +Standards-Version: 3.5.6 +Build-Depends: libssl-dev, autoconf (>= 2.12), automake, debhelper, libtool, gettext, texi2html, zlib1g-dev + +Package: tinc +Architecture: any +Depends: debconf, ${shlibs: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. + . + You need to have two kernel modules installed, on a Debian system + they should already be there. If they are not, the manual will + explain you how to do that. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..49b9921 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,20 @@ +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): + Guus Sliepen + Ivo Timmermans + +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 following is the text from /usr/share/doc/tinc/COPYING.README: + +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. diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..08152ec --- /dev/null +++ b/debian/dirs @@ -0,0 +1,3 @@ +etc/tinc +etc/tinc/example +usr/share/doc/tinc diff --git a/debian/doc-base.tinc b/debian/doc-base.tinc new file mode 100644 index 0000000..6f28d1f --- /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: net + +Format: HTML +Files: /usr/share/doc/tinc/tinc*.html +Index: /usr/share/doc/tinc/tinc_toc.html diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..eb9b151 --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +AUTHORS 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/init.d b/debian/init.d new file mode 100644 index 0000000..5dac505 --- /dev/null +++ b/debian/init.d @@ -0,0 +1,77 @@ +#! /bin/sh +# +# System startup script for tinc +# $Id: init.d,v 1.14.2.4 2000/12/05 09:03:41 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. +# + +DAEMON="/usr/sbin/tincd" +NAME="tinc" +DESC="tinc daemons" +TCONF="/etc/tinc" +EXTRA="" +NETSFILE="$TCONF/nets.boot" +NETS="" + +test -f $DAEMON || exit 0 + +find_nets () { + if [ ! -f $NETSFILE ] ; then + echo "Please create $NETSFILE." + exit 0 + fi + NETS="`egrep '^[ ]*[a-zA-Z0-9_]+[ ]*$' $NETSFILE`" +} + +case "$1" in + start) + find_nets + echo -n "Starting $DESC:" + for n in $NETS ; do + echo -n " $n" + $DAEMON -n $n $EXTRA + done + echo "." + ;; + stop) + find_nets + echo -n "Stopping $DESC:" + for n in $NETS ; do + echo -n " $n" + $DAEMON -n $n $EXTRA -k + done + echo "." + ;; + reload) + find_nets + echo -n "Reloading $DESC configuration:" + for n in $NETS ; do + echo -n " $n" + $DAEMON -n $n $EXTRA -k1 + done + echo "." + ;; + restart|force-reload) + find_nets + echo -n "Restarting $DESC:" + for n in $NETS ; do + echo -n " $n" + $DAEMON -n $n $EXTRA -k + sleep 1 + $DAEMON -n $n $EXTRA + done + echo "." + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/debian/po-Makefile.in.in.diff b/debian/po-Makefile.in.in.diff new file mode 100644 index 0000000..b33223a --- /dev/null +++ b/debian/po-Makefile.in.in.diff @@ -0,0 +1,32 @@ +--- Makefile.in.in.orig Thu Nov 2 20:02:58 2000 ++++ Makefile.in.in Thu Nov 2 23:25:42 2000 +@@ -24,6 +24,8 @@ + gettextsrcdir = $(prefix)/share/gettext/po + subdir = po + ++DESTDIR = ++ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ +@@ -111,16 +113,16 @@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ +- *.gmo) destdir=$(gnulocaledir);; \ +- *) destdir=$(localedir);; \ ++ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ ++ *) destdir=$(DESTDIR)$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$$destdir/$$lang/LC_MESSAGES; \ diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..9b8421b --- /dev/null +++ b/debian/postinst @@ -0,0 +1,108 @@ +#! /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/.devfsd -a ! -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 + cat < $NETSFILE + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# Automatically added by dh_installinit, edited for use with debconf +if [ -x "/etc/init.d/tinc" ]; then + update-rc.d tinc defaults >/dev/null + + if [ "$1" = "configure" ] ; then + if dpkg --compare-versions "$2" lt "1.0pre5-4" ; then + /etc/init.d/tinc start + else + if [ -e /usr/share/debconf/confmodule ] ; then + . /usr/share/debconf/confmodule + db_get tinc/restart_on_upgrade + if [ "$RET" = "true" ] ; then + /etc/init.d/tinc start + else + echo "I have not stopped or restarted the tinc daemon. You should do this" + echo "yourself whenever you're ready; type \`\`/etc/init.d/tinc restart''." + fi + db_stop + else + /etc/init.d/tinc start + fi + fi + fi +fi +# End automatically added section + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..8b30ded --- /dev/null +++ b/debian/postrm @@ -0,0 +1,9 @@ +#!/bin/sh +set -e +# Automatically added by package maintainer +if [ "$1" = purge ]; then + update-rc.d tinc remove >/dev/null 2>/dev/null +fi +# End automatically added section + +#DEBHELPER# diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 0000000..1b54335 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,18 @@ +#!/bin/sh + +# Automatically added by dh_installinit, edited for use with debconf +if [ -x "/etc/init.d/tinc" ]; then + if [ -e /usr/share/debconf/confmodule ] ; then + . /usr/share/debconf/confmodule + db_get tinc/restart_on_upgrade + if [ "$RET" = "true" ] ; then + /etc/init.d/tinc stop + fi + db_stop + else + /etc/init.d/tinc stop + fi +fi +# End automatically added section + +#DEBHELPER# diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..296a943 --- /dev/null +++ b/debian/rules @@ -0,0 +1,81 @@ +#!/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=3 + +build: build-stamp +build-stamp: + dh_testdir + +# # If the Makefile.in.in file in po/ already contains DESTDIR support, skip the patching. + cd `pwd`/po ; ( \ + if ! grep DESTDIR Makefile.in.in > /dev/null ; then \ + patch -Ns -p0 < `pwd`/../debian/po-Makefile.in.in.diff || true ;\ + fi ;\ + ) + ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info --sysconfdir=/etc \ + --localstatedir=/var + $(MAKE) +# cd doc && texi2html -split=chapter tinc.texi + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + -$(MAKE) distclean + rm -f src/device.c + + 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 + mkdir -p `pwd`/debian/tmp/usr/share/doc/tinc/examples + cd `pwd`/debian/tmp/usr/share/doc/tinc/examples/ && tar xfz $(PWD)/doc/sample-config.tar.gz + cp COPYING.README `pwd`/debian/tmp/usr/share/doc/tinc/ + ln -s /usr/share/doc/tinc/README.Debian `pwd`/debian/tmp/etc/tinc/example/README + p="`pwd`" ; cd $$p/debian/tmp/usr/share/doc/tinc ; texi2html -split=chapter $$p/doc/tinc.texi + +# 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_testdir + dh_testroot + dh_movefiles + dh_installdocs + dh_installexamples + install -o root -g root -m 755 debian/init.d debian/tinc/etc/init.d/tinc + dh_installmanpages + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_installdebconf + dh_compress + dh_fixperms + dh_installdeb + 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/tinc-down b/debian/tinc-down new file mode 100644 index 0000000..9f3b499 --- /dev/null +++ b/debian/tinc-down @@ -0,0 +1,7 @@ +#!/bin/sh +# This file closes down the tap device. +# Note that if you use the universal tun/tap driver, you don't +# need to do anything; once tinc quits the tap device is already +# removed by the kernel. + +ifconfig tap0 down diff --git a/debian/tinc-up b/debian/tinc-up new file mode 100644 index 0000000..46ab015 --- /dev/null +++ b/debian/tinc-up @@ -0,0 +1,14 @@ +#!/bin/sh +# This file sets up the tap device. +# It gives you the freedom to do anything you want with it. +# Use the correct name for the tap device: +# For ethertap this is tap0, tap1, tap2 etcetera, +# but for the universal tun/tap device use $NETNAME. + +# Set hardware ethernet address (required for Mode=router) +ifconfig tap0 hw ether fe:fd:0:0:0:0 + +# Give it the right ip and netmask. Remember, the subnet of the +# tap device must be larger than that of the individual Subnets +# as defined in the host configuration file! +ifconfig tap0 192.168.1.1 netmask 255.255.0.0 -arp diff --git a/debian/tinc.dirs b/debian/tinc.dirs new file mode 100644 index 0000000..7f2c4e3 --- /dev/null +++ b/debian/tinc.dirs @@ -0,0 +1,6 @@ +usr/sbin +usr/share +etc +etc/init.d +usr/share/locale + diff --git a/debian/tinc.files b/debian/tinc.files new file mode 100644 index 0000000..439807b --- /dev/null +++ b/debian/tinc.files @@ -0,0 +1,5 @@ +usr/sbin/tincd +usr/share/man +etc +usr/share/doc/tinc +usr/share/locale diff --git a/debian/tinc.modules b/debian/tinc.modules new file mode 100644 index 0000000..198e92a --- /dev/null +++ b/debian/tinc.modules @@ -0,0 +1,11 @@ +alias char-major-36 netlink_dev + +alias tap0 ethertap +alias tap1 ethertap +alias tap2 ethertap +alias tap3 ethertap + +options tap0 -o tap0 -x unit=0 +options tap1 -o tap1 -x unit=1 +options tap2 -o tap2 -x unit=2 +options tap3 -o tap3 -x unit=3 diff --git a/debian/tinc.templates b/debian/tinc.templates new file mode 100644 index 0000000..8e07209 --- /dev/null +++ b/debian/tinc.templates @@ -0,0 +1,14 @@ +Template: tinc/restart_on_upgrade +Type: boolean +Default: true +Description: Restart tinc on each upgrade? + You may choose if you want me to restart the tinc daemon every time + you install a new version of this package. + . + Sometimes you don't want to do this, for example if you are doing the + upgrade over a tunnel that is created with tinc. Stopping the daemon + would probably leave you with a dead connection, and tinc may not be + started again. + . + If you say no, you have to restart tinc yourself if you upgraded, + by typing `/etc/init.d/tinc restart' whenever it suits you. diff --git a/debian/tinc.templates.nl b/debian/tinc.templates.nl new file mode 100644 index 0000000..e509612 --- /dev/null +++ b/debian/tinc.templates.nl @@ -0,0 +1,13 @@ +Template: tinc/restart_on_upgrade +Description: Start tinc opnieuw na iedere upgrade? + Je kunt kiezen of ik de tinc daemon opnieuw moet starten iedere keer + als je een nieuwe versie van het pakket installeert. + . + Soms wil je dit niet doen, bij voorbeeld als je de upgrade uitvoert + over een tunnel die met tinc is gemaakt. Het stoppen van tinc + resulteert dan waarschijnlijk is een dode verbinding, en tinc wordt + dan misschien niet opnieuw gestart. + . + Als je nee antwoordt, moet je zelf tinc opnieuw starten na een + upgrade, door `/etc/init.d/tinc restart' in te tiepen wanneer het + goed uitkomt. From 458d509a4fbbfacda4871062628ac55714604866 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 16 Jul 2005 11:42:04 +0200 Subject: [PATCH 02/31] Import Debian changes 1.0.4-2 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 --- debian/changelog | 7 ++++++ debian/control | 2 +- debian/po/cs.po | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ debian/rules | 2 +- 4 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 debian/po/cs.po diff --git a/debian/changelog b/debian/changelog index 9624302..4653767 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 diff --git a/debian/control b/debian/control index dd7acdd..067f4ea 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen -Standards-Version: 3.6.1 +Standards-Version: 3.6.2 Build-Depends: libssl-dev, debhelper (>= 4.1.16), gettext, texi2html, zlib1g-dev, cdbs, liblzo-dev Package: tinc diff --git a/debian/po/cs.po b/debian/po/cs.po new file mode 100644 index 0000000..6316375 --- /dev/null +++ b/debian/po/cs.po @@ -0,0 +1,63 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: tinc 1.0.4-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-11-11 20:06+0000\n" +"PO-Revision-Date: 2005-06-10 22:44+0200\n" +"Last-Translator: Martin Sin \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "Restart tinc on each upgrade?" +msgstr "Restartovat tinc pøi ka¾dé aktualizaci?" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"You may choose if you want me to restart the tinc daemon every time you " +"install a new version of this package." +msgstr "" +"Mù¾ete zvolit, zda restartovat tinc daemona poka¾dé, kdy¾ je instalována " +"nová verze tohoto balíèku." + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"Sometimes you don't want to do this, for example if you are doing the " +"upgrade over a tunnel that is created with tinc. Stopping the daemon would " +"probably leave you with a dead connection, and tinc may not be started again." +msgstr "" +"Nìkdy tuto mo¾nost nepotøebujete, napøíklad pokud provádíte aktualizaci " +"pøes tunel, který je vytvoøen pomocí tinc. Zastavení tohoto daemona " +"vám pravdìpodobnì zanechá \"mrtvé pøipojení\" a navíc se tinc nemusí znovu " +"spustit." + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"If you refuse, you have to restart tinc yourself if you upgraded, by typing " +"`invoke-rc.d tinc restart' whenever it suits you." +msgstr "" +"Pokud zamítnete, musíte po aktualizaci restartovat tinc ruènì, zadáním " +"pøíkazu `invoke-rc.d tinc restart' kdykoliv se vám to hodí." diff --git a/debian/rules b/debian/rules index 7a87cc8..1dd4fc6 100755 --- a/debian/rules +++ b/debian/rules @@ -15,5 +15,5 @@ clean:: build/tinc:: cd doc && $(MAKE) texi2html binary-post-install/tinc:: - mv -v doc/*.html debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ + mv -v doc/tinc/*.html debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ cd debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ && tar xzf ../../../../../../doc/sample-config.tar.gz && mv sample-config examples && rm -rf examples/CVS examples/hosts/CVS From 23459e12373f65168a3fc716f7f6b1f4e221cb87 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Thu, 29 Sep 2005 11:15:34 +0200 Subject: [PATCH 03/31] Import Debian changes 1.0.4-3 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 --- debian/changelog | 8 ++++++++ debian/control | 6 +----- debian/po/ja.po | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ debian/po/vi.po | 48 +++++++++++++++++++++++++++++++++++++++++++++++ debian/postinst | 8 ++++---- 5 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 debian/po/ja.po create mode 100644 debian/po/vi.po diff --git a/debian/changelog b/debian/changelog index 4653767..64e6c7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 diff --git a/debian/control b/debian/control index 067f4ea..9f8d73f 100644 --- a/debian/control +++ b/debian/control @@ -7,13 +7,9 @@ Build-Depends: libssl-dev, debhelper (>= 4.1.16), gettext, texi2html, zlib1g-dev Package: tinc Architecture: any -Depends: debconf, ${shlibs:Depends} +Depends: debconf | debconf-2.0, ${shlibs: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. - . - You need to have two kernel modules installed, on a Debian system - they should already be there. If they are not, the manual will - explain you how to do that. diff --git a/debian/po/ja.po b/debian/po/ja.po new file mode 100644 index 0000000..946afa4 --- /dev/null +++ b/debian/po/ja.po @@ -0,0 +1,49 @@ +msgid "" +msgstr "" +"Project-Id-Version: tinc 1.0.4-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-11-11 20:06+0000\n" +"PO-Revision-Date: 2005-06-14 21:09+0900\n" +"Last-Translator: Atsushi Shimono \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "Restart tinc on each upgrade?" +msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¤¿¤Ó¤Ë tinc ¤òºÆµ¯Æ°¤·¤Þ¤¹¤«¡©" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"You may choose if you want me to restart the tinc daemon every time you " +"install a new version of this package." +msgstr "" +"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤Ó¤Ë¡¢tinc ¥Ç¡¼¥â¥ó¤ò" +"ºÆµ¯Æ°¤¹¤ë¤«¤É¤¦¤«¤òÁªÂò¤Ç¤­¤Þ¤¹¡£" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"Sometimes you don't want to do this, for example if you are doing the " +"upgrade over a tunnel that is created with tinc. Stopping the daemon would " +"probably leave you with a dead connection, and tinc may not be started again." +msgstr "" +"tinc ¤Î¥È¥ó¥Í¥ë¤ò·Ðͳ¤·¤Æ¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤Æ¤¤¤ë¤È¤­¤Ê¤É¡¢¤³¤ì¤ò¹Ô¤¤" +"¤¿¤¯¤Ê¤¤¤³¤È¤¬¤¢¤ë¤È»×¤¤¤Þ¤¹¡£¥Ç¡¼¥â¥ó¤ò»ß¤á¤ë¤³¤È¤ÇÀܳ¤¬¼º¤ï¤ì¡¢tinc " +"¤âºÆµ¯Æ°¤·¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"If you refuse, you have to restart tinc yourself if you upgraded, by typing " +"`invoke-rc.d tinc restart' whenever it suits you." +msgstr "" +"¤³¤ì¤òÁªÂò¤·¤Ê¤¤¾ì¹ç¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤¿ºÝ¡¢ÅԹ礬Îɤ¤¤È¤­¤Ë " +"'invoke-rc.d tinc restart' ¤ò¼Â¹Ô¤·¤Æ tinc ¤ò¼«Ê¬¤ÇºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" diff --git a/debian/po/vi.po b/debian/po/vi.po new file mode 100644 index 0000000..8177667 --- /dev/null +++ b/debian/po/vi.po @@ -0,0 +1,48 @@ +# Vietnamese translation for tinc. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: tinc 1.0.4-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-11-11 20:06+0000\n" +"PO-Revision-Date: 2005-08-10 17:13+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: LocFactoryEditor 1.2.2\n" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "Restart tinc on each upgrade?" +msgstr "Khởi chạy lại trình tinc má»—i lần nâng cấp không?" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"You may choose if you want me to restart the tinc daemon every time you " +"install a new version of this package." +msgstr "Tại đây bạn có thể chá»n tá»± Ä‘á»™ng khởi chạy lại trình ná»n (dæmon) tinc má»—i lần bạn cài đặt phiên bản má»›i của gói này hay không." + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"Sometimes you don't want to do this, for example if you are doing the " +"upgrade over a tunnel that is created with tinc. Stopping the daemon would " +"probably leave you with a dead connection, and tinc may not be started again." +msgstr "Äôi khi bạn không muốn làm nhÆ° thế, lấy thí dụ nếu bạn Ä‘ang nâng cấp qua Ä‘Æ°á»ng hầm mà tinc tạo. Trong trÆ°á»ng hợp này, ngừng trình ná»n rất có thể sẽ ngắt kết nối, và có lẽ tinc sẽ không khởi chạy lại." + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"If you refuse, you have to restart tinc yourself if you upgraded, by typing " +"`invoke-rc.d tinc restart' whenever it suits you." +msgstr "Nếu bạn từ chối thì bạn cần phải tá»± khởi chạy lại trình tinc má»—i lần nâng cấp, bằng cách gõ lệnh « invoke-rc.d tinc restart » (gá»i-rc.d tinc khởi chạy lại) khi thích hợp." diff --git a/debian/postinst b/debian/postinst index e7671c3..7fccffd 100644 --- a/debian/postinst +++ b/debian/postinst @@ -51,12 +51,12 @@ fi case "$1" in configure) - if [ ! -e /dev/.devfsd -a ! -e /dev/.devfs ] ; then - if [ ! -e /dev/net/tun -a ! -e /dev/tun ] ; then + if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then + if [ ! -e /dev/net/tun ] ; then if [ ! -e /dev/tun ] ; 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; fi if [ ! -e $NETSFILE ] ; then echo "## This file contains all names of the networks to be started on system startup." > $NETSFILE From 2cb318558230afc45b433f3e453b5dbc6e419a36 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 17 Oct 2005 12:34:32 +0200 Subject: [PATCH 04/31] Import Debian changes 1.0.4-4 tinc (1.0.4-4) unstable; urgency=low * Include swedish debconf translation. Closes: #332963 * Remove nets.boot on purge. Closes: #333303 --- debian/changelog | 7 ++++++ debian/po/sv.po | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ debian/postrm | 1 + 3 files changed, 70 insertions(+) create mode 100644 debian/po/sv.po diff --git a/debian/changelog b/debian/changelog index 64e6c7b..c999c42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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. diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 0000000..aaa7347 --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,62 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: tinc 1.0.4-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-11-11 20:06+0000\n" +"PO-Revision-Date: 2005-10-10 22:06+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "Restart tinc on each upgrade?" +msgstr "Starta om tinc vid varje uppgradering?" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"You may choose if you want me to restart the tinc daemon every time you " +"install a new version of this package." +msgstr "" +"Du kan välja om du vill att jag startar om tinc-daemonen varje gång du installerar en " +"ny version av detta paket." + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"Sometimes you don't want to do this, for example if you are doing the " +"upgrade over a tunnel that is created with tinc. Stopping the daemon would " +"probably leave you with a dead connection, and tinc may not be started again." +msgstr "" +"Ibland vill du kanske inte göra detta, till exempel om du gör en uppgradering " +"via en tunnel som är skapad med tinc. Stoppa daemonen skulle antagligen koppla ner " +"förbindelsen och tinc kan inte startas igen." + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"If you refuse, you have to restart tinc yourself if you upgraded, by typing " +"`invoke-rc.d tinc restart' whenever it suits you." +msgstr "" +"Om du vägrar måste du starta om tinc själv om du uppgraderat, genom att skriva " +"'invoke-rc.d tinc restart' när det passar dig." + diff --git a/debian/postrm b/debian/postrm index 8b30ded..e4fbf15 100644 --- a/debian/postrm +++ b/debian/postrm @@ -2,6 +2,7 @@ set -e # Automatically added by package maintainer if [ "$1" = purge ]; then + rm -f /etc/tinc/nets.boot update-rc.d tinc remove >/dev/null 2>/dev/null fi # End automatically added section From 19f25e5e7de34d105bedc8c3fe5ae003021eaef3 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 14 Aug 2007 13:50:27 +0200 Subject: [PATCH 05/31] Import Debian changes 1.0.8-2 tinc (1.0.8-2) unstable; urgency=low * Include Portugese debconf translation. Closes: #434191 --- debian/changelog | 6 ++++++ debian/po/pt.po | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 debian/po/pt.po diff --git a/debian/changelog b/debian/changelog index 50f8696..be09f1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +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 diff --git a/debian/po/pt.po b/debian/po/pt.po new file mode 100644 index 0000000..3f67afd --- /dev/null +++ b/debian/po/pt.po @@ -0,0 +1,56 @@ +# translation of tinc debconf to Portuguese +# Copyright (C) 2007 Américo Monteiro +# This file is distributed under the same license as the tinc package. +# +# Américo Monteiro , 2007. +msgid "" +msgstr "" +"Project-Id-Version: tinc_1.0.8-1_templates\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-05-25 04:46+0200\n" +"PO-Revision-Date: 2007-07-21 16:38+0100\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: boolean +#. Description +#: ../tinc.templates:1001 +msgid "Restart tinc on each upgrade?" +msgstr "Reiniciar o tinc em cada actualização?" + +#. Type: boolean +#. Description +#: ../tinc.templates:1001 +msgid "" +"You may choose if you want me to restart the tinc daemon every time you " +"install a new version of this package." +msgstr "" +"Você pode escolher se quer eu reinicie o serviço tinc toda a vez que instalar " +"uma nova versão deste pacote." + +#. Type: boolean +#. Description +#: ../tinc.templates:1001 +msgid "" +"Sometimes you don't want to do this, for example if you are doing the " +"upgrade over a tunnel that is created with tinc. Stopping the daemon would " +"probably leave you with a dead connection, and tinc may not be started again." +msgstr "" +"Por vezes você não querer que isto aconteça, por exemplo, se estiver a fazer " +"a actualização por um túnel que é criado pelo tinc. Parando o serviço iria provavelmente " +"deixá-lo com uma ligação morta, e o tinc poderia não arrancar de novo." + +#. Type: boolean +#. Description +#: ../tinc.templates:1001 +msgid "" +"If you refuse, you have to restart tinc yourself if you upgraded, by typing " +"`invoke-rc.d tinc restart' whenever it suits you." +msgstr "" +"Se recusar, terá que ser você a reiniciar o tinc se o actualizar, escrevendo " +"'invoke-rc.d tinc restart' ou outro comando que lhe sirva." + From 7e336e415f74e1b2a8f8d5b54aaf49cf24c93bf2 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 1 Nov 2009 20:37:16 +0100 Subject: [PATCH 06/31] Import Debian changes 1.0.11-1 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. --- config.log | 859 ----------------------------------------------- debian/changelog | 6 - 2 files changed, 865 deletions(-) delete mode 100644 config.log diff --git a/config.log b/config.log deleted file mode 100644 index 0a2b3a7..0000000 --- a/config.log +++ /dev/null @@ -1,859 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by configure, which was -generated by GNU Autoconf 2.64. Invocation command line was - - $ /scratch/users/guus/backports/tinc-1.0.11/./configure --build=i486-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libexecdir=${prefix}/lib/tinc --disable-maintainer-mode --disable-dependency-tracking --srcdir=. - -## --------- ## -## Platform. ## -## --------- ## - -hostname = haplo -uname -m = x86_64 -uname -r = 2.6.32.7 -uname -s = Linux -uname -v = #1 SMP PREEMPT Mon Feb 1 16:35:39 CET 2010 - -/usr/bin/uname -p = unknown -/bin/uname -X = unknown - -/bin/arch = unknown -/usr/bin/arch -k = unknown -/usr/convex/getsysinfo = unknown -/usr/bin/hostinfo = unknown -/bin/machine = unknown -/usr/bin/oslevel = unknown -/bin/universe = unknown - -PATH: /usr/sbin -PATH: /usr/bin -PATH: /sbin -PATH: /bin -PATH: /usr/bin/X11 - - -## ----------- ## -## Core tests. ## -## ----------- ## - -configure:2282: checking for a BSD-compatible install -configure:2350: result: /usr/bin/install -c -configure:2361: checking whether build environment is sane -configure:2411: result: yes -configure:2552: checking for a thread-safe mkdir -p -configure:2591: result: /bin/mkdir -p -configure:2604: checking for gawk -configure:2634: result: no -configure:2604: checking for mawk -configure:2620: found /usr/bin/mawk -configure:2631: result: mawk -configure:2642: checking whether make sets $(MAKE) -configure:2664: result: yes -configure:2747: checking whether to enable maintainer-specific portions of Makefiles -configure:2756: result: no -configure:2785: checking for style of include used by make -configure:2813: result: GNU -configure:2883: checking for gcc -configure:2910: result: cc -configure:3139: checking for C compiler version -configure:3148: cc --version >&5 -cc (Debian 4.3.2-1.1) 4.3.2 -Copyright (C) 2008 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:3159: $? = 0 -configure:3148: cc -v >&5 -Using built-in specs. -Target: i486-linux-gnu -Configured with: ../src/configure -v --with-pkgversion='Debian 4.3.2-1.1' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-targets=all --enable-cld --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu -Thread model: posix -gcc version 4.3.2 (Debian 4.3.2-1.1) -configure:3159: $? = 0 -configure:3148: cc -V >&5 -cc: '-V' option must have argument -configure:3159: $? = 1 -configure:3148: cc -qversion >&5 -cc: unrecognized option '-qversion' -cc: no input files -configure:3159: $? = 1 -configure:3181: checking for C compiler default output file name -configure:3203: cc -g -O2 -g -Wall -O2 conftest.c >&5 -configure:3207: $? = 0 -configure:3244: result: a.out -configure:3260: checking whether the C compiler works -configure:3269: ./a.out -configure:3273: $? = 0 -configure:3288: result: yes -configure:3295: checking whether we are cross compiling -configure:3297: result: no -configure:3300: checking for suffix of executables -configure:3307: cc -o conftest -g -O2 -g -Wall -O2 conftest.c >&5 -configure:3311: $? = 0 -configure:3333: result: -configure:3339: checking for suffix of object files -configure:3361: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:3365: $? = 0 -configure:3386: result: o -configure:3390: checking whether we are using the GNU C compiler -configure:3409: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:3409: $? = 0 -configure:3418: result: yes -configure:3427: checking whether cc accepts -g -configure:3447: cc -c -g conftest.c >&5 -configure:3447: $? = 0 -configure:3488: result: yes -configure:3505: checking for cc option to accept ISO C89 -configure:3569: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:3569: $? = 0 -configure:3582: result: none needed -configure:3604: checking dependency style of cc -configure:3714: result: none -configure:3735: checking how to run the C preprocessor -configure:3766: cc -E conftest.c -configure:3766: $? = 0 -configure:3780: cc -E conftest.c -conftest.c:11:28: error: ac_nonexistent.h: No such file or directory -configure:3780: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "tinc" -| #define VERSION "1.0.11" -| /* end confdefs.h. */ -| #include -configure:3805: result: cc -E -configure:3825: cc -E conftest.c -configure:3825: $? = 0 -configure:3839: cc -E conftest.c -conftest.c:11:28: error: ac_nonexistent.h: No such file or directory -configure:3839: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "tinc" -| #define VERSION "1.0.11" -| /* end confdefs.h. */ -| #include -configure:3868: checking for grep that handles long lines and -e -configure:3926: result: /bin/grep -configure:3931: checking for egrep -configure:3993: result: /bin/grep -E -configure:3998: checking for ANSI C header files -configure:4018: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4018: $? = 0 -configure:4091: cc -o conftest -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4091: $? = 0 -configure:4091: ./conftest -configure:4091: $? = 0 -configure:4102: result: yes -configure:4115: checking for sys/types.h -configure:4115: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4115: $? = 0 -configure:4115: result: yes -configure:4115: checking for sys/stat.h -configure:4115: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4115: $? = 0 -configure:4115: result: yes -configure:4115: checking for stdlib.h -configure:4115: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4115: $? = 0 -configure:4115: result: yes -configure:4115: checking for string.h -configure:4115: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4115: $? = 0 -configure:4115: result: yes -configure:4115: checking for memory.h -configure:4115: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4115: $? = 0 -configure:4115: result: yes -configure:4115: checking for strings.h -configure:4115: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4115: $? = 0 -configure:4115: result: yes -configure:4115: checking for inttypes.h -configure:4115: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4115: $? = 0 -configure:4115: result: yes -configure:4115: checking for stdint.h -configure:4115: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4115: $? = 0 -configure:4115: result: yes -configure:4115: checking for unistd.h -configure:4115: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4115: $? = 0 -configure:4115: result: yes -configure:4129: checking minix/config.h usability -configure:4129: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -conftest.c:54:26: error: minix/config.h: No such file or directory -configure:4129: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "tinc" -| #define VERSION "1.0.11" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| #include -configure:4129: result: no -configure:4129: checking minix/config.h presence -configure:4129: cc -E conftest.c -conftest.c:21:26: error: minix/config.h: No such file or directory -configure:4129: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "tinc" -| #define VERSION "1.0.11" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| /* end confdefs.h. */ -| #include -configure:4129: result: no -configure:4129: checking for minix/config.h -configure:4129: result: no -configure:4150: checking whether it is safe to define __EXTENSIONS__ -configure:4168: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4168: $? = 0 -configure:4175: result: yes -configure:4196: checking for cc option to accept ISO C99 -configure:4345: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -conftest.c:77: error: expected ';', ',' or ')' before 'text' -conftest.c: In function 'main': -conftest.c:129: warning: implicit declaration of function 'test_restrict' -conftest.c:131: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'newvar' -conftest.c:131: error: 'newvar' undeclared (first use in this function) -conftest.c:131: error: (Each undeclared identifier is reported only once -conftest.c:131: error: for each function it appears in.) -conftest.c:141: error: 'for' loop initial declaration used outside C99 mode -configure:4345: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "tinc" -| #define VERSION "1.0.11" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define __EXTENSIONS__ 1 -| #define _ALL_SOURCE 1 -| #define _GNU_SOURCE 1 -| #define _POSIX_PTHREAD_SEMANTICS 1 -| #define _TANDEM_SOURCE 1 -| #define __USE_BSD 1 -| /* end confdefs.h. */ -| #include -| #include -| #include -| #include -| #include -| -| // Check varargs macros. These examples are taken from C99 6.10.3.5. -| #define debug(...) fprintf (stderr, __VA_ARGS__) -| #define showlist(...) puts (#__VA_ARGS__) -| #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -| static void -| test_varargs_macros (void) -| { -| int x = 1234; -| int y = 5678; -| debug ("Flag"); -| debug ("X = %d\n", x); -| showlist (The first, second, and third items.); -| report (x>y, "x is %d but y is %d", x, y); -| } -| -| // Check long long types. -| #define BIG64 18446744073709551615ull -| #define BIG32 4294967295ul -| #define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -| #if !BIG_OK -| your preprocessor is broken; -| #endif -| #if BIG_OK -| #else -| your preprocessor is broken; -| #endif -| static long long int bignum = -9223372036854775807LL; -| static unsigned long long int ubignum = BIG64; -| -| struct incomplete_array -| { -| int datasize; -| double data[]; -| }; -| -| struct named_init { -| int number; -| const wchar_t *name; -| double average; -| }; -| -| typedef const char *ccp; -| -| static inline int -| test_restrict (ccp restrict text) -| { -| // See if C++-style comments work. -| // Iterate through items via the restricted pointer. -| // Also check for declarations in for loops. -| for (unsigned int i = 0; *(text+i) != '\0'; ++i) -| continue; -| return 0; -| } -| -| // Check varargs and va_copy. -| static void -| test_varargs (const char *format, ...) -| { -| va_list args; -| va_start (args, format); -| va_list args_copy; -| va_copy (args_copy, args); -| -| const char *str; -| int number; -| float fnumber; -| -| while (*format) -| { -| switch (*format++) -| { -| case 's': // string -| str = va_arg (args_copy, const char *); -| break; -| case 'd': // int -| number = va_arg (args_copy, int); -| break; -| case 'f': // float -| fnumber = va_arg (args_copy, double); -| break; -| default: -| break; -| } -| } -| va_end (args_copy); -| va_end (args); -| } -| -| int -| main () -| { -| -| // Check bool. -| _Bool success = false; -| -| // Check restrict. -| if (test_restrict ("String literal") == 0) -| success = true; -| char *restrict newvar = "Another string"; -| -| // Check varargs. -| test_varargs ("s, d' f .", "string", 65, 34.234); -| test_varargs_macros (); -| -| // Check flexible array members. -| struct incomplete_array *ia = -| malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); -| ia->datasize = 10; -| for (int i = 0; i < ia->datasize; ++i) -| ia->data[i] = i * 1.234; -| -| // Check named initializers. -| struct named_init ni = { -| .number = 34, -| .name = L"Test wide string", -| .average = 543.34343, -| }; -| -| ni.number = 58; -| -| int dynamic_array[ni.number]; -| dynamic_array[ni.number - 1] = 543; -| -| // work around unused variable warnings -| return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' -| || dynamic_array[ni.number - 1] != 543); -| -| ; -| return 0; -| } -configure:4345: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4345: $? = 0 -configure:4365: result: -std=gnu99 -configure:4378: checking how to run the C preprocessor -configure:4448: result: cc -E -configure:4468: cc -E conftest.c -configure:4468: $? = 0 -configure:4482: cc -E conftest.c -conftest.c:27:28: error: ac_nonexistent.h: No such file or directory -configure:4482: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "tinc" -| #define VERSION "1.0.11" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define __EXTENSIONS__ 1 -| #define _ALL_SOURCE 1 -| #define _GNU_SOURCE 1 -| #define _POSIX_PTHREAD_SEMANTICS 1 -| #define _TANDEM_SOURCE 1 -| #define __USE_BSD 1 -| /* end confdefs.h. */ -| #include -configure:4511: checking whether ln -s works -configure:4515: result: yes -configure:4565: checking for ranlib -configure:4581: found /usr/bin/ranlib -configure:4592: result: ranlib -configure:4620: checking build system type -configure:4634: result: i486-pc-linux-gnu -configure:4654: checking host system type -configure:4667: result: i486-pc-linux-gnu -configure:4865: checking for ANSI C header files -configure:4969: result: yes -configure:4980: checking stdbool.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking stdbool.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for stdbool.h -configure:4980: result: yes -configure:4980: checking syslog.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking syslog.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for syslog.h -configure:4980: result: yes -configure:4980: checking sys/file.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking sys/file.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for sys/file.h -configure:4980: result: yes -configure:4980: checking sys/ioctl.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking sys/ioctl.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for sys/ioctl.h -configure:4980: result: yes -configure:4980: checking sys/mman.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking sys/mman.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for sys/mman.h -configure:4980: result: yes -configure:4980: checking sys/param.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking sys/param.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for sys/param.h -configure:4980: result: yes -configure:4980: checking sys/socket.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking sys/socket.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for sys/socket.h -configure:4980: result: yes -configure:4980: checking sys/time.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking sys/time.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for sys/time.h -configure:4980: result: yes -configure:4980: checking sys/uio.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking sys/uio.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for sys/uio.h -configure:4980: result: yes -configure:4980: checking sys/wait.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking sys/wait.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for sys/wait.h -configure:4980: result: yes -configure:4980: checking netdb.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking netdb.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for netdb.h -configure:4980: result: yes -configure:4980: checking arpa/inet.h usability -configure:4980: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking arpa/inet.h presence -configure:4980: cc -E conftest.c -configure:4980: $? = 0 -configure:4980: result: yes -configure:4980: checking for arpa/inet.h -configure:4980: result: yes -configure:4994: checking for net/if.h -configure:4994: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4994: $? = 0 -configure:4994: result: yes -configure:4994: checking for net/if_types.h -configure:4994: cc -std=gnu99 -c -g -O2 -g -Wall -O2 conftest.c >&5 -conftest.c:45:26: error: net/if_types.h: No such file or directory - -## ---------------- ## -## Cache variables. ## -## ---------------- ## - -ac_cv_build=i486-pc-linux-gnu -ac_cv_c_compiler_gnu=yes -ac_cv_env_CC_set=set -ac_cv_env_CC_value=cc -ac_cv_env_CFLAGS_set=set -ac_cv_env_CFLAGS_value='-g -O2 -g -Wall -O2' -ac_cv_env_CPPFLAGS_set=set -ac_cv_env_CPPFLAGS_value= -ac_cv_env_CPP_set= -ac_cv_env_CPP_value= -ac_cv_env_LDFLAGS_set=set -ac_cv_env_LDFLAGS_value= -ac_cv_env_LIBS_set= -ac_cv_env_LIBS_value= -ac_cv_env_build_alias_set=set -ac_cv_env_build_alias_value=i486-linux-gnu -ac_cv_env_host_alias_set= -ac_cv_env_host_alias_value= -ac_cv_env_target_alias_set= -ac_cv_env_target_alias_value= -ac_cv_header_arpa_inet_h=yes -ac_cv_header_inttypes_h=yes -ac_cv_header_memory_h=yes -ac_cv_header_minix_config_h=no -ac_cv_header_net_if_h=yes -ac_cv_header_netdb_h=yes -ac_cv_header_stdbool_h=yes -ac_cv_header_stdc=yes -ac_cv_header_stdint_h=yes -ac_cv_header_stdlib_h=yes -ac_cv_header_string_h=yes -ac_cv_header_strings_h=yes -ac_cv_header_sys_file_h=yes -ac_cv_header_sys_ioctl_h=yes -ac_cv_header_sys_mman_h=yes -ac_cv_header_sys_param_h=yes -ac_cv_header_sys_socket_h=yes -ac_cv_header_sys_stat_h=yes -ac_cv_header_sys_time_h=yes -ac_cv_header_sys_types_h=yes -ac_cv_header_sys_uio_h=yes -ac_cv_header_sys_wait_h=yes -ac_cv_header_syslog_h=yes -ac_cv_header_unistd_h=yes -ac_cv_host=i486-pc-linux-gnu -ac_cv_objext=o -ac_cv_path_EGREP='/bin/grep -E' -ac_cv_path_GREP=/bin/grep -ac_cv_path_install='/usr/bin/install -c' -ac_cv_path_mkdir=/bin/mkdir -ac_cv_prog_AWK=mawk -ac_cv_prog_CPP='cc -E' -ac_cv_prog_ac_ct_CC=cc -ac_cv_prog_ac_ct_RANLIB=ranlib -ac_cv_prog_cc_c89= -ac_cv_prog_cc_c99=-std=gnu99 -ac_cv_prog_cc_g=yes -ac_cv_prog_make_make_set=yes -ac_cv_safe_to_define___extensions__=yes -am_cv_CC_dependencies_compiler_type=none - -## ----------------- ## -## Output variables. ## -## ----------------- ## - -ACLOCAL='${SHELL} /scratch/users/guus/backports/tinc-1.0.11/missing --run aclocal-1.11' -ALLOCA='' -AMDEPBACKSLASH='' -AMDEP_FALSE='' -AMDEP_TRUE='#' -AMTAR='${SHELL} /scratch/users/guus/backports/tinc-1.0.11/missing --run tar' -AUTOCONF='${SHELL} /scratch/users/guus/backports/tinc-1.0.11/missing --run autoconf' -AUTOHEADER='${SHELL} /scratch/users/guus/backports/tinc-1.0.11/missing --run autoheader' -AUTOMAKE='${SHELL} /scratch/users/guus/backports/tinc-1.0.11/missing --run automake-1.11' -AWK='mawk' -CC='cc -std=gnu99' -CCDEPMODE='depmode=none' -CFLAGS='-g -O2 -g -Wall -O2' -CPP='cc -E' -CPPFLAGS='' -CYGPATH_W='echo' -DEFS='' -DEPDIR='.deps' -ECHO_C='' -ECHO_N='-n' -ECHO_T='' -EGREP='/bin/grep -E' -EXEEXT='' -GREP='/bin/grep' -INCLUDES='' -INSTALL_DATA='${INSTALL} -m 644' -INSTALL_PROGRAM='${INSTALL}' -INSTALL_SCRIPT='${INSTALL}' -INSTALL_STRIP_PROGRAM='$(install_sh) -c -s' -LDFLAGS='' -LIBOBJS='' -LIBS='' -LN_S='ln -s' -LTLIBOBJS='' -MAINT='#' -MAINTAINER_MODE_FALSE='' -MAINTAINER_MODE_TRUE='#' -MAKEINFO='${SHELL} /scratch/users/guus/backports/tinc-1.0.11/missing --run makeinfo' -MKDIR_P='/bin/mkdir -p' -OBJEXT='o' -PACKAGE='tinc' -PACKAGE_BUGREPORT='' -PACKAGE_NAME='' -PACKAGE_STRING='' -PACKAGE_TARNAME='' -PACKAGE_URL='' -PACKAGE_VERSION='' -PATH_SEPARATOR=':' -RANLIB='ranlib' -SET_MAKE='' -SHELL='/bin/sh' -STRIP='' -TUNEMU_FALSE='' -TUNEMU_TRUE='#' -VERSION='1.0.11' -ac_ct_CC='cc' -am__EXEEXT_FALSE='' -am__EXEEXT_TRUE='' -am__fastdepCC_FALSE='' -am__fastdepCC_TRUE='#' -am__include='include' -am__isrc='' -am__leading_dot='.' -am__quote='' -am__tar='${AMTAR} chof - "$$tardir"' -am__untar='${AMTAR} xf -' -bindir='${exec_prefix}/bin' -build='i486-pc-linux-gnu' -build_alias='i486-linux-gnu' -build_cpu='i486' -build_os='linux-gnu' -build_vendor='pc' -datadir='${datarootdir}' -datarootdir='${prefix}/share' -docdir='${datarootdir}/doc/${PACKAGE}' -dvidir='${docdir}' -exec_prefix='NONE' -host='i486-pc-linux-gnu' -host_alias='' -host_cpu='i486' -host_os='linux-gnu' -host_vendor='pc' -htmldir='${docdir}' -includedir='${prefix}/include' -infodir='${prefix}/share/info' -install_sh='${SHELL} /scratch/users/guus/backports/tinc-1.0.11/install-sh' -libdir='${exec_prefix}/lib' -libexecdir='${prefix}/lib/tinc' -localedir='${datarootdir}/locale' -localstatedir='/var' -mandir='${prefix}/share/man' -mkdir_p='/bin/mkdir -p' -oldincludedir='/usr/include' -pdfdir='${docdir}' -prefix='/usr' -program_transform_name='s,x,x,' -psdir='${docdir}' -sbindir='${exec_prefix}/sbin' -sharedstatedir='${prefix}/com' -sysconfdir='/etc' -target_alias='' - -## ----------- ## -## confdefs.h. ## -## ----------- ## - -/* confdefs.h */ -#define PACKAGE_NAME "" -#define PACKAGE_TARNAME "" -#define PACKAGE_VERSION "" -#define PACKAGE_STRING "" -#define PACKAGE_BUGREPORT "" -#define PACKAGE_URL "" -#define PACKAGE "tinc" -#define VERSION "1.0.11" -#define STDC_HEADERS 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_UNISTD_H 1 -#define __EXTENSIONS__ 1 -#define _ALL_SOURCE 1 -#define _GNU_SOURCE 1 -#define _POSIX_PTHREAD_SEMANTICS 1 -#define _TANDEM_SOURCE 1 -#define __USE_BSD 1 -#define HAVE_LINUX 1 -#define STDC_HEADERS 1 -#define HAVE_STDBOOL_H 1 -#define HAVE_SYSLOG_H 1 -#define HAVE_SYS_FILE_H 1 -#define HAVE_SYS_IOCTL_H 1 -#define HAVE_SYS_MMAN_H 1 -#define HAVE_SYS_PARAM_H 1 -#define HAVE_SYS_SOCKET_H 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_SYS_UIO_H 1 -#define HAVE_SYS_WAIT_H 1 -#define HAVE_NETDB_H 1 -#define HAVE_ARPA_INET_H 1 -#define HAVE_NET_IF_H 1 - -configure: caught signal 2 -configure: exit 1 diff --git a/debian/changelog b/debian/changelog index 288fb55..cd71b80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -tinc (1.0.11-1~bpo50+1) lenny-backports; urgency=low - - * Rebuild for lenny-backports. - - -- Guus Sliepen Thu, 04 Feb 2010 19:03:00 +0000 - tinc (1.0.11-1) unstable; urgency=low * New upstream release. From 0dd8a426079dbc17b22e55132d57d06f0380a932 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Thu, 4 Feb 2010 00:56:45 +0100 Subject: [PATCH 07/31] Import Debian changes 1.0.12-1 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. --- debian/changelog | 16 +++++++--------- debian/control | 4 ++-- debian/postinst | 10 ---------- debian/postrm | 1 - debian/rules | 39 ++++++++++++++++++++++++--------------- debian/source/format | 1 + debian/tinc.modules | 12 ------------ 7 files changed, 34 insertions(+), 49 deletions(-) create mode 100644 debian/source/format delete mode 100644 debian/tinc.modules diff --git a/debian/changelog b/debian/changelog index b46ee18..7213ede 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,16 @@ -tinc (1.0.12-1~bpo50) lenny-backports; urgency=low +tinc (1.0.12-1) unstable; urgency=low * New upstream release. - * Keep debian/ from 1.0.11-1~bpo50. + * 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 Wed, 17 Feb 2010 22:00:31 +0000 - -tinc (1.0.11-1~bpo50+1) lenny-backports; urgency=low - - * Rebuild for lenny-backports. - - -- Guus Sliepen Thu, 04 Feb 2010 19:03:00 +0000 + -- Guus Sliepen Thu, 04 Feb 2010 00:56:45 +0100 tinc (1.0.11-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 73c20bc..9516383 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen -Standards-Version: 3.8.3 -Build-Depends: libssl-dev, debhelper (>= 7), gettext, texi2html, texinfo, zlib1g-dev, cdbs, liblzo2-dev +Standards-Version: 3.8.4 +Build-Depends: libssl-dev, debhelper (>= 7.0.50~), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev Homepage: http://www.tinc-vpn.org/ Package: tinc diff --git a/debian/postinst b/debian/postinst index 5233dae..f17dc57 100644 --- a/debian/postinst +++ b/debian/postinst @@ -28,10 +28,7 @@ set -e # installation fails and the `postinst' is called with `abort-upgrade', # `abort-remove' or `abort-deconfigure'. -# Automatically added by dh_installinit, edited for use with debconf if [ -x "/etc/init.d/tinc" ]; then - update-rc.d tinc defaults >/dev/null - if [ "$1" = "configure" ] ; then if dpkg --compare-versions "$2" lt "1.0pre5-4" ; then RET="true" @@ -46,8 +43,6 @@ if [ -x "/etc/init.d/tinc" ]; then fi fi fi -# End automatically added section - case "$1" in configure) @@ -80,11 +75,6 @@ case "$1" in ;; esac -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - #DEBHELPER# exit 0 - - diff --git a/debian/postrm b/debian/postrm index e4fbf15..43644af 100644 --- a/debian/postrm +++ b/debian/postrm @@ -3,7 +3,6 @@ set -e # Automatically added by package maintainer if [ "$1" = purge ]; then rm -f /etc/tinc/nets.boot - update-rc.d tinc remove >/dev/null 2>/dev/null fi # End automatically added section diff --git a/debian/rules b/debian/rules index 7272f93..a27b6cf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,30 @@ #!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. -include /usr/share/cdbs/1/rules/debhelper.mk -#include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/class/autotools.mk +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -# A bit of a kludge, we have our own init.d handling in postinst, but -# cdbs calls dh_installinit anyway. -DEB_DH_INSTALLINIT_ARGS = -n +%: + dh $@ -clean:: - rm -rf src/device.c doc/tinc -build/tinc:: - cd doc && $(MAKE) texi2html -binary-post-install/tinc:: +override_dh_auto_build: + dh_auto_build + cd doc && $(MAKE) texi2html + +override_dh_auto_install: + dh_auto_install # Guess where texi2html installed its output today... [ -f doc/tinc/tinc.html ] \ - && mv -v doc/tinc/*.html debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ \ - || mv -v doc/*.html debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ - rm -f debian/$(cdbs_curpkg)/usr/share/info/dir* - cd debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ && tar xzf ../../../../../../doc/sample-config.tar.gz && mv sample-config examples && rm -rf examples/CVS examples/hosts/CVS + && mv doc/tinc/*.html debian/tinc/usr/share/doc/tinc/ \ + || mv doc/*.html debian/tinc/usr/share/doc/tinc/ + # Remove info dir file + rm -f debian/tinc/usr/share/info/dir + +override_dh_clean: + dh_clean + rm -f src/device.c 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.modules b/debian/tinc.modules deleted file mode 100644 index edd98bb..0000000 --- a/debian/tinc.modules +++ /dev/null @@ -1,12 +0,0 @@ -alias char-major-36 netlink_dev -alias char-major-10-200 tun - -alias tap0 ethertap -alias tap1 ethertap -alias tap2 ethertap -alias tap3 ethertap - -options tap0 -o tap0 -x unit=0 -options tap1 -o tap1 -x unit=1 -options tap2 -o tap2 -x unit=2 -options tap3 -o tap3 -x unit=3 From 3cfe4d82fb3fdaf967e7a116934c3fcddcbf3078 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 2 Mar 2010 14:01:36 +0100 Subject: [PATCH 08/31] Import Debian changes 1.0.12-2 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. --- debian/changelog | 11 +++++++ debian/config | 9 ------ debian/control | 2 +- debian/init.d | 13 ++++++++- debian/po/POTFILES.in | 1 - debian/po/cs.po | 63 ----------------------------------------- debian/po/de.po | 55 ----------------------------------- debian/po/fr.po | 62 ---------------------------------------- debian/po/ja.po | 49 -------------------------------- debian/po/nl.po | 63 ----------------------------------------- debian/po/pt.po | 56 ------------------------------------ debian/po/ru.po | 58 ------------------------------------- debian/po/sv.po | 62 ---------------------------------------- debian/po/templates.pot | 56 ------------------------------------ debian/po/vi.po | 48 ------------------------------- debian/postinst | 54 ++--------------------------------- debian/postrm | 4 +-- debian/prerm | 20 ------------- debian/rules | 3 ++ debian/tinc.templates | 14 --------- 20 files changed, 31 insertions(+), 672 deletions(-) delete mode 100644 debian/config delete mode 100644 debian/po/POTFILES.in delete mode 100644 debian/po/cs.po delete mode 100644 debian/po/de.po delete mode 100644 debian/po/fr.po delete mode 100644 debian/po/ja.po delete mode 100644 debian/po/nl.po delete mode 100644 debian/po/pt.po delete mode 100644 debian/po/ru.po delete mode 100644 debian/po/sv.po delete mode 100644 debian/po/templates.pot delete mode 100644 debian/po/vi.po delete mode 100644 debian/prerm delete mode 100644 debian/tinc.templates diff --git a/debian/changelog b/debian/changelog index 7213ede..4ffd149 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +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. diff --git a/debian/config b/debian/config deleted file mode 100644 index ab660b8..0000000 --- a/debian/config +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -e - -# Source debconf library. -. /usr/share/debconf/confmodule - -db_title tinc configuration - -db_input medium tinc/restart_on_upgrade || true -db_go diff --git a/debian/control b/debian/control index 9516383..f812c0a 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Homepage: http://www.tinc-vpn.org/ Package: tinc Architecture: any -Depends: debconf | debconf-2.0, ${shlibs:Depends}, ${misc:Depends} +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 diff --git a/debian/init.d b/debian/init.d index a7dd3cd..da1a386 100644 --- a/debian/init.d +++ b/debian/init.d @@ -54,7 +54,18 @@ reload() { $DAEMON -n $1 -kHUP } restart() { - stop "$@" && sleep 1 + stop "$@" + sleep 0.5 + i=0; + while [ -f /var/run/tinc.$1.pid ] ; do + if [ $i = '10' ] ; then + break + else + echo -n "." + sleep 0.5 + i=$(($i+1)) + fi + done start "$@" } diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in deleted file mode 100644 index e86992b..0000000 --- a/debian/po/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -[type: gettext/rfc822deb] tinc.templates diff --git a/debian/po/cs.po b/debian/po/cs.po deleted file mode 100644 index 6316375..0000000 --- a/debian/po/cs.po +++ /dev/null @@ -1,63 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.4-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-06-10 22:44+0200\n" -"Last-Translator: Martin Sin \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Restartovat tinc pøi ka¾dé aktualizaci?" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Mù¾ete zvolit, zda restartovat tinc daemona poka¾dé, kdy¾ je instalována " -"nová verze tohoto balíèku." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Nìkdy tuto mo¾nost nepotøebujete, napøíklad pokud provádíte aktualizaci " -"pøes tunel, který je vytvoøen pomocí tinc. Zastavení tohoto daemona " -"vám pravdìpodobnì zanechá \"mrtvé pøipojení\" a navíc se tinc nemusí znovu " -"spustit." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Pokud zamítnete, musíte po aktualizaci restartovat tinc ruènì, zadáním " -"pøíkazu `invoke-rc.d tinc restart' kdykoliv se vám to hodí." diff --git a/debian/po/de.po b/debian/po/de.po deleted file mode 100644 index 9ab4408..0000000 --- a/debian/po/de.po +++ /dev/null @@ -1,55 +0,0 @@ -# Translation of tinc debconf templates to German -# Copyright (C) Helge Kreutzmann , 2007. -# This file is distributed under the same license as the tinc package. -# -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.7-1\n" -"Report-Msgid-Bugs-To: tinc@packages.debian.org\n" -"POT-Creation-Date: 2007-01-13 20:22+0100\n" -"PO-Revision-Date: 2007-02-25 16:43+0100\n" -"Last-Translator: Helge Kreutzmann \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "Restart tinc on each upgrade?" -msgstr "Tinc bei jedem Upgrade neu starten?" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Sie können dies auswählen, falls Sie möchten, dass jedes mal, wenn Sie eine " -"neue Version installieren, Tinc neu gestartet werden soll." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"In manchen Situationen ist dies nicht gewollt, zum Beispiel falls Sie das " -"Upgrade über einen Tunnel durchführen, der mit Tinc erstellt wurde. Würde " -"dann der Daemon beendet, wäre die Kommunikation tot und Tinc könnte sich " -"nicht neu starten." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Falls Sie hier ablehnen, müssen Sie Tinc selbst neu starten, wenn Sie ein " -"Upgrade durchgeführt haben, indem Sie »invoke-rc.d tinc restart« eingeben, " -"wenn es Ihnen passt." diff --git a/debian/po/fr.po b/debian/po/fr.po deleted file mode 100644 index b34e478..0000000 --- a/debian/po/fr.po +++ /dev/null @@ -1,62 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: tinc_1.0.3-4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-02-18 12:42+0100\n" -"Last-Translator: Michel Grentzinger \n" -"Language-Team: French \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Faut-il redémarrer tinc à chaque mise à jour ?" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Vous pouvez choisir de redémarrer le démon tinc à chaque fois que vous " -"installez une nouvelle version de ce paquet." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Dans certains cas, vous devrez éviter de le faire, par exemple si vous " -"mettez à jour à travers un tunnel créé avec tinc. Arrêter le démon " -"laisserait sans doute une connexion inactive et tinc ne pourrait pas être " -"redémarré." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Si vous refusez cette option, vous devrez redémarrer tinc vous-même en cas " -"de mise à jour, avec la commande : « invoke-rc.d tinc restart », au moment " -"où cela vous conviendra." diff --git a/debian/po/ja.po b/debian/po/ja.po deleted file mode 100644 index 946afa4..0000000 --- a/debian/po/ja.po +++ /dev/null @@ -1,49 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.4-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-06-14 21:09+0900\n" -"Last-Translator: Atsushi Shimono \n" -"Language-Team: Japanese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¤¿¤Ó¤Ë tinc ¤òºÆµ¯Æ°¤·¤Þ¤¹¤«¡©" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤Ó¤Ë¡¢tinc ¥Ç¡¼¥â¥ó¤ò" -"ºÆµ¯Æ°¤¹¤ë¤«¤É¤¦¤«¤òÁªÂò¤Ç¤­¤Þ¤¹¡£" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"tinc ¤Î¥È¥ó¥Í¥ë¤ò·Ðͳ¤·¤Æ¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤Æ¤¤¤ë¤È¤­¤Ê¤É¡¢¤³¤ì¤ò¹Ô¤¤" -"¤¿¤¯¤Ê¤¤¤³¤È¤¬¤¢¤ë¤È»×¤¤¤Þ¤¹¡£¥Ç¡¼¥â¥ó¤ò»ß¤á¤ë¤³¤È¤ÇÀܳ¤¬¼º¤ï¤ì¡¢tinc " -"¤âºÆµ¯Æ°¤·¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"¤³¤ì¤òÁªÂò¤·¤Ê¤¤¾ì¹ç¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤¿ºÝ¡¢ÅԹ礬Îɤ¤¤È¤­¤Ë " -"'invoke-rc.d tinc restart' ¤ò¼Â¹Ô¤·¤Æ tinc ¤ò¼«Ê¬¤ÇºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" diff --git a/debian/po/nl.po b/debian/po/nl.po deleted file mode 100644 index 660b235..0000000 --- a/debian/po/nl.po +++ /dev/null @@ -1,63 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: tinc_1.0.4-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-05-04 21:40+0200\n" -"Last-Translator: Guus Sliepen \n" -"Language-Team: Dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Start tinc opnieuw na iedere upgrade?" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Je kunt kiezen of ik de tinc daemon opnieuw moet starten iedere keer als je " -"een nieuwe versie van het pakket installeert." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Soms wil je dit niet doen, bij voorbeeld als je de upgrade uitvoert over een " -"tunnel die met tinc is gemaakt. Het stoppen van tinc resulteert dan " -"waarschijnlijk is een dode verbinding, en tinc wordt dan misschien niet " -"opnieuw gestart." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Als je weigert, moet je zelf tinc opnieuw starten na een upgrade, door" -"`invoke-rc.d tinc restart' in te tiepen wanneer het goed uitkomt." diff --git a/debian/po/pt.po b/debian/po/pt.po deleted file mode 100644 index 3f67afd..0000000 --- a/debian/po/pt.po +++ /dev/null @@ -1,56 +0,0 @@ -# translation of tinc debconf to Portuguese -# Copyright (C) 2007 Américo Monteiro -# This file is distributed under the same license as the tinc package. -# -# Américo Monteiro , 2007. -msgid "" -msgstr "" -"Project-Id-Version: tinc_1.0.8-1_templates\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-25 04:46+0200\n" -"PO-Revision-Date: 2007-07-21 16:38+0100\n" -"Last-Translator: Américo Monteiro \n" -"Language-Team: Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "Restart tinc on each upgrade?" -msgstr "Reiniciar o tinc em cada actualização?" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Você pode escolher se quer eu reinicie o serviço tinc toda a vez que instalar " -"uma nova versão deste pacote." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Por vezes você não querer que isto aconteça, por exemplo, se estiver a fazer " -"a actualização por um túnel que é criado pelo tinc. Parando o serviço iria provavelmente " -"deixá-lo com uma ligação morta, e o tinc poderia não arrancar de novo." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Se recusar, terá que ser você a reiniciar o tinc se o actualizar, escrevendo " -"'invoke-rc.d tinc restart' ou outro comando que lhe sirva." - diff --git a/debian/po/ru.po b/debian/po/ru.po deleted file mode 100644 index caab454..0000000 --- a/debian/po/ru.po +++ /dev/null @@ -1,58 +0,0 @@ -# translation of tinc_1.0.9-1_ru.po to Russian -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Yuri Kozlov , 2009. -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.9-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-27 10:27+0100\n" -"PO-Revision-Date: 2009-09-13 09:42+0400\n" -"Last-Translator: Yuri Kozlov \n" -"Language-Team: Russian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "Restart tinc on each upgrade?" -msgstr "ПерезапуÑкать tinc поÑле каждого обновлениÑ?" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Ð’Ñ‹ можете указать, что нужно перезапуÑкать Ñлужбу tinc каждый раз при " -"уÑтановке новой верÑии данного пакета." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Иногда вы не хотели бы Ñто делать, например, еÑли вы производите " -"обновление через туннель, Ñозданный Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ tinc. ОÑтановка Ñлужбы, " -"Ñкорее вÑего, приведёт к повиÑшему Ñоединению, и tinc не Ñможет запуÑтитьÑÑ " -"Ñнова." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"ЕÑли ответите отрицательно, то вам нужно перезапуÑтить tinc вручную Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ " -"команды `invoke-rc.d tinc restart' в более удобное времÑ." - diff --git a/debian/po/sv.po b/debian/po/sv.po deleted file mode 100644 index aaa7347..0000000 --- a/debian/po/sv.po +++ /dev/null @@ -1,62 +0,0 @@ -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# Developers do not need to manually edit POT or PO files. -# , fuzzy -# -# -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.4-3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-10-10 22:06+0200\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Starta om tinc vid varje uppgradering?" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Du kan välja om du vill att jag startar om tinc-daemonen varje gång du installerar en " -"ny version av detta paket." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Ibland vill du kanske inte göra detta, till exempel om du gör en uppgradering " -"via en tunnel som är skapad med tinc. Stoppa daemonen skulle antagligen koppla ner " -"förbindelsen och tinc kan inte startas igen." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Om du vägrar måste du starta om tinc själv om du uppgraderat, genom att skriva " -"'invoke-rc.d tinc restart' när det passar dig." - diff --git a/debian/po/templates.pot b/debian/po/templates.pot deleted file mode 100644 index eade3ff..0000000 --- a/debian/po/templates.pot +++ /dev/null @@ -1,56 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" diff --git a/debian/po/vi.po b/debian/po/vi.po deleted file mode 100644 index 8177667..0000000 --- a/debian/po/vi.po +++ /dev/null @@ -1,48 +0,0 @@ -# Vietnamese translation for tinc. -# Copyright © 2005 Free Software Foundation, Inc. -# Clytie Siddall , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.4-2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-08-10 17:13+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: LocFactoryEditor 1.2.2\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Khởi chạy lại trình tinc má»—i lần nâng cấp không?" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "Tại đây bạn có thể chá»n tá»± Ä‘á»™ng khởi chạy lại trình ná»n (dæmon) tinc má»—i lần bạn cài đặt phiên bản má»›i của gói này hay không." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "Äôi khi bạn không muốn làm nhÆ° thế, lấy thí dụ nếu bạn Ä‘ang nâng cấp qua Ä‘Æ°á»ng hầm mà tinc tạo. Trong trÆ°á»ng hợp này, ngừng trình ná»n rất có thể sẽ ngắt kết nối, và có lẽ tinc sẽ không khởi chạy lại." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "Nếu bạn từ chối thì bạn cần phải tá»± khởi chạy lại trình tinc má»—i lần nâng cấp, bằng cách gõ lệnh « invoke-rc.d tinc restart » (gá»i-rc.d tinc khởi chạy lại) khi thích hợp." diff --git a/debian/postinst b/debian/postinst index f17dc57..62aea7e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,49 +1,9 @@ #! /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" -RET="false" +NETSFILE="/etc/tinc/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'. - -if [ -x "/etc/init.d/tinc" ]; then - if [ "$1" = "configure" ] ; then - if dpkg --compare-versions "$2" lt "1.0pre5-4" ; then - RET="true" - else - if [ -e /usr/share/debconf/confmodule ] ; then - . /usr/share/debconf/confmodule - db_get tinc/restart_on_upgrade - db_stop - else - RET="true" - fi - fi - fi -fi - case "$1" in configure) if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then @@ -56,17 +16,9 @@ case "$1" in if [ ! -e $NETSFILE ] ; then echo "## This file contains all names of the networks to be started on system startup." > $NETSFILE fi - - if [ "$RET" = "true" ] ; then - invoke-rc.d tinc restart - else - echo "I have not stopped or restarted the tinc daemon. You should do this" - echo "yourself whenever you're ready; type \`\`invoke-rc.d tinc restart''." - fi - ;; + ;; abort-upgrade|abort-remove|abort-deconfigure) - ;; *) @@ -76,5 +28,3 @@ case "$1" in esac #DEBHELPER# - -exit 0 diff --git a/debian/postrm b/debian/postrm index 43644af..dc3247b 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,9 +1,9 @@ #!/bin/sh + set -e -# Automatically added by package maintainer + if [ "$1" = purge ]; then rm -f /etc/tinc/nets.boot fi -# End automatically added section #DEBHELPER# diff --git a/debian/prerm b/debian/prerm deleted file mode 100644 index 30347c0..0000000 --- a/debian/prerm +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -# Automatically added by dh_installinit, edited for use with debconf -if [ -x "/etc/init.d/tinc" -a "$1" != "upgrade" ]; then - if [ -e /usr/share/debconf/confmodule ] ; then - . /usr/share/debconf/confmodule - db_get tinc/restart_on_upgrade - if [ "$RET" = "true" ] ; then - invoke-rc.d tinc stop - fi - db_stop - else - invoke-rc.d tinc stop - fi -fi -# End automatically added section - -#DEBHELPER# diff --git a/debian/rules b/debian/rules index a27b6cf..e1606c5 100755 --- a/debian/rules +++ b/debian/rules @@ -25,6 +25,9 @@ override_dh_auto_install: # Remove info dir file rm -f debian/tinc/usr/share/info/dir +override_dh_installinit: + dh_installinit -R + override_dh_clean: dh_clean rm -f src/device.c diff --git a/debian/tinc.templates b/debian/tinc.templates deleted file mode 100644 index 46578dc..0000000 --- a/debian/tinc.templates +++ /dev/null @@ -1,14 +0,0 @@ -Template: tinc/restart_on_upgrade -Type: boolean -Default: true -_Description: Restart tinc on each upgrade? - You may choose if you want me to restart the tinc daemon every time you - install a new version of this package. - . - Sometimes you don't want to do this, for example if you are doing the - upgrade over a tunnel that is created with tinc. Stopping the daemon - would probably leave you with a dead connection, and tinc may not be - started again. - . - If you refuse, you have to restart tinc yourself if you upgraded, by - typing `invoke-rc.d tinc restart' whenever it suits you. From 0fd2ac248d0f4f464580d17584fcd823212f7c34 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 13 Apr 2010 12:06:36 +0200 Subject: [PATCH 09/31] Import Debian changes 1.0.13-1 tinc (1.0.13-1) unstable; urgency=low * New upstream release. --- debian/changelog | 31 +++++++++++++------- debian/config | 9 ------ debian/control | 6 ++-- debian/init.d | 13 ++++++++- debian/po/POTFILES.in | 1 - debian/po/cs.po | 63 ---------------------------------------- debian/po/de.po | 55 ----------------------------------- debian/po/fr.po | 62 --------------------------------------- debian/po/ja.po | 49 ------------------------------- debian/po/nl.po | 63 ---------------------------------------- debian/po/pt.po | 56 ------------------------------------ debian/po/ru.po | 58 ------------------------------------- debian/po/sv.po | 62 --------------------------------------- debian/po/templates.pot | 56 ------------------------------------ debian/po/vi.po | 48 ------------------------------- debian/postinst | 64 ++--------------------------------------- debian/postrm | 5 ++-- debian/prerm | 20 ------------- debian/rules | 42 +++++++++++++++++---------- debian/source/format | 1 + debian/tinc.modules | 12 -------- debian/tinc.templates | 14 --------- 22 files changed, 67 insertions(+), 723 deletions(-) delete mode 100644 debian/config delete mode 100644 debian/po/POTFILES.in delete mode 100644 debian/po/cs.po delete mode 100644 debian/po/de.po delete mode 100644 debian/po/fr.po delete mode 100644 debian/po/ja.po delete mode 100644 debian/po/nl.po delete mode 100644 debian/po/pt.po delete mode 100644 debian/po/ru.po delete mode 100644 debian/po/sv.po delete mode 100644 debian/po/templates.pot delete mode 100644 debian/po/vi.po delete mode 100644 debian/prerm create mode 100644 debian/source/format delete mode 100644 debian/tinc.modules delete mode 100644 debian/tinc.templates diff --git a/debian/changelog b/debian/changelog index 7621427..75834bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,24 +1,33 @@ -tinc (1.0.13-1~bpo50) lenny-backports; urgency=low +tinc (1.0.13-1) unstable; urgency=low * New upstream release. - -- Guus Sliepen Thu, 02 Sep 2010 14:40:42 +0200 + -- Guus Sliepen Tue, 13 Apr 2010 12:06:36 +0200 -tinc (1.0.12-1~bpo50) lenny-backports; urgency=low +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. - * Keep debian/ from 1.0.11-1~bpo50. + * 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 Wed, 17 Feb 2010 22:00:31 +0000 - -tinc (1.0.11-1~bpo50+1) lenny-backports; urgency=low - - * Rebuild for lenny-backports. - - -- Guus Sliepen Thu, 04 Feb 2010 19:03:00 +0000 + -- Guus Sliepen Thu, 04 Feb 2010 00:56:45 +0100 tinc (1.0.11-1) unstable; urgency=low diff --git a/debian/config b/debian/config deleted file mode 100644 index ab660b8..0000000 --- a/debian/config +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -e - -# Source debconf library. -. /usr/share/debconf/confmodule - -db_title tinc configuration - -db_input medium tinc/restart_on_upgrade || true -db_go diff --git a/debian/control b/debian/control index 73c20bc..f812c0a 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen -Standards-Version: 3.8.3 -Build-Depends: libssl-dev, debhelper (>= 7), gettext, texi2html, texinfo, zlib1g-dev, cdbs, liblzo2-dev +Standards-Version: 3.8.4 +Build-Depends: libssl-dev, debhelper (>= 7.0.50~), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev Homepage: http://www.tinc-vpn.org/ Package: tinc Architecture: any -Depends: debconf | debconf-2.0, ${shlibs:Depends}, ${misc:Depends} +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 diff --git a/debian/init.d b/debian/init.d index a7dd3cd..da1a386 100644 --- a/debian/init.d +++ b/debian/init.d @@ -54,7 +54,18 @@ reload() { $DAEMON -n $1 -kHUP } restart() { - stop "$@" && sleep 1 + stop "$@" + sleep 0.5 + i=0; + while [ -f /var/run/tinc.$1.pid ] ; do + if [ $i = '10' ] ; then + break + else + echo -n "." + sleep 0.5 + i=$(($i+1)) + fi + done start "$@" } diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in deleted file mode 100644 index e86992b..0000000 --- a/debian/po/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -[type: gettext/rfc822deb] tinc.templates diff --git a/debian/po/cs.po b/debian/po/cs.po deleted file mode 100644 index 6316375..0000000 --- a/debian/po/cs.po +++ /dev/null @@ -1,63 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.4-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-06-10 22:44+0200\n" -"Last-Translator: Martin Sin \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Restartovat tinc pøi ka¾dé aktualizaci?" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Mù¾ete zvolit, zda restartovat tinc daemona poka¾dé, kdy¾ je instalována " -"nová verze tohoto balíèku." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Nìkdy tuto mo¾nost nepotøebujete, napøíklad pokud provádíte aktualizaci " -"pøes tunel, který je vytvoøen pomocí tinc. Zastavení tohoto daemona " -"vám pravdìpodobnì zanechá \"mrtvé pøipojení\" a navíc se tinc nemusí znovu " -"spustit." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Pokud zamítnete, musíte po aktualizaci restartovat tinc ruènì, zadáním " -"pøíkazu `invoke-rc.d tinc restart' kdykoliv se vám to hodí." diff --git a/debian/po/de.po b/debian/po/de.po deleted file mode 100644 index 9ab4408..0000000 --- a/debian/po/de.po +++ /dev/null @@ -1,55 +0,0 @@ -# Translation of tinc debconf templates to German -# Copyright (C) Helge Kreutzmann , 2007. -# This file is distributed under the same license as the tinc package. -# -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.7-1\n" -"Report-Msgid-Bugs-To: tinc@packages.debian.org\n" -"POT-Creation-Date: 2007-01-13 20:22+0100\n" -"PO-Revision-Date: 2007-02-25 16:43+0100\n" -"Last-Translator: Helge Kreutzmann \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "Restart tinc on each upgrade?" -msgstr "Tinc bei jedem Upgrade neu starten?" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Sie können dies auswählen, falls Sie möchten, dass jedes mal, wenn Sie eine " -"neue Version installieren, Tinc neu gestartet werden soll." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"In manchen Situationen ist dies nicht gewollt, zum Beispiel falls Sie das " -"Upgrade über einen Tunnel durchführen, der mit Tinc erstellt wurde. Würde " -"dann der Daemon beendet, wäre die Kommunikation tot und Tinc könnte sich " -"nicht neu starten." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Falls Sie hier ablehnen, müssen Sie Tinc selbst neu starten, wenn Sie ein " -"Upgrade durchgeführt haben, indem Sie »invoke-rc.d tinc restart« eingeben, " -"wenn es Ihnen passt." diff --git a/debian/po/fr.po b/debian/po/fr.po deleted file mode 100644 index b34e478..0000000 --- a/debian/po/fr.po +++ /dev/null @@ -1,62 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: tinc_1.0.3-4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-02-18 12:42+0100\n" -"Last-Translator: Michel Grentzinger \n" -"Language-Team: French \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Faut-il redémarrer tinc à chaque mise à jour ?" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Vous pouvez choisir de redémarrer le démon tinc à chaque fois que vous " -"installez une nouvelle version de ce paquet." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Dans certains cas, vous devrez éviter de le faire, par exemple si vous " -"mettez à jour à travers un tunnel créé avec tinc. Arrêter le démon " -"laisserait sans doute une connexion inactive et tinc ne pourrait pas être " -"redémarré." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Si vous refusez cette option, vous devrez redémarrer tinc vous-même en cas " -"de mise à jour, avec la commande : « invoke-rc.d tinc restart », au moment " -"où cela vous conviendra." diff --git a/debian/po/ja.po b/debian/po/ja.po deleted file mode 100644 index 946afa4..0000000 --- a/debian/po/ja.po +++ /dev/null @@ -1,49 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.4-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-06-14 21:09+0900\n" -"Last-Translator: Atsushi Shimono \n" -"Language-Team: Japanese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¤¿¤Ó¤Ë tinc ¤òºÆµ¯Æ°¤·¤Þ¤¹¤«¡©" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤Ó¤Ë¡¢tinc ¥Ç¡¼¥â¥ó¤ò" -"ºÆµ¯Æ°¤¹¤ë¤«¤É¤¦¤«¤òÁªÂò¤Ç¤­¤Þ¤¹¡£" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"tinc ¤Î¥È¥ó¥Í¥ë¤ò·Ðͳ¤·¤Æ¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤Æ¤¤¤ë¤È¤­¤Ê¤É¡¢¤³¤ì¤ò¹Ô¤¤" -"¤¿¤¯¤Ê¤¤¤³¤È¤¬¤¢¤ë¤È»×¤¤¤Þ¤¹¡£¥Ç¡¼¥â¥ó¤ò»ß¤á¤ë¤³¤È¤ÇÀܳ¤¬¼º¤ï¤ì¡¢tinc " -"¤âºÆµ¯Æ°¤·¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"¤³¤ì¤òÁªÂò¤·¤Ê¤¤¾ì¹ç¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤¿ºÝ¡¢ÅԹ礬Îɤ¤¤È¤­¤Ë " -"'invoke-rc.d tinc restart' ¤ò¼Â¹Ô¤·¤Æ tinc ¤ò¼«Ê¬¤ÇºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" diff --git a/debian/po/nl.po b/debian/po/nl.po deleted file mode 100644 index 660b235..0000000 --- a/debian/po/nl.po +++ /dev/null @@ -1,63 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: tinc_1.0.4-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-05-04 21:40+0200\n" -"Last-Translator: Guus Sliepen \n" -"Language-Team: Dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Start tinc opnieuw na iedere upgrade?" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Je kunt kiezen of ik de tinc daemon opnieuw moet starten iedere keer als je " -"een nieuwe versie van het pakket installeert." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Soms wil je dit niet doen, bij voorbeeld als je de upgrade uitvoert over een " -"tunnel die met tinc is gemaakt. Het stoppen van tinc resulteert dan " -"waarschijnlijk is een dode verbinding, en tinc wordt dan misschien niet " -"opnieuw gestart." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Als je weigert, moet je zelf tinc opnieuw starten na een upgrade, door" -"`invoke-rc.d tinc restart' in te tiepen wanneer het goed uitkomt." diff --git a/debian/po/pt.po b/debian/po/pt.po deleted file mode 100644 index 3f67afd..0000000 --- a/debian/po/pt.po +++ /dev/null @@ -1,56 +0,0 @@ -# translation of tinc debconf to Portuguese -# Copyright (C) 2007 Américo Monteiro -# This file is distributed under the same license as the tinc package. -# -# Américo Monteiro , 2007. -msgid "" -msgstr "" -"Project-Id-Version: tinc_1.0.8-1_templates\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-25 04:46+0200\n" -"PO-Revision-Date: 2007-07-21 16:38+0100\n" -"Last-Translator: Américo Monteiro \n" -"Language-Team: Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "Restart tinc on each upgrade?" -msgstr "Reiniciar o tinc em cada actualização?" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Você pode escolher se quer eu reinicie o serviço tinc toda a vez que instalar " -"uma nova versão deste pacote." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Por vezes você não querer que isto aconteça, por exemplo, se estiver a fazer " -"a actualização por um túnel que é criado pelo tinc. Parando o serviço iria provavelmente " -"deixá-lo com uma ligação morta, e o tinc poderia não arrancar de novo." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Se recusar, terá que ser você a reiniciar o tinc se o actualizar, escrevendo " -"'invoke-rc.d tinc restart' ou outro comando que lhe sirva." - diff --git a/debian/po/ru.po b/debian/po/ru.po deleted file mode 100644 index caab454..0000000 --- a/debian/po/ru.po +++ /dev/null @@ -1,58 +0,0 @@ -# translation of tinc_1.0.9-1_ru.po to Russian -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Yuri Kozlov , 2009. -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.9-1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-27 10:27+0100\n" -"PO-Revision-Date: 2009-09-13 09:42+0400\n" -"Last-Translator: Yuri Kozlov \n" -"Language-Team: Russian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "Restart tinc on each upgrade?" -msgstr "ПерезапуÑкать tinc поÑле каждого обновлениÑ?" - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Ð’Ñ‹ можете указать, что нужно перезапуÑкать Ñлужбу tinc каждый раз при " -"уÑтановке новой верÑии данного пакета." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Иногда вы не хотели бы Ñто делать, например, еÑли вы производите " -"обновление через туннель, Ñозданный Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ tinc. ОÑтановка Ñлужбы, " -"Ñкорее вÑего, приведёт к повиÑшему Ñоединению, и tinc не Ñможет запуÑтитьÑÑ " -"Ñнова." - -#. Type: boolean -#. Description -#: ../tinc.templates:1001 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"ЕÑли ответите отрицательно, то вам нужно перезапуÑтить tinc вручную Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ " -"команды `invoke-rc.d tinc restart' в более удобное времÑ." - diff --git a/debian/po/sv.po b/debian/po/sv.po deleted file mode 100644 index aaa7347..0000000 --- a/debian/po/sv.po +++ /dev/null @@ -1,62 +0,0 @@ -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# Developers do not need to manually edit POT or PO files. -# , fuzzy -# -# -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.4-3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-10-10 22:06+0200\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Starta om tinc vid varje uppgradering?" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" -"Du kan välja om du vill att jag startar om tinc-daemonen varje gång du installerar en " -"ny version av detta paket." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" -"Ibland vill du kanske inte göra detta, till exempel om du gör en uppgradering " -"via en tunnel som är skapad med tinc. Stoppa daemonen skulle antagligen koppla ner " -"förbindelsen och tinc kan inte startas igen." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" -"Om du vägrar måste du starta om tinc själv om du uppgraderat, genom att skriva " -"'invoke-rc.d tinc restart' när det passar dig." - diff --git a/debian/po/templates.pot b/debian/po/templates.pot deleted file mode 100644 index eade3ff..0000000 --- a/debian/po/templates.pot +++ /dev/null @@ -1,56 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "" diff --git a/debian/po/vi.po b/debian/po/vi.po deleted file mode 100644 index 8177667..0000000 --- a/debian/po/vi.po +++ /dev/null @@ -1,48 +0,0 @@ -# Vietnamese translation for tinc. -# Copyright © 2005 Free Software Foundation, Inc. -# Clytie Siddall , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: tinc 1.0.4-2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-11 20:06+0000\n" -"PO-Revision-Date: 2005-08-10 17:13+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: LocFactoryEditor 1.2.2\n" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Khởi chạy lại trình tinc má»—i lần nâng cấp không?" - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"You may choose if you want me to restart the tinc daemon every time you " -"install a new version of this package." -msgstr "Tại đây bạn có thể chá»n tá»± Ä‘á»™ng khởi chạy lại trình ná»n (dæmon) tinc má»—i lần bạn cài đặt phiên bản má»›i của gói này hay không." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"Sometimes you don't want to do this, for example if you are doing the " -"upgrade over a tunnel that is created with tinc. Stopping the daemon would " -"probably leave you with a dead connection, and tinc may not be started again." -msgstr "Äôi khi bạn không muốn làm nhÆ° thế, lấy thí dụ nếu bạn Ä‘ang nâng cấp qua Ä‘Æ°á»ng hầm mà tinc tạo. Trong trÆ°á»ng hợp này, ngừng trình ná»n rất có thể sẽ ngắt kết nối, và có lẽ tinc sẽ không khởi chạy lại." - -#. Type: boolean -#. Description -#: ../tinc.templates:4 -msgid "" -"If you refuse, you have to restart tinc yourself if you upgraded, by typing " -"`invoke-rc.d tinc restart' whenever it suits you." -msgstr "Nếu bạn từ chối thì bạn cần phải tá»± khởi chạy lại trình tinc má»—i lần nâng cấp, bằng cách gõ lệnh « invoke-rc.d tinc restart » (gá»i-rc.d tinc khởi chạy lại) khi thích hợp." diff --git a/debian/postinst b/debian/postinst index 5233dae..62aea7e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,54 +1,9 @@ #! /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" -RET="false" +NETSFILE="/etc/tinc/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'. - -# Automatically added by dh_installinit, edited for use with debconf -if [ -x "/etc/init.d/tinc" ]; then - update-rc.d tinc defaults >/dev/null - - if [ "$1" = "configure" ] ; then - if dpkg --compare-versions "$2" lt "1.0pre5-4" ; then - RET="true" - else - if [ -e /usr/share/debconf/confmodule ] ; then - . /usr/share/debconf/confmodule - db_get tinc/restart_on_upgrade - db_stop - else - RET="true" - fi - fi - fi -fi -# End automatically added section - - case "$1" in configure) if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then @@ -61,17 +16,9 @@ case "$1" in if [ ! -e $NETSFILE ] ; then echo "## This file contains all names of the networks to be started on system startup." > $NETSFILE fi - - if [ "$RET" = "true" ] ; then - invoke-rc.d tinc restart - else - echo "I have not stopped or restarted the tinc daemon. You should do this" - echo "yourself whenever you're ready; type \`\`invoke-rc.d tinc restart''." - fi - ;; + ;; abort-upgrade|abort-remove|abort-deconfigure) - ;; *) @@ -80,11 +27,4 @@ case "$1" in ;; esac -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - #DEBHELPER# - -exit 0 - - diff --git a/debian/postrm b/debian/postrm index e4fbf15..dc3247b 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,10 +1,9 @@ #!/bin/sh + set -e -# Automatically added by package maintainer + if [ "$1" = purge ]; then rm -f /etc/tinc/nets.boot - update-rc.d tinc remove >/dev/null 2>/dev/null fi -# End automatically added section #DEBHELPER# diff --git a/debian/prerm b/debian/prerm deleted file mode 100644 index 30347c0..0000000 --- a/debian/prerm +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -# Automatically added by dh_installinit, edited for use with debconf -if [ -x "/etc/init.d/tinc" -a "$1" != "upgrade" ]; then - if [ -e /usr/share/debconf/confmodule ] ; then - . /usr/share/debconf/confmodule - db_get tinc/restart_on_upgrade - if [ "$RET" = "true" ] ; then - invoke-rc.d tinc stop - fi - db_stop - else - invoke-rc.d tinc stop - fi -fi -# End automatically added section - -#DEBHELPER# diff --git a/debian/rules b/debian/rules index 7272f93..e1606c5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,33 @@ #!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. -include /usr/share/cdbs/1/rules/debhelper.mk -#include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/class/autotools.mk +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -# A bit of a kludge, we have our own init.d handling in postinst, but -# cdbs calls dh_installinit anyway. -DEB_DH_INSTALLINIT_ARGS = -n +%: + dh $@ -clean:: - rm -rf src/device.c doc/tinc -build/tinc:: - cd doc && $(MAKE) texi2html -binary-post-install/tinc:: +override_dh_auto_build: + dh_auto_build + cd doc && $(MAKE) texi2html + +override_dh_auto_install: + dh_auto_install # Guess where texi2html installed its output today... [ -f doc/tinc/tinc.html ] \ - && mv -v doc/tinc/*.html debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ \ - || mv -v doc/*.html debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ - rm -f debian/$(cdbs_curpkg)/usr/share/info/dir* - cd debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ && tar xzf ../../../../../../doc/sample-config.tar.gz && mv sample-config examples && rm -rf examples/CVS examples/hosts/CVS + && mv doc/tinc/*.html debian/tinc/usr/share/doc/tinc/ \ + || mv doc/*.html debian/tinc/usr/share/doc/tinc/ + # Remove info dir file + rm -f debian/tinc/usr/share/info/dir + +override_dh_installinit: + dh_installinit -R + +override_dh_clean: + dh_clean + rm -f src/device.c 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.modules b/debian/tinc.modules deleted file mode 100644 index edd98bb..0000000 --- a/debian/tinc.modules +++ /dev/null @@ -1,12 +0,0 @@ -alias char-major-36 netlink_dev -alias char-major-10-200 tun - -alias tap0 ethertap -alias tap1 ethertap -alias tap2 ethertap -alias tap3 ethertap - -options tap0 -o tap0 -x unit=0 -options tap1 -o tap1 -x unit=1 -options tap2 -o tap2 -x unit=2 -options tap3 -o tap3 -x unit=3 diff --git a/debian/tinc.templates b/debian/tinc.templates deleted file mode 100644 index 46578dc..0000000 --- a/debian/tinc.templates +++ /dev/null @@ -1,14 +0,0 @@ -Template: tinc/restart_on_upgrade -Type: boolean -Default: true -_Description: Restart tinc on each upgrade? - You may choose if you want me to restart the tinc daemon every time you - install a new version of this package. - . - Sometimes you don't want to do this, for example if you are doing the - upgrade over a tunnel that is created with tinc. Stopping the daemon - would probably leave you with a dead connection, and tinc may not be - started again. - . - If you refuse, you have to restart tinc yourself if you upgraded, by - typing `invoke-rc.d tinc restart' whenever it suits you. From dc781ea51d2b9230f1a5ab22cb4d83f0ca4ac0c2 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 12 Apr 2013 20:40:15 +0000 Subject: [PATCH 10/31] Import Debian changes 1.0.13-1+squeeze1 tinc (1.0.13-1+squeeze1) squeeze-security; urgency=high * Drop packets forwarded via TCP if they are too big (CVE-2013-1428). --- debian/changelog | 6 ++++++ debian/patches/fix-CVE-2013-1428 | 31 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 38 insertions(+) create mode 100644 debian/patches/fix-CVE-2013-1428 create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 75834bf..39d8d07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tinc (1.0.13-1+squeeze1) squeeze-security; urgency=high + + * Drop packets forwarded via TCP if they are too big (CVE-2013-1428). + + -- Guus Sliepen Fri, 12 Apr 2013 20:40:15 +0000 + tinc (1.0.13-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/fix-CVE-2013-1428 b/debian/patches/fix-CVE-2013-1428 new file mode 100644 index 0000000..5849759 --- /dev/null +++ b/debian/patches/fix-CVE-2013-1428 @@ -0,0 +1,31 @@ +From 17a33dfd95b1a29e90db76414eb9622df9632320 Mon Sep 17 00:00:00 2001 +From: Guus Sliepen +Date: Fri, 12 Apr 2013 17:15:05 +0200 +Subject: [PATCH] Drop packets forwarded via TCP if they are too big + (CVE-2013-1428). + +Normally all requests sent via the meta connections are checked so that they +cannot be larger than the input buffer. However, when packets are forwarded via +meta connections, they are copied into a packet buffer without checking whether +it fits into it. Since the packet buffer is allocated on the stack, this in +effect allows an authenticated remote node to cause a stack overflow. + +This issue was found by Martin Schobert. +--- + src/net_packet.c | 3 +++ + 1 file changed, 3 insertions(+) + +Index: tinc-1.0.13/src/net_packet.c +=================================================================== +--- tinc-1.0.13.orig/src/net_packet.c 2010-03-13 17:53:33.000000000 +0000 ++++ tinc-1.0.13/src/net_packet.c 2013-04-12 20:34:17.395183282 +0000 +@@ -347,6 +347,9 @@ + void receive_tcppacket(connection_t *c, char *buffer, int len) { + vpn_packet_t outpkt; + ++ if(len > sizeof outpkt.data) ++ return; ++ + outpkt.len = len; + if(c->options & OPTION_TCPONLY) + outpkt.priority = 0; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..f301124 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-CVE-2013-1428 From 3f653aaa2d4eb71950b4562cab1e1828fb0c9a6a Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 9 May 2011 00:25:37 +0200 Subject: [PATCH 11/31] Import Debian changes 1.0.14-1 tinc (1.0.14-1) unstable; urgency=low * New upstream release. * Bump Standards-Version. --- debian/changelog | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5456088..9ad50ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -tinc (1.0.14-1~bpo60+1) squeeze-backports; urgency=low - - * Rebuild for squeeze-backports. - - -- Guus Sliepen Tue, 07 Jun 2011 09:35:50 +0000 - tinc (1.0.14-1) unstable; urgency=low * New upstream release. From 94e6f906d5cd59561c01f77d47ce5b921fbb8f94 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 23 Jul 2011 14:37:56 +0200 Subject: [PATCH 12/31] Import Debian changes 1.0.16-1 tinc (1.0.16-1) unstable; urgency=low * New upstream release. * Mention alarm option in /etc/init.d/tinc's usage information. Closes: #631761 --- debian/changelog | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d95c76..a2adf6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -tinc (1.0.16-1~bpo60+1) squeeze-backports; urgency=low - - * Rebuild for squeeze-backports, no changes. - - -- Michael Tokarev Mon, 12 Dec 2011 13:27:23 +0400 - tinc (1.0.16-1) unstable; urgency=low * New upstream release. From 8ce89f6ef0623b90eef10a8b7dea0cb6cef9d853 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 25 Mar 2012 18:52:15 +0200 Subject: [PATCH 13/31] Import Debian changes 1.0.18-1 tinc (1.0.18-1) unstable; urgency=low * New upstream release. --- debian/changelog | 8 -------- debian/control | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1bcd83a..9feb9d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -tinc (1.0.18-1~bpo60+1) squeeze-backports; urgency=low - - * Rebuild for squeeze-backports. - * Build-Depend on libvdeplug-dev | libvdeplug2-dev, to compensate - for package rename in wheezy. - - -- Michael Tokarev Thu, 12 Apr 2012 12:22:23 +0400 - tinc (1.0.18-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index c627292..75e73ec 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,8 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen -Uploaders: Michael Tokarev Standards-Version: 3.9.3 -Build-Depends: libssl-dev, debhelper (>= 7.0.50~), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev | libvdeplug2-dev +Build-Depends: libssl-dev, debhelper (>= 7.0.50~), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev Homepage: http://www.tinc-vpn.org/ Package: tinc From cc0493ea1700c8f09e006d6787205fcccea4a5a4 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Fri, 28 Dec 2012 23:49:04 +0400 Subject: [PATCH 14/31] Import Debian changes 1.0.19-2~bpo60+1 tinc (1.0.19-2~bpo60+1) squeeze-backports; urgency=low * Rebuild for squeeze-backports. * Build-depend on libvdeplug2-dev, not libvdeplug-dev, as it is how it is named in squeeze. tinc (1.0.19-2) unstable; urgency=low * Fix behaviour of tinc-pidfile. Closes: #679130 * Enable parallel building in debian/rules. --- debian/changelog | 15 +++++++++++++++ debian/control | 3 ++- debian/rules | 2 +- debian/tinc.if-post-down | 6 ++++-- debian/tinc.if-pre-up | 5 +++-- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index a21ad22..66369e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +tinc (1.0.19-2~bpo60+1) squeeze-backports; urgency=low + + * Rebuild for squeeze-backports. + * Build-depend on libvdeplug2-dev, not libvdeplug-dev, + as it is how it is named in squeeze. + + -- Michael Tokarev Fri, 28 Dec 2012 23:49:04 +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. diff --git a/debian/control b/debian/control index ace6328..e223ccf 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,9 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen +Uploaders: Michael Tokarev Standards-Version: 3.9.3 -Build-Depends: libssl-dev, debhelper (>= 9), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev +Build-Depends: libssl-dev, debhelper (>= 9), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev | libvdeplug2-dev Homepage: http://www.tinc-vpn.org/ Package: tinc diff --git a/debian/rules b/debian/rules index 3c36ef2..cf68c18 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ --parallel override_dh_auto_configure: dh_auto_configure -- --enable-uml --enable-vde diff --git a/debian/tinc.if-post-down b/debian/tinc.if-post-down index e48b24a..fb77810 100755 --- a/debian/tinc.if-post-down +++ b/debian/tinc.if-post-down @@ -3,10 +3,12 @@ set -e if [ "$IF_TINC_NET" ] ; then - tincd -n "$IF_TINC_NET" -k + EXTRA="" + [ -n "$IF_TINC_PIDFILE" ] && EXTRA="--pidfile=$IF_TINC_PIDFILE" || IF_TINC_PIDFILE=/var/run/tinc.$IF_TINC_NET.pid + tincd -n "$IF_TINC_NET" -k $EXTRA sleep 0.1 i=0; - while [ -f "/var/run/tinc.$IF_TINC_NET.pid" ] ; do + while [ -f "$IF_TINC_PIDFILE" ] ; do if [ $i = '30' ] ; then echo 'Failed to stop tinc daemon!' exit 1 diff --git a/debian/tinc.if-pre-up b/debian/tinc.if-pre-up index a7c917e..99d36ca 100755 --- a/debian/tinc.if-pre-up +++ b/debian/tinc.if-pre-up @@ -14,10 +14,11 @@ set -e [ -n "$IF_TINC_DEBUG" ] && EXTRA="$EXTRA -d$IF_TINC_DEBUG" [ -n "$IF_TINC_MLOCK" ] && EXTRA="$EXTRA --mlock" [ -n "$IF_TINC_LOGFILE" ] && EXTRA="$EXTRA --logfile=$IF_TINC_LOGFILE" -[ -n "$IF_TINC_PIDFILE" ] && EXTRA="$EXTRA --logfile=$IF_TINC_PIDFILE" +[ -n "$IF_TINC_PIDFILE" ] && EXTRA="$EXTRA --pidfile=$IF_TINC_PIDFILE" || IF_TINC_PIDFILE=/var/run/tinc.$IF_TINC_NET.pid [ -n "$IF_TINC_CHROOT" ] && EXTRA="$EXTRA --chroot" [ -n "$IF_TINC_USER" ] && EXTRA="$EXTRA --user=$IF_TINC_USER" + # Start tinc daemon /usr/sbin/tincd -n "$IF_TINC_NET" -o "Interface=$IFACE" $EXTRA @@ -26,7 +27,7 @@ set -e sleep 0.1 i=0; -while [ ! -f "/var/run/tinc.$IF_TINC_NET.pid" ] ; do +while [ ! -f "$IF_TINC_PIDFILE" ] ; do if [ $i = '30' ] ; then echo 'Failed to start tinc daemon!' exit 1 From a797a94c81442c04e867dd704554a4ca2cb2b952 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 26 Jun 2012 18:28:34 +0200 Subject: [PATCH 15/31] Import Debian changes 1.0.19-2 tinc (1.0.19-2) unstable; urgency=low * Fix behaviour of tinc-pidfile. Closes: #679130 * Enable parallel building in debian/rules. --- debian/changelog | 8 -------- debian/control | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 66369e7..f2fc02b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -tinc (1.0.19-2~bpo60+1) squeeze-backports; urgency=low - - * Rebuild for squeeze-backports. - * Build-depend on libvdeplug2-dev, not libvdeplug-dev, - as it is how it is named in squeeze. - - -- Michael Tokarev Fri, 28 Dec 2012 23:49:04 +0400 - tinc (1.0.19-2) unstable; urgency=low * Fix behaviour of tinc-pidfile. Closes: #679130 diff --git a/debian/control b/debian/control index e223ccf..ace6328 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,8 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen -Uploaders: Michael Tokarev Standards-Version: 3.9.3 -Build-Depends: libssl-dev, debhelper (>= 9), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev | libvdeplug2-dev +Build-Depends: libssl-dev, debhelper (>= 9), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev Homepage: http://www.tinc-vpn.org/ Package: tinc From 4343b5a2fa8a262c91406f2aa2cc1e78ff246d8c Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 23 Apr 2013 08:35:41 +0400 Subject: [PATCH 16/31] Import Debian changes 1.0.19-3~bpo60+1 tinc (1.0.19-3~bpo60+1) squeeze-backports; urgency=high * Rebuild for squeeze-backports. * Build-depend on libvdeplug2-dev, not libvdeplug-dev, as it is how it is named in squeeze. tinc (1.0.19-3) unstable; urgency=high * Drop packets forwarded via TCP if they are too big (CVE-2013-1428). --- debian/changelog | 14 ++++++++++++++ debian/control | 3 ++- debian/patches/fix-CVE-2013-1428 | 29 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-CVE-2013-1428 create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index f2fc02b..78c5c0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +tinc (1.0.19-3~bpo60+1) squeeze-backports; urgency=high + + * Rebuild for squeeze-backports. + * Build-depend on libvdeplug2-dev, not libvdeplug-dev, + as it is how it is named in squeeze. + + -- Michael Tokarev Tue, 23 Apr 2013 08:35:41 +0400 + +tinc (1.0.19-3) unstable; urgency=high + + * Drop packets forwarded via TCP if they are too big (CVE-2013-1428). + + -- Guus Sliepen Fri, 12 Apr 2013 22:52:10 +0200 + tinc (1.0.19-2) unstable; urgency=low * Fix behaviour of tinc-pidfile. Closes: #679130 diff --git a/debian/control b/debian/control index ace6328..e223ccf 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,9 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen +Uploaders: Michael Tokarev Standards-Version: 3.9.3 -Build-Depends: libssl-dev, debhelper (>= 9), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev +Build-Depends: libssl-dev, debhelper (>= 9), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev | libvdeplug2-dev Homepage: http://www.tinc-vpn.org/ Package: tinc diff --git a/debian/patches/fix-CVE-2013-1428 b/debian/patches/fix-CVE-2013-1428 new file mode 100644 index 0000000..f49de8e --- /dev/null +++ b/debian/patches/fix-CVE-2013-1428 @@ -0,0 +1,29 @@ +From 17a33dfd95b1a29e90db76414eb9622df9632320 Mon Sep 17 00:00:00 2001 +From: Guus Sliepen +Date: Fri, 12 Apr 2013 17:15:05 +0200 +Subject: [PATCH] Drop packets forwarded via TCP if they are too big + (CVE-2013-1428). + +Normally all requests sent via the meta connections are checked so that they +cannot be larger than the input buffer. However, when packets are forwarded via +meta connections, they are copied into a packet buffer without checking whether +it fits into it. Since the packet buffer is allocated on the stack, this in +effect allows an authenticated remote node to cause a stack overflow. + +This issue was found by Martin Schobert. +--- + src/net_packet.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/src/net_packet.c ++++ b/src/net_packet.c +@@ -378,6 +378,9 @@ + void receive_tcppacket(connection_t *c, const char *buffer, int len) { + vpn_packet_t outpkt; + ++ if(len > sizeof outpkt.data) ++ return; ++ + outpkt.len = len; + if(c->options & OPTION_TCPONLY) + outpkt.priority = 0; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..f301124 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-CVE-2013-1428 From 6698135e07908fceda014fa16865180747fafb6d Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 12 Apr 2013 22:52:10 +0200 Subject: [PATCH 17/31] Import Debian changes 1.0.19-3 tinc (1.0.19-3) unstable; urgency=high * Drop packets forwarded via TCP if they are too big (CVE-2013-1428). --- debian/changelog | 8 -------- debian/control | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 78c5c0a..c7565b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -tinc (1.0.19-3~bpo60+1) squeeze-backports; urgency=high - - * Rebuild for squeeze-backports. - * Build-depend on libvdeplug2-dev, not libvdeplug-dev, - as it is how it is named in squeeze. - - -- Michael Tokarev Tue, 23 Apr 2013 08:35:41 +0400 - tinc (1.0.19-3) unstable; urgency=high * Drop packets forwarded via TCP if they are too big (CVE-2013-1428). diff --git a/debian/control b/debian/control index e223ccf..ace6328 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,8 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen -Uploaders: Michael Tokarev Standards-Version: 3.9.3 -Build-Depends: libssl-dev, debhelper (>= 9), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev | libvdeplug2-dev +Build-Depends: libssl-dev, debhelper (>= 9), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev Homepage: http://www.tinc-vpn.org/ Package: tinc From 854118c85f8c95eea06d486850b6038b1b1ec9e2 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Wed, 14 Aug 2013 15:34:29 +0200 Subject: [PATCH 18/31] Import Debian changes 1.0.22-1 tinc (1.0.22-1) unstable; 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. --- debian/changelog | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 22ed43d..f0d1631 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -tinc (1.0.22-1~bpo70+1) wheezy-backports; urgency=low - - * Rebuilt for wheezy-backports. - - -- Guus Sliepen Sun, 18 Aug 2013 14:37:57 +0000 - tinc (1.0.22-1) unstable; urgency=low * New upstream release. From d7b49da4e65674c3fc8f7b739f8033ce8cb4e6a4 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 19 Oct 2013 21:06:05 +0200 Subject: [PATCH 19/31] Import Debian changes 1.0.23-1 tinc (1.0.23-1) unstable; urgency=low * New upstream release. --- debian/changelog | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index c41fa49..a390b69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -tinc (1.0.23-1~bpo70+1) wheezy-backports; urgency=low - - * Rebuild for wheezy-backports. - - -- Guus Sliepen Tue, 12 Nov 2013 11:00:41 +0100 - tinc (1.0.23-1) unstable; urgency=low * New upstream release. From e53cefdf85f41699c811c7269013e2ad3fb90186 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Thu, 5 Dec 2013 09:41:13 +0000 Subject: [PATCH 20/31] Import Debian changes 1.0.23-2 tinc (1.0.23-2) unstable; urgency=low * Use if-statements instead of && in shell scripts. Closes: #731279 The && operator does not clear the error status, and if the next statement in a shell script does not change the error status it would cause the script to prematurely exit. Thanks to Peter Reinholdtsen for spotting it. * Use absolute path to tincd in the if-post-down script. --- debian/changelog | 10 ++++++++++ debian/tinc.if-post-down | 8 ++++++-- debian/tinc.if-pre-up | 4 +++- debian/tinc.if-up | 5 +++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index a390b69..55d48fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +tinc (1.0.23-2) unstable; urgency=low + + * Use if-statements instead of && in shell scripts. Closes: #731279 + The && operator does not clear the error status, and if the next statement + in a shell script does not change the error status it would cause the + script to prematurely exit. Thanks to Peter Reinholdtsen for spotting it. + * Use absolute path to tincd in the if-post-down script. + + -- Guus Sliepen Thu, 05 Dec 2013 09:41:13 +0000 + tinc (1.0.23-1) unstable; urgency=low * New upstream release. diff --git a/debian/tinc.if-post-down b/debian/tinc.if-post-down index fb77810..60c2d51 100755 --- a/debian/tinc.if-post-down +++ b/debian/tinc.if-post-down @@ -4,8 +4,12 @@ set -e if [ "$IF_TINC_NET" ] ; then EXTRA="" - [ -n "$IF_TINC_PIDFILE" ] && EXTRA="--pidfile=$IF_TINC_PIDFILE" || IF_TINC_PIDFILE=/var/run/tinc.$IF_TINC_NET.pid - tincd -n "$IF_TINC_NET" -k $EXTRA + if [ -n "$IF_TINC_PIDFILE" ]; then + EXTRA="--pidfile=$IF_TINC_PIDFILE" + else + IF_TINC_PIDFILE=/var/run/tinc.$IF_TINC_NET.pid + fi + /usr/sbin/tincd -n "$IF_TINC_NET" -k $EXTRA sleep 0.1 i=0; while [ -f "$IF_TINC_PIDFILE" ] ; do diff --git a/debian/tinc.if-pre-up b/debian/tinc.if-pre-up index 99d36ca..ee7b82d 100755 --- a/debian/tinc.if-pre-up +++ b/debian/tinc.if-pre-up @@ -2,7 +2,9 @@ set -e -[ -z "$IF_TINC_NET" ] && exit 0 +if [ -z "$IF_TINC_NET" ]; then + exit 0 +fi # Read options from /etc/default diff --git a/debian/tinc.if-up b/debian/tinc.if-up index 2da794f..364f88f 100755 --- a/debian/tinc.if-up +++ b/debian/tinc.if-up @@ -2,7 +2,8 @@ set -e -[ "$METHOD" = loopback ] && exit 0 -[ -n "$IF_TINC_NET" ] && exit 0 +if [ "$METHOD" = loopback -o -n "$IF_TINC_NET" ]; then + exit 0 +fi invoke-rc.d tinc alarm || exit 0 From a0bb9d443fb7e8cbc07c904b4d50a1e12a664f7c Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 23 Jun 2014 09:46:54 -0400 Subject: [PATCH 21/31] Import Debian changes 1.0.24-2~bpo70+1 tinc (1.0.24-2~bpo70+1) wheezy-backports; urgency=medium * Backport to wheezy-backports. * Add myself to Uploaders. tinc (1.0.24-2) unstable; urgency=medium * Improve the init script: stopping tinc now waits for the process to terminate. If that doesn't happen in 5 seconds, it will send the TERM signal again (which helps if tinc is waiting for a script to finish executing). It now also detects whether the process mentioned in the PID file is actually running, and if not it will exit early and without warnings. Closes: #748107 --- debian/changelog | 18 ++++++++++++++++++ debian/control | 1 + debian/tinc.init | 41 +++++++++++++++++++++++++++++------------ 3 files changed, 48 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index e45ef7e..9ebdf1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +tinc (1.0.24-2~bpo70+1) wheezy-backports; urgency=medium + + * Backport to wheezy-backports. + * Add myself to Uploaders. + + -- Micah Anderson Mon, 23 Jun 2014 09:46:54 -0400 + +tinc (1.0.24-2) unstable; urgency=medium + + * Improve the init script: stopping tinc now waits for the process to + terminate. If that doesn't happen in 5 seconds, it will send the TERM + signal again (which helps if tinc is waiting for a script to finish + executing). It now also detects whether the process mentioned in the PID + file is actually running, and if not it will exit early and without + warnings. Closes: #748107 + + -- Guus Sliepen Wed, 14 May 2014 21:44:16 +0200 + tinc (1.0.24-1) unstable; urgency=medium [ Guus Sliepen ] diff --git a/debian/control b/debian/control index feaa1c4..8daa21d 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Guus Sliepen Standards-Version: 3.9.5 Build-Depends: libssl-dev, debhelper (>= 9), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev Homepage: http://www.tinc-vpn.org/ +Uploaders: Micah Anderson Package: tinc Architecture: any diff --git a/debian/tinc.init b/debian/tinc.init index c44af7e..813a59c 100644 --- a/debian/tinc.init +++ b/debian/tinc.init @@ -73,28 +73,45 @@ test -n "$LIMITS" && setlimits $LIMITS start() { $DAEMON $EXTRA -n "$@" } + stop() { - $DAEMON -n $1 -k + [ -f /var/run/tinc.$1.pid ] || return + read pid rest /dev/null || return + + $DAEMON -n $1 -k || return + + i=0; + sleep 0.5 + + # Wait for the pidfile to disappear + while [ -f /var/run/tinc.$1.pid ]; do + # And check that there is an actual process running + kill -0 "$pid" 2>/dev/null || return + + if [ $i = '10' ] ; then + # It's still alive, kill it again and give up + $DAEMON -n $1 -k && sleep 0.5 + break + else + echo -n "." + i=$(($i+1)) + fi + + sleep 0.5 + done } + reload() { $DAEMON -n $1 -kHUP } + alarm() { $DAEMON -n $1 -kALRM } + restart() { stop "$@" - sleep 0.5 - i=0; - while [ -f /var/run/tinc.$1.pid ] ; do - if [ $i = '10' ] ; then - break - else - echo -n "." - sleep 0.5 - i=$(($i+1)) - fi - done start "$@" } From c0d04cc16808228246f8fb178ee06eaf8c98704d Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Wed, 14 May 2014 21:44:16 +0200 Subject: [PATCH 22/31] Import Debian changes 1.0.24-2 tinc (1.0.24-2) unstable; urgency=medium * Improve the init script: stopping tinc now waits for the process to terminate. If that doesn't happen in 5 seconds, it will send the TERM signal again (which helps if tinc is waiting for a script to finish executing). It now also detects whether the process mentioned in the PID file is actually running, and if not it will exit early and without warnings. Closes: #748107 --- debian/changelog | 7 ------- debian/control | 1 - 2 files changed, 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ebdf1e..1d3591e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -tinc (1.0.24-2~bpo70+1) wheezy-backports; urgency=medium - - * Backport to wheezy-backports. - * Add myself to Uploaders. - - -- Micah Anderson Mon, 23 Jun 2014 09:46:54 -0400 - tinc (1.0.24-2) unstable; urgency=medium * Improve the init script: stopping tinc now waits for the process to diff --git a/debian/control b/debian/control index 8daa21d..feaa1c4 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Guus Sliepen Standards-Version: 3.9.5 Build-Depends: libssl-dev, debhelper (>= 9), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev Homepage: http://www.tinc-vpn.org/ -Uploaders: Micah Anderson Package: tinc Architecture: any From 1e23c12b1d725fba663d8db4760e99a42af2c992 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 24 Jun 2014 14:01:47 -0400 Subject: [PATCH 23/31] Import Debian changes 1.0.24-2.1 tinc (1.0.24-2.1) unstable; urgency=medium * NMU after getting go ahead from guus on #tinc * Add a -dbg package which contains the debugging symbols for tinc Thanks hark@puscii.nl (Closes: #752561) --- debian/changelog | 8 ++++++++ debian/control | 13 +++++++++++++ debian/rules | 6 +++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1d3591e..85365a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +tinc (1.0.24-2.1) unstable; urgency=medium + + * NMU after getting go ahead from guus on #tinc + * Add a -dbg package which contains the debugging symbols for tinc + Thanks hark@puscii.nl (Closes: #752561) + + -- Micah Anderson Tue, 24 Jun 2014 14:01:47 -0400 + tinc (1.0.24-2) unstable; urgency=medium * Improve the init script: stopping tinc now waits for the process to diff --git a/debian/control b/debian/control index feaa1c4..ce877c4 100644 --- a/debian/control +++ b/debian/control @@ -14,3 +14,16 @@ Description: Virtual Private Network daemon (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-dbg +Architecture: any +Section: debug +Priority: extra +Depends: ${shlibs:Depends}, ${misc:Depends}, tinc (= ${binary:Version}) +Description: debugging symbols 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 the debugging symbols for tinc. diff --git a/debian/rules b/debian/rules index 2aaaef9..8d13df5 100755 --- a/debian/rules +++ b/debian/rules @@ -12,11 +12,15 @@ %: dh $@ --parallel +.PHONY: override_dh_strip +override_dh_strip: + dh_strip --dbg-package=tinc-dbg + override_dh_auto_configure: dh_auto_configure -- --enable-uml --enable-vde override_dh_auto_install: - dh_auto_install -- install-html + dh_auto_install --destdir=debian/tinc -- install-html # Remove info dir file rm -f debian/tinc/usr/share/info/dir From 4d11e18342dc3f9806e2c3fb1a686e9aaa7a6376 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 8 Oct 2018 20:14:24 +0200 Subject: [PATCH 24/31] Import Debian changes 1.0.24-2.1+deb8u1 tinc (1.0.24-2.1+deb8u1) jessie-security; urgency=medium * Prevent oracle attacks (CVE-2018-16737, CVE-2018-16738). * Prevent a MITM from forcing a NULL cipher for UDP (CVE-2018-16758). --- debian/changelog | 7 + debian/patches/security-fixes | 840 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 848 insertions(+) create mode 100644 debian/patches/security-fixes diff --git a/debian/changelog b/debian/changelog index 85365a9..f8c1df3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tinc (1.0.24-2.1+deb8u1) jessie-security; urgency=medium + + * Prevent oracle attacks (CVE-2018-16737, CVE-2018-16738). + * Prevent a MITM from forcing a NULL cipher for UDP (CVE-2018-16758). + + -- Guus Sliepen Mon, 08 Oct 2018 20:14:24 +0200 + tinc (1.0.24-2.1) unstable; urgency=medium * NMU after getting go ahead from guus on #tinc diff --git a/debian/patches/security-fixes b/debian/patches/security-fixes new file mode 100644 index 0000000..9f04f0b --- /dev/null +++ b/debian/patches/security-fixes @@ -0,0 +1,840 @@ +diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in +index 0548628f..a2a635fb 100644 +--- a/doc/tinc.conf.5.in ++++ b/doc/tinc.conf.5.in +@@ -464,7 +464,7 @@ Multiple + .Va Address + variables can be specified, in which case each address will be tried until a working + connection has been established. +-.It Va Cipher Li = Ar cipher Pq blowfish ++.It Va Cipher Li = Ar cipher Pq aes-256-cbc + The symmetric cipher algorithm used to encrypt UDP packets. + Any cipher supported by OpenSSL is recognised. + Furthermore, specifying +@@ -479,7 +479,7 @@ Fragmentation Needed or Packet too Big messages are dropped by firewalls. + This option sets the level of compression used for UDP packets. + Possible values are 0 (off), 1 (fast zlib) and any integer up to 9 (best zlib), + 10 (fast lzo) and 11 (best lzo). +-.It Va Digest Li = Ar digest Pq sha1 ++.It Va Digest Li = Ar digest Pq sha256 + The digest algorithm used to authenticate UDP packets. + Any digest supported by OpenSSL is recognised. + Furthermore, specifying +diff --git a/doc/tinc.texi b/doc/tinc.texi +index 85790028..6e422cfe 100644 +--- a/doc/tinc.texi ++++ b/doc/tinc.texi +@@ -1143,7 +1143,7 @@ Multiple Address variables can be specified, in which case each address will be + tried until a working connection has been established. + + @cindex Cipher +-@item Cipher = <@var{cipher}> (blowfish) ++@item Cipher = <@var{cipher}> (aes-256-cbc) + The symmetric cipher algorithm used to encrypt UDP packets. + Any cipher supported by OpenSSL is recognized. + Furthermore, specifying "none" will turn off packet encryption. +@@ -1162,7 +1162,7 @@ Possible values are 0 (off), 1 (fast zlib) and any integer up to 9 (best zlib), + 10 (fast lzo) and 11 (best lzo). + + @cindex Digest +-@item Digest = <@var{digest}> (sha1) ++@item Digest = <@var{digest}> (sha256) + The digest algorithm used to authenticate UDP packets. + Any digest supported by OpenSSL is recognized. + Furthermore, specifying "none" will turn off packet authentication. +diff --git a/m4/openssl.m4 b/m4/openssl.m4 +index 254ea4ff..77b3a4a8 100644 +--- a/m4/openssl.m4 ++++ b/m4/openssl.m4 +@@ -45,12 +45,14 @@ AC_DEFUN([tinc_OPENSSL], + [AC_MSG_ERROR([OpenSSL libraries not found.])] + ) + +- AC_CHECK_FUNCS([RAND_pseudo_bytes EVP_EncryptInit_ex], , +- [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break], ++ AC_CHECK_FUNCS([RAND_bytes EVP_EncryptInit_ex EVP_CIPHER_CTX_new], , ++ [AC_MSG_ERROR([Missing LibreSSL/OpenSSL functionality, make sure you have installed the latest version.]); break], + ) + +- AC_CHECK_DECL([OpenSSL_add_all_algorithms], , +- [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break], ++ AC_CHECK_DECLS([OpenSSL_add_all_algorithms, EVP_aes_256_cfb], , ++ [AC_MSG_ERROR([Missing LibreSSL/OpenSSL functionality, make sure you have installed the latest version.]); break], + [#include ] + ) ++ ++ AC_CHECK_FUNCS([BN_GENCB_new ERR_remove_state RSA_set0_key], , , [#include ]) + ]) +diff --git a/src/connection.h b/src/connection.h +index 877601fe..9e4dc663 100644 +--- a/src/connection.h ++++ b/src/connection.h +@@ -41,7 +41,9 @@ typedef struct connection_status_t { + unsigned int encryptout:1; /* 1 if we can encrypt outgoing traffic */ + unsigned int decryptin:1; /* 1 if we have to decrypt incoming traffic */ + unsigned int mst:1; /* 1 if this connection is part of a minimum spanning tree */ +- unsigned int unused:23; ++ unsigned int proxy_passed:1; /* 1 if we are connecting via a proxy and we have finished talking with it */ ++ unsigned int tarpit:1; /* 1 if the connection should be added to the tarpit */ ++ unsigned int unused:21; + } connection_status_t; + + #include "edge.h" +diff --git a/src/net.c b/src/net.c +index 8d0a0cf4..4e53d920 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -166,6 +166,22 @@ static int build_fdset(fd_set *readset, fd_set *writeset) { + return max; + } + ++/* Put a misbehaving connection in the tarpit */ ++void tarpit(int fd) { ++ static int pits[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; ++ static int next_pit = 0; ++ ++ if(pits[next_pit] != -1) { ++ closesocket(pits[next_pit]); ++ } ++ ++ pits[next_pit++] = fd; ++ ++ if(next_pit >= sizeof pits / sizeof pits[0]) { ++ next_pit = 0; ++ } ++} ++ + /* + Terminate a connection: + - Close the socket +@@ -186,8 +202,13 @@ void terminate_connection(connection_t *c, bool report) { + if(c->node) + c->node->connection = NULL; + +- if(c->socket) +- closesocket(c->socket); ++ if(c->socket) { ++ if(c->status.tarpit) { ++ tarpit(c->socket); ++ } else { ++ closesocket(c->socket); ++ } ++ } + + if(c->edge) { + if(!c->node) { +@@ -274,6 +295,7 @@ static void check_dead_connections(void) { + closesocket(c->socket); + do_outgoing_connection(c); + } else { ++ c->status.tarpit = true; + terminate_connection(c, false); + } + } +@@ -353,6 +375,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) { + + if(FD_ISSET(c->socket, readset)) { + if(!receive_meta(c)) { ++ c->status.tarpit = true; + terminate_connection(c, c->status.active); + continue; + } +diff --git a/src/net.h b/src/net.h +index 2b50c5a2..5ae8d344 100644 +--- a/src/net.h ++++ b/src/net.h +@@ -163,6 +163,7 @@ extern void flush_queue(struct node_t *); + extern bool read_rsa_public_key(struct connection_t *); + extern void send_mtu_probe(struct node_t *); + extern void load_all_subnets(void); ++extern void tarpit(int fd); + + #ifndef HAVE_MINGW + #define closesocket(s) close(s) +diff --git a/src/net_packet.c b/src/net_packet.c +index d11d58ad..5d7c212d 100644 +--- a/src/net_packet.c ++++ b/src/net_packet.c +@@ -145,7 +145,7 @@ void send_mtu_probe(node_t *n) { + len = 64; + + memset(packet.data, 0, 14); +- RAND_pseudo_bytes(packet.data + 14, len - 14); ++ RAND_bytes(packet.data + 14, len - 14); + packet.len = len; + if(i >= 4 && n->mtuprobes <= 10) + packet.priority = -1; +@@ -314,10 +314,10 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) { + if(n->incipher) { + outpkt = pkt[nextpkt++]; + +- if(!EVP_DecryptInit_ex(&n->inctx, NULL, NULL, NULL, NULL) +- || !EVP_DecryptUpdate(&n->inctx, (unsigned char *) &outpkt->seqno, &outlen, ++ if(!EVP_DecryptInit_ex(n->inctx, NULL, NULL, NULL, NULL) ++ || !EVP_DecryptUpdate(n->inctx, (unsigned char *) &outpkt->seqno, &outlen, + (unsigned char *) &inpkt->seqno, inpkt->len) +- || !EVP_DecryptFinal_ex(&n->inctx, (unsigned char *) &outpkt->seqno + outlen, &outpad)) { ++ || !EVP_DecryptFinal_ex(n->inctx, (unsigned char *) &outpkt->seqno + outlen, &outpad)) { + ifdebug(TRAFFIC) logger(LOG_DEBUG, "Error decrypting packet from %s (%s): %s", + n->name, n->hostname, ERR_error_string(ERR_get_error(), NULL)); + return; +@@ -482,10 +482,10 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) { + if(n->outcipher) { + outpkt = pkt[nextpkt++]; + +- if(!EVP_EncryptInit_ex(&n->outctx, NULL, NULL, NULL, NULL) +- || !EVP_EncryptUpdate(&n->outctx, (unsigned char *) &outpkt->seqno, &outlen, ++ if(!EVP_EncryptInit_ex(n->outctx, NULL, NULL, NULL, NULL) ++ || !EVP_EncryptUpdate(n->outctx, (unsigned char *) &outpkt->seqno, &outlen, + (unsigned char *) &inpkt->seqno, inpkt->len) +- || !EVP_EncryptFinal_ex(&n->outctx, (unsigned char *) &outpkt->seqno + outlen, &outpad)) { ++ || !EVP_EncryptFinal_ex(n->outctx, (unsigned char *) &outpkt->seqno + outlen, &outpad)) { + ifdebug(TRAFFIC) logger(LOG_ERR, "Error while encrypting packet to %s (%s): %s", + n->name, n->hostname, ERR_error_string(ERR_get_error(), NULL)); + goto end; +diff --git a/src/net_setup.c b/src/net_setup.c +index fa4e9867..ea2a3b78 100644 +--- a/src/net_setup.c ++++ b/src/net_setup.c +@@ -53,11 +53,22 @@ char *proxyuser; + char *proxypass; + proxytype_t proxytype; + ++#ifndef HAVE_RSA_SET0_KEY ++int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { ++ BN_free(r->n); r->n = n; ++ BN_free(r->e); r->e = e; ++ BN_free(r->d); r->d = d; ++ return 1; ++} ++#endif ++ + bool read_rsa_public_key(connection_t *c) { + FILE *fp; + char *pubname; + char *hcfname; + char *key; ++ BIGNUM *n = NULL; ++ BIGNUM *e = NULL; + + if(!c->rsa_key) { + c->rsa_key = RSA_new(); +@@ -67,12 +78,19 @@ bool read_rsa_public_key(connection_t *c) { + /* First, check for simple PublicKey statement */ + + if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key)) { +- if(BN_hex2bn(&c->rsa_key->n, key) != strlen(key)) { ++ if(BN_hex2bn(&n, key) != strlen(key)) { ++ free(key); + logger(LOG_ERR, "Invalid PublicKey for %s!", c->name); + return false; + } +- BN_hex2bn(&c->rsa_key->e, "FFFF"); + free(key); ++ BN_hex2bn(&e, "FFFF"); ++ if(!n || !e || RSA_set0_key(c->rsa_key, n, e, NULL) != 1) { ++ BN_free(e); ++ BN_free(n); ++ logger(LOG_ERR, "RSA_set0_key() failed with PublicKey for %s!", c->name); ++ return false; ++ } + return true; + } + +@@ -163,27 +181,39 @@ bool read_rsa_public_key(connection_t *c) { + static bool read_rsa_private_key(void) { + FILE *fp; + char *fname, *key, *pubkey; ++ BIGNUM *n = NULL; ++ BIGNUM *e = NULL; ++ BIGNUM *d = NULL; + + if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) { + myself->connection->rsa_key = RSA_new(); + // RSA_blinding_on(myself->connection->rsa_key, NULL); +- if(BN_hex2bn(&myself->connection->rsa_key->d, key) != strlen(key)) { ++ if(BN_hex2bn(&d, key) != strlen(key)) { + logger(LOG_ERR, "Invalid PrivateKey for myself!"); + free(key); + return false; + } + free(key); + if(!get_config_string(lookup_config(config_tree, "PublicKey"), &pubkey)) { ++ BN_free(d); + logger(LOG_ERR, "PrivateKey used but no PublicKey found!"); + return false; + } +- if(BN_hex2bn(&myself->connection->rsa_key->n, pubkey) != strlen(pubkey)) { +- logger(LOG_ERR, "Invalid PublicKey for myself!"); ++ if(BN_hex2bn(&n, pubkey) != strlen(pubkey)) { + free(pubkey); ++ BN_free(d); ++ logger(LOG_ERR, "Invalid PublicKey for myself!"); + return false; + } + free(pubkey); +- BN_hex2bn(&myself->connection->rsa_key->e, "FFFF"); ++ BN_hex2bn(&e, "FFFF"); ++ if(!n || !e || !d || RSA_set0_key(myself->connection->rsa_key, n, e, d) != 1) { ++ BN_free(d); ++ BN_free(e); ++ BN_free(n); ++ logger(LOG_ERR, "RSA_set0_key() failed with PrivateKey for myself!"); ++ return false; ++ } + return true; + } + +@@ -608,14 +638,25 @@ static bool setup_myself(void) { + } + free(cipher); + } else +- myself->incipher = EVP_bf_cbc(); ++ myself->incipher = EVP_aes_256_cbc(); + + if(myself->incipher) +- myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len; ++ myself->inkeylength = EVP_CIPHER_key_length(myself->incipher) + EVP_CIPHER_iv_length(myself->incipher); + else + myself->inkeylength = 1; + +- myself->connection->outcipher = EVP_bf_ofb(); ++ /* We need to use a stream mode for the meta protocol. Use AES for this, ++ but try to match the key size with the one from the cipher selected ++ by Cipher. ++ */ ++ ++ int keylen = EVP_CIPHER_key_length(myself->incipher); ++ if(keylen <= 16) ++ myself->connection->outcipher = EVP_aes_128_cfb(); ++ else if(keylen <= 24) ++ myself->connection->outcipher = EVP_aes_192_cfb(); ++ else ++ myself->connection->outcipher = EVP_aes_256_cfb(); + + if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime)) + keylifetime = 3600; +@@ -639,13 +680,13 @@ static bool setup_myself(void) { + + free(digest); + } else +- myself->indigest = EVP_sha1(); ++ myself->indigest = EVP_sha256(); + +- myself->connection->outdigest = EVP_sha1(); ++ myself->connection->outdigest = EVP_sha256(); + + if(get_config_int(lookup_config(config_tree, "MACLength"), &myself->inmaclength)) { + if(myself->indigest) { +- if(myself->inmaclength > myself->indigest->md_size) { ++ if(myself->inmaclength > EVP_MD_size(myself->indigest)) { + logger(LOG_ERR, "MAC length exceeds size of digest!"); + return false; + } else if(myself->inmaclength < 0) { +diff --git a/src/net_socket.c b/src/net_socket.c +index 9a67bb3c..479b595d 100644 +--- a/src/net_socket.c ++++ b/src/net_socket.c +@@ -513,6 +513,9 @@ void setup_outgoing_connection(outgoing_t *outgoing) { + new connection + */ + bool handle_new_meta_connection(int sock) { ++ static const int max_accept_burst = 10; ++ static int last_accept_burst; ++ static int last_accept_time; + connection_t *c; + sockaddr_t sa; + int fd; +@@ -525,6 +528,22 @@ bool handle_new_meta_connection(int sock) { + return false; + } + ++ if(last_accept_time == now) { ++ last_accept_burst++; ++ ++ if(last_accept_burst >= max_accept_burst) { ++ if(last_accept_burst == max_accept_burst) { ++ ifdebug(CONNECTIONS) logger(LOG_WARNING, "Throttling incoming connections"); ++ } ++ ++ tarpit(fd); ++ return false; ++ } ++ } else { ++ last_accept_burst = 0; ++ last_accept_time = now; ++ } ++ + sockaddrunmap(&sa); + + c = new_connection(); +@@ -546,7 +565,6 @@ bool handle_new_meta_connection(int sock) { + connection_add(c); + + c->allow_request = ID; +- send_id(c); + + return true; + } +diff --git a/src/node.c b/src/node.c +index cf70f838..19f37306 100644 +--- a/src/node.c ++++ b/src/node.c +@@ -1,6 +1,6 @@ + /* + node.c -- node tree management +- Copyright (C) 2001-2011 Guus Sliepen , ++ Copyright (C) 2001-2016 Guus Sliepen , + 2001-2005 Ivo Timmermans + + This program is free software; you can redistribute it and/or modify +@@ -57,8 +57,10 @@ node_t *new_node(void) { + if(replaywin) n->late = xmalloc_and_zero(replaywin); + n->subnet_tree = new_subnet_tree(); + n->edge_tree = new_edge_tree(); +- EVP_CIPHER_CTX_init(&n->inctx); +- EVP_CIPHER_CTX_init(&n->outctx); ++ n->inctx = EVP_CIPHER_CTX_new(); ++ n->outctx = EVP_CIPHER_CTX_new(); ++ if(!n->inctx || !n->outctx) ++ abort(); + n->mtu = MTU; + n->maxmtu = MTU; + +@@ -80,8 +82,8 @@ void free_node(node_t *n) { + + sockaddrfree(&n->address); + +- EVP_CIPHER_CTX_cleanup(&n->inctx); +- EVP_CIPHER_CTX_cleanup(&n->outctx); ++ EVP_CIPHER_CTX_free(n->outctx); ++ EVP_CIPHER_CTX_free(n->inctx); + + if(n->mtuevent) + event_del(n->mtuevent); +@@ -172,8 +174,8 @@ void dump_nodes(void) { + for(node = node_tree->head; node; node = node->next) { + n = node->data; + logger(LOG_DEBUG, " %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s pmtu %d (min %d max %d)", +- n->name, n->hostname, n->outcipher ? n->outcipher->nid : 0, +- n->outdigest ? n->outdigest->type : 0, n->outmaclength, n->outcompression, ++ n->name, n->hostname, n->outcipher ? EVP_CIPHER_nid(n->outcipher) : 0, ++ n->outdigest ? EVP_MD_type(n->outdigest) : 0, n->outmaclength, n->outcompression, + n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-", + n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu); + } +diff --git a/src/node.h b/src/node.h +index f9ef3c15..c83610e8 100644 +--- a/src/node.h ++++ b/src/node.h +@@ -50,12 +50,12 @@ typedef struct node_t { + const EVP_CIPHER *incipher; /* Cipher type for UDP packets received from him */ + char *inkey; /* Cipher key and iv */ + int inkeylength; /* Cipher key and iv length */ +- EVP_CIPHER_CTX inctx; /* Cipher context */ ++ EVP_CIPHER_CTX *inctx; /* Cipher context */ + + const EVP_CIPHER *outcipher; /* Cipher type for UDP packets sent to him*/ + char *outkey; /* Cipher key and iv */ + int outkeylength; /* Cipher key and iv length */ +- EVP_CIPHER_CTX outctx; /* Cipher context */ ++ EVP_CIPHER_CTX *outctx; /* Cipher context */ + + const EVP_MD *indigest; /* Digest type for MAC of packets received from him */ + int inmaclength; /* Length of MAC */ +diff --git a/src/protocol_auth.c b/src/protocol_auth.c +index 971341f7..5834fcdf 100644 +--- a/src/protocol_auth.c ++++ b/src/protocol_auth.c +@@ -145,7 +145,7 @@ bool id_h(connection_t *c) { + + /* Check if identity is a valid name */ + +- if(!check_id(name)) { ++ if(!check_id(name) || !strcmp(name, myself->name)) { + logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ID", c->name, + c->hostname, "invalid name"); + return false; +@@ -177,6 +177,11 @@ bool id_h(connection_t *c) { + if(!c->config_tree) + init_configuration(&c->config_tree); + c->allow_request = ACK; ++ ++ if(!c->outgoing) { ++ send_id(c); ++ } ++ + return send_ack(c); + } + +@@ -196,6 +201,10 @@ bool id_h(connection_t *c) { + + c->allow_request = METAKEY; + ++ if(!c->outgoing) { ++ send_id(c); ++ } ++ + return send_metakey(c); + } + +@@ -210,8 +219,11 @@ bool send_metakey(connection_t *c) { + + c->outkey = xrealloc(c->outkey, len); + +- if(!c->outctx) +- c->outctx = xmalloc_and_zero(sizeof(*c->outctx)); ++ if(!c->outctx) { ++ c->outctx = EVP_CIPHER_CTX_new(); ++ if(!c->outctx) ++ abort(); ++ } + + /* Copy random data to the buffer */ + +@@ -262,17 +274,17 @@ bool send_metakey(connection_t *c) { + /* Send the meta key */ + + x = send_request(c, "%d %d %d %d %d %s", METAKEY, +- c->outcipher ? c->outcipher->nid : 0, +- c->outdigest ? c->outdigest->type : 0, c->outmaclength, ++ c->outcipher ? EVP_CIPHER_nid(c->outcipher) : 0, ++ c->outdigest ? EVP_MD_type(c->outdigest) : 0, c->outmaclength, + c->outcompression, buffer); + + /* Further outgoing requests are encrypted with the key we just generated */ + + if(c->outcipher) { + if(!EVP_EncryptInit(c->outctx, c->outcipher, +- (unsigned char *)c->outkey + len - c->outcipher->key_len, +- (unsigned char *)c->outkey + len - c->outcipher->key_len - +- c->outcipher->iv_len)) { ++ (unsigned char *)c->outkey + len - EVP_CIPHER_key_length(c->outcipher), ++ (unsigned char *)c->outkey + len - EVP_CIPHER_key_length(c->outcipher) - ++ EVP_CIPHER_iv_length(c->outcipher))) { + logger(LOG_ERR, "Error during initialisation of cipher for %s (%s): %s", + c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL)); + return false; +@@ -308,8 +320,11 @@ bool metakey_h(connection_t *c) { + + c->inkey = xrealloc(c->inkey, len); + +- if(!c->inctx) +- c->inctx = xmalloc_and_zero(sizeof(*c->inctx)); ++ if(!c->inctx) { ++ c->inctx = EVP_CIPHER_CTX_new(); ++ if(!c->inctx) ++ abort(); ++ } + + /* Convert the challenge from hexadecimal back to binary */ + +@@ -345,9 +360,9 @@ bool metakey_h(connection_t *c) { + } + + if(!EVP_DecryptInit(c->inctx, c->incipher, +- (unsigned char *)c->inkey + len - c->incipher->key_len, +- (unsigned char *)c->inkey + len - c->incipher->key_len - +- c->incipher->iv_len)) { ++ (unsigned char *)c->inkey + len - EVP_CIPHER_key_length(c->incipher), ++ (unsigned char *)c->inkey + len - EVP_CIPHER_key_length(c->incipher) - ++ EVP_CIPHER_iv_length(c->incipher))) { + logger(LOG_ERR, "Error during initialisation of cipher from %s (%s): %s", + c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL)); + return false; +@@ -355,7 +370,8 @@ bool metakey_h(connection_t *c) { + + c->status.decryptin = true; + } else { +- c->incipher = NULL; ++ logger(LOG_ERR, "%s (%s) uses null cipher!", c->name, c->hostname); ++ return false; + } + + c->inmaclength = maclength; +@@ -368,12 +384,13 @@ bool metakey_h(connection_t *c) { + return false; + } + +- if(c->inmaclength > c->indigest->md_size || c->inmaclength < 0) { ++ if(c->inmaclength > EVP_MD_size(c->indigest) || c->inmaclength < 0) { + logger(LOG_ERR, "%s (%s) uses bogus MAC length!", c->name, c->hostname); + return false; + } + } else { +- c->indigest = NULL; ++ logger(LOG_ERR, "%s (%s) uses null digest!", c->name, c->hostname); ++ return false; + } + + c->incompression = compression; +@@ -447,27 +464,38 @@ bool challenge_h(connection_t *c) { + + /* Rest is done by send_chal_reply() */ + +- return send_chal_reply(c); ++ if(c->outgoing) { ++ return send_chal_reply(c); ++ } else { ++ return true; ++ } + } + + bool send_chal_reply(connection_t *c) { + char hash[EVP_MAX_MD_SIZE * 2 + 1]; +- EVP_MD_CTX ctx; ++ EVP_MD_CTX *ctx; + + /* Calculate the hash from the challenge we received */ + +- if(!EVP_DigestInit(&ctx, c->indigest) +- || !EVP_DigestUpdate(&ctx, c->mychallenge, RSA_size(myself->connection->rsa_key)) +- || !EVP_DigestFinal(&ctx, (unsigned char *)hash, NULL)) { ++ ctx = EVP_MD_CTX_create(); ++ if(!ctx) ++ abort(); ++ ++ if(!EVP_DigestInit(ctx, c->indigest) ++ || !EVP_DigestUpdate(ctx, c->mychallenge, RSA_size(myself->connection->rsa_key)) ++ || !EVP_DigestFinal(ctx, (unsigned char *)hash, NULL)) { ++ EVP_MD_CTX_destroy(ctx); + logger(LOG_ERR, "Error during calculation of response for %s (%s): %s", + c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL)); + return false; + } + ++ EVP_MD_CTX_destroy(ctx); ++ + /* Convert the hash to a hexadecimal formatted string */ + +- bin2hex(hash, hash, c->indigest->md_size); +- hash[c->indigest->md_size * 2] = '\0'; ++ bin2hex(hash, hash, EVP_MD_size(c->indigest)); ++ hash[EVP_MD_size(c->indigest) * 2] = '\0'; + + /* Send the reply */ + +@@ -477,7 +505,7 @@ bool send_chal_reply(connection_t *c) { + bool chal_reply_h(connection_t *c) { + char hishash[MAX_STRING_SIZE]; + char myhash[EVP_MAX_MD_SIZE]; +- EVP_MD_CTX ctx; ++ EVP_MD_CTX *ctx; + + if(sscanf(c->buffer, "%*d " MAX_STRING, hishash) != 1) { + logger(LOG_ERR, "Got bad %s from %s (%s)", "CHAL_REPLY", c->name, +@@ -487,7 +515,7 @@ bool chal_reply_h(connection_t *c) { + + /* Check if the length of the hash is all right */ + +- if(strlen(hishash) != c->outdigest->md_size * 2) { ++ if(strlen(hishash) != EVP_MD_size(c->outdigest) * 2) { + logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, + c->hostname, "wrong challenge reply length"); + return false; +@@ -495,24 +523,31 @@ bool chal_reply_h(connection_t *c) { + + /* Convert the hash to binary format */ + +- if(!hex2bin(hishash, hishash, c->outdigest->md_size)) { ++ if(!hex2bin(hishash, hishash, EVP_MD_size(c->outdigest))) { + logger(LOG_ERR, "Got bad %s from %s(%s): %s", "CHAL_REPLY", c->name, c->hostname, "invalid hash"); + return false; + } + + /* Calculate the hash from the challenge we sent */ + +- if(!EVP_DigestInit(&ctx, c->outdigest) +- || !EVP_DigestUpdate(&ctx, c->hischallenge, RSA_size(c->rsa_key)) +- || !EVP_DigestFinal(&ctx, (unsigned char *)myhash, NULL)) { ++ ctx = EVP_MD_CTX_create(); ++ if(!ctx) ++ abort(); ++ ++ if(!EVP_DigestInit(ctx, c->outdigest) ++ || !EVP_DigestUpdate(ctx, c->hischallenge, RSA_size(c->rsa_key)) ++ || !EVP_DigestFinal(ctx, (unsigned char *)myhash, NULL)) { ++ EVP_MD_CTX_destroy(ctx); + logger(LOG_ERR, "Error during calculation of response from %s (%s): %s", + c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL)); + return false; + } + ++ EVP_MD_CTX_destroy(ctx); ++ + /* Verify the incoming hash with the calculated hash */ + +- if(memcmp(hishash, myhash, c->outdigest->md_size)) { ++ if(memcmp(hishash, myhash, EVP_MD_size(c->outdigest))) { + logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, + c->hostname, "wrong challenge reply"); + +@@ -531,6 +566,10 @@ bool chal_reply_h(connection_t *c) { + + c->allow_request = ACK; + ++ if(!c->outgoing) { ++ send_chal_reply(c); ++ } ++ + return send_ack(c); + } + +diff --git a/src/protocol_edge.c b/src/protocol_edge.c +index 3dfff05e..fa57494e 100644 +--- a/src/protocol_edge.c ++++ b/src/protocol_edge.c +@@ -70,7 +70,7 @@ bool add_edge_h(connection_t *c) { + + /* Check if names are valid */ + +- if(!check_id(from_name) || !check_id(to_name)) { ++ if(!check_id(from_name) || !check_id(to_name) || !strcmp(from_name, to_name)) { + logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name, + c->hostname, "invalid name"); + return false; +@@ -181,7 +181,7 @@ bool del_edge_h(connection_t *c) { + + /* Check if names are valid */ + +- if(!check_id(from_name) || !check_id(to_name)) { ++ if(!check_id(from_name) || !check_id(to_name) || !strcmp(from_name, to_name)) { + logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name, + c->hostname, "invalid name"); + return false; +diff --git a/src/protocol_key.c b/src/protocol_key.c +index 301ead5d..1b96597f 100644 +--- a/src/protocol_key.c ++++ b/src/protocol_key.c +@@ -164,7 +164,7 @@ bool send_ans_key(node_t *to) { + } + + if(to->incipher) +- EVP_DecryptInit_ex(&to->inctx, to->incipher, NULL, (unsigned char *)to->inkey, (unsigned char *)to->inkey + to->incipher->key_len); ++ EVP_DecryptInit_ex(to->inctx, to->incipher, NULL, (unsigned char *)to->inkey, (unsigned char *)to->inkey + EVP_CIPHER_key_length(to->incipher)); + + // Reset sequence number and late packet window + mykeyused = true; +@@ -178,8 +178,8 @@ bool send_ans_key(node_t *to) { + + return send_request(to->nexthop->connection, "%d %s %s %s %d %d %d %d", ANS_KEY, + myself->name, to->name, key, +- to->incipher ? to->incipher->nid : 0, +- to->indigest ? to->indigest->type : 0, to->inmaclength, ++ to->incipher ? EVP_CIPHER_nid(to->incipher) : 0, ++ to->indigest ? EVP_MD_type(to->indigest) : 0, to->inmaclength, + to->incompression); + } + +@@ -268,12 +268,17 @@ bool ans_key_h(connection_t *c) { + return true; + } + +- if(from->outkeylength != from->outcipher->key_len + from->outcipher->iv_len) { ++ if(from->outkeylength != EVP_CIPHER_key_length(from->outcipher) + EVP_CIPHER_iv_length(from->outcipher)) { + logger(LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, + from->hostname); + return true; + } + } else { ++ if(from->outkeylength != 1) { ++ logger(LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname); ++ return true; ++ } ++ + from->outcipher = NULL; + } + +@@ -288,7 +293,7 @@ bool ans_key_h(connection_t *c) { + return true; + } + +- if(from->outmaclength > from->outdigest->md_size || from->outmaclength < 0) { ++ if(from->outmaclength > EVP_MD_size(from->outdigest) || from->outmaclength < 0) { + logger(LOG_ERR, "Node %s (%s) uses bogus MAC length!", + from->name, from->hostname); + return true; +@@ -305,7 +310,7 @@ bool ans_key_h(connection_t *c) { + from->outcompression = compression; + + if(from->outcipher) +- if(!EVP_EncryptInit_ex(&from->outctx, from->outcipher, NULL, (unsigned char *)from->outkey, (unsigned char *)from->outkey + from->outcipher->key_len)) { ++ if(!EVP_EncryptInit_ex(from->outctx, from->outcipher, NULL, (unsigned char *)from->outkey, (unsigned char *)from->outkey + EVP_CIPHER_key_length(from->outcipher))) { + logger(LOG_ERR, "Error during initialisation of key from %s (%s): %s", + from->name, from->hostname, ERR_error_string(ERR_get_error(), NULL)); + return true; +diff --git a/src/tincd.c b/src/tincd.c +index b6a6c29c..19f2e174 100644 +--- a/src/tincd.c ++++ b/src/tincd.c +@@ -330,7 +330,7 @@ static bool parse_options(int argc, char **argv) { + + /* This function prettyprints the key generation process */ + +-static void indicator(int a, int b, void *p) { ++static int indicator(int a, int b, BN_GENCB *cb) { + switch (a) { + case 0: + fprintf(stderr, "."); +@@ -362,19 +362,48 @@ static void indicator(int a, int b, void *p) { + default: + fprintf(stderr, "?"); + } ++ ++ return 1; ++} ++ ++#ifndef HAVE_BN_GENCB_NEW ++BN_GENCB *BN_GENCB_new(void) { ++ return xmalloc_and_zero(sizeof(BN_GENCB)); + } + ++void BN_GENCB_free(BN_GENCB *cb) { ++ free(cb); ++} ++#endif ++ + /* + Generate a public/private RSA keypair, and ask for a file to store + them in. + */ + static bool keygen(int bits) { ++ BIGNUM *e = NULL; + RSA *rsa_key; + FILE *f; + char *pubname, *privname; ++ BN_GENCB *cb; ++ int result; + + fprintf(stderr, "Generating %d bits keys:\n", bits); +- rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL); ++ ++ cb = BN_GENCB_new(); ++ if(!cb) ++ abort(); ++ BN_GENCB_set(cb, indicator, NULL); ++ ++ rsa_key = RSA_new(); ++ BN_hex2bn(&e, "10001"); ++ if(!rsa_key || !e) ++ abort(); ++ ++ result = RSA_generate_key_ex(rsa_key, bits, e, cb); ++ ++ BN_free(e); ++ BN_GENCB_free(cb); + + if(!rsa_key) { + fprintf(stderr, "Error during key generation!\n"); +@@ -697,7 +726,11 @@ end: + EVP_cleanup(); + ENGINE_cleanup(); + CRYPTO_cleanup_all_ex_data(); ++#ifdef HAVE_ERR_REMOVE_STATE ++ // OpenSSL claims this function was deprecated in 1.0.0, ++ // but valgrind's leak detector shows you still need to call it to make sure OpenSSL cleans up properly. + ERR_remove_state(0); ++#endif + ERR_free_strings(); + + exit_configuration(&config_tree); diff --git a/debian/patches/series b/debian/patches/series index e69de29..a9c233b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +security-fixes From a83439b02309fda41edd77a804ca79b96025b439 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 10 Apr 2016 12:45:33 +0200 Subject: [PATCH 25/31] Import Debian changes 1.0.27-2 tinc (1.0.27-2) unstable; urgency=medium * Fix tinc@.service. --- debian/changelog | 6 ++++++ debian/tinc@.service | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c2041c..ab12224 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tinc (1.0.27-2) unstable; urgency=medium + + * Fix tinc@.service. + + -- Guus Sliepen Sun, 10 Apr 2016 12:45:33 +0200 + tinc (1.0.27-1) unstable; urgency=medium * New upstream release. diff --git a/debian/tinc@.service b/debian/tinc@.service index de5c1b1..4bb4d2d 100644 --- a/debian/tinc@.service +++ b/debian/tinc@.service @@ -6,9 +6,9 @@ ReloadPropagatedFrom=tinc.service [Service] Type=simple WorkingDirectory=/etc/tinc/%i -ExecStart=/usr/sbin/tinc -n %i start -D -ExecReload=/usr/sbin/tinc -n %i reload -ExecStop=/usr/sbin/tinc -n %i stop +ExecStart=/usr/sbin/tincd -n %i -D +ExecReload=/usr/sbin/tincd -n %i -kHUP +ExecStop=/usr/sbin/tincd -n %i -k TimeoutStopSec=5 Restart=always RestartSec=60 From e537caa7b10f95f0942b9b0b24c3cdcd33ee85fd Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 10 Apr 2016 15:44:28 +0200 Subject: [PATCH 26/31] Import Debian changes 1.0.28-1 tinc (1.0.28-1) unstable; urgency=medium * New upstream release. - Fixes FTBFS on kfreebsd. * Systemd service files are now provided by upstream. --- debian/changelog | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 40b559a..b8c3075 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -tinc (1.0.28-1~bpo8+1) jessie-backports; urgency=medium - - * Rebuild for jessie-backports. - - -- Aron Xu Mon, 18 Jul 2016 20:55:54 +0800 - tinc (1.0.28-1) unstable; urgency=medium * New upstream release. From dcd38ec07d5f1a046d6536e6dc2daff50e2a6c2b Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Thu, 27 Oct 2016 13:09:46 +0200 Subject: [PATCH 27/31] Import Debian changes 1.0.29-2 tinc (1.0.29-2) unstable; urgency=medium * Rebuild with libssl-dev from unstable. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a801b66..9927ebe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tinc (1.0.29-2) unstable; urgency=medium + + * Rebuild with libssl-dev from unstable. + + -- Guus Sliepen Thu, 27 Oct 2016 13:09:46 +0200 + tinc (1.0.29-1) unstable; urgency=medium * New upstream release. From 29893227461c119dcba5117997a1dbce8aa3fb71 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 22 Sep 2018 17:35:50 +0200 Subject: [PATCH 28/31] Import Debian changes 1.0.31-1+deb9u1 tinc (1.0.31-1+deb9u1) stretch-security; urgency=high * Prevent oracle attacks (CVE-2018-16737, CVE-2018-16738). * Prevent a MITM from forcing a NULL cipher for UDP (CVE-2018-16758). --- debian/changelog | 7 + debian/patches/security-fixes | 234 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 242 insertions(+) create mode 100644 debian/patches/security-fixes diff --git a/debian/changelog b/debian/changelog index 93529d1..9cb7818 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tinc (1.0.31-1+deb9u1) stretch-security; urgency=high + + * Prevent oracle attacks (CVE-2018-16737, CVE-2018-16738). + * Prevent a MITM from forcing a NULL cipher for UDP (CVE-2018-16758). + + -- Guus Sliepen Sat, 22 Sep 2018 17:35:50 +0200 + tinc (1.0.31-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/security-fixes b/debian/patches/security-fixes new file mode 100644 index 0000000..99d07b7 --- /dev/null +++ b/debian/patches/security-fixes @@ -0,0 +1,234 @@ +--- a/src/connection.h ++++ b/src/connection.h +@@ -42,7 +42,8 @@ + unsigned int decryptin:1; /* 1 if we have to decrypt incoming traffic */ + unsigned int mst:1; /* 1 if this connection is part of a minimum spanning tree */ + unsigned int proxy_passed:1; /* 1 if we are connecting via a proxy and we have finished talking with it */ +- unsigned int unused:22; ++ unsigned int tarpit:1; /* 1 if the connection should be added to the tarpit */ ++ unsigned int unused:21; + } connection_status_t; + + #include "edge.h" +--- a/src/net.c ++++ b/src/net.c +@@ -158,6 +158,22 @@ + return max; + } + ++/* Put a misbehaving connection in the tarpit */ ++void tarpit(int fd) { ++ static int pits[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; ++ static int next_pit = 0; ++ ++ if(pits[next_pit] != -1) { ++ closesocket(pits[next_pit]); ++ } ++ ++ pits[next_pit++] = fd; ++ ++ if(next_pit >= sizeof pits / sizeof pits[0]) { ++ next_pit = 0; ++ } ++} ++ + /* + Terminate a connection: + - Close the socket +@@ -178,8 +194,13 @@ + if(c->node) + c->node->connection = NULL; + +- if(c->socket) +- closesocket(c->socket); ++ if(c->socket) { ++ if(c->status.tarpit) { ++ tarpit(c->socket); ++ } else { ++ closesocket(c->socket); ++ } ++ } + + if(c->edge) { + if(!c->node) { +@@ -266,6 +287,7 @@ + closesocket(c->socket); + do_outgoing_connection(c); + } else { ++ c->status.tarpit = true; + terminate_connection(c, false); + } + } +@@ -345,6 +367,7 @@ + + if(FD_ISSET(c->socket, readset)) { + if(!receive_meta(c)) { ++ c->status.tarpit = true; + terminate_connection(c, c->status.active); + continue; + } +--- a/src/net.h ++++ b/src/net.h +@@ -150,6 +150,7 @@ + extern bool read_rsa_public_key(struct connection_t *); + extern void send_mtu_probe(struct node_t *); + extern void load_all_subnets(void); ++extern void tarpit(int fd); + + #ifndef HAVE_MINGW + #define closesocket(s) close(s) +--- a/src/net_socket.c ++++ b/src/net_socket.c +@@ -552,6 +552,9 @@ + new connection + */ + bool handle_new_meta_connection(int sock) { ++ static const int max_accept_burst = 10; ++ static int last_accept_burst; ++ static int last_accept_time; + connection_t *c; + sockaddr_t sa; + int fd; +@@ -564,6 +567,22 @@ + return false; + } + ++ if(last_accept_time == now) { ++ last_accept_burst++; ++ ++ if(last_accept_burst >= max_accept_burst) { ++ if(last_accept_burst == max_accept_burst) { ++ ifdebug(CONNECTIONS) logger(LOG_WARNING, "Throttling incoming connections"); ++ } ++ ++ tarpit(fd); ++ return false; ++ } ++ } else { ++ last_accept_burst = 0; ++ last_accept_time = now; ++ } ++ + sockaddrunmap(&sa); + + c = new_connection(); +@@ -585,7 +604,6 @@ + connection_add(c); + + c->allow_request = ID; +- send_id(c); + + return true; + } +--- a/src/protocol_auth.c ++++ b/src/protocol_auth.c +@@ -59,7 +59,7 @@ + + /* Check if identity is a valid name */ + +- if(!check_id(name)) { ++ if(!check_id(name) || !strcmp(name, myself->name)) { + logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ID", c->name, + c->hostname, "invalid name"); + return false; +@@ -91,6 +91,11 @@ + if(!c->config_tree) + init_configuration(&c->config_tree); + c->allow_request = ACK; ++ ++ if(!c->outgoing) { ++ send_id(c); ++ } ++ + return send_ack(c); + } + +@@ -110,6 +115,10 @@ + + c->allow_request = METAKEY; + ++ if(!c->outgoing) { ++ send_id(c); ++ } ++ + return send_metakey(c); + } + +@@ -292,7 +301,8 @@ + c->inbudget = byte_budget(c->incipher); + c->status.decryptin = true; + } else { +- c->incipher = NULL; ++ logger(LOG_ERR, "%s (%s) uses null cipher!", c->name, c->hostname); ++ return false; + } + + c->inmaclength = maclength; +@@ -310,7 +320,8 @@ + return false; + } + } else { +- c->indigest = NULL; ++ logger(LOG_ERR, "%s (%s) uses null digest!", c->name, c->hostname); ++ return false; + } + + c->incompression = compression; +@@ -384,7 +395,11 @@ + + /* Rest is done by send_chal_reply() */ + +- return send_chal_reply(c); ++ if(c->outgoing) { ++ return send_chal_reply(c); ++ } else { ++ return true; ++ } + } + + bool send_chal_reply(connection_t *c) { +@@ -482,6 +497,10 @@ + + c->allow_request = ACK; + ++ if(!c->outgoing) { ++ send_chal_reply(c); ++ } ++ + return send_ack(c); + } + +--- a/src/protocol_edge.c ++++ b/src/protocol_edge.c +@@ -70,7 +70,7 @@ + + /* Check if names are valid */ + +- if(!check_id(from_name) || !check_id(to_name)) { ++ if(!check_id(from_name) || !check_id(to_name) || !strcmp(from_name, to_name)) { + logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name, + c->hostname, "invalid name"); + return false; +@@ -192,7 +192,7 @@ + + /* Check if names are valid */ + +- if(!check_id(from_name) || !check_id(to_name)) { ++ if(!check_id(from_name) || !check_id(to_name) || !strcmp(from_name, to_name)) { + logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name, + c->hostname, "invalid name"); + return false; +--- a/src/protocol_key.c ++++ b/src/protocol_key.c +@@ -274,6 +274,11 @@ + return true; + } + } else { ++ if(from->outkeylength != 1) { ++ logger(LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname); ++ return true; ++ } ++ + from->outcipher = NULL; + } + diff --git a/debian/patches/series b/debian/patches/series index e69de29..a9c233b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +security-fixes From 36f0d3c81620a7130ea216f8e8f79162f86b311d Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 28 Jan 2019 21:54:45 +0100 Subject: [PATCH 29/31] Import Debian changes 1.0.35-2 tinc (1.0.35-2) unstable; urgency=medium * Bump Standards-Version and Build-Depend on debhelper-compat (= 12). * Remove calls to dh_installinit and dh_systemd_start from debian/rules, compat level 12 does the right thing by default. * Ensure we clean up doc/tinc.info. --- debian/changelog | 9 +++++++++ debian/compat | 1 - debian/control | 5 +++-- debian/rules | 10 ++++------ 4 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 3e20884..a98443c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +tinc (1.0.35-2) unstable; urgency=medium + + * Bump Standards-Version and Build-Depend on debhelper-compat (= 12). + * Remove calls to dh_installinit and dh_systemd_start from debian/rules, + compat level 12 does the right thing by default. + * Ensure we clean up doc/tinc.info. + + -- Guus Sliepen Mon, 28 Jan 2019 21:54:45 +0100 + tinc (1.0.35-1) unstable; urgency=medium * New upstream release. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 839702d..3efe26a 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,14 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen -Standards-Version: 4.1.3 -Build-Depends: libssl-dev, debhelper (>= 10), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev +Standards-Version: 4.3.0 +Build-Depends: libssl-dev, debhelper-compat (= 12), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev Homepage: http://www.tinc-vpn.org/ Rules-Requires-Root: no Package: tinc Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6) Description: Virtual Private Network daemon tinc is a daemon with which you can create a virtual private network diff --git a/debian/rules b/debian/rules index 814050a..43828fa 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,10 @@ %: dh $@ +override_dh_clean: + dh_clean + rm -f doc/tinc.info + override_dh_auto_configure: dh_auto_configure -- --enable-uml --enable-vde --with-systemd=/lib/systemd/system --runstatedir=/run @@ -10,9 +14,3 @@ 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 From 446afddf389b62152c6c002f77d297d1da5e4381 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Sun, 7 Aug 2011 17:32:39 +0400 Subject: [PATCH 30/31] Import Debian changes 1.1~pre2-2 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 --- debian/changelog | 8 ++++++++ debian/control | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6727d50..b9c1c97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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. diff --git a/debian/control b/debian/control index 9f9999a..67653f7 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Guus Sliepen Standards-Version: 3.9.2 -Build-Depends: libssl-dev (>>1.0.0), debhelper (>= 7.0.50~), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev +Build-Depends: libssl-dev (>>1.0.0), debhelper (>= 7.0.50~), texi2html, texinfo, zlib1g-dev, liblzo2-dev, libncurses5-dev, libevent-dev Homepage: http://www.tinc-vpn.org/ Package: tinc From 5c54f47af6686b42fe41376b10854988b6365147 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Wed, 1 May 2013 10:41:31 +0200 Subject: [PATCH 31/31] Import Debian changes 1.1~pre7-2 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 --- debian/changelog | 17 ++++++++++++++++- debian/tinc.if-post-down | 6 +++++- debian/tinc.if-pre-up | 15 +++++++++++++++ debian/tinc.init | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a37f605..04844cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +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. @@ -13,7 +28,7 @@ tinc (1.1~pre6-1) experimental; urgency=low tinc (1.1~pre4-1) experimental; urgency=low - [ Gian Piero ] + [ Gian Piero Carrubba ] * Allow resource limits to be set in /etc/default/tinc. Closes: #690685 [ Guus Sliepen ] diff --git a/debian/tinc.if-post-down b/debian/tinc.if-post-down index ed1a22f..3c677ca 100755 --- a/debian/tinc.if-post-down +++ b/debian/tinc.if-post-down @@ -6,7 +6,11 @@ if [ "$IF_TINC_NET" ] ; then tinc -n "$IF_TINC_NET" stop sleep 0.1 i=0; - while [ -f "/var/run/tinc.$IF_TINC_NET.pid" ] ; do + while read pid rest < /var/run/tinc.$IF_TINC_NET.pid ; do + if [ ! -e "/proc/$pid" ] ; then + exit 0 + fi + if [ $i = '30' ] ; then echo 'Failed to stop tinc daemon!' exit 1 diff --git a/debian/tinc.if-pre-up b/debian/tinc.if-pre-up index e0e5a45..6ae85bc 100755 --- a/debian/tinc.if-pre-up +++ b/debian/tinc.if-pre-up @@ -8,6 +8,21 @@ set -e . /etc/default/tinc +# 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 [ -n "$IF_TINC_CONFIG" ] && EXTRA="$EXTRA -c $IF_TINC_CONFIG" diff --git a/debian/tinc.init b/debian/tinc.init index e2091ea..ed354cb 100644 --- a/debian/tinc.init +++ b/debian/tinc.init @@ -41,7 +41,7 @@ foreach_net() { egrep '^[ ]*[a-zA-Z0-9_-]+' $NETSFILE | while read net args; do echo -n " $net" case "$1" in - start) $CONTROL -n $net start -- $EXTRA $args ;; + start|restart) $CONTROL -n $net $1 $EXTRA $args ;; *) $CONTROL -n $net $1 ;; esac done