Import Debian changes 1.1~pre15-1
tinc (1.1~pre15-1) experimental; urgency=medium
* New upstream release.
* Bump Standards-Version.
* Bump debian/compat.
* Don't use while loops checking PID files anymore, the tinc CLI will
wait properly for the daemon to start or stop. Closes: #772379, #832784
* Clean up scripts as suggested by Dominik George. Closes: #832781
* Test for /etc/default/tinc before trying to source it. Closes: #777262
This commit is contained in:
Guus Sliepen
commit
46616ac501
94 changed files with 1727 additions and 1084 deletions
14
debian/changelog
vendored
14
debian/changelog
vendored
|
|
@ -1,12 +1,14 @@
|
|||
tinc (1.1~pre14-16-g15b868e-1) experimental; urgency=medium
|
||||
tinc (1.1~pre15-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.
|
||||
* Bump Standards-Version.
|
||||
* Bump debian/compat.
|
||||
* Don't use while loops checking PID files anymore, the tinc CLI will
|
||||
wait properly for the daemon to start or stop. Closes: #772379, #832784
|
||||
* Clean up scripts as suggested by Dominik George. Closes: #832781
|
||||
* Test for /etc/default/tinc before trying to source it. Closes: #777262
|
||||
|
||||
-- Guus Sliepen <guus@debian.org> Mon, 26 Sep 2016 21:35:35 +0200
|
||||
-- Guus Sliepen <guus@debian.org> Tue, 05 Sep 2017 21:03:51 +0200
|
||||
|
||||
tinc (1.1~pre12-1) experimental; urgency=medium
|
||||
|
||||
|
|
|
|||
4
debian/control
vendored
4
debian/control
vendored
|
|
@ -2,8 +2,8 @@ Source: tinc
|
|||
Section: net
|
||||
Priority: optional
|
||||
Maintainer: Guus Sliepen <guus@debian.org>
|
||||
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
|
||||
Standards-Version: 4.0.0
|
||||
Build-Depends: libssl-dev (>>1.0.0), debhelper (>= 10), texinfo, zlib1g-dev, liblzo2-dev, libncurses5-dev, libreadline-dev, libvdeplug-dev, python | python-all | python-dev | python-all-dev, dh-python
|
||||
Homepage: https://www.tinc-vpn.org/
|
||||
|
||||
Package: tinc
|
||||
|
|
|
|||
2
debian/patches/fix-version-number
vendored
2
debian/patches/fix-version-number
vendored
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
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_INIT([tinc], [1.1~pre15])
|
||||
AC_CONFIG_SRCDIR([src/tincd.c])
|
||||
AC_GNU_SOURCE
|
||||
AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall])
|
||||
|
|
|
|||
50
debian/patches/reproducible-build
vendored
50
debian/patches/reproducible-build
vendored
|
|
@ -1,50 +0,0 @@
|
|||
--- 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
|
||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
|
@ -1,2 +1 @@
|
|||
fix-version-number
|
||||
reproducible-build
|
||||
|
|
|
|||
13
debian/rules
vendored
13
debian/rules
vendored
|
|
@ -1,21 +1,10 @@
|
|||
#!/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.
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
#include /usr/share/dpkg/buildflags.mk
|
||||
|
||||
%:
|
||||
dh $@ --parallel --with python2
|
||||
|
||||
override_dh_auto_configure:
|
||||
dh_auto_configure -- --enable-uml --enable-vde --with-systemd
|
||||
dh_auto_configure -- --enable-vde --with-systemd
|
||||
$(MAKE) clean
|
||||
|
||||
override_dh_auto_install:
|
||||
|
|
|
|||
22
debian/tinc.if-post-down
vendored
22
debian/tinc.if-post-down
vendored
|
|
@ -2,22 +2,12 @@
|
|||
|
||||
set -e
|
||||
|
||||
if [ "$IF_TINC_NET" ] ; then
|
||||
tinc -n "$IF_TINC_NET" stop
|
||||
sleep 0.1
|
||||
i=0;
|
||||
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
|
||||
fi
|
||||
sleep 0.1
|
||||
i=$(($i+1))
|
||||
done
|
||||
test "$METHOD" != loopback -a -n "$IF_TINC_NET" || exit 0
|
||||
|
||||
if test -z "$IF_TINC_PIDFILE"; then
|
||||
/usr/sbin/tinc -n "$IF_TINC_NET" stop $EXTRA
|
||||
else
|
||||
/usr/sbin/tinc -n "$IF_TINC_NET" --pidfile="$IF_TINC_PIDFILE" stop
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
38
debian/tinc.if-pre-up
vendored
38
debian/tinc.if-pre-up
vendored
|
|
@ -2,11 +2,13 @@
|
|||
|
||||
set -e
|
||||
|
||||
[ -z "$IF_TINC_NET" ] && exit 0
|
||||
test -n "$IF_TINC_NET" || exit 0
|
||||
|
||||
# Read options from /etc/default
|
||||
|
||||
. /etc/default/tinc
|
||||
if test -e /etc/default/tinc; then
|
||||
. /etc/default/tinc
|
||||
fi
|
||||
|
||||
# Set process limits
|
||||
|
||||
|
|
@ -25,28 +27,20 @@ test -n "$LIMITS" && setlimits $LIMITS
|
|||
|
||||
# Read options from /etc/network/interfaces
|
||||
|
||||
[ -n "$IF_TINC_CONFIG" ] && EXTRA="$EXTRA -c $IF_TINC_CONFIG"
|
||||
[ -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_CHROOT" ] && EXTRA="$EXTRA --chroot"
|
||||
[ -n "$IF_TINC_USER" ] && EXTRA="$EXTRA --user=$IF_TINC_USER"
|
||||
test -z "$IF_TINC_CONFIG" || EXTRA="$EXTRA -c $IF_TINC_CONFIG"
|
||||
test -z "$IF_TINC_DEBUG" || EXTRA="$EXTRA -d$IF_TINC_DEBUG"
|
||||
test -z "$IF_TINC_MLOCK" || EXTRA="$EXTRA --mlock"
|
||||
test -z "$IF_TINC_LOGFILE" || EXTRA="$EXTRA --logfile=$IF_TINC_LOGFILE"
|
||||
test -z "$IF_TINC_PIDFILE" || EXTRA="$EXTRA --pidfile=$IF_TINC_PIDFILE" || IF_TINC_PIDFILE=/var/run/tinc.$IF_TINC_NET.pid
|
||||
test -z "$IF_TINC_CHROOT" || EXTRA="$EXTRA --chroot"
|
||||
test -z "$IF_TINC_USER" || EXTRA="$EXTRA --user=$IF_TINC_USER"
|
||||
|
||||
# Start tinc daemon
|
||||
|
||||
/usr/sbin/tincd -n "$IF_TINC_NET" -o "Interface=$IFACE" $EXTRA
|
||||
|
||||
# Wait for it to come up properly
|
||||
|
||||
sleep 0.1
|
||||
i=0;
|
||||
while [ ! -f "/var/run/tinc.$IF_TINC_NET.pid" ] ; do
|
||||
if [ $i = '30' ] ; then
|
||||
echo 'Failed to start tinc daemon!'
|
||||
exit 1
|
||||
fi
|
||||
sleep 0.1
|
||||
i=$(($i+1))
|
||||
done
|
||||
if test -z "$IF_TINC_PIDFILE"; then
|
||||
/usr/sbin/tinc -n "$IF_TINC_NET" start -o "Interface=$IFACE" $EXTRA
|
||||
else
|
||||
/usr/sbin/tinc -n "$IF_TINC_NET" --pidfile="$IF_TINC_PIDFILE" start -o "Interface=$IFACE" $EXTRA
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
9
debian/tinc.if-up
vendored
9
debian/tinc.if-up
vendored
|
|
@ -2,7 +2,10 @@
|
|||
|
||||
set -e
|
||||
|
||||
[ "$METHOD" = loopback ] && exit 0
|
||||
[ -n "$IF_TINC_NET" ] && exit 0
|
||||
test "$METHOD" != loopback -a -n "$IF_TINC_NET" || exit 0
|
||||
|
||||
invoke-rc.d tinc retry
|
||||
if test -z "$IF_TINC_PIDFILE"; then
|
||||
/usr/sbin/tinc -n "$IF_TINC_NET" retry
|
||||
else
|
||||
/usr/sbin/tinc -n "$IF_TINC_NET" --pidfile="$IF_TINC_PIDFILE" retry
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue