From: Darshaka Pathirana Date: Sun, 19 Jan 2020 16:35:47 +0000 (+0100) Subject: Merge tag 'upstream/0.3.8' X-Git-Url: https://git.syn-net.org/debian/?p=anytun.git;a=commitdiff_plain;h=135b1e960735394a0f379760ba11aff7da8112fd;hp=f727d6d02cd5ea649a4f4895e015622060e45078 Merge tag 'upstream/0.3.8' Upstream version 0.3.8 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc diff --git a/debian/anytun.default b/debian/anytun.default new file mode 100644 index 0000000..4457805 --- /dev/null +++ b/debian/anytun.default @@ -0,0 +1,5 @@ +# Defaults for anytun initscript +# sourced by /etc/init.d/anytun + +# Additional options that are passed to the Daemon. +DAEMONOPTS="--username anytun" diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..c43b1e5 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,130 @@ +anytun (0.3.7-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with boost 1.67. + + -- Dimitri John Ledkov Sat, 28 Jul 2018 01:29:20 +0100 + +anytun (0.3.7-1) unstable; urgency=medium + + * [6294e1d] New upstream version 0.3.7 + - Fix FTBFS with GCC-8 (Closes: #897704) + * [627ba33] Fix spelling errors in man page + * [cb2ecde] Update Debian copyright file + * [74b165b] Bump Debian Standards-Version to 4.1.5 + * [9e924f4] Update debian/rules file + * [635dc05] Enable systemd integration (Closes: #880371) + - Thanks to Dimitri John Ledkov for the patch. + * [455cf82] Update to debhelper 11 and bump debian compat to version 11 + * [eadcba6] Replace dh_systemd_enable with dh_installsystemd + * [2ca4e31] Ignore quilt .pc directory + * [98b9d22] Remove 0002-Enable-systemd-integration.patch relict + * [70946f9] Update Debian copyright file and add GPL-3+ with OpenSSL exception + * [1ede2f4] Change Vcs-* to salsa.debian.org (gitlab) + + -- Darshaka Pathirana Mon, 23 Jul 2018 15:12:55 +0200 + +anytun (0.3.6-1) unstable; urgency=medium + + [ Michael Prokop ] + * [355b0cb] New maintainer, adding myself as Uploader + * [2319dc9] Drop deprecated Vcs-* headers + + [ Darshaka Pathirana ] + * [e6be7f2] Add depends on lsb-base to + fix lintian warning init.d-script-needs-depends-on-lsb-base + * [6428516] Bump debian compat version to 9 + * [010a339] Fix lintian error maintainer-script-lacks-debhelper-token + * [6af0685] Bump Debian Standards-Version to 3.9.8 (no further changes) + * [7cf79af] Add build targets build-arch + build-indep + * [081c9d5] Bump build dependency on debhelper v9 + * [48df959] Add debian/source/format file, 3.0 (quilt) + * [ad68eae] Update + convert debian/copyright to machine-readable deb5 format + * [c0bc4ea] Add Vcs-* headers + + -- Darshaka Pathirana Thu, 26 Jan 2017 01:59:48 +0100 + +anytun (0.3.6-0.1) unstable; urgency=medium + + * Non-maintainer upload + * New upstream release Closes: #811834 + * Add watch file. + + -- Dimitri John Ledkov Thu, 18 Aug 2016 14:11:30 +0100 + +anytun (0.3.5-1) unstable; urgency=medium + + * [012bc15] Imported Upstream version 0.3.5 + * [ccd85ca] wrap-and-sort the debian directory + * [b7ab5f3] Update dependency from libgcrypt11-dev to libgcrypt20-dev + (Closes: #758997) + + -- Michael Prokop Fri, 29 Aug 2014 13:29:45 -0700 + +anytun (0.3.4-2) unstable; urgency=low + + * [bffd997] Fix typo in package description. Thanks to Sebastian + Carneiro for the patch (Closes: #675417) + * [3287f84] Bump Standards-Version to 3.9.3. + + -- Michael Prokop Mon, 11 Jun 2012 16:49:05 +0200 + +anytun (0.3.4-1) unstable; urgency=low + + * [ef0cacf] Imported Upstream version 0.3.4, addressing the + Boost.Asio io_service() -> get_io_service() change. + [Closes: #652767] + + -- Michael Prokop Mon, 02 Jan 2012 11:10:27 +0100 + +anytun (0.3.3-3) unstable; urgency=low + + * [7044496] Sync src/configure with upstream and patch from #615691 + to address the "ftbfs with gold or ld --no-add-needed" issue. + Thanks to Ilya Barygin for the patch and + Daniel T Chen for forwarding to Debian BTS + (Closes: #615691) + * [13f624c] Bump standards version to 3.9.2 + + -- Michael Prokop Thu, 29 Dec 2011 11:56:35 +0100 + +anytun (0.3.3-2.1) unstable; urgency=low + + * Non-maintainer upload. + * control: Switch to non-versioned boost build-dependencies. + [Closes: #630433] + + -- Steve M. Robbins Fri, 22 Jul 2011 23:59:29 -0500 + +anytun (0.3.3-2) unstable; urgency=low + + * Bump Build-Depends from Boost 1.40 to 1.42 (thanks to + Steve M. Robbins for bringing up). + * Drop unnecessary autotools-dev from Build-Depends. + + -- Michael Prokop Thu, 06 May 2010 00:32:44 +0200 + +anytun (0.3.3-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.8.4 (no further changes). + * Add $remote_fs to Required-{Start,Stop} in initscript. + + -- Michael Prokop Wed, 17 Feb 2010 02:41:13 +0100 + +anytun (0.3.2-2) unstable; urgency=low + + * Apply patch by Cyril Brulebois to fix FTBFS on GNU/kFreeBSD. + Thanks! [Closes: #561421] + * Drop asciidoc and related packages from build-depends and ship + manpages statically instead. Upstream will ship manpages in + next release through the tarball. [Closes: #561381] + + -- Michael Prokop Wed, 23 Dec 2009 01:48:48 +0100 + +anytun (0.3.2-1) unstable; urgency=low + + * Initial release. [Closes: #531077] + + -- Michael Prokop Mon, 14 Dec 2009 02:08:25 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +11 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..1936ede --- /dev/null +++ b/debian/control @@ -0,0 +1,38 @@ +Source: anytun +Section: net +Priority: optional +Maintainer: Darshaka Pathirana +Uploaders: Michael Prokop +Build-Depends: debhelper (>= 11~), + libboost-regex-dev, + libboost-serialization-dev, + libboost-system-dev, + libboost-thread-dev, + libgcrypt20-dev, + pkg-config, + systemd +Homepage: http://www.anytun.org/ +Standards-Version: 4.1.5 +Vcs-git: https://salsa.debian.org/debian/anytun.git +Vcs-Browser: https://salsa.debian.org/debian/anytun + +Package: anytun +Architecture: any +Depends: adduser, + lsb-base (>= 3.0-6), + ${misc:Depends}, + ${shlibs:Depends} +Suggests: quagga +Description: secure anycast tunneling protocol + Anytun is an implementation of the secure anycast tunneling protocol. It + uses an easy openvpn style interface and makes it possible to build + redundant VPN clusters with load balancing between servers. VPN servers + share a single IP address. Adding and removing VPN Servers is done by the + routing protocol, so no client changes have to be made when additional VPN + servers are added or removed. It is possible to realise global load + balancing based on shortest BGP routes by simply announcing the address + space of the tunnel servers at multiple locations. + . + Currently ethernet, ipv4 and ipv6 tunnels are supported by the + implementation. However the protocol allows one to tunnel every ETHERTYPE + protocol. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..ddeace9 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,71 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: anytun +Upstream-Contact: Christian Pointner +Source: https://www.anytun.org/ + +Files: * +Copyright: 2007-2018 Christian Pointner + 2007-2014 Markus Grüneis + 2007-2014 Othmar Gsenger + 2007-2014 Erwin Nindl +License: GPL-3+ with OpenSSL exception + +Files: debian/* +Copyright: 2009-2017 Michael Prokop + 2017-2018 Darshaka Pathirana +License: GPL-3+ + +License: GPL-3+ with OpenSSL exception + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later + version. + . + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +License: GPL-3+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/overrides b/debian/overrides new file mode 100644 index 0000000..089ff42 --- /dev/null +++ b/debian/overrides @@ -0,0 +1,9 @@ +anytun: non-standard-file-perm usr/share/anytun/examples/config/client1/config 0600 != 0644 +anytun: non-standard-file-perm usr/share/anytun/examples/config/client2/config 0600 != 0644 +anytun: non-standard-file-perm usr/share/anytun/examples/config/client3/config 0600 != 0644 +anytun: non-standard-file-perm usr/share/anytun/examples/config/p2p-a/config 0600 != 0644 +anytun: non-standard-file-perm usr/share/anytun/examples/config/p2p-b/config 0600 != 0644 +anytun: non-standard-file-perm usr/share/anytun/examples/config/server/config 0600 != 0644 +anytun: non-standard-file-perm usr/share/anytun/examples/config/server/conf.d/client1 0600 != 0644 +anytun: non-standard-file-perm usr/share/anytun/examples/config/server/conf.d/client2 0600 != 0644 +anytun: non-standard-file-perm usr/share/anytun/examples/config/server/conf.d/client3 0600 != 0644 diff --git a/debian/patches/01-fix-typos b/debian/patches/01-fix-typos new file mode 100644 index 0000000..4be75f5 --- /dev/null +++ b/debian/patches/01-fix-typos @@ -0,0 +1,58 @@ +--- a/doc/anytun.8.txt ++++ b/doc/anytun.8.txt +@@ -109,7 +109,7 @@ + packets. In case of anycast tunnel endpoints, the anycast + IP has to be used. In case of unicast endpoints, the + address is usually derived correctly from the routing +- table. The default is to not use a special inteface and just ++ table. The default is to not use a special interface and just + bind on all interfaces. + + *-p, --port ''*:: +@@ -145,7 +145,7 @@ + of multiple anycast hosts. The unicast IP address of + the anycast host can be used here. This is needed for + communication with the other anycast hosts. The default is to +- not use a special inteface and just bind on all interfaces. However ++ not use a special interface and just bind on all interfaces. However + this is only the case if synchronisation is active see *--sync-port*. + + *-S, --sync-port ''*:: +@@ -210,7 +210,7 @@ + the multiplex id to use. default: 0 + + *-s, --sender-id ''*:: +- Each anycast tunnel endpoint needs a uniqe sender id ++ Each anycast tunnel endpoint needs a unique sender id + (1, 2, 3, ...). It is needed to distinguish the senders + in case of replay attacks. This option can be ignored on + unicast endpoints. default: 0 +--- a/doc/anytun.8 ++++ b/doc/anytun.8 +@@ -150,7 +150,7 @@ + .PP + \fB\-i, \-\-interface \fR\fB\fI\fR\fR + .RS 4 +-This IP address is used as the sender address for outgoing packets\&. In case of anycast tunnel endpoints, the anycast IP has to be used\&. In case of unicast endpoints, the address is usually derived correctly from the routing table\&. The default is to not use a special inteface and just bind on all interfaces\&. ++This IP address is used as the sender address for outgoing packets\&. In case of anycast tunnel endpoints, the anycast IP has to be used\&. In case of unicast endpoints, the address is usually derived correctly from the routing table\&. The default is to not use a special interface and just bind on all interfaces\&. + .RE + .PP + \fB\-p, \-\-port \fR\fB\fI\fR\fR +@@ -182,7 +182,7 @@ + .RS 4 + local unicast(sync) ip address to bind to + +-This option is only needed for tunnel endpoints consisting of multiple anycast hosts\&. The unicast IP address of the anycast host can be used here\&. This is needed for communication with the other anycast hosts\&. The default is to not use a special inteface and just bind on all interfaces\&. However this is only the case if synchronisation is active see ++This option is only needed for tunnel endpoints consisting of multiple anycast hosts\&. The unicast IP address of the anycast host can be used here\&. This is needed for communication with the other anycast hosts\&. The default is to not use a special interface and just bind on all interfaces\&. However this is only the case if synchronisation is active see + \fB\-\-sync\-port\fR\&. + .RE + .PP +@@ -255,7 +255,7 @@ + .PP + \fB\-s, \-\-sender\-id \fR\fB\fI\fR\fR + .RS 4 +-Each anycast tunnel endpoint needs a uniqe sender id (1, 2, 3, \&...)\&. It is needed to distinguish the senders in case of replay attacks\&. This option can be ignored on unicast endpoints\&. default: 0 ++Each anycast tunnel endpoint needs a unique sender id (1, 2, 3, \&...)\&. It is needed to distinguish the senders in case of replay attacks\&. This option can be ignored on unicast endpoints\&. default: 0 + .RE + .PP + \fB\-w, \-\-window\-size \fR\fB\fI\fR\fR diff --git a/debian/patches/02-boost1.67.patch b/debian/patches/02-boost1.67.patch new file mode 100644 index 0000000..359b2d9 --- /dev/null +++ b/debian/patches/02-boost1.67.patch @@ -0,0 +1,22 @@ +--- anytun-0.3.7.orig/src/anytunError.cpp ++++ anytun-0.3.7/src/anytunError.cpp +@@ -64,6 +64,6 @@ std::ostream& operator<<(std::ostream& s + + std::ostream& operator<<(std::ostream& stream, AnytunErrno const& value) + { +- boost::system::system_error err(boost::system::error_code(value.err_, boost::system::get_system_category())); ++ boost::system::system_error err(boost::system::error_code(value.err_, boost::system::system_category())); + return stream << err.what(); + } +--- anytun-0.3.7.orig/src/resolver.cpp ++++ anytun-0.3.7/src/resolver.cpp +@@ -81,7 +81,7 @@ ResolveHandler::ResolveHandler(co + template + void ResolveHandler::operator()(const boost::system::error_code& e, boost::asio::ip::basic_resolver_iterator endpointIt) + { +- if(boost::system::posix_error::success == e) { ++ if(boost::system::errc::success == e) { + try { + onResolve_(endpointIt); + } catch(const std::runtime_error& e) { + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e3093ec --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +01-fix-typos +02-boost1.67.patch diff --git a/debian/postinst b/debian/postinst new file mode 100755 index 0000000..9896643 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,14 @@ +#!/bin/sh +# postinst script for anytun + +set -e + +if [ -x "/etc/init.d/anytun" ]; then + update-rc.d anytun defaults >/dev/null +fi + +if [ "$1" = "configure" ]; then + adduser --quiet --system --group --no-create-home --home /var/run/anytun anytun +fi + +#DEBHELPER# diff --git a/debian/postrm b/debian/postrm new file mode 100755 index 0000000..227ebdf --- /dev/null +++ b/debian/postrm @@ -0,0 +1,17 @@ +#!/bin/sh +# postrm script for anytun + +set -e + +if [ "$1" = "purge" ] ; then + update-rc.d anytun remove >/dev/null || exit $? + + if [ -x "$(command -v deluser)" -a -x "$(command -v delgroup)" ]; then + deluser --quiet --system anytun || true + delgroup --quiet --system anytun || true + else + echo "Not removing anytun user and group: adduser package not found." >&2 + fi +fi + +#DEBHELPER# diff --git a/debian/prerm b/debian/prerm new file mode 100755 index 0000000..4cfa5cb --- /dev/null +++ b/debian/prerm @@ -0,0 +1,14 @@ +#!/bin/sh +# prerm script for anytun + +set -e + +if [ -x "/etc/init.d/anytun" ] && [ "$1" = remove ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d anytun stop || true + else + /etc/init.d/anytun stop || true + fi +fi + +#DEBHELPER# diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..c964064 --- /dev/null +++ b/debian/rules @@ -0,0 +1,84 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + +# see FEATURE AREAS in dpkg-buildflags(1) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + + +configure: configure-stamp +configure-stamp: + dh_testdir + cd src && ./configure --no-manpage --prefix=/usr --sysconfdir=/etc --examplesdir=/usr/share/anytun/examples && cd .. + touch configure-stamp + +build: build-arch build-indep + +build-arch: build-stamp +build-indep: build-stamp + +build-stamp: configure-stamp + dh_testdir + + cd src && $(MAKE) && cd .. + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + $(MAKE) --directory=$(CURDIR)/src distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_installdirs + + # Add here commands to install the package into debian/anytun. + cd src && $(MAKE) DESTDIR=$(CURDIR)/debian/anytun install && cd .. + # Fix unusual path: + mv debian/anytun/usr/share/anytun/examples/anytun debian/anytun/usr/share/anytun/examples/config + echo "example configurations can be found at /usr/share/anytun/examples/config" > debian/anytun/etc/anytun/README + +# Build architecture-independent files here. +binary-indep: install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installman doc/anytun.8 doc/anytun-config.8 doc/anytun-controld.8 doc/anytun-showtables.8 + dh_installexamples + dh_installsystemd anytun.service + dh_installinit + dh_link + dh_strip + dh_compress + mkdir -p debian/anytun/usr/share/lintian/overrides/ + cp -av debian/overrides debian/anytun/usr/share/lintian/overrides/anytun + dh_fixperms + find debian/anytun -type f -name config -exec chmod 600 {} \; + find debian/anytun -type f -name post-up.sh -exec chmod 755 {} \; + chmod 600 debian/anytun/usr/share/anytun/examples/config/server/conf.d/* + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure 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/watch b/debian/watch new file mode 100644 index 0000000..d164fa8 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +https://www.anytun.org/download/ \ +anytun-([\d\.]+)\.tar\.gz