Merge commit 'upstream/0.3.4'
authorMichael Prokop <mika@debian.org>
Mon, 2 Jan 2012 10:07:01 +0000 (11:07 +0100)
committerMichael Prokop <mika@debian.org>
Mon, 2 Jan 2012 10:07:01 +0000 (11:07 +0100)
debian/anytun.default [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/overrides [new file with mode: 0644]
debian/postinst [new file with mode: 0755]
debian/postrm [new file with mode: 0755]
debian/prerm [new file with mode: 0755]
debian/rules [new file with mode: 0755]

diff --git a/debian/anytun.default b/debian/anytun.default
new file mode 100644 (file)
index 0000000..4457805
--- /dev/null
@@ -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 (file)
index 0000000..07503d7
--- /dev/null
@@ -0,0 +1,51 @@
+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 <barygin@gmail.com> for the patch and
+    Daniel T Chen <seven.steps@gmail.com> for forwarding to Debian BTS
+    (Closes: #615691)
+  * [13f624c] Bump standards version to 3.9.2
+
+ -- Michael Prokop <mika@debian.org>  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 <smr@debian.org>  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 <mika@debian.org>  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 <mika@debian.org>  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 <mika@debian.org>  Wed, 23 Dec 2009 01:48:48 +0100
+
+anytun (0.3.2-1) unstable; urgency=low
+
+  * Initial release. [Closes: #531077]
+
+ -- Michael Prokop <mika@debian.org>  Mon, 14 Dec 2009 02:08:25 +0100
+
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..418ac5a
--- /dev/null
@@ -0,0 +1,27 @@
+Source: anytun
+Section: net
+Priority: extra
+Maintainer: Michael Prokop <mika@debian.org>
+Build-Depends: debhelper (>= 5), libgcrypt11-dev, libboost-regex-dev, libboost-serialization-dev, libboost-system-dev, libboost-thread-dev
+Homepage: http://www.anytun.org/
+Vcs-git: git://git.grml.org/anytun.git
+Vcs-Browser: http://git.grml.org/?p=anytun.git
+Standards-Version: 3.9.2
+
+Package: anytun
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+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 to tunnel every ETHERTYPE
+ protocol.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..66bc1c6
--- /dev/null
@@ -0,0 +1,32 @@
+This package was debianized by Michael Prokop <mika@debian.org> on
+Fri, 29 May 2009 11:23:42 +0200.
+
+It was downloaded from <http://www.anytun.org/>
+
+Upstream Author: Othmar Gsenger <otti@anytun.org>
+                Erwin Nindl <nine@anytun.org>
+                Christian Pointner <equinox@anytun.org>
+
+Copyright: 2007-2008 Othmar Gsenger, Erwin Nindl, Christian Pointner
+
+License:
+
+    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 can be found in `/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is © 2009, Michael Prokop <mika@debian.org> and
+is licensed under the GPL, see above.
diff --git a/debian/overrides b/debian/overrides
new file mode 100644 (file)
index 0000000..089ff42
--- /dev/null
@@ -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/postinst b/debian/postinst
new file mode 100755 (executable)
index 0000000..9f95520
--- /dev/null
@@ -0,0 +1,12 @@
+#!/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
diff --git a/debian/postrm b/debian/postrm
new file mode 100755 (executable)
index 0000000..1fe51f5
--- /dev/null
@@ -0,0 +1,15 @@
+#!/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
diff --git a/debian/prerm b/debian/prerm
new file mode 100755 (executable)
index 0000000..7fe2136
--- /dev/null
@@ -0,0 +1,12 @@
+#!/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
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..f5bd42b
--- /dev/null
@@ -0,0 +1,76 @@
+#!/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
+
+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-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_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