Import Debian changes 1.1~pre14-16-g15b868e-1

tinc (1.1~pre14-16-g15b868e-1) experimental; urgency=medium

  * New upstream release.
    - Use the latest git version in order to compile with OpenSSL 1.1.0.
  * Bump debian/compat and Standards-Version.
  * Fix the version number in configure.ac.
  * Make the build reproducible.

debian/changelog

@@ -1,3 +1,13 @@
+tinc (1.1~pre14-16-g15b868e-1) experimental; urgency=medium
+
+  * New upstream release.
+    - Use the latest git version in order to compile with OpenSSL 1.1.0.
+  * Bump debian/compat and Standards-Version.
+  * Fix the version number in configure.ac.
+  * Make the build reproducible.
+
+ -- Guus Sliepen <guus@debian.org>  Mon, 26 Sep 2016 21:35:35 +0200
+
 tinc (1.1~pre12-1) experimental; urgency=medium
 
   * New upstream release.

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -2,7 +2,7 @@ Source: tinc
 Section: net
 Priority: optional
 Maintainer: Guus Sliepen <guus@debian.org>
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Build-Depends: libssl-dev (>>1.0.0), debhelper (>= 9), texinfo, zlib1g-dev, liblzo2-dev, libncurses5-dev, libreadline-dev, libvdeplug-dev, python | python-all | python-dev | python-all-dev, dh-python
 Homepage: https://www.tinc-vpn.org/
 

debian/patches/fix-version-number

@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ(2.61)
+-AC_INIT([tinc], m4_esyscmd_s((git describe || echo UNKNOWN) | sed 's/release-//'))
++AC_INIT([tinc], m4_esyscmd_s((git describe || echo 1.1pre14-16-g15b868e) | sed 's/release-//'))
+ AC_CONFIG_SRCDIR([src/tincd.c])
+ AC_GNU_SOURCE
+ AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall])

debian/patches/reproducible-build

@@ -0,0 +1,50 @@
+--- a/src/process.c
++++ b/src/process.c
+@@ -219,8 +219,8 @@
+ 
+ 	openlogger(identname, logmode);
+ 
+-	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
+-			   BUILD_VERSION, BUILD_DATE, BUILD_TIME, debug_level);
++	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s starting, debug level %d",
++			   BUILD_VERSION, debug_level);
+ 
+ 	return true;
+ }
+--- a/src/tincctl.c
++++ b/src/tincctl.c
+@@ -87,8 +87,8 @@
+ };
+ 
+ static void version(void) {
+-	printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
+-		   BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
++	printf("%s version %s (protocol %d.%d)\n", PACKAGE,
++		   BUILD_VERSION, PROT_MAJOR, PROT_MINOR);
+ 	printf("Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.\n"
+ 			"See the AUTHORS file for a complete list.\n\n"
+ 			"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
+--- a/src/tincd.c
++++ b/src/tincd.c
+@@ -344,8 +344,8 @@
+ 	chdir(confbase);
+ 
+ 	if(show_version) {
+-		printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
+-			   BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
++		printf("%s version %s (protocol %d.%d)\n", PACKAGE,
++			   BUILD_VERSION, PROT_MAJOR, PROT_MINOR);
+ 		printf("Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.\n"
+ 				"See the AUTHORS file for a complete list.\n\n"
+ 				"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
+--- a/src/version.c
++++ b/src/version.c
+@@ -22,8 +22,6 @@
+ #include "../config.h"
+ 
+ /* This file is always rebuilt (even if there are no changes) so that the following is updated */
+-const char* const BUILD_DATE = __DATE__;
+-const char* const BUILD_TIME = __TIME__;
+ #ifdef GIT_DESCRIPTION
+ const char* const BUILD_VERSION = GIT_DESCRIPTION;
+ #else

debian/patches/series

@@ -0,0 +1,2 @@
+fix-version-number
+reproducible-build

debian/rules

@@ -15,7 +15,7 @@
 	dh $@ --parallel --with python2
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-uml --enable-vde
+	dh_auto_configure -- --enable-uml --enable-vde --with-systemd
 	$(MAKE) clean
 
 override_dh_auto_install:

debian/tinc.install

@@ -5,4 +5,4 @@ usr/share/man/man5
 usr/share/man/man8/tincd.*
 usr/share/man/man8/tinc.*
 usr/share/info
-debian/*.service /lib/systemd/system/
+lib/systemd/system

debian/tinc.service

@@ -1,16 +0,0 @@
-# This is a mostly empty service, but allows commands like stop, start, reload
-# to propagate to all tinc@ service instances.
-
-[Unit]
-Description=Tinc VPN
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/true
-ExecReload=/bin/true
-WorkingDirectory=/etc/tinc
-
-[Install]
-WantedBy=multi-user.target

debian/tinc@.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=Tinc net %i
-PartOf=tinc.service
-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
-TimeoutStopSec=5
-Restart=always
-RestartSec=60
-
-[Install]
-WantedBy=tinc.service