The two one-liner patches below are made against the current tinc CVS
tree. The debian/rules patch replaces the prefix=blah on the "make
install"
line with DESTDIR=blah. The prefix is correctly set for /usr, but is
overridden with the current make install. DESTDIR is the clean way to
relocate the installation into the debian/tmp build dir.
The second patch strips the newline off $VPNMASK in the init.d script.
The perl system() call sees the ifconfig call as two separate commands.
--- tinc/debian/rules Sun May 21 18:40:41 2000
+++ tinc.new/debian/rules Sun Aug 20 16:16:50 2000
@@ -32,7 +32,7 @@
dh_clean -k
dh_installdirs
- $(MAKE) install prefix=`pwd`/debian/tmp/usr
+ $(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
ln -s /usr/share/doc/tinc/README.Debian
`pwd`/debian/tmp/etc/tinc/example/README
--- tinc/debian/init.d Fri Jul 14 22:19:33 2000
+++ tinc.new/debian/init.d Sun Aug 20 16:35:04 2000
@@ -68,6 +68,7 @@
chomp($VPN);
} elsif ( /^[ ]*VpnMask[ =]+([^ \#]+)/i ) {
$VPNMASK=$1;
+ chomp($VPNMASK);
}
}
if(!defined($DEV)) {
--
ljlane@debian.org
-
Tinc: Discussion list about the tinc VPN daemon
Archive: http://mail.nl.linux.org/lists/
Tinc site: http://ftp.nl.linux.org/pub/linux/tinc/