| 1 |
commit: 574e09d32d9eaa0961a2b97132213e0500deff26 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 23 13:49:37 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 23 13:49:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574e09d3 |
| 7 |
|
| 8 |
net-misc/freelan: Fix build with boost 1.63, bug #603998 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
net-misc/freelan/files/boost163.patch | 24 ++++++++++++++++++++++++ |
| 13 |
net-misc/freelan/freelan-2.0.ebuild | 5 +++-- |
| 14 |
2 files changed, 27 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-misc/freelan/files/boost163.patch b/net-misc/freelan/files/boost163.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..33636ef |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-misc/freelan/files/boost163.patch |
| 21 |
@@ -0,0 +1,24 @@ |
| 22 |
+Index: freelan-2.0/libs/freelan/src/core.cpp |
| 23 |
+=================================================================== |
| 24 |
+--- freelan-2.0.orig/libs/freelan/src/core.cpp |
| 25 |
++++ freelan-2.0/libs/freelan/src/core.cpp |
| 26 |
+@@ -1766,7 +1766,8 @@ namespace freelan |
| 27 |
+ { |
| 28 |
+ m_logger(fscp::log_level::information) << "IPv4 address: " << m_configuration.tap_adapter.ipv4_address_prefix_length; |
| 29 |
+ |
| 30 |
+- tap_config.ipv4.network_address = { m_configuration.tap_adapter.ipv4_address_prefix_length.address(), m_configuration.tap_adapter.ipv4_address_prefix_length.prefix_length() }; |
| 31 |
++ asiotap::base_ip_network_address<boost::asio::ip::address_v4> a(m_configuration.tap_adapter.ipv4_address_prefix_length.address(), m_configuration.tap_adapter.ipv4_address_prefix_length.prefix_length()); |
| 32 |
++ tap_config.ipv4.network_address = a; |
| 33 |
+ } |
| 34 |
+ else |
| 35 |
+ { |
| 36 |
+@@ -1778,7 +1779,8 @@ namespace freelan |
| 37 |
+ { |
| 38 |
+ m_logger(fscp::log_level::information) << "IPv6 address: " << m_configuration.tap_adapter.ipv6_address_prefix_length; |
| 39 |
+ |
| 40 |
+- tap_config.ipv6.network_address = { m_configuration.tap_adapter.ipv6_address_prefix_length.address(), m_configuration.tap_adapter.ipv6_address_prefix_length.prefix_length() }; |
| 41 |
++ asiotap::base_ip_network_address<boost::asio::ip::address_v6> a(m_configuration.tap_adapter.ipv6_address_prefix_length.address(), m_configuration.tap_adapter.ipv6_address_prefix_length.prefix_length()); |
| 42 |
++ tap_config.ipv6.network_address = a; |
| 43 |
+ } |
| 44 |
+ else |
| 45 |
+ { |
| 46 |
|
| 47 |
diff --git a/net-misc/freelan/freelan-2.0.ebuild b/net-misc/freelan/freelan-2.0.ebuild |
| 48 |
index e6284f2..cc4f590 100644 |
| 49 |
--- a/net-misc/freelan/freelan-2.0.ebuild |
| 50 |
+++ b/net-misc/freelan/freelan-2.0.ebuild |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 1999-2016 Gentoo Foundation |
| 53 |
+# Copyright 1999-2017 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
# $Id$ |
| 56 |
|
| 57 |
@@ -30,7 +30,8 @@ src_prepare() { |
| 58 |
epatch \ |
| 59 |
"${FILESDIR}/boost158.patch" \ |
| 60 |
"${FILESDIR}/mf.patch" \ |
| 61 |
- "${FILESDIR}/prefix.patch" |
| 62 |
+ "${FILESDIR}/prefix.patch" \ |
| 63 |
+ "${FILESDIR}/boost163.patch" |
| 64 |
|
| 65 |
sed -e "s/CXXFLAGS='-O3'/CXXFLAGS=''/" \ |
| 66 |
-e "s/CXXFLAGS=\['-Werror'\]/CXXFLAGS=[]/" \ |
Archives