diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-01 22:16:57 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-01 22:17:10 +0300 |
commit | 0f291cce3faf2fd387c0db8f04bd2f9f4187f6df (patch) | |
tree | fd9642af54c93d167257fc64a83fd6b13e4797a2 /meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch | |
parent | cb8d89a37dfb6211c4918867949f0f8cc4bf6bf4 (diff) | |
download | openbmc-0f291cce3faf2fd387c0db8f04bd2f9f4187f6df.tar.xz |
meta-openembedded: subtree update:1e8bc46e55..6a5d6bc9ad
Aaltonen Eero (1):
Recipe for docopt.cpp option parsing library
Aaron Chan (1):
python3-pyatspi: Add Dbus ATSPI recipe
Adrian Bunk (11):
xmlsec1: Import from meta-security
libgit2: Upgrade 0.27.9 -> 0.28.3
libenv-perl: Import from meta-security
libgit2: Don't pass parameters with their default values to cmake
Replace EXCLUDE_FROM_WORLD_libc-musl = "1" with COMPATIBLE_HOST_libc-musl = 'null'
libwebsockets: Fix the build with -Os
mimic: Fix the build with -Os
Adapt to the lsb -> lsb-release change in OE-core
meta-oe: Replace EXCLUDE_FROM_WORLD_libc-musl = "1" with COMPATIBLE_HOST_libc-musl = 'null'
Remove LICENSE = "MIT" from packagegroups and images
Remove bogus COMMON_LICENSE_DIR usage in LIC_FILES_CHKSUM
Andreas Müller (4):
cmark: initial add 0.29.0
libsigc++-2.0: upgrade 2.10.1 -> 2.10.2
glibmm: upgrade 2.58.1 -> 2.60.0
evolution-data-server: remove unused gconf dep and pythonnative dep
Anuj Mittal (2):
pugixml: add recipe
vlc: don't look at host headers for live555
Bruce Ashfield (1):
dnsmasq: fix build against 5.2 headers
Callaghan, Dan (1):
python3-pystemd: add new recipe
Changqing Li (3):
xfsprogs: support usrmerge
ntfs-3g-ntfsprogs: support usrmerge
grubby: support usrmerge
Chris Laplante (1):
breakpad: fix patch striplevel to avoid 'devtool modify breakpad' error
Christophe PRIOUZEAU (1):
python-script: update license md5sum
Gianfranco Costamagna (2):
libmodbus: update version to 3.1.6
ifmetric: add initial recipe based on Debian packaging and patches
Hongxu Jia (4):
libdevmapper/lvm2: force recipe libdevmapper to populate sysroot only
multipath-tools: lvm2 to DEPENDS
cryptsetup: add libdevmapper to RDEPENDS
cryptsetup: add libdevmapper to RDEPENDS
Kai Kang (1):
xfce4-datetime-setter: fix compile error and requires distro feature x11
Khem Raj (14):
libgpiod: nherit python3native unconditionally
kernel-selftest: Warn conditionally about clang-native dependency
docopt.cpp: Drop using gitpkgv
libnss-nisplus: Fix build with glibc >= 2.30
bpftool.bb: Disable SECURITY_CFLAGS
kernel-selftest: Explicitly disable stack protector
ncmpc: Update to 0.34
websocketpp_0.8.1.bb: Fix build with asio from boost 1.70+
can-utils: Fix build with kernel headers >= 5.2
android-tools: update license md5sum for BSD-2-Clause
can-isotp: Update to latest tip
linux-atm: Fix build with kernel headers 5.2+
drbd: Upgrade to 9.0.19-1
ssiapi: Upgrade to 1.3.0
Klauer, Daniel (1):
sjf2410-linux-native: Fix do_deploy sstate caching
Oleksandr Kravchuk (1):
nftables: update to 0.9.2
Piotr Tworek (18):
libmxml: Use autotools bbclass and cleanup the recipe a bit.
evolution-data-server: Update to version 3.32.4
evolution-data-server: Drop x11 as required distro feature.
evolution-data-server: Inherit upstream-version-is-even bbclass.
evolution-data-server: Add dedicated packages for libebook-contacts.
evolution-data-server: Specify SYSCONF_INSTALL_DIR in EXTRA_OECMAKE.
evolution-data-server: Drop bits related to autotools
evolution-data-server: Add PACKAGECONFIGs for oauth2 and kerberos.
evolution-data-server: Drop ENABLE_UOA from EXTRA_OECMAKE.
evolution-data-server: Drop glade file references.
evolution-data-server: Fix package gobject-introspection support.
evolution-data-server: Add PACKAGECONFIG for vala bindings.
evolution-data-server: Turn goa support into PACKAGECONFIG feature.
evolution-data-server: Add weather PACKAGECONFIG feature.
evolution-data-server: Add PACKAGECONFIG entry for phonenumber.
evolution-data-server: Use SRC_URI provided by gnomebase.
evolution-data-server: Remove unused FILES paterns.
evolution-data-server: Don't use explicit version number for libebook
Qi.Chen@windriver.com (1):
libblockdev: fix PACKAGECONFIG regarding python
Robert Yang (1):
netcf: Fix Manifest not found issue
Yi Zhao (1):
samba: upgrade 4.10.6 -> 4.10.7
Yuan Chao (11):
python-typing: upgrade 3.7.4 -> 3.7.4.1
python-twisted: upgrade 19.2.1 -> 19.7.0
python-jsonschema: upgrade 2.6.0 -> 3.0.2
kpatch: upgrade 0.7.1 -> 0.8.0
libtdb: upgrade 1.4.1 -> 1.4.2
python-paste: upgrade 3.1.0 -> 3.1.1
python-pip: upgrade 19.2.2 -> 19.2.3
python-pytest: upgrade 3.4.2 -> 5.1.1
python3-xxhash: upgrade 1.3.0 -> 1.4.1
python-pluggy: upgrade 0.6.0 -> 0.12.0
python-cmd2: upgrade 0.9.2 -> 0.9.16
Zang Ruochen (3):
python-futures: upgrade 3.2.0 -> 3.3.0
python-pyyaml: upgrade 3.13 -> 5.1.2
python-alembic: upgrade 1.0.11 -> 1.1.0
Change-Id: I3b55c2efba09c26e31018ee2cbbc908f06630c7c
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch | 155 |
1 files changed, 0 insertions, 155 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch deleted file mode 100644 index 530c960ce..000000000 --- a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4 Mon Sep 17 00:00:00 2001 -From: Peter Thorson <git@zaphoyd.com> -Date: Sun, 11 Jun 2017 16:13:25 -0500 -Subject: [PATCH] minor adjustments to recent extension negotiation related - fixes, refactor a bit more extension negotiation code to be simpler - ---- - websocketpp/impl/connection_impl.hpp | 6 +-- - websocketpp/processors/hybi13.hpp | 92 ++++++++++++++++++------------------ - 2 files changed, 49 insertions(+), 49 deletions(-) - -Index: websocketpp-0.7.0/websocketpp/impl/connection_impl.hpp -=================================================================== ---- websocketpp-0.7.0.orig/websocketpp/impl/connection_impl.hpp -+++ websocketpp-0.7.0/websocketpp/impl/connection_impl.hpp -@@ -1222,17 +1222,17 @@ - std::pair<lib::error_code,std::string> neg_results; - neg_results = m_processor->negotiate_extensions(m_request); - -- if (neg_results.first == error::make_error_code(error::extension_parse_error)) { -+ if (neg_results.first == processor::error::make_error_code(processor::error::extension_parse_error)) { - // There was a fatal error in extension parsing that should result in - // a failed connection attempt. -- m_alog.write(log::alevel::info, "Bad request: " + neg_results.first.message()); -+ m_elog.write(log::elevel::info, "Bad request: " + neg_results.first.message()); - m_response.set_status(http::status_code::bad_request); - return neg_results.first; - } else if (neg_results.first) { - // There was a fatal error in extension processing that is probably our - // fault. Consider extension negotiation to have failed and continue as - // if extensions were not supported -- m_alog.write(log::alevel::info, -+ m_elog.write(log::elevel::info, - "Extension negotiation failed: " + neg_results.first.message()); - } else { - // extension negotiation succeeded, set response header accordingly -Index: websocketpp-0.7.0/websocketpp/processors/hybi13.hpp -=================================================================== ---- websocketpp-0.7.0.orig/websocketpp/processors/hybi13.hpp -+++ websocketpp-0.7.0/websocketpp/processors/hybi13.hpp -@@ -97,11 +97,6 @@ - /** - * This exists mostly because the code for requests and responses is - * identical and I can't have virtual template methods. -- * -- * NOTE: this method makes assumptions that the permessage-deflate -- * extension is the only one supported. If additional extensions are -- * ever supported it should be reviewed carefully. Most cases where -- * that assumption is made are explicitly noted. - */ - template <typename header_type> - err_str_pair negotiate_extensions_helper(header_type const & header) { -@@ -130,55 +125,60 @@ - - http::parameter_list::const_iterator it; - -+ // look through the list of extension requests to find the first -+ // one that we can accept. - if (m_permessage_deflate.is_implemented()) { - err_str_pair neg_ret; - for (it = p.begin(); it != p.end(); ++it) { -- // look through each extension, if the key is permessage-deflate -- if (it->first == "permessage-deflate") { -- // if we have already successfully negotiated this extension -- // then skip any other requests to negotiate the same one -- // with different parameters -- if (m_permessage_deflate.is_enabled()) { -- continue; -- } -- -- -- neg_ret = m_permessage_deflate.negotiate(it->second); -- -- if (neg_ret.first) { -- // Figure out if this is an error that should halt all -- // extension negotiations or simply cause negotiation of -- // this specific extension to fail. -- //std::cout << "permessage-compress negotiation failed: " -- // << neg_ret.first.message() << std::endl; -- } else { -- // Note: this list will need commas if WebSocket++ ever -- // supports more than one extension -- -- // Actually try to initialize the extension before we -- // deem negotiation complete -- ret.first = m_permessage_deflate.init(base::m_server); -- if (!ret.first) { -- -- // TODO: support multiple extensions. -- // right now, because there is only one extension -- // supported, it failing to negotiate means we are -- // done with all negotiating. In the future if more -- // extensions are supported a better solution will -- // be needed here. -- break; -- } else { -- ret.second += neg_ret.second; -- -- // continue looking for more extensions -- continue; -- } -- -- } -+ // not a permessage-deflate extension request, ignore -+ if (it->first != "permessage-deflate") { -+ continue; -+ } -+ -+ // if we have already successfully negotiated this extension -+ // then skip any other requests to negotiate the same one -+ // with different parameters -+ if (m_permessage_deflate.is_enabled()) { -+ continue; -+ } -+ -+ // attempt to negotiate this offer -+ neg_ret = m_permessage_deflate.negotiate(it->second); -+ -+ if (neg_ret.first) { -+ // negotiation offer failed. Do nothing. We will continue -+ // searching for a permessage-deflate config that succeeds -+ continue; -+ } -+ -+ // Negotiation tentatively succeeded -+ -+ // Actually try to initialize the extension before we -+ // deem negotiation complete -+ lib::error_code ec = m_permessage_deflate.init(base::m_server); -+ -+ if (ec) { -+ // Negotiation succeeded but initialization failed this is -+ // an error that should stop negotiation of permessage -+ // deflate. Return the reason for the init failure -+ -+ ret.first = ec; -+ break; -+ } else { -+ // Successfully initialized, push the negotiated response into -+ // the reply and stop looking for additional permessage-deflate -+ // extensions -+ ret.second += neg_ret.second; -+ break; - } - } - } - -+ // support for future extensions would go here. Should check the value of -+ // ret.first before continuing. Might need to consider whether failure of -+ // negotiation of an earlier extension should stop negotiation of subsequent -+ // ones -+ - return ret; - } - |