From: Michael Prokop Date: Wed, 17 Feb 2010 02:07:13 +0000 (+0100) Subject: Merge branch 'upstream' X-Git-Tag: v0.3.3-1~2 X-Git-Url: https://git.syn-net.org/?p=debian%2Fuanytun.git;a=commitdiff_plain;h=1b20b4ac3db80cae22b217b2093ef73af1b5c6ef;hp=aa74a4fd24d8e8537f76531e6257fa90145355d3 Merge branch 'upstream' --- diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..c386032 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,16 @@ +uanytun (0.3.2-2) unstable; urgency=low + + * Drop asciidoc and related packages from build-depends and ship + manpage statically instead. Upstream will ship manpage in + next release through the tarball. + * Apply patch based on the one from Cyril Brulebois for anytun to fix + FTBFS on GNU/kFreeBSD. + + -- Michael Prokop Wed, 23 Dec 2009 03:50:43 +0100 + +uanytun (0.3.2-1) unstable; urgency=low + + * Initial release (Closes: #531082) + + -- Michael Prokop Mon, 14 Dec 2009 17:43:13 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..6058d3a --- /dev/null +++ b/debian/control @@ -0,0 +1,27 @@ +Source: uanytun +Section: net +Priority: extra +Maintainer: Michael Prokop +Build-Depends: debhelper (>= 5), libgcrypt11-dev +Standards-Version: 3.8.3 +Homepage: http://www.anytun.org/ +Vcs-git: git://git.grml.org/uanytun.git +Vcs-Browser: http://git.grml.org/?p=uanytun.git + +Package: uanytun +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Description: tiny implementation of the secure anycast tunneling protocol + uAnytun is a tiny implementation of SATP (Secure Anycast Tunneling + Protocol). Unlike Anytun which is a full featured implementation + uAnytun has no support for multiple connections or synchronisation. + It is a small single threaded implementation intended to act as a + client on small platforms. SATP defines a protocol used for + communication between any combination of unicast and anycast tunnel + endpoints. It has less protocol overhead than IPSec in Tunnel mode + and allows tunneling of every ETHER TYPE protocol (e.g. ethernet, + ip, arp ...). SATP directly includes cryptography and message + authentication based on the methodes used by SRTP (Secure Real-time + Transport Protocol). It is intended to deliver a generic, + scaleable and secure solution for tunneling and relaying of packets + of any protocol. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..d1d4289 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Michael Prokop on +Fri, 29 May 2009 11:23:42 +0200. + +It was downloaded from + +Upstream Author: Christian Pointner + +Copyright: 2007-2009 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 and +is licensed under the GPL, see above. diff --git a/debian/overrides b/debian/overrides new file mode 100644 index 0000000..b36a80a --- /dev/null +++ b/debian/overrides @@ -0,0 +1,5 @@ +uanytun: non-standard-file-perm usr/share/uanytun/examples/config/client1/config 0600 != 0644 +uanytun: non-standard-file-perm usr/share/uanytun/examples/config/client2/config 0600 != 0644 +uanytun: non-standard-file-perm usr/share/uanytun/examples/config/client3/config 0600 != 0644 +uanytun: non-standard-file-perm usr/share/uanytun/examples/config/p2p-a/config 0600 != 0644 +uanytun: non-standard-file-perm usr/share/uanytun/examples/config/p2p-b/config 0600 != 0644 diff --git a/debian/postinst b/debian/postinst new file mode 100755 index 0000000..b72feed --- /dev/null +++ b/debian/postinst @@ -0,0 +1,12 @@ +#!/bin/sh +# postinst script for uanytun + +set -e + +if [ -x "/etc/init.d/uanytun" ]; then + update-rc.d uanytun defaults >/dev/null +fi + +if [ "$1" = "configure" ]; then + adduser --quiet --system --group --no-create-home --home /var/run/uanytun uanytun +fi diff --git a/debian/postrm b/debian/postrm new file mode 100755 index 0000000..9088e15 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,15 @@ +#!/bin/sh +# postrm script for uanytun + +set -e + +if [ "$1" = "purge" ] ; then + update-rc.d uanytun remove >/dev/null || exit $? + + if [ -x "$(command -v deluser)" -a -x "$(command -v delgroup)" ]; then + deluser --quiet --system uanytun || true + delgroup --quiet --system uanytun || true + else + echo "Not removing uanytun user and group: adduser package not found." >&2 + fi +fi diff --git a/debian/prerm b/debian/prerm new file mode 100755 index 0000000..01b209c --- /dev/null +++ b/debian/prerm @@ -0,0 +1,12 @@ +#!/bin/sh +# prerm script for uanytun + +set -e + +if [ -x "/etc/init.d/uanytun" ] && [ "$1" = remove ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d uanytun stop || true + else + /etc/init.d/uanytun stop || true + fi +fi diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..b6b42b9 --- /dev/null +++ b/debian/rules @@ -0,0 +1,75 @@ +#!/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/uanytun/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/uanytun. + cd src && $(MAKE) DESTDIR=$(CURDIR)/debian/uanytun install && cd .. + # Fix unusual path: + mv debian/uanytun/usr/share/uanytun/examples/uanytun debian/uanytun/usr/share/uanytun/examples/config + echo "example configurations can be found at /usr/share/uanytun/examples/config" > debian/uanytun/etc/uanytun/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_installexamples + dh_installinit + dh_installman debian/uanytun.8 + dh_link + dh_strip + dh_compress + mkdir -p debian/uanytun/usr/share/lintian/overrides/ + cp -av debian/overrides debian/uanytun/usr/share/lintian/overrides/uanytun + dh_fixperms + find debian/uanytun -type f -name config -exec chmod 600 {} \; + find debian/uanytun -type f -name post-up.sh -exec chmod 755 {} \; + 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/uanytun.8 b/debian/uanytun.8 new file mode 100644 index 0000000..5b51ce1 --- /dev/null +++ b/debian/uanytun.8 @@ -0,0 +1,408 @@ +'\" t +.\" Title: uanytun +.\" Author: [see the "AUTHORS" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 12/14/2009 +.\" Manual: uanytun user manual +.\" Source: uanytun 0.3.2 +.\" Language: English +.\" +.TH "UANYTUN" "8" "12/14/2009" "uanytun 0.3.2" "uanytun user manual" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +uanytun \- micro anycast tunneling daemon +.SH "SYNOPSIS" +.sp +.nf +\fBuanytun\fR + [ \fB\-h|\-\-help\fR ] + [ \fB\-D|\-\-nodaemonize\fR ] + [ \fB\-u|\-\-username\fR ] + [ \fB\-g|\-\-groupname\fR ] + [ \fB\-C|\-\-chroot\fR ] + [ \fB\-P|\-\-write\-pid\fR ] + [ \fB\-L|\-\-log\fR :[,[,[\&.\&.]]] ] + [ \fB\-i|\-\-interface\fR ] + [ \fB\-p|\-\-port\fR ] + [ \fB\-r|\-\-remote\-host\fR ] + [ \fB\-o|\-\-remote\-port\fR ] + [ \fB\-4|\-\-ipv4\-only\fR ] + [ \fB\-6|\-\-ipv6\-only\fR ] + [ \fB\-d|\-\-dev\fR ] + [ \fB\-t|\-\-type\fR ] + [ \fB\-n|\-\-ifconfig\fR / ] + [ \fB\-x|\-\-post\-up\-script\fR