Mageia Bugzilla – Attachment 10158 Details for
Bug 22138
chromium-browser-stable new security issues fixed in 67.0.3396.62
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
Fix build for revision 1229801
chromium66.diff (text/plain), 6.64 KB, created by
Adrien Guichard
on 2018-05-16 14:13:50 CEST
(
hide
)
Description:
Fix build for revision 1229801
Filename:
MIME Type:
Creator:
Adrien Guichard
Created:
2018-05-16 14:13:50 CEST
Size:
6.64 KB
patch
obsolete
>Index: SOURCES/chromium-66-ffmpeg-features.patch >=================================================================== >--- SOURCES/chromium-66-ffmpeg-features.patch (nonexistent) >+++ SOURCES/chromium-66-ffmpeg-features.patch (copie de travail) >@@ -0,0 +1,22 @@ >+--- chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn.buildflag_header 2018-03-29 22:00:27.309041504 +0200 >++++ chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn 2018-03-30 12:30:19.959072993 +0200 >+@@ -14,8 +14,8 @@ >+ ] >+ } >+ >+-buildflag_header("ffmpeg_buildflags") { >+- header = "ffmpeg_buildflags.h" >++buildflag_header("ffmpeg_features") { >++ header = "ffmpeg_features.h" >+ flags = [ "USE_SYSTEM_FFMPEG=true" ] >+ } >+ >+@@ -36,7 +36,7 @@ >+ >+ source_set("ffmpeg") { >+ deps = [ >+- ":ffmpeg_buildflags", >++ ":ffmpeg_features", >+ ":ffmpeg_shim", >+ ] >+ public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ] >Index: SOURCES/chromium-66-gcc7.patch >=================================================================== >--- SOURCES/chromium-66-gcc7.patch (nonexistent) >+++ SOURCES/chromium-66-gcc7.patch (copie de travail) >@@ -0,0 +1,69 @@ >+--- chromium-66.0.3359.170/device/fido/device_response_converter.cc.mga7 2018-05-16 06:07:22.473118420 +0200 >++++ chromium-66.0.3359.170/device/fido/device_response_converter.cc 2018-05-16 06:12:18.662791365 +0200 >+@@ -121,7 +121,7 @@ >+ response.SetNumCredentials(it->second.GetUnsigned()); >+ } >+ >+- return response; >++ return base::Optional<AuthenticatorGetAssertionResponse>(std::move(response)); >+ } >+ >+ base::Optional<AuthenticatorGetInfoResponse> ReadCTAPGetInfoResponse( >+@@ -241,7 +241,7 @@ >+ response.SetPinProtocols(std::move(supported_pin_protocols)); >+ } >+ >+- return response; >++ return base::Optional<AuthenticatorGetInfoResponse>(std::move(response)); >+ } >+ >+ } // namespace device >+--- chromium-66.0.3359.170/cc/raster/playback_image_provider.cc.mga7 2018-05-16 06:16:58.704988411 +0200 >++++ chromium-66.0.3359.170/cc/raster/playback_image_provider.cc 2018-05-16 06:18:11.323228706 +0200 >+@@ -70,7 +70,12 @@ >+ } >+ >+ PlaybackImageProvider::Settings::Settings() = default; >+-PlaybackImageProvider::Settings::Settings(const Settings& other) = default; >++// PlaybackImageProvider::Settings::Settings(const Settings& other) = default; >++PlaybackImageProvider::Settings::Settings(const Settings& other) { >++ images_to_skip = other.images_to_skip; >++ image_to_current_frame_index = other.image_to_current_frame_index; >++} >++ >+ PlaybackImageProvider::Settings::~Settings() = default; >+ >+ } // namespace cc >+--- chromium-66.0.3359.170/chrome/browser/supervised_user/supervised_user_url_filter.cc.mga7 2018-05-16 07:26:32.123025519 +0200 >++++ chromium-66.0.3359.170/chrome/browser/supervised_user/supervised_user_url_filter.cc 2018-05-16 07:43:20.125157951 +0200 >+@@ -368,7 +368,7 @@ >+ >+ // Allow navigations to whitelisted origins (currently families.google.com). >+ static const base::NoDestructor<base::flat_set<GURL>> kWhitelistedOrigins( >+- {GURL(kFamiliesUrl).GetOrigin()}); >++ (const base::flat_set<GURL>&){GURL(kFamiliesUrl).GetOrigin()}); >+ if (base::ContainsKey(*kWhitelistedOrigins, effective_url.GetOrigin())) >+ return ALLOW; >+ >+--- chromium-66.0.3359.170/content/browser/appcache/appcache_request_handler.cc.mga7 2018-05-16 11:27:42.050327621 +0200 >++++ chromium-66.0.3359.170/content/browser/appcache/appcache_request_handler.cc 2018-05-16 11:30:16.992336108 +0200 >+@@ -639,7 +639,7 @@ >+ >+ SubresourceLoaderParams params; >+ params.loader_factory_info = factory_ptr.PassInterface(); >+- return params; >++ return base::Optional<SubresourceLoaderParams>(std::move(params)); >+ } >+ >+ void AppCacheRequestHandler::MaybeCreateSubresourceLoader( >+--- chromium-66.0.3359.170/content/browser/service_worker/service_worker_controllee_request_handler.cc.gmga7 2018-05-16 13:58:29.122823191 +0200 >++++ chromium-66.0.3359.170/content/browser/service_worker/service_worker_controllee_request_handler.cc 2018-05-16 13:58:48.686824263 +0200 >+@@ -271,7 +271,7 @@ >+ controller_info->object_info = provider_host_->GetOrCreateServiceWorkerHandle( >+ provider_host_->controller()); >+ params.controller_service_worker_info = std::move(controller_info); >+- return params; >++ return base::Optional<SubresourceLoaderParams>(std::move(params)); >+ } >+ >+ void ServiceWorkerControlleeRequestHandler::PrepareForMainResource( >Index: SPECS/chromium-browser-stable.spec >=================================================================== >--- SPECS/chromium-browser-stable.spec (révision 1229801) >+++ SPECS/chromium-browser-stable.spec (copie de travail) >@@ -18,7 +18,7 @@ > %define google_default_client_secret mLT8XooDODav1OJG5G3bY61d > > Name: chromium-browser-stable >-Version: 66.0.3359.139 >+Version: 66.0.3359.170 > Release: %mkrel 1 > Summary: A fast webkit-based web browser > Group: Networking/WWW >@@ -79,7 +79,7 @@ > # (cjw) fix coding errors resulting in gcc 7 warning > Patch54: chromium-62-gcc7.patch > # (cjw) fix build with gtk2 >-Patch55: chromium-62-gtk2.patch >+#Patch55: chromium-62-gtk2.patch > # (cjw) fix more gcc warnings > Patch58: chromium-63-gcc7.patch > # (cjw) fix gcc errors and warnings >@@ -86,6 +86,8 @@ > Patch177: chromium-64-gcc7.patch > # (cjw) fix even more gcc warnings > Patch179: chromium-65-gcc7.patch >+Patch180: chromium-66-ffmpeg-features.patch >+Patch181: chromium-66-gcc7.patch > > Provides: %{crname} > Obsoletes: chromium-browser-unstable < 26.0.1410.51 >@@ -129,7 +131,7 @@ > BuildRequires: pkgconfig(harfbuzz) > %endif > BuildRequires: pkgconfig(icu-i18n) >-BuildRequires: pkgconfig(jsoncpp) >+#BuildRequires: pkgconfig(jsoncpp) > BuildRequires: pkgconfig(libcap) > BuildRequires: pkgconfig(libdrm) > BuildRequires: pkgconfig(libexif) >@@ -283,7 +285,7 @@ > > %build > %if %mgaver >= 7 >-%define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libvpx libpng icu zlib jsoncpp opus libdrm >+%define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libvpx libpng icu zlib opus libdrm > %else > %define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libpng icu zlib jsoncpp opus libdrm freetype > %endif >@@ -343,7 +345,7 @@ > # filter out -g from CFLAGS and CXXFLAGS to fix builds > CFLAGS=$(echo "$CFLAGS"|sed -e 's/-g //') > CXXFLAGS=$(echo "$CXXFLAGS"|sed -e 's/-g //') >-CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=noexcept-type -Wno-error=register -Wno-error=strict-overflow -Wno-error=deprecated-declarations" >+CXXFLAGS="$CXXFLAGS -Wno-error -fpermissive -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=noexcept-type -Wno-error=register -Wno-error=strict-overflow -Wno-error=deprecated-declarations" > > python tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}' >
Index: SOURCES/chromium-66-ffmpeg-features.patch =================================================================== --- SOURCES/chromium-66-ffmpeg-features.patch (nonexistent) +++ SOURCES/chromium-66-ffmpeg-features.patch (copie de travail) @@ -0,0 +1,22 @@ +--- chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn.buildflag_header 2018-03-29 22:00:27.309041504 +0200 ++++ chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn 2018-03-30 12:30:19.959072993 +0200 +@@ -14,8 +14,8 @@ + ] + } + +-buildflag_header("ffmpeg_buildflags") { +- header = "ffmpeg_buildflags.h" ++buildflag_header("ffmpeg_features") { ++ header = "ffmpeg_features.h" + flags = [ "USE_SYSTEM_FFMPEG=true" ] + } + +@@ -36,7 +36,7 @@ + + source_set("ffmpeg") { + deps = [ +- ":ffmpeg_buildflags", ++ ":ffmpeg_features", + ":ffmpeg_shim", + ] + public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ] Index: SOURCES/chromium-66-gcc7.patch =================================================================== --- SOURCES/chromium-66-gcc7.patch (nonexistent) +++ SOURCES/chromium-66-gcc7.patch (copie de travail) @@ -0,0 +1,69 @@ +--- chromium-66.0.3359.170/device/fido/device_response_converter.cc.mga7 2018-05-16 06:07:22.473118420 +0200 ++++ chromium-66.0.3359.170/device/fido/device_response_converter.cc 2018-05-16 06:12:18.662791365 +0200 +@@ -121,7 +121,7 @@ + response.SetNumCredentials(it->second.GetUnsigned()); + } + +- return response; ++ return base::Optional<AuthenticatorGetAssertionResponse>(std::move(response)); + } + + base::Optional<AuthenticatorGetInfoResponse> ReadCTAPGetInfoResponse( +@@ -241,7 +241,7 @@ + response.SetPinProtocols(std::move(supported_pin_protocols)); + } + +- return response; ++ return base::Optional<AuthenticatorGetInfoResponse>(std::move(response)); + } + + } // namespace device +--- chromium-66.0.3359.170/cc/raster/playback_image_provider.cc.mga7 2018-05-16 06:16:58.704988411 +0200 ++++ chromium-66.0.3359.170/cc/raster/playback_image_provider.cc 2018-05-16 06:18:11.323228706 +0200 +@@ -70,7 +70,12 @@ + } + + PlaybackImageProvider::Settings::Settings() = default; +-PlaybackImageProvider::Settings::Settings(const Settings& other) = default; ++// PlaybackImageProvider::Settings::Settings(const Settings& other) = default; ++PlaybackImageProvider::Settings::Settings(const Settings& other) { ++ images_to_skip = other.images_to_skip; ++ image_to_current_frame_index = other.image_to_current_frame_index; ++} ++ + PlaybackImageProvider::Settings::~Settings() = default; + + } // namespace cc +--- chromium-66.0.3359.170/chrome/browser/supervised_user/supervised_user_url_filter.cc.mga7 2018-05-16 07:26:32.123025519 +0200 ++++ chromium-66.0.3359.170/chrome/browser/supervised_user/supervised_user_url_filter.cc 2018-05-16 07:43:20.125157951 +0200 +@@ -368,7 +368,7 @@ + + // Allow navigations to whitelisted origins (currently families.google.com). + static const base::NoDestructor<base::flat_set<GURL>> kWhitelistedOrigins( +- {GURL(kFamiliesUrl).GetOrigin()}); ++ (const base::flat_set<GURL>&){GURL(kFamiliesUrl).GetOrigin()}); + if (base::ContainsKey(*kWhitelistedOrigins, effective_url.GetOrigin())) + return ALLOW; + +--- chromium-66.0.3359.170/content/browser/appcache/appcache_request_handler.cc.mga7 2018-05-16 11:27:42.050327621 +0200 ++++ chromium-66.0.3359.170/content/browser/appcache/appcache_request_handler.cc 2018-05-16 11:30:16.992336108 +0200 +@@ -639,7 +639,7 @@ + + SubresourceLoaderParams params; + params.loader_factory_info = factory_ptr.PassInterface(); +- return params; ++ return base::Optional<SubresourceLoaderParams>(std::move(params)); + } + + void AppCacheRequestHandler::MaybeCreateSubresourceLoader( +--- chromium-66.0.3359.170/content/browser/service_worker/service_worker_controllee_request_handler.cc.gmga7 2018-05-16 13:58:29.122823191 +0200 ++++ chromium-66.0.3359.170/content/browser/service_worker/service_worker_controllee_request_handler.cc 2018-05-16 13:58:48.686824263 +0200 +@@ -271,7 +271,7 @@ + controller_info->object_info = provider_host_->GetOrCreateServiceWorkerHandle( + provider_host_->controller()); + params.controller_service_worker_info = std::move(controller_info); +- return params; ++ return base::Optional<SubresourceLoaderParams>(std::move(params)); + } + + void ServiceWorkerControlleeRequestHandler::PrepareForMainResource( Index: SPECS/chromium-browser-stable.spec =================================================================== --- SPECS/chromium-browser-stable.spec (révision 1229801) +++ SPECS/chromium-browser-stable.spec (copie de travail) @@ -18,7 +18,7 @@ %define google_default_client_secret mLT8XooDODav1OJG5G3bY61d Name: chromium-browser-stable -Version: 66.0.3359.139 +Version: 66.0.3359.170 Release: %mkrel 1 Summary: A fast webkit-based web browser Group: Networking/WWW @@ -79,7 +79,7 @@ # (cjw) fix coding errors resulting in gcc 7 warning Patch54: chromium-62-gcc7.patch # (cjw) fix build with gtk2 -Patch55: chromium-62-gtk2.patch +#Patch55: chromium-62-gtk2.patch # (cjw) fix more gcc warnings Patch58: chromium-63-gcc7.patch # (cjw) fix gcc errors and warnings @@ -86,6 +86,8 @@ Patch177: chromium-64-gcc7.patch # (cjw) fix even more gcc warnings Patch179: chromium-65-gcc7.patch +Patch180: chromium-66-ffmpeg-features.patch +Patch181: chromium-66-gcc7.patch Provides: %{crname} Obsoletes: chromium-browser-unstable < 26.0.1410.51 @@ -129,7 +131,7 @@ BuildRequires: pkgconfig(harfbuzz) %endif BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(jsoncpp) +#BuildRequires: pkgconfig(jsoncpp) BuildRequires: pkgconfig(libcap) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libexif) @@ -283,7 +285,7 @@ %build %if %mgaver >= 7 -%define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libvpx libpng icu zlib jsoncpp opus libdrm +%define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libvpx libpng icu zlib opus libdrm %else %define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libpng icu zlib jsoncpp opus libdrm freetype %endif @@ -343,7 +345,7 @@ # filter out -g from CFLAGS and CXXFLAGS to fix builds CFLAGS=$(echo "$CFLAGS"|sed -e 's/-g //') CXXFLAGS=$(echo "$CXXFLAGS"|sed -e 's/-g //') -CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=noexcept-type -Wno-error=register -Wno-error=strict-overflow -Wno-error=deprecated-declarations" +CXXFLAGS="$CXXFLAGS -Wno-error -fpermissive -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=noexcept-type -Wno-error=register -Wno-error=strict-overflow -Wno-error=deprecated-declarations" python tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}'
View Attachment As Raw
Actions:
View
Attachments on
bug 22138
:
10145
|
10146
|
10149
|
10158
|
10159