From 9b47596758752c5dc131b747a30bbe0057f268f2 Mon Sep 17 00:00:00 2001 From: Samir Hussain Date: Mon, 16 Oct 2017 14:49:33 -0400 Subject: [PATCH 1/9] Update VERSION to 1.3.11dev1 --- CHANGES | 2 ++ l2tp.h | 2 +- packaging/fedora/xl2tpd.spec | 2 +- packaging/openwrt/Makefile | 2 +- packaging/suse/sles10.spec | 2 +- packaging/suse/xl2tpd.spec | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 2bc42453..37bf8e1c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +v1.3.11dev1 (October 16, 2017) + v1.3.10.1rc2 (October 16, 2017) * Have max retries as a configuration [Samir Hussain] * Add more into to "select timeout" debug message [Samir Hussain] diff --git a/l2tp.h b/l2tp.h index b780155e..e38fa5bd 100644 --- a/l2tp.h +++ b/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.1rc2" +#define SERVER_VERSION "xl2tpd-1.3.11dev1" #define VENDOR_NAME "xelerance.com" #ifndef PPPD #define PPPD "/usr/sbin/pppd" diff --git a/packaging/fedora/xl2tpd.spec b/packaging/fedora/xl2tpd.spec index 7bc3e3b3..5053decf 100644 --- a/packaging/fedora/xl2tpd.spec +++ b/packaging/fedora/xl2tpd.spec @@ -1,6 +1,6 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.3.10.1rc2 +Version: 1.3.11dev1 Release: 1%{?dist} License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/ diff --git a/packaging/openwrt/Makefile b/packaging/openwrt/Makefile index c269cf21..363b5d18 100644 --- a/packaging/openwrt/Makefile +++ b/packaging/openwrt/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xl2tpd -PKG_VERSION:=1.3.10.1rc2 +PKG_VERSION:=1.3.11dev1 PKG_RELEASE:=1 PKG_MD5SUM:=ab5656eb5a3d1973f7f69b039675332e-NEEDSUPDATING diff --git a/packaging/suse/sles10.spec b/packaging/suse/sles10.spec index 3b613d8e..4fd65c04 100644 --- a/packaging/suse/sles10.spec +++ b/packaging/suse/sles10.spec @@ -1,6 +1,6 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.3.10.1rc2 +Version: 1.3.11dev1 Release: 1%{?dist} License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/ diff --git a/packaging/suse/xl2tpd.spec b/packaging/suse/xl2tpd.spec index 724c14c1..5587c6d6 100644 --- a/packaging/suse/xl2tpd.spec +++ b/packaging/suse/xl2tpd.spec @@ -1,6 +1,6 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.3.10.1rc2 +Version: 1.3.11dev1 Release: 1%{?dist} License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/ From aa961bd14872392e12460e4382d3916469330956 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Mon, 16 Oct 2017 15:28:08 -0400 Subject: [PATCH 2/9] Use HTTPS URL in d/copyright --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 100fafec..cd7e2029 100644 --- a/debian/copyright +++ b/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: * From 9b52ae0de02622de754652fbf473e121acf7dbb8 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Mon, 16 Oct 2017 15:31:03 -0400 Subject: [PATCH 3/9] Refresh d/control by partly sync'ing from Debian --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 668c9298..5e2d015e 100644 --- a/debian/control +++ b/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 From 37ce69ffa53b2325d80dac21557ec25553de9a83 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Mon, 16 Oct 2017 15:43:28 -0400 Subject: [PATCH 4/9] Drop d/repack.sh script and refresh d/watch --- debian/repack.sh | 41 ----------------------------------------- debian/watch | 12 +++--------- 2 files changed, 3 insertions(+), 50 deletions(-) delete mode 100755 debian/repack.sh diff --git a/debian/repack.sh b/debian/repack.sh deleted file mode 100755 index 3b6d5180..00000000 --- a/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/debian/watch b/debian/watch index 34e99ca5..94e1625d 100644 --- a/debian/watch +++ b/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 From e03dc0d3655adab206d9dc0c8884651c39a98168 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Mon, 16 Oct 2017 15:44:09 -0400 Subject: [PATCH 5/9] Bump d/compat to 9 --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/compat b/debian/compat index 7f8f011e..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 From 446f0c92aa079c5a5aa643684d6af352904e13eb Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Mon, 16 Oct 2017 15:46:29 -0400 Subject: [PATCH 6/9] Copy debian/source/options from Debian --- debian/source/options | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/source/options diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 00000000..ced93ce8 --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +--diff-ignore +--tar-ignore From a097b45c899a579e048f34551a4afeb486e67d5c Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Mon, 16 Oct 2017 15:50:30 -0400 Subject: [PATCH 7/9] Revert "Copy debian/source/options from Debian" This reverts commit 446f0c92aa079c5a5aa643684d6af352904e13eb. Not compatible with Xenial's dpkg-buildpackage --- debian/source/options | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/source/options diff --git a/debian/source/options b/debian/source/options deleted file mode 100644 index ced93ce8..00000000 --- a/debian/source/options +++ /dev/null @@ -1,2 +0,0 @@ ---diff-ignore ---tar-ignore From a0c6b4f40ec131d493f86ba90bebfef183e1b300 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Mon, 16 Oct 2017 16:56:55 -0400 Subject: [PATCH 8/9] Build packages for Xenial by default --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 32729182..d6898a59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xl2tpd (XL2TPDBASEVERSION-0xelerance1) trusty; urgency=low +xl2tpd (XL2TPDBASEVERSION-0ubuntu0.16.04xelerance1) xenial; urgency=low * Update to XL2TPDBASEVERSION From 09d35730165325005c3e57bb949c9e9a24875b73 Mon Sep 17 00:00:00 2001 From: Samir Hussain Date: Wed, 21 Feb 2018 15:54:58 -0500 Subject: [PATCH 9/9] Update VERSION to 1.3.11rc1 --- CHANGES | 11 ++++++++--- l2tp.h | 2 +- packaging/fedora/xl2tpd.spec | 2 +- packaging/openwrt/Makefile | 2 +- packaging/suse/sles10.spec | 2 +- packaging/suse/xl2tpd.spec | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 37bf8e1c..320058a1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,11 @@ -v1.3.11dev1 (October 16, 2017) - -v1.3.10.1rc2 (October 16, 2017) +v1.3.11rc1 (February 21, 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] diff --git a/l2tp.h b/l2tp.h index e38fa5bd..f5f922e8 100644 --- a/l2tp.h +++ b/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.11dev1" +#define SERVER_VERSION "xl2tpd-1.3.11rc1" #define VENDOR_NAME "xelerance.com" #ifndef PPPD #define PPPD "/usr/sbin/pppd" diff --git a/packaging/fedora/xl2tpd.spec b/packaging/fedora/xl2tpd.spec index 5053decf..e1267d69 100644 --- a/packaging/fedora/xl2tpd.spec +++ b/packaging/fedora/xl2tpd.spec @@ -1,6 +1,6 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.3.11dev1 +Version: 1.3.11rc1 Release: 1%{?dist} License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/ diff --git a/packaging/openwrt/Makefile b/packaging/openwrt/Makefile index 363b5d18..d5aae869 100644 --- a/packaging/openwrt/Makefile +++ b/packaging/openwrt/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xl2tpd -PKG_VERSION:=1.3.11dev1 +PKG_VERSION:=1.3.11rc1 PKG_RELEASE:=1 PKG_MD5SUM:=ab5656eb5a3d1973f7f69b039675332e-NEEDSUPDATING diff --git a/packaging/suse/sles10.spec b/packaging/suse/sles10.spec index 4fd65c04..5e4c2e0c 100644 --- a/packaging/suse/sles10.spec +++ b/packaging/suse/sles10.spec @@ -1,6 +1,6 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.3.11dev1 +Version: 1.3.11rc1 Release: 1%{?dist} License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/ diff --git a/packaging/suse/xl2tpd.spec b/packaging/suse/xl2tpd.spec index 5587c6d6..11169982 100644 --- a/packaging/suse/xl2tpd.spec +++ b/packaging/suse/xl2tpd.spec @@ -1,6 +1,6 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.3.11dev1 +Version: 1.3.11rc1 Release: 1%{?dist} License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/