From 109f940a4c8eb578b3bbf5dc4eb00c1eb843b7d4 Mon Sep 17 00:00:00 2001 From: Darshaka Pathirana Date: Sun, 19 Jan 2020 18:04:12 +0100 Subject: [PATCH] Remove patches which have been integrated into v0.3.8 --- debian/patches/01-fix-typos | 58 --------------------------------------- debian/patches/02-boost1.67.patch | 22 --------------- debian/patches/series | 2 -- 3 files changed, 82 deletions(-) delete mode 100644 debian/patches/01-fix-typos delete mode 100644 debian/patches/02-boost1.67.patch diff --git a/debian/patches/01-fix-typos b/debian/patches/01-fix-typos deleted file mode 100644 index 4be75f5..0000000 --- a/debian/patches/01-fix-typos +++ /dev/null @@ -1,58 +0,0 @@ ---- a/doc/anytun.8.txt -+++ b/doc/anytun.8.txt -@@ -109,7 +109,7 @@ - packets. In case of anycast tunnel endpoints, the anycast - IP has to be used. In case of unicast endpoints, the - address is usually derived correctly from the routing -- table. The default is to not use a special inteface and just -+ table. The default is to not use a special interface and just - bind on all interfaces. - - *-p, --port ''*:: -@@ -145,7 +145,7 @@ - of multiple anycast hosts. The unicast IP address of - the anycast host can be used here. This is needed for - communication with the other anycast hosts. The default is to -- not use a special inteface and just bind on all interfaces. However -+ not use a special interface and just bind on all interfaces. However - this is only the case if synchronisation is active see *--sync-port*. - - *-S, --sync-port ''*:: -@@ -210,7 +210,7 @@ - the multiplex id to use. default: 0 - - *-s, --sender-id ''*:: -- Each anycast tunnel endpoint needs a uniqe sender id -+ Each anycast tunnel endpoint needs a unique sender id - (1, 2, 3, ...). It is needed to distinguish the senders - in case of replay attacks. This option can be ignored on - unicast endpoints. default: 0 ---- a/doc/anytun.8 -+++ b/doc/anytun.8 -@@ -150,7 +150,7 @@ - .PP - \fB\-i, \-\-interface \fR\fB\fI\fR\fR - .RS 4 --This IP address is used as the sender address for outgoing packets\&. In case of anycast tunnel endpoints, the anycast IP has to be used\&. In case of unicast endpoints, the address is usually derived correctly from the routing table\&. The default is to not use a special inteface and just bind on all interfaces\&. -+This IP address is used as the sender address for outgoing packets\&. In case of anycast tunnel endpoints, the anycast IP has to be used\&. In case of unicast endpoints, the address is usually derived correctly from the routing table\&. The default is to not use a special interface and just bind on all interfaces\&. - .RE - .PP - \fB\-p, \-\-port \fR\fB\fI\fR\fR -@@ -182,7 +182,7 @@ - .RS 4 - local unicast(sync) ip address to bind to - --This option is only needed for tunnel endpoints consisting of multiple anycast hosts\&. The unicast IP address of the anycast host can be used here\&. This is needed for communication with the other anycast hosts\&. The default is to not use a special inteface and just bind on all interfaces\&. However this is only the case if synchronisation is active see -+This option is only needed for tunnel endpoints consisting of multiple anycast hosts\&. The unicast IP address of the anycast host can be used here\&. This is needed for communication with the other anycast hosts\&. The default is to not use a special interface and just bind on all interfaces\&. However this is only the case if synchronisation is active see - \fB\-\-sync\-port\fR\&. - .RE - .PP -@@ -255,7 +255,7 @@ - .PP - \fB\-s, \-\-sender\-id \fR\fB\fI\fR\fR - .RS 4 --Each anycast tunnel endpoint needs a uniqe sender id (1, 2, 3, \&...)\&. It is needed to distinguish the senders in case of replay attacks\&. This option can be ignored on unicast endpoints\&. default: 0 -+Each anycast tunnel endpoint needs a unique sender id (1, 2, 3, \&...)\&. It is needed to distinguish the senders in case of replay attacks\&. This option can be ignored on unicast endpoints\&. default: 0 - .RE - .PP - \fB\-w, \-\-window\-size \fR\fB\fI\fR\fR diff --git a/debian/patches/02-boost1.67.patch b/debian/patches/02-boost1.67.patch deleted file mode 100644 index 359b2d9..0000000 --- a/debian/patches/02-boost1.67.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- anytun-0.3.7.orig/src/anytunError.cpp -+++ anytun-0.3.7/src/anytunError.cpp -@@ -64,6 +64,6 @@ std::ostream& operator<<(std::ostream& s - - std::ostream& operator<<(std::ostream& stream, AnytunErrno const& value) - { -- boost::system::system_error err(boost::system::error_code(value.err_, boost::system::get_system_category())); -+ boost::system::system_error err(boost::system::error_code(value.err_, boost::system::system_category())); - return stream << err.what(); - } ---- anytun-0.3.7.orig/src/resolver.cpp -+++ anytun-0.3.7/src/resolver.cpp -@@ -81,7 +81,7 @@ ResolveHandler::ResolveHandler(co - template - void ResolveHandler::operator()(const boost::system::error_code& e, boost::asio::ip::basic_resolver_iterator endpointIt) - { -- if(boost::system::posix_error::success == e) { -+ if(boost::system::errc::success == e) { - try { - onResolve_(endpointIt); - } catch(const std::runtime_error& e) { - diff --git a/debian/patches/series b/debian/patches/series index e3093ec..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +0,0 @@ -01-fix-typos -02-boost1.67.patch -- 2.1.4