From ecb5ef1a3f45cc1f2e797bf66bb48f5867d85b18 Mon Sep 17 00:00:00 2001 From: AndreDVJ Date: Mon, 12 Mar 2018 01:44:10 -0300 Subject: [PATCH] xl2tpd: Updated to 1.3.11 Actually, nothing really changed that affects TomatoUSB... --- release/src-rt-6.x.4708/router/xl2tpd/CHANGES | 17 +++++--- .../router/xl2tpd/debian/changelog | 2 +- .../router/xl2tpd/debian/compat | 2 +- .../router/xl2tpd/debian/control | 6 +-- .../router/xl2tpd/debian/copyright | 2 +- .../router/xl2tpd/debian/repack.sh | 41 ------------------- .../router/xl2tpd/debian/watch | 12 ++---- release/src-rt-6.x.4708/router/xl2tpd/l2tp.h | 8 ++-- .../xl2tpd/packaging/fedora/xl2tpd.spec | 18 ++++---- .../router/xl2tpd/packaging/openwrt/Makefile | 2 +- .../router/xl2tpd/packaging/suse/sles10.spec | 16 ++++---- .../router/xl2tpd/packaging/suse/xl2tpd.spec | 16 ++++---- 12 files changed, 51 insertions(+), 91 deletions(-) delete mode 100755 release/src-rt-6.x.4708/router/xl2tpd/debian/repack.sh diff --git a/release/src-rt-6.x.4708/router/xl2tpd/CHANGES b/release/src-rt-6.x.4708/router/xl2tpd/CHANGES index 18fb61406c..9a218adf03 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/CHANGES +++ b/release/src-rt-6.x.4708/router/xl2tpd/CHANGES @@ -1,3 +1,10 @@ +v1.3.11 (March 7, 2018) +* Build packages for Xenial by default (Simon Deziel) +* Bump d/compat to 9 (Simon Deziel) +* Drop d/repack.sh script and refresh d/watch (Simon Deziel) +* Refresh d/control by partly sync'ing from Debian (Simon Deziel) +* Use HTTPS URL in d/copyright (Simon Deziel) + v1.3.10.1 (November 16, 2017) * Have max retries as a configuration [Samir Hussain] * Add more into to "select timeout" debug message [Samir Hussain] @@ -198,7 +205,7 @@ v1.2.7 v1.2.6 * Partial fix for compiling on OpenBSD [synapse] * add missing setting of logopen=1 in init_log() [Shingo Yamawaki] -* xltpd could deadlock on syslog() call in signal handler [Bart Trojanowski] +* xltpd could deadlock on syslog() call in signal handler [Bart Trojanowski] * fix fedora/centos spec file [Paul] v1.2.5 @@ -214,14 +221,14 @@ v1.2.4 * Workaround for broken kernels that send duplicate pids to waitpid() See: https://bugzilla.redhat.com/show_bug.cgi?id=486945 [Mika / Tuomo] * Fix pppd option from legacy -detach to nodetach [Tuomo] - + v1.2.3 * Fixes for prefix/destdir and spec files [paul/tuomo] * Use pcap not pcap-devel on suse, rhel and centos [paul/tuomo/shingo] * Added pfc to contrib. pfc is a tool to compile active-filters for pppd, which can be used for dial-on-demand filters [paul/roberto] * Bug tracker bugs fixed - # 998: xl2tpd-1.2.2 Makefile sets wrong path for mandir + # 998: xl2tpd-1.2.2 Makefile sets wrong path for mandir v1.2.2 * PPP CHAP authentication using plugin passwordfd.so failed [tgohad@mvista.com] @@ -244,7 +251,7 @@ v1.2.0 v1.1.12 * Fix for dropped packets and wrong disconnects. [Ray Overland / Tuomo] -* Included debian directory from Roberto C. Sanchez +* Included debian directory from Roberto C. Sanchez v1.1.11 * Support for passwordfd when using xl2tpd as client. @@ -322,7 +329,7 @@ v1.01 v1.00 * First version managed by Xelerance, called xl2tpd. * If we aren't deamonized, then log to stderr. -* added install: and DESTDIR support +* added install: and DESTDIR support 0.70 -- diff --git a/release/src-rt-6.x.4708/router/xl2tpd/debian/changelog b/release/src-rt-6.x.4708/router/xl2tpd/debian/changelog index 3272918272..d6898a59d3 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/debian/changelog +++ b/release/src-rt-6.x.4708/router/xl2tpd/debian/changelog @@ -1,4 +1,4 @@ -xl2tpd (XL2TPDBASEVERSION-0xelerance1) trusty; urgency=low +xl2tpd (XL2TPDBASEVERSION-0ubuntu0.16.04xelerance1) xenial; urgency=low * Update to XL2TPDBASEVERSION diff --git a/release/src-rt-6.x.4708/router/xl2tpd/debian/compat b/release/src-rt-6.x.4708/router/xl2tpd/debian/compat index 7f8f011eb7..ec635144f6 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/debian/compat +++ b/release/src-rt-6.x.4708/router/xl2tpd/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/release/src-rt-6.x.4708/router/xl2tpd/debian/control b/release/src-rt-6.x.4708/router/xl2tpd/debian/control index 668c929856..5e2d015e6e 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/debian/control +++ b/release/src-rt-6.x.4708/router/xl2tpd/debian/control @@ -5,13 +5,13 @@ Maintainer: Simon Deziel Homepage: https://www.xelerance.com/software/xl2tpd/ Vcs-Browser: https://github.com/xelerance/xl2tpd Vcs-Git: git://github.com/xelerance/xl2tpd.git -Build-Depends: debhelper (>= 7.0.8), libpcap0.8-dev -Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 9.20120115), libpcap0.8-dev +Standards-Version: 3.9.8 Package: xl2tpd Architecture: any Provides: l2tpd -Depends: ${shlibs:Depends}, ${misc:Depends}, ppp +Depends: ${shlibs:Depends}, ${misc:Depends}, ppp, lsb-base (>= 3.0-6) Description: 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 diff --git a/release/src-rt-6.x.4708/router/xl2tpd/debian/copyright b/release/src-rt-6.x.4708/router/xl2tpd/debian/copyright index 100fafecaa..cd7e202986 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/debian/copyright +++ b/release/src-rt-6.x.4708/router/xl2tpd/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: https://github.com/xelerance/xl2tpd Files: * diff --git a/release/src-rt-6.x.4708/router/xl2tpd/debian/repack.sh b/release/src-rt-6.x.4708/router/xl2tpd/debian/repack.sh deleted file mode 100755 index 3b6d518017..0000000000 --- a/release/src-rt-6.x.4708/router/xl2tpd/debian/repack.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/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 -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" diff --git a/release/src-rt-6.x.4708/router/xl2tpd/debian/watch b/release/src-rt-6.x.4708/router/xl2tpd/debian/watch index 34e99ca526..94e1625d3c 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/debian/watch +++ b/release/src-rt-6.x.4708/router/xl2tpd/debian/watch @@ -1,9 +1,3 @@ -# The uversionmangle option separates consecutive digits in the version string -# with a period. The reason for this is that in the past, upstream used -# version numbers like 1.00, 1.00, and 1.1.08. For some time now they have -# switched to a more "standard" 1.2.8, 1.3.0, 1.3.1, and so forth, versioning -# scheme. - -version=3 -opts="dversionmangle=s/\+dfsg//,uversionmangle=s/(\d)(\d)/\1\.\2/g" https://github.com/xelerance/xl2tpd/tags .*/v?(\d[\d\.]+)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) debian debian/repack.sh - +version=4 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/xl2tpd-$1\.tar\.gz/ \ + https://github.com/xelerance/xl2tpd/tags .*/v?(\d\S+)\.tar\.gz diff --git a/release/src-rt-6.x.4708/router/xl2tpd/l2tp.h b/release/src-rt-6.x.4708/router/xl2tpd/l2tp.h index 9b93f3f384..dfabfae3dd 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/l2tp.h +++ b/release/src-rt-6.x.4708/router/xl2tpd/l2tp.h @@ -58,7 +58,7 @@ typedef unsigned long long _u64; #define CONTROL_PIPE_REQ_LNS_REMOVE 'w' /* Get status of LNS */ #define BINARY "xl2tpd" -#define SERVER_VERSION "xl2tpd-1.3.10.1" +#define SERVER_VERSION "xl2tpd-1.3.11" #define VENDOR_NAME "xelerance.com" #ifndef PPPD #define PPPD "/usr/sbin/pppd" @@ -82,7 +82,7 @@ struct control_hdr #define CLBIT(ver) (ver & 0x4000) /* Length bit present. Must be 1 for control messages */ -#define CZBITS(ver) (ver &0x37F8) /* Reserved bits: We must drop +#define CZBITS(ver) (ver &0x37F8) /* Reserved bits: We must drop anything with these there */ #define CFBIT(ver) (ver & 0x0800) /* Presence of Ns and Nr fields @@ -116,7 +116,7 @@ struct payload_hdr #define DEFAULT_MAX_RETRIES 95 /* give us more time to debug */ #endif -#define DEFAULT_RWS_SIZE 4 /* Default max outstanding +#define DEFAULT_RWS_SIZE 4 /* Default max outstanding control packets in queue */ #define DEFAULT_TX_BPS 10000000 /* For outgoing calls, report this speed */ #define DEFAULT_RX_BPS 10000000 @@ -251,7 +251,7 @@ extern int get_entropy (unsigned char *, int); #endif -/* +/* * This is just some stuff to take * care of kernel definitions */ diff --git a/release/src-rt-6.x.4708/router/xl2tpd/packaging/fedora/xl2tpd.spec b/release/src-rt-6.x.4708/router/xl2tpd/packaging/fedora/xl2tpd.spec index 73378cf806..4e771ec1d9 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/packaging/fedora/xl2tpd.spec +++ b/release/src-rt-6.x.4708/router/xl2tpd/packaging/fedora/xl2tpd.spec @@ -1,13 +1,13 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.3.10.1 +Version: 1.3.11 Release: 1%{?dist} License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/ Group: System Environment/Daemons Source0: https://github.com/xelerance/xl2tpd/archive/v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: ppp +Requires: ppp BuildRequires: kernel-headers => 2.6.23 %if 0%{?el3}%{?el4} BuildRequires: libpcap @@ -80,7 +80,7 @@ then mv /etc/ppp/options.l2tpd /etc/ppp/options.xl2tpd mv /etc/xl2tpd/l2tp-secrets /etc/xl2tpd/l2tpd-secrets.rpmsave cp -pa /etc/l2tpd/l2tp-secrets /etc/xl2tpd/l2tp-secrets - + fi @@ -168,10 +168,10 @@ fi * Sat Jun 4 2005 Jacco de Leeuw - l2tpd.org has been hijacked. Project moved back to SourceForge: - http://l2tpd.sourceforge.net + http://l2tpd.sourceforge.net * Tue May 3 2005 Jacco de Leeuw -- Small Makefile fixes. Explicitly use gcc instead of cc. +- Small Makefile fixes. Explicitly use gcc instead of cc. Network services library was not linked on Solaris due to typo. * Thu Mar 17 2005 Jacco de Leeuw 0.69-11jdl @@ -180,7 +180,7 @@ fi * Fri Feb 4 2005 Jacco de Leeuw - Added code from Roaring Penguin (rp-l2tp) to support SysV-style ptys. - Requires the N_HDLC kernel module. + Requires the N_HDLC kernel module. * Fri Nov 26 2004 Jacco de Leeuw - Updated the README. @@ -236,7 +236,7 @@ fi - Renamed the example Openswan .conf files to better reflect the situation. There are two variants using different portselectors. Previously I thought Windows 2000/XP used portselector 17/0 - and the rest used 17/1701. But with the release of an updated + and the rest used 17/1701. But with the release of an updated IPsec client by Microsoft, it turns out that 17/0 must have been a mistake: the updated client now also uses 17/1701. @@ -250,7 +250,7 @@ fi * Thu Mar 6 2003 Jacco de Leeuw 0.69-5jdl - Replaced Dominique's patch by Damion de Soto's, which does not - depend on the N_HDLC kernel module. + depend on the N_HDLC kernel module. * Wed Feb 26 2003 Jacco de Leeuw 0.69-4jdl - Seperate example config files for Win9x (MSL2TP) and Win2K/XP @@ -284,7 +284,7 @@ fi - Specfile adapted from Mandrake Cooker. The original RPM can be retrieved through: http://www.rpmfind.net/linux/rpm2html/search.php?query=l2tpd -- Config path changed from /etc/l2tp/ to /etc/l2tpd/ +- Config path changed from /etc/l2tp/ to /etc/l2tpd/ (Seems more logical and rp-l2tp already uses /etc/l2tp/). - Do not run at boot or install. The original RPM uses a config file which is completely commented out, but it still starts l2tpd on all diff --git a/release/src-rt-6.x.4708/router/xl2tpd/packaging/openwrt/Makefile b/release/src-rt-6.x.4708/router/xl2tpd/packaging/openwrt/Makefile index 03477582f6..3d8d297cee 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/packaging/openwrt/Makefile +++ b/release/src-rt-6.x.4708/router/xl2tpd/packaging/openwrt/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xl2tpd -PKG_VERSION:=1.3.10.1 +PKG_VERSION:=1.3.11 PKG_RELEASE:=1 PKG_MD5SUM:=ab5656eb5a3d1973f7f69b039675332e-NEEDSUPDATING diff --git a/release/src-rt-6.x.4708/router/xl2tpd/packaging/suse/sles10.spec b/release/src-rt-6.x.4708/router/xl2tpd/packaging/suse/sles10.spec index 02aed90420..01a7909b26 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/packaging/suse/sles10.spec +++ b/release/src-rt-6.x.4708/router/xl2tpd/packaging/suse/sles10.spec @@ -1,6 +1,6 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.3.10.1 +Version: 1.3.11 Release: 1%{?dist} License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/ @@ -73,7 +73,7 @@ then mv /etc/ppp/options.l2tpd /etc/ppp/options.xl2tpd mv /etc/xl2tpd/l2tp-secrets /etc/xl2tpd/l2tpd-secrets.rpmsave cp -pa /etc/l2tpd/l2tp-secrets /etc/xl2tpd/l2tp-secrets - + fi @@ -162,10 +162,10 @@ exit 0 * Sat Jun 4 2005 Jacco de Leeuw - l2tpd.org has been hijacked. Project moved back to SourceForge: - http://l2tpd.sourceforge.net + http://l2tpd.sourceforge.net * Tue May 3 2005 Jacco de Leeuw -- Small Makefile fixes. Explicitly use gcc instead of cc. +- Small Makefile fixes. Explicitly use gcc instead of cc. Network services library was not linked on Solaris due to typo. * Thu Mar 17 2005 Jacco de Leeuw 0.69-11jdl @@ -174,7 +174,7 @@ exit 0 * Fri Feb 4 2005 Jacco de Leeuw - Added code from Roaring Penguin (rp-l2tp) to support SysV-style ptys. - Requires the N_HDLC kernel module. + Requires the N_HDLC kernel module. * Fri Nov 26 2004 Jacco de Leeuw - Updated the README. @@ -230,7 +230,7 @@ exit 0 - Renamed the example Openswan .conf files to better reflect the situation. There are two variants using different portselectors. Previously I thought Windows 2000/XP used portselector 17/0 - and the rest used 17/1701. But with the release of an updated + and the rest used 17/1701. But with the release of an updated IPsec client by Microsoft, it turns out that 17/0 must have been a mistake: the updated client now also uses 17/1701. @@ -244,7 +244,7 @@ exit 0 * Thu Mar 6 2003 Jacco de Leeuw 0.69-5jdl - Replaced Dominique's patch by Damion de Soto's, which does not - depend on the N_HDLC kernel module. + depend on the N_HDLC kernel module. * Wed Feb 26 2003 Jacco de Leeuw 0.69-4jdl - Seperate example config files for Win9x (MSL2TP) and Win2K/XP @@ -278,7 +278,7 @@ exit 0 - Specfile adapted from Mandrake Cooker. The original RPM can be retrieved through: http://www.rpmfind.net/linux/rpm2html/search.php?query=l2tpd -- Config path changed from /etc/l2tp/ to /etc/l2tpd/ +- Config path changed from /etc/l2tp/ to /etc/l2tpd/ (Seems more logical and rp-l2tp already uses /etc/l2tp/). - Do not run at boot or install. The original RPM uses a config file which is completely commented out, but it still starts l2tpd on all diff --git a/release/src-rt-6.x.4708/router/xl2tpd/packaging/suse/xl2tpd.spec b/release/src-rt-6.x.4708/router/xl2tpd/packaging/suse/xl2tpd.spec index 5ebc497af2..9f799bc5bc 100644 --- a/release/src-rt-6.x.4708/router/xl2tpd/packaging/suse/xl2tpd.spec +++ b/release/src-rt-6.x.4708/router/xl2tpd/packaging/suse/xl2tpd.spec @@ -1,6 +1,6 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.3.10.1 +Version: 1.3.11 Release: 1%{?dist} License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/ @@ -73,7 +73,7 @@ then mv /etc/ppp/options.l2tpd /etc/ppp/options.xl2tpd mv /etc/xl2tpd/l2tp-secrets /etc/xl2tpd/l2tpd-secrets.rpmsave cp -pa /etc/l2tpd/l2tp-secrets /etc/xl2tpd/l2tp-secrets - + fi @@ -162,10 +162,10 @@ exit 0 * Sat Jun 4 2005 Jacco de Leeuw - l2tpd.org has been hijacked. Project moved back to SourceForge: - http://l2tpd.sourceforge.net + http://l2tpd.sourceforge.net * Tue May 3 2005 Jacco de Leeuw -- Small Makefile fixes. Explicitly use gcc instead of cc. +- Small Makefile fixes. Explicitly use gcc instead of cc. Network services library was not linked on Solaris due to typo. * Thu Mar 17 2005 Jacco de Leeuw 0.69-11jdl @@ -174,7 +174,7 @@ exit 0 * Fri Feb 4 2005 Jacco de Leeuw - Added code from Roaring Penguin (rp-l2tp) to support SysV-style ptys. - Requires the N_HDLC kernel module. + Requires the N_HDLC kernel module. * Fri Nov 26 2004 Jacco de Leeuw - Updated the README. @@ -230,7 +230,7 @@ exit 0 - Renamed the example Openswan .conf files to better reflect the situation. There are two variants using different portselectors. Previously I thought Windows 2000/XP used portselector 17/0 - and the rest used 17/1701. But with the release of an updated + and the rest used 17/1701. But with the release of an updated IPsec client by Microsoft, it turns out that 17/0 must have been a mistake: the updated client now also uses 17/1701. @@ -244,7 +244,7 @@ exit 0 * Thu Mar 6 2003 Jacco de Leeuw 0.69-5jdl - Replaced Dominique's patch by Damion de Soto's, which does not - depend on the N_HDLC kernel module. + depend on the N_HDLC kernel module. * Wed Feb 26 2003 Jacco de Leeuw 0.69-4jdl - Seperate example config files for Win9x (MSL2TP) and Win2K/XP @@ -278,7 +278,7 @@ exit 0 - Specfile adapted from Mandrake Cooker. The original RPM can be retrieved through: http://www.rpmfind.net/linux/rpm2html/search.php?query=l2tpd -- Config path changed from /etc/l2tp/ to /etc/l2tpd/ +- Config path changed from /etc/l2tp/ to /etc/l2tpd/ (Seems more logical and rp-l2tp already uses /etc/l2tp/). - Do not run at boot or install. The original RPM uses a config file which is completely commented out, but it still starts l2tpd on all