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.
This commit is contained in:
parent
06acdce080
commit
cc0493ea17
5 changed files with 25 additions and 6 deletions
15
debian/changelog
vendored
15
debian/changelog
vendored
|
@ -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 <mjt@tls.msk.ru> 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 <guus@debian.org> Tue, 26 Jun 2012 18:28:34 +0200
|
||||
|
||||
tinc (1.0.19-1) unstable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
|
3
debian/control
vendored
3
debian/control
vendored
|
@ -2,8 +2,9 @@ Source: tinc
|
|||
Section: net
|
||||
Priority: optional
|
||||
Maintainer: Guus Sliepen <guus@debian.org>
|
||||
Uploaders: Michael Tokarev <mjt@tls.msk.ru>
|
||||
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
|
||||
|
|
2
debian/rules
vendored
2
debian/rules
vendored
|
@ -10,7 +10,7 @@
|
|||
#export DH_VERBOSE=1
|
||||
|
||||
%:
|
||||
dh $@
|
||||
dh $@ --parallel
|
||||
|
||||
override_dh_auto_configure:
|
||||
dh_auto_configure -- --enable-uml --enable-vde
|
||||
|
|
6
debian/tinc.if-post-down
vendored
6
debian/tinc.if-post-down
vendored
|
@ -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
|
||||
|
|
5
debian/tinc.if-pre-up
vendored
5
debian/tinc.if-pre-up
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue