From: Benjamin Cama Date: Thu, 2 Feb 2012 01:20:27 +0000 (+0100) Subject: Merge branch 'fdn-mods' X-Git-Tag: 2.2.1-2fdn3.1~19 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/92db0e2617cec9b118708c722c1a9f273001f87d?hp=99921507eb9b842d4f41c5516af1f455d4a49a99 Merge branch 'fdn-mods' --- diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..66566b3 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,118 @@ +l2tpns (2.2.1-1fdn3) unstable; urgency=low + + * Change the rtm_proto to some arbitrary-defined value. + * Set hostname /after/ having read the config file. + * Fix logging of the tunnel number in different places. + * Several cleanups. + + -- Benjamin Cama Tue, 03 Jan 2012 20:28:20 +0100 + +l2tpns (2.2.1-1fdn2) unstable; urgency=low + + * Add netlink support. Replace most ioctl(). + * Use netlink to set up tun device. + * Make routset()/route6set() use netlink. + * Switch from masks to CIDR globally for IPv4. + * Use the source IP we use as BGP router identifier. + * Check for expired timers even when receiving no events. + * Better error handling on CLI initialization. + * Correctly set mp_epdis in host order. + + -- Benjamin Cama Thu, 15 Sep 2011 23:57:05 +0200 + +l2tpns (2.2.1-1fdn1) unstable; urgency=low + + * Version for FDN with features listed below + * Add RFC 4760 support + * Display session's remainging time in CLI. + * Remove no more used plugin function names; fixes a crash. + * Add an option to set source address for a BGP session. + * Wait before retrying on CEASE. + * Stop BGP session even when we are master + * Add a cli_bind_address configuration option. + * Add an "hostname" config option. + * Kill sessions receiving a ConfReq while closing. + * Add a config option to set the advertised BGP next hop. + + -- Benjamin Cama Fri, 29 Jul 2011 14:58:11 +0200 + +l2tpns (2.2.1-1) unstable; urgency=low + + * Updated to latest CVS to date (marked 2.2.x, after a 2.2.0 release, hence + this version number). + + -- Benjamin Cama Thu, 28 Jul 2011 18:16:54 +0200 + +l2tpns (2.1.21-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Added LSB formatted dependency info in init.d script (closes: #468889) + + -- Peter Eisentraut Wed, 02 Apr 2008 01:58:55 +0200 + +l2tpns (2.1.21-1) unstable; urgency=high + + * New upstream release. + * Fixes potential remote code execution; hence urgency=high + + -- Jonathan McDowell Tue, 05 Dec 2006 16:52:54 +0000 + +l2tpns (2.1.19-1) unstable; urgency=low + + * New upstream release. + * Add debian/watch file. + * Bump Standards-Version to 3.7.2.0 (no changes). + + -- Jonathan McDowell Sat, 22 Jul 2006 14:11:14 +0100 + +l2tpns (2.1.16-1) unstable; urgency=low + + * New upstream release. + + -- Jonathan McDowell Tue, 21 Mar 2006 10:43:11 +0000 + +l2tpns (2.1.15-1) unstable; urgency=low + + * New upstream release. + + -- Jonathan McDowell Tue, 20 Dec 2005 11:00:23 +0000 + +l2tpns (2.1.10-1) unstable; urgency=low + + * New upstream release. + + -- Jonathan McDowell Sun, 13 Nov 2005 17:49:49 +0000 + +l2tpns (2.1.8-1) unstable; urgency=low + + * New upstream release. + * Update Standards-Version to 3.6.2.0 (no changes). + + -- Jonathan McDowell Tue, 27 Sep 2005 17:20:19 +0100 + +l2tpns (2.1.3-1) unstable; urgency=low + + * New upstream release. + + -- Jonathan McDowell Wed, 24 Aug 2005 13:05:42 +0100 + +l2tpns (2.0.22-1) unstable; urgency=low + + * New upstream release; last of the 2.0 releases as I plan to upload + 2.1.1 once I've tested it in production myself. + + -- Jonathan McDowell Thu, 23 Jun 2005 13:41:57 +0100 + +l2tpns (2.0.14-1) unstable; urgency=low + + * New upstream release. + * Tidy up spelling in Description. + * Make lintian happy by lowering case of Layer 2. + + -- Jonathan McDowell Thu, 06 Jan 2005 14:22:33 +0000 + +l2tpns (2.0.8-1) unstable; urgency=low + + * Initial Debian upload. (closes: #280675) + + -- Jonathan McDowell Fri, 26 Nov 2004 10:27:01 +0000 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..cc11d4b --- /dev/null +++ b/debian/control @@ -0,0 +1,20 @@ +Source: l2tpns +Section: net +Priority: optional +Maintainer: Jonathan McDowell +Build-Depends: debhelper (>> 4), libcli-dev (>> 1.8.5) +Standards-Version: 3.7.2.0 + +Package: l2tpns +Architecture: any +Depends: ${shlibs:Depends} +Description: layer 2 tunnelling protocol network server (LNS) + l2tpns is a daemon designed to terminate large volumes of layer 2 + tunnelling protocol (RFC 2661: L2TP) sessions. + . + The daemon supports up to 65535 sessions plus features such as rate + limiting, walled garden, usage accounting, and clustering (for both + load-sharing and redundancy). + . + Note that only the LNS side of the L2TP protocol is implemented, for + a more complete L2TP implementation see the l2tpd package. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..c6ea95b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,10 @@ +This package was debianized by Jonathan McDowell on +Wed, 30 Jun 2004 12:47:44 +0100. + +It was downloaded from http://sf.net/projects/l2tpns + +Upstream Author: David Parrish (david@dparrish.com) + +You are free to distribute this software under the terms of the GNU +General Public License. The full text of this license can be found +in the file /usr/share/common-licenses/GPL diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..a614c5b --- /dev/null +++ b/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +usr/sbin +usr/lib/l2tpns +var/lib/l2tpns diff --git a/debian/init.d b/debian/init.d new file mode 100644 index 0000000..3da046d --- /dev/null +++ b/debian/init.d @@ -0,0 +1,74 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: l2tpns +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO +# +# l2tpns Based on skeleton example file. +# +# Written by Miquel van Smoorenburg . +# Modified for Debian GNU/Linux +# by Ian Murdock . +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/l2tpns +NAME=l2tpns +DESC=l2tpns +ARGS="-d" + +test -f $DAEMON || exit 0 + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON -- $ARGS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --oknodo --stop --signal 3 --quiet \ + --pidfile /var/run/$NAME.pid --exec $DAEMON -- $ARGS + echo "$NAME." + ;; + reload) + # + # If the daemon can reload its config files on the fly + # for example by sending it SIGHUP, do it here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this a do-nothing entry. + # + echo "Reloading $DESC configuration files." + start-stop-daemon --stop --signal 1 --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $ARGS + ;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $ARGS + sleep 5 + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $ARGS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..603bda2 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,13 @@ +#! /bin/sh +# postinst script for l2tpns +# +# see: dh_installdeb(1) + +set -e + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..eecf58f --- /dev/null +++ b/debian/postrm @@ -0,0 +1,11 @@ +#! /bin/sh +# postrm script for l2tpns + +set -e + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..61b4735 --- /dev/null +++ b/debian/preinst @@ -0,0 +1,13 @@ +#! /bin/sh +# preinst script for l2tpns + +set -e + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 0000000..9826490 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,13 @@ +#! /bin/sh +# prerm script for l2tpns + +set -e + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..0580bd7 --- /dev/null +++ b/debian/rules @@ -0,0 +1,82 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #/usr/bin/docbook-to-man debian/l2tpns.sgml > l2tpns.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/l2tpns + install -D -m 644 -o root -g root etc/l2tpns.logrotate \ + $(CURDIR)/debian/l2tpns/etc/logrotate.d/l2tpns + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs Docs/manual.html + dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installpam + dh_installinit + dh_installcron + dh_installman + dh_installinfo + dh_installchangelogs Changes + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb +# dh_perl + 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/watch b/debian/watch new file mode 100644 index 0000000..436fd86 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +# format version number, currently 3; this line is compulsory! +version=3 + +http://sf.net/l2tpns/l2tpns-(.*)\.tar\.gz