From 6b97316077f74e4f9356837b6f8ceb0d0253f80b Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 28 Apr 2018 15:39:10 +0200 Subject: [PATCH 1/8] Use https URL. --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a7befa30..99b74e8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xl2tpd (1.3.11-2) UNRELEASED; urgency=medium + + * Use https URL. + + -- Samuel Thibault Sat, 28 Apr 2018 15:39:04 +0200 + xl2tpd (1.3.11-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 64aa483a..98f3ac82 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Samir Hussain Uploaders: Samuel Thibault Homepage: https://www.xelerance.com/software/xl2tpd/ Vcs-Browser: https://github.com/xelerance/xl2tpd -Vcs-Git: git://github.com/xelerance/xl2tpd.git +Vcs-Git: https://github.com/xelerance/xl2tpd.git Build-Depends: debhelper (>= 10), libpcap0.8-dev Standards-Version: 3.9.8 From e9edcdc37b5cd213144aad750a5c56f8d1930c3f Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 4 Nov 2018 00:01:10 +0100 Subject: [PATCH 2/8] Close bug --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1f2c2b7c..e5e3f0a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ xl2tpd (1.3.12-1.1) UNRELEASED; urgency=medium * Non-maintainer upload. - * Fix FTCFBS: Let dh_auto_build pass cross compilers to make. (Closes: #-1) + * Fix FTCFBS: Let dh_auto_build pass cross compilers to make. + (Closes: #899423) -- Helmut Grohne Thu, 24 May 2018 06:08:31 +0200 From 602d2939c4dcce455a5f326b12c4273026cb60b0 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 1 Jan 2019 17:22:43 +0100 Subject: [PATCH 3/8] upload --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e5e3f0a5..9eca2217 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -xl2tpd (1.3.12-1.1) UNRELEASED; urgency=medium +xl2tpd (1.3.12-1.1) unstable; urgency=medium + [ Helmut Grohne ] * Non-maintainer upload. * Fix FTCFBS: Let dh_auto_build pass cross compilers to make. (Closes: #899423) - -- Helmut Grohne Thu, 24 May 2018 06:08:31 +0200 + -- Samuel Thibault Tue, 01 Jan 2019 17:22:40 +0100 xl2tpd (1.3.12-1) unstable; urgency=medium From 86d6c2f5a0f8697aa1c85f0356d41d283a788853 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 1 Jan 2019 17:24:57 +0100 Subject: [PATCH 4/8] Move c0cce208e4a5 to patch series --- README.xl2tpd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.xl2tpd b/README.xl2tpd index 30ee65a2..b5b712d7 100644 --- a/README.xl2tpd +++ b/README.xl2tpd @@ -28,8 +28,9 @@ Xl2tpd is based on the 0.69 L2TP by Jeff McAdams It was de-facto maintained by Jacco de Leeuw in 2002 and 2003. NOTE: In Linux kernel 4.15+ there is a kernel bug with ancillary IP_PKTINFO. - As such, for Linux kernel 4.15+ we recommend the community use xl2tpd - 1.3.12+ + As such, for Linux kernel 4.15+ we recommend the community use the + 1.3.12 branch as a temporary solution until the branch is merged into + the master branch. Mailing Lists : https://lists.openswan.org/cgi-bin/mailman/listinfo/xl2tpd is home of the From 357aa890a362a3c7f93fc33a06513136199a77af Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 1 Jan 2019 17:27:11 +0100 Subject: [PATCH 5/8] Really move changes to patch series --- debian/patches/README-update | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 23 insertions(+) create mode 100644 debian/patches/README-update create mode 100644 debian/patches/series diff --git a/debian/patches/README-update b/debian/patches/README-update new file mode 100644 index 00000000..f4372067 --- /dev/null +++ b/debian/patches/README-update @@ -0,0 +1,22 @@ +commit c0cce208e4a5c5b058916221764d7ebcb5c31e6b +Author: Samir Hussain +Date: Mon May 28 10:04:14 2018 -0400 + + Update README to provide latest info on xl2tpd + Linux kernel 4.15+ + +diff --git a/README.xl2tpd b/README.xl2tpd +index b5b712d..30ee65a 100644 +--- a/README.xl2tpd ++++ b/README.xl2tpd +@@ -28,9 +28,8 @@ Xl2tpd is based on the 0.69 L2TP by Jeff McAdams + It was de-facto maintained by Jacco de Leeuw in 2002 and 2003. + + NOTE: In Linux kernel 4.15+ there is a kernel bug with ancillary IP_PKTINFO. +- As such, for Linux kernel 4.15+ we recommend the community use the +- 1.3.12 branch as a temporary solution until the branch is merged into +- the master branch. ++ As such, for Linux kernel 4.15+ we recommend the community use xl2tpd ++ 1.3.12+ + + Mailing Lists : + https://lists.openswan.org/cgi-bin/mailman/listinfo/xl2tpd is home of the diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..7697f00f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +README-update From fad3ae0084e797945f6d8e1a4ca14787364d59be Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 1 Aug 2020 17:31:16 +0200 Subject: [PATCH 6/8] control: Bump Standards-Version to 4.5.0 * copyright: Use https URL for Format. * control: Bump Standards-Version to 4.5.0. --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/copyright | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9eca2217..bc3da46d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xl2tpd (1.3.12-2) UNRELEASED; urgency=medium + + * copyright: Use https URL for Format. + * control: Bump Standards-Version to 4.5.0. + + -- Samuel Thibault Sat, 01 Aug 2020 15:34:57 +0200 + xl2tpd (1.3.12-1.1) unstable; urgency=medium [ Helmut Grohne ] diff --git a/debian/control b/debian/control index 98f3ac82..0eec362d 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Homepage: https://www.xelerance.com/software/xl2tpd/ Vcs-Browser: https://github.com/xelerance/xl2tpd Vcs-Git: https://github.com/xelerance/xl2tpd.git Build-Depends: debhelper (>= 10), libpcap0.8-dev -Standards-Version: 3.9.8 +Standards-Version: 4.5.0 Package: xl2tpd Architecture: any diff --git a/debian/copyright b/debian/copyright index 1eb71894..768ae8e3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Formats: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://www.xelerance.com/software/xl2tpd/ (repacked to remove non-free RFC text included in upstream distribution) Files: * From d666b43b331637c7f18a6550226229d6bda1d02d Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 1 Nov 2020 00:57:34 +0100 Subject: [PATCH 7/8] Bump debhelper from 10 to 12 --- debian/changelog | 1 + debian/compat | 1 - debian/control | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index bc3da46d..6ea29610 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xl2tpd (1.3.12-2) UNRELEASED; urgency=medium * copyright: Use https URL for Format. * control: Bump Standards-Version to 4.5.0. + * Bump debhelper from 10 to 12. -- Samuel Thibault Sat, 01 Aug 2020 15:34:57 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 0eec362d..9a910bd8 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Samuel Thibault Homepage: https://www.xelerance.com/software/xl2tpd/ Vcs-Browser: https://github.com/xelerance/xl2tpd Vcs-Git: https://github.com/xelerance/xl2tpd.git -Build-Depends: debhelper (>= 10), libpcap0.8-dev +Build-Depends: debhelper-compat (= 12), libpcap0.8-dev Standards-Version: 4.5.0 Package: xl2tpd From 7941dfb5e77c6dbd02001fa93cc539db4d40e0d7 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 30 Aug 2021 23:54:43 +0200 Subject: [PATCH 8/8] Drop patch that cannot be applied any more --- debian/patches/README-update | 22 ---------------------- debian/patches/series | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 debian/patches/README-update diff --git a/debian/patches/README-update b/debian/patches/README-update deleted file mode 100644 index f4372067..00000000 --- a/debian/patches/README-update +++ /dev/null @@ -1,22 +0,0 @@ -commit c0cce208e4a5c5b058916221764d7ebcb5c31e6b -Author: Samir Hussain -Date: Mon May 28 10:04:14 2018 -0400 - - Update README to provide latest info on xl2tpd + Linux kernel 4.15+ - -diff --git a/README.xl2tpd b/README.xl2tpd -index b5b712d..30ee65a 100644 ---- a/README.xl2tpd -+++ b/README.xl2tpd -@@ -28,9 +28,8 @@ Xl2tpd is based on the 0.69 L2TP by Jeff McAdams - It was de-facto maintained by Jacco de Leeuw in 2002 and 2003. - - NOTE: In Linux kernel 4.15+ there is a kernel bug with ancillary IP_PKTINFO. -- As such, for Linux kernel 4.15+ we recommend the community use the -- 1.3.12 branch as a temporary solution until the branch is merged into -- the master branch. -+ As such, for Linux kernel 4.15+ we recommend the community use xl2tpd -+ 1.3.12+ - - Mailing Lists : - https://lists.openswan.org/cgi-bin/mailman/listinfo/xl2tpd is home of the diff --git a/debian/patches/series b/debian/patches/series index 7697f00f..792d6005 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -README-update +#