--- xl2tpd-1.2.5+dfsg.orig/debian/copyright +++ xl2tpd-1.2.5+dfsg/debian/copyright @@ -0,0 +1,19 @@ +Upstream-Source: http://www.xelerance.com/software/xl2tpd/ + +Upstream Author: Xelerance Corporation + +Files: * +Copyright: (c) 2006-2007 Xelerance Corporation +License: GPL-2+ + Please see the CREDITS file for a complete copyright history of all parts of + the project. + + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. + +Files: debian/* +Copyright: (c) 2007-2008 Roberto C. Sanchez +License: GPL-2+ + The packaging is based on the packaging of the original l2tpd package by + Jean-Francois Dive. + --- xl2tpd-1.2.5+dfsg.orig/debian/compat +++ xl2tpd-1.2.5+dfsg/debian/compat @@ -0,0 +1 @@ +5 --- xl2tpd-1.2.5+dfsg.orig/debian/control +++ xl2tpd-1.2.5+dfsg/debian/control @@ -0,0 +1,22 @@ +Source: xl2tpd +Section: net +Priority: optional +Maintainer: Roberto C. Sanchez +Homepage: http://www.xelerance.com/software/xl2tpd/ +Build-Depends: debhelper (>= 5), libpcap0.8-dev +Standards-Version: 3.8.3 + +Package: xl2tpd +Architecture: any +Provides: l2tpd +Replaces: l2tpd (<< ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ppp +Description: a layer 2 tunneling protocol implementation + xl2tpd is an open source implementation of the L2TP tunneling + protocol (RFC2661). xl2tpd is forked from l2tpd and is maintained by + Xelerance Corporation. + . + The main purpose of this protocol is to tunnel PPP frames through IP + networks. It implements both LAC and LNS role in the L2TP networking + architecture. + --- xl2tpd-1.2.5+dfsg.orig/debian/rules +++ xl2tpd-1.2.5+dfsg/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 + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) clean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) PREFIX=/usr DESTDIR=$(CURDIR)/debian/xl2tpd install + cp $(CURDIR)/doc/l2tpd.conf.sample $(CURDIR)/debian/xl2tpd/etc/xl2tpd/xl2tpd.conf + cp $(CURDIR)/doc/l2tp-secrets.sample $(CURDIR)/debian/xl2tpd/etc/xl2tpd/l2tp-secrets + +# Build architecture-independent files here. +binary-indep: build install + # Nothing to do here + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs CHANGES + dh_installdocs + dh_installexamples +# dh_install + dh_installinit + dh_installman + cp debian/lintian-overrides \ + debian/xl2tpd/usr/share/lintian/overrides/xl2tpd + dh_link + dh_strip + dh_compress + dh_fixperms + chmod 600 $(CURDIR)/debian/xl2tpd/etc/xl2tpd/l2tp-secrets + 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 --- xl2tpd-1.2.5+dfsg.orig/debian/xl2tpd.postrm +++ xl2tpd-1.2.5+dfsg/debian/xl2tpd.postrm @@ -0,0 +1,39 @@ +#!/bin/sh +# postrm script for xl2tpd +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- xl2tpd-1.2.5+dfsg.orig/debian/xl2tpd.dirs +++ xl2tpd-1.2.5+dfsg/debian/xl2tpd.dirs @@ -0,0 +1,3 @@ +usr/sbin +etc/xl2tpd +usr/share/lintian/overrides --- xl2tpd-1.2.5+dfsg.orig/debian/lintian-overrides +++ xl2tpd-1.2.5+dfsg/debian/lintian-overrides @@ -0,0 +1,4 @@ +# The etc/xl2tpd/l2tp-secrets file must not be readable by non-root +xl2tpd: non-standard-file-perm etc/xl2tpd/l2tp-secrets 0600 != 0644 +xl2tpd: hyphen-used-as-minus-sign + --- xl2tpd-1.2.5+dfsg.orig/debian/xl2tpd.examples +++ xl2tpd-1.2.5+dfsg/debian/xl2tpd.examples @@ -0,0 +1 @@ +examples/* --- xl2tpd-1.2.5+dfsg.orig/debian/xl2tpd.docs +++ xl2tpd-1.2.5+dfsg/debian/xl2tpd.docs @@ -0,0 +1,4 @@ +README.xl2tpd +CREDITS +contrib/pfc.README +contrib/pppol2tp-2.6.23.README --- xl2tpd-1.2.5+dfsg.orig/debian/xl2tpd.postinst +++ xl2tpd-1.2.5+dfsg/debian/xl2tpd.postinst @@ -0,0 +1,41 @@ +#!/bin/sh +# postinst script for xl2tpd +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- xl2tpd-1.2.5+dfsg.orig/debian/xl2tpd.init +++ xl2tpd-1.2.5+dfsg/debian/xl2tpd.init @@ -0,0 +1,71 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: xl2tpd l2tpd +# Required-Start: $network $syslog +# Required-Stop: $network $syslog +# Should-Start: ipsec +# Should-Stop: ipsec +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: layer 2 tunelling protocol daemon +# Description: xl2tpd is usually used in conjunction with an ipsec +# daemon (such as openswan). +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/xl2tpd +NAME=xl2tpd +DESC=xl2tpd + +test -x $DAEMON || exit 0 + +# Include xl2tpd defaults if available +if [ -f /etc/default/xl2tpd ] ; then + . /etc/default/xl2tpd +fi + +PIDFILE=/var/run/$NAME.pid + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + test -d ${XL2TPD_RUN_DIR:-/var/run/xl2tpd} || mkdir -p ${XL2TPD_RUN_DIR:-/var/run/xl2tpd} + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \ + --exec $DAEMON + echo "$NAME." + ;; + force-reload) + test -d ${XL2TPD_RUN_DIR:-/var/run/xl2tpd} || mkdir -p ${XL2TPD_RUN_DIR:-/var/run/xl2tpd} + # check whether $DAEMON is running. If so, restart + start-stop-daemon --stop --test --quiet --pidfile \ + $PIDFILE --exec $DAEMON \ + && $0 restart \ + || exit 0 + ;; + restart) + test -d ${XL2TPD_RUN_DIR:-/var/run/xl2tpd} || mkdir -p ${XL2TPD_RUN_DIR:-/var/run/xl2tpd} + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --pidfile \ + $PIDFILE --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + $PIDFILE --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- xl2tpd-1.2.5+dfsg.orig/debian/xl2tpd.prerm +++ xl2tpd-1.2.5+dfsg/debian/xl2tpd.prerm @@ -0,0 +1,40 @@ +#!/bin/sh +# prerm script for xl2tpd +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- xl2tpd-1.2.5+dfsg.orig/debian/xl2tpd.default +++ xl2tpd-1.2.5+dfsg/debian/xl2tpd.default @@ -0,0 +1,13 @@ +# Defaults for xl2tpd initscript +# sourced by /etc/init.d/xl2tpd +# installed at /etc/default/xl2tpd by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# Where the l2tp-control pipe is located +XL2TPD_RUN_DIR="/var/run/xl2tpd" + +# Additional options that are passed to the Daemon. +DAEMON_OPTS="" --- xl2tpd-1.2.5+dfsg.orig/debian/repack.sh +++ xl2tpd-1.2.5+dfsg/debian/repack.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# Repackage upstream source to exclude non-distributable files +# should be called as "repack sh --upstream-source +# (for example, via uscan) + +set -e +set -u + +FILE=$3 +PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'` +VER="$2+dfsg" + +printf "\nRepackaging $FILE\n" + +DIR=`mktemp -d ./tmpRepackXXXXXX` +trap "rm -rf $DIR" QUIT INT EXIT + +tar xzf $FILE -C $DIR + +TARGET=`echo $FILE |sed 's/_\(.*\)\.orig/_\1+dfsg.orig/'` +REPACK=`basename $TARGET` + +UP_DIR=`ls -1 $DIR` + +( + set -e + set -u + + cd $DIR + + rm -v $UP_DIR/doc/rfc2661.txt + rm -rv $UP_DIR/debian/ + + REPACK_DIR="$PKG-$VER.orig" + mv $UP_DIR $REPACK_DIR + tar -c $REPACK_DIR | gzip -9 > $REPACK +) + +rm -v $FILE +mv $DIR/$REPACK $TARGET + +echo "*** $FILE repackaged as $TARGET" --- xl2tpd-1.2.5+dfsg.orig/debian/watch +++ xl2tpd-1.2.5+dfsg/debian/watch @@ -0,0 +1,9 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +opts="dversionmangle=s/\+dfsg//" ftp://ftp.xelerance.com/xl2tpd/xl2tpd-(.*)\.tar\.gz debian debian/repack.sh --- xl2tpd-1.2.5+dfsg.orig/debian/changelog +++ xl2tpd-1.2.5+dfsg/debian/changelog @@ -0,0 +1,74 @@ +xl2tpd (1.2.5+dfsg-1) unstable; urgency=low + + * New upstream release + * Remove unnecessary README.source since dpatch was dropped + * Update to Standards-Version 3.8.3 + + -- Roberto C. Sanchez Sun, 24 Jan 2010 15:23:17 -0500 + +xl2tpd (1.2.4+dfsg-1) unstable; urgency=low + + * New upstream release (Closes: #494795) + * Update to Standards-Version 3.8.1 + + Add README.source + + Fix watch file to use dversionmangle instead of uversionmangle + * Update copyright file to new proposed format + * Drop debian/patches/02_trust_pppd_to_die.dpatch (included upstream) + * Add build-time dependency on libpcap0.8-dev + * Make lintian happy: + + Move creation of directory in /var/run to daemon start time + * Drop l2tpd transitional package + + -- Roberto C. Sanchez Fri, 13 Mar 2009 09:58:54 -0400 + +xl2tpd (1.2.0+dfsg-1) unstable; urgency=low + + * New upstream release. + * debian/patches/01_fix_makefile_bashism.dpatch: Remove, included upstream + + -- Roberto C. Sanchez Mon, 31 Mar 2008 17:02:47 -0400 + +xl2tpd (1.1.12.dfsg.1-4) unstable; urgency=low + + * Ship examples (Closes: #466512) + * Trust pppd to die properly (Closes: #466057) + * Update watch file and automate repacking upstream tarball. + + -- Roberto C. Sanchez Sat, 08 Mar 2008 21:25:41 -0500 + +xl2tpd (1.1.12.dfsg.1-3) unstable; urgency=low + + * Update to Standards-Version 3.7.3 (no changes required) + * Fix Makefile bashism, thanks to Luca Falavigna (Closes: #453046) + * Make sure conffiles are not left behind (Closes: #455023) + + -- Roberto C. Sanchez Sun, 20 Jan 2008 21:13:52 -0500 + +xl2tpd (1.1.12.dfsg.1-2) unstable; urgency=low + + * debian/control: Switch Homepage to be a proper control field. + * debian/xl2tpd.init: Add --oknodo for stop action (Closes: #447990) + + -- Roberto C. Sanchez Sun, 4 Nov 2007 14:47:30 -0500 + +xl2tpd (1.1.12.dfsg.1-1) unstable; urgency=low + + * New upstream release + * Repack upsteam tarball: remove non-free RFC and shipped debian/ directory + + -- Roberto C. Sanchez Sat, 20 Oct 2007 09:46:16 -0400 + +xl2tpd (1.1.11.dfsg.1-2) unstable; urgency=low + + * Added missing copyright notices. + + -- Roberto C. Sanchez Fri, 3 Aug 2007 14:13:23 -0400 + +xl2tpd (1.1.11.dfsg.1-1) unstable; urgency=low + + * Initial release (Closes: #427113, 402660) + * Make l2tpd obsolete (Closes: #358799) + * Repackage upstream tarball to remove non-free RFC (Closes: #393381) + + -- Roberto C. Sanchez Tue, 31 Jul 2007 20:57:23 -0400 +