From owner-svn-ports-branches@freebsd.org Mon Jul 23 08:59:50 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD09410441B3; Mon, 23 Jul 2018 08:59:49 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8661372C14; Mon, 23 Jul 2018 08:59:49 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 672B71A6D6; Mon, 23 Jul 2018 08:59:49 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6N8xnaC051288; Mon, 23 Jul 2018 08:59:49 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6N8xiwO051256; Mon, 23 Jul 2018 08:59:44 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201807230859.w6N8xiwO051256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Mon, 23 Jul 2018 08:59:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475158 - in branches/2018Q3/www/chromium: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: in branches/2018Q3/www/chromium: . files X-SVN-Commit-Revision: 475158 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2018 08:59:50 -0000 Author: cpm Date: Mon Jul 23 08:59:43 2018 New Revision: 475158 URL: https://svnweb.freebsd.org/changeset/ports/475158 Log: MFH: r475101 www/chromium: update to 67.0.3396.87 Changelog: https://chromium.googlesource.com/chromium/src/+log/65.0.3325.181..67.0.3396.87?pretty=fuller&n=10000 Security: https://vuxml.freebsd.org/freebsd/36ff7a74-47b1-11e8-a7d6-54e1ad544088.html Security: https://vuxml.freebsd.org/freebsd/006bee4e-4c49-11e8-9c32-54ee754af08e.html Security: https://vuxml.freebsd.org/freebsd/e457978b-5484-11e8-9b85-54ee754af08e.html Security: https://vuxml.freebsd.org/freebsd/427b0f58-644c-11e8-9e1b-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/4cb49a23-6c89-11e8-8b33-e8e0b747a45a.html Approved by: ports-secteam (miwi) Added: branches/2018Q3/www/chromium/files/patch-base_files_file__path__watcher__stub.cc - copied unchanged from r475101, head/www/chromium/files/patch-base_files_file__path__watcher__stub.cc branches/2018Q3/www/chromium/files/patch-base_process_kill.h - copied unchanged from r475101, head/www/chromium/files/patch-base_process_kill.h branches/2018Q3/www/chromium/files/patch-base_process_kill_posix.cc - copied unchanged from r475101, head/www/chromium/files/patch-base_process_kill_posix.cc branches/2018Q3/www/chromium/files/patch-base_process_process__handle.cc - copied unchanged from r475101, head/www/chromium/files/patch-base_process_process__handle.cc branches/2018Q3/www/chromium/files/patch-base_process_process__handle.h - copied unchanged from r475101, head/www/chromium/files/patch-base_process_process__handle.h branches/2018Q3/www/chromium/files/patch-build_config_linux_BUILD.gn - copied unchanged from r475101, head/www/chromium/files/patch-build_config_linux_BUILD.gn branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn - copied unchanged from r475101, head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_libusb.gn - copied unchanged from r475101, head/www/chromium/files/patch-build_linux_unbundle_libusb.gn branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py - copied unchanged from r475101, head/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py branches/2018Q3/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc - copied unchanged from r475101, head/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc - copied unchanged from r475101, head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc branches/2018Q3/www/chromium/files/patch-components_crash_content_app_crashpad.cc - copied unchanged from r475101, head/www/chromium/files/patch-components_crash_content_app_crashpad.cc branches/2018Q3/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc - copied unchanged from r475101, head/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc branches/2018Q3/www/chromium/files/patch-components_services_filesystem_file_system_app.cc - copied unchanged from r475101, head/www/chromium/files/patch-components_services_filesystem_file_system_app.cc branches/2018Q3/www/chromium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc - copied unchanged from r475101, head/www/chromium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc branches/2018Q3/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc - copied unchanged from r475101, head/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc branches/2018Q3/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h - copied unchanged from r475101, head/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h branches/2018Q3/www/chromium/files/patch-content_browser_webui_web_ui_impl.cc - copied unchanged from r475101, head/www/chromium/files/patch-content_browser_webui_web_ui_impl.cc branches/2018Q3/www/chromium/files/patch-content_browser_webui_web_ui_impl.h - copied unchanged from r475101, head/www/chromium/files/patch-content_browser_webui_web_ui_impl.h branches/2018Q3/www/chromium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.cc - copied unchanged from r475101, head/www/chromium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.cc branches/2018Q3/www/chromium/files/patch-content_public_browser_web_ui.h - copied unchanged from r475101, head/www/chromium/files/patch-content_public_browser_web_ui.h branches/2018Q3/www/chromium/files/patch-content_public_browser_web_ui_data_source.h - copied unchanged from r475101, head/www/chromium/files/patch-content_public_browser_web_ui_data_source.h branches/2018Q3/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc - copied unchanged from r475101, head/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc branches/2018Q3/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h - copied unchanged from r475101, head/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h branches/2018Q3/www/chromium/files/patch-media_ffmpeg_ffmpeg_common.h - copied unchanged from r475101, head/www/chromium/files/patch-media_ffmpeg_ffmpeg_common.h branches/2018Q3/www/chromium/files/patch-media_filters_ffmpeg_demuxer.cc - copied unchanged from r475101, head/www/chromium/files/patch-media_filters_ffmpeg_demuxer.cc branches/2018Q3/www/chromium/files/patch-media_filters_ffmpeg_demuxer_unittest.cc - copied unchanged from r475101, head/www/chromium/files/patch-media_filters_ffmpeg_demuxer_unittest.cc branches/2018Q3/www/chromium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc - copied unchanged from r475101, head/www/chromium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc branches/2018Q3/www/chromium/files/patch-net_proxy_resolution_proxy_resolution_service.cc - copied unchanged from r475101, head/www/chromium/files/patch-net_proxy_resolution_proxy_resolution_service.cc branches/2018Q3/www/chromium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc - copied unchanged from r475101, head/www/chromium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc branches/2018Q3/www/chromium/files/patch-sandbox_linux_services_libc_interceptor.cc - copied unchanged from r475101, head/www/chromium/files/patch-sandbox_linux_services_libc_interceptor.cc branches/2018Q3/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc - copied unchanged from r475101, head/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc branches/2018Q3/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c - copied unchanged from r475101, head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c branches/2018Q3/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h - copied unchanged from r475101, head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h branches/2018Q3/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h - copied unchanged from r475101, head/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h branches/2018Q3/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp - copied unchanged from r475101, head/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp branches/2018Q3/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp - copied unchanged from r475101, head/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp branches/2018Q3/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp - copied unchanged from r475101, head/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp branches/2018Q3/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc - copied unchanged from r475101, head/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_BUILD.gn - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_BUILD.gn branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc branches/2018Q3/www/chromium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni - copied unchanged from r475101, head/www/chromium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni branches/2018Q3/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h - copied unchanged from r475101, head/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h branches/2018Q3/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc branches/2018Q3/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc branches/2018Q3/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc branches/2018Q3/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc branches/2018Q3/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc branches/2018Q3/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc - copied unchanged from r475101, head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc branches/2018Q3/www/chromium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc - copied unchanged from r475101, head/www/chromium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc Deleted: branches/2018Q3/www/chromium/files/patch-build_config_compiler_BUILD.gn branches/2018Q3/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_vr_sample_queue.cc branches/2018Q3/www/chromium/files/patch-components_assist_ranker_ranker_example_util.cc branches/2018Q3/www/chromium/files/patch-components_filesystem_file__system__app.cc branches/2018Q3/www/chromium/files/patch-content_browser_download_base__file.cc branches/2018Q3/www/chromium/files/patch-content_network_BUILD.gn branches/2018Q3/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc branches/2018Q3/www/chromium/files/patch-device_sensors_data__fetcher__shared__memory.h branches/2018Q3/www/chromium/files/patch-device_usb_usb__context__unittest.cc branches/2018Q3/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc branches/2018Q3/www/chromium/files/patch-device_usb_usb__device__handle__impl.h branches/2018Q3/www/chromium/files/patch-device_usb_usb__device__impl.cc branches/2018Q3/www/chromium/files/patch-gpu_ipc_client_gpu_memory_buffer_impl.cc branches/2018Q3/www/chromium/files/patch-media_base_decoder__buffer.h branches/2018Q3/www/chromium/files/patch-media_capture_BUILD.gn branches/2018Q3/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc branches/2018Q3/www/chromium/files/patch-net_proxy_proxy__service.cc branches/2018Q3/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc branches/2018Q3/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc branches/2018Q3/www/chromium/files/patch-storage_browser_quota_quota__settings.cc branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_core_editing_EditingBehavior.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_core_html_canvas_CanvasAsyncBlobCreator.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_core_html_forms_InternalPopupMenu.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_BUILD.gn branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontMetrics.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Atomics.h branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_BUILD.gn branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ByteSwap.h branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ContainerAnnotations.h branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_StackUtil.cpp branches/2018Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp branches/2018Q3/www/chromium/files/patch-third__party_libusb_BUILD.gn branches/2018Q3/www/chromium/files/patch-third__party_swiftshader_src_Common_Socket.cpp branches/2018Q3/www/chromium/files/patch-third__party_vulkan-validation-layers_src_loader_vk_loader_platform.h branches/2018Q3/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_timestamp_extrapolator.cc Modified: branches/2018Q3/www/chromium/Makefile branches/2018Q3/www/chromium/distinfo branches/2018Q3/www/chromium/files/audio_manager_openbsd.cc branches/2018Q3/www/chromium/files/extra-patch-llvm-base branches/2018Q3/www/chromium/files/extra-patch-llvm-port branches/2018Q3/www/chromium/files/patch-BUILD.gn branches/2018Q3/www/chromium/files/patch-base_process_process__metrics__freebsd.cc branches/2018Q3/www/chromium/files/patch-build_config_allocator.gni branches/2018Q3/www/chromium/files/patch-chrome_browser_about__flags.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_browser__process__impl.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_browser__resources.grd branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__commands.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__query.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_memory__details__linux.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html branches/2018Q3/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc branches/2018Q3/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc branches/2018Q3/www/chromium/files/patch-chrome_common_chrome__features.cc branches/2018Q3/www/chromium/files/patch-chrome_common_chrome__features.h branches/2018Q3/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc branches/2018Q3/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc branches/2018Q3/www/chromium/files/patch-components_crash_content_app_BUILD.gn branches/2018Q3/www/chromium/files/patch-components_crash_content_browser_BUILD.gn branches/2018Q3/www/chromium/files/patch-components_gcm__driver_gcm__client.h branches/2018Q3/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc branches/2018Q3/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc branches/2018Q3/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc branches/2018Q3/www/chromium/files/patch-content_app_content__main__runner.cc branches/2018Q3/www/chromium/files/patch-content_browser_browser__main__loop.cc branches/2018Q3/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc branches/2018Q3/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h branches/2018Q3/www/chromium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.h branches/2018Q3/www/chromium/files/patch-content_common_BUILD.gn branches/2018Q3/www/chromium/files/patch-content_gpu_BUILD.gn branches/2018Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc branches/2018Q3/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc branches/2018Q3/www/chromium/files/patch-device_usb_usb__context.cc branches/2018Q3/www/chromium/files/patch-device_usb_usb__error.cc branches/2018Q3/www/chromium/files/patch-device_usb_usb__service__impl.cc branches/2018Q3/www/chromium/files/patch-device_usb_usb__service__impl.h branches/2018Q3/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc branches/2018Q3/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc branches/2018Q3/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc branches/2018Q3/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc branches/2018Q3/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc branches/2018Q3/www/chromium/files/patch-net_base_address__tracker__linux.cc branches/2018Q3/www/chromium/files/patch-net_http_http__network__session.cc branches/2018Q3/www/chromium/files/patch-net_socket_udp__socket__posix.cc branches/2018Q3/www/chromium/files/patch-net_url__request_url__request__context__builder.cc branches/2018Q3/www/chromium/files/patch-sandbox_linux_BUILD.gn branches/2018Q3/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc branches/2018Q3/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc branches/2018Q3/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc branches/2018Q3/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp branches/2018Q3/www/chromium/files/patch-third__party_sqlite_BUILD.gn branches/2018Q3/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc branches/2018Q3/www/chromium/files/patch-third__party_zlib_BUILD.gn branches/2018Q3/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py branches/2018Q3/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc branches/2018Q3/www/chromium/files/patch-ui_base_resource_resource__bundle.cc branches/2018Q3/www/chromium/files/patch-ui_views_mus_aura__init.cc branches/2018Q3/www/chromium/pkg-plist Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/www/chromium/Makefile ============================================================================== --- branches/2018Q3/www/chromium/Makefile Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/Makefile Mon Jul 23 08:59:43 2018 (r475158) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 65.0.3325.181 -PORTREVISION= 6 +PORTVERSION= 67.0.3396.87 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -19,7 +18,8 @@ BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ .if !defined(GN_ONLY) -BUILD_DEPENDS+= gperf:devel/gperf \ +BUILD_DEPENDS+= git:devel/git \ + gperf:devel/gperf \ yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ flock:sysutils/flock \ @@ -49,7 +49,6 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ - libvpx.so:multimedia/libvpx \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ @@ -121,7 +120,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_libjpeg=true \ - use_system_sqlite=false \ extra_cxxflags="-I${LOCALBASE}/include" \ extra_ldflags="-L${LOCALBASE}/lib" # TODO: investigate building with these options: @@ -243,7 +241,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - ffmpeg flac freetype harfbuzz-ng libdrm libvpx libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} + ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} .endif do-configure: Modified: branches/2018Q3/www/chromium/distinfo ============================================================================== --- branches/2018Q3/www/chromium/distinfo Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/distinfo Mon Jul 23 08:59:43 2018 (r475158) @@ -1,5 +1,5 @@ -TIMESTAMP = 1521889794 -SHA256 (chromium-65.0.3325.181.tar.xz) = 93666448c6b96ec83e6a35a64cff40db4eb92a154fe1db4e7dab4761d0e38687 -SIZE (chromium-65.0.3325.181.tar.xz) = 570386836 -SHA256 (chromium-65.0.3325.181-testdata.tar.xz) = 03018143ffe8c96ca2710e0c48bb19f1e122cf07394f15b73a814c2f6b2a3cdb -SIZE (chromium-65.0.3325.181-testdata.tar.xz) = 252462976 +TIMESTAMP = 1531563535 +SHA256 (chromium-67.0.3396.87.tar.xz) = 5d27a72f0cb8247343034f63fdd9747ff388c05b9fceb541668dd04fb372db1d +SIZE (chromium-67.0.3396.87.tar.xz) = 591491608 +SHA256 (chromium-67.0.3396.87-testdata.tar.xz) = 091923fca8baca0e949d1d8e490cabdec0a536c3af3d67d398c6465b67c5fb3c +SIZE (chromium-67.0.3396.87-testdata.tar.xz) = 261857908 Modified: branches/2018Q3/www/chromium/files/audio_manager_openbsd.cc ============================================================================== --- branches/2018Q3/www/chromium/files/audio_manager_openbsd.cc Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/audio_manager_openbsd.cc Mon Jul 23 08:59:43 2018 (r475158) @@ -167,10 +167,10 @@ std::unique_ptr CreateAudioManage DLOG(WARNING) << "CreateAudioManager"; #if defined(USE_SNDIO) UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1); - return base::MakeUnique(std::move(audio_thread), + return std::make_unique(std::move(audio_thread), audio_log_factory); #else - return base::MakeUnique(std::move(audio_thread), + return std::make_unique(std::move(audio_thread), audio_log_factory); #endif Modified: branches/2018Q3/www/chromium/files/extra-patch-llvm-base ============================================================================== --- branches/2018Q3/www/chromium/files/extra-patch-llvm-base Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/extra-patch-llvm-base Mon Jul 23 08:59:43 2018 (r475158) @@ -43,3 +43,79 @@ forward_variables_from(invoker, [ +--- build/config/compiler/BUILD.gn.orig 2018-06-13 00:10:02.000000000 +0200 ++++ build/config/compiler/BUILD.gn 2018-07-21 13:05:54.418405000 +0200 +@@ -51,7 +51,7 @@ + # only two architectures that are currently checked in). Turn this off when + # you are using a custom toolchain and need to control -B in cflags. + linux_use_bundled_binutils = +- linux_use_bundled_binutils_override && is_linux && ++ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && + (current_cpu == "x64" || current_cpu == "x86") + binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", + root_build_dir) +@@ -375,8 +375,6 @@ + "-Wl,-z,relro", + ] + if (!using_sanitizer) { +- ldflags += [ "-Wl,-z,defs" ] +- + # Functions interposed by the sanitizers can make ld think + # that some libraries aren't needed when they actually are, + # http://crbug.com/234010. As workaround, disable --as-needed. +@@ -467,7 +465,7 @@ + # TODO(hans): Remove this once Clang generates better optimized debug info by + # default. https://crbug.com/765793 + if (is_clang && !is_nacl && current_toolchain == host_toolchain && +- target_os != "chromeos") { ++ target_os != "chromeos" && !is_bsd) { + cflags += [ + "-Xclang", + "-mllvm", +@@ -708,7 +706,7 @@ + cflags += [ "-mtune=$arm_tune" ] + } + } else if (current_cpu == "arm64") { +- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { ++ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { + cflags += [ "--target=aarch64-linux-gnu" ] + ldflags += [ "--target=aarch64-linux-gnu" ] + } +@@ -1387,10 +1385,6 @@ + + # TODO(hans): https://crbug.com/766891 + "-Wno-null-pointer-arithmetic", +- +- # Ignore warnings about MSVC optimization pragmas. +- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 +- "-Wno-ignored-pragma-optimize", + ] + if (llvm_force_head_revision) { + cflags += [ +@@ -2096,7 +2090,7 @@ + # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f + cflags += [ "-gdwarf-3" ] + } +- cflags += [ "-g2" ] ++ cflags += [ "-g0" ] + } + if (use_debug_fission && !is_nacl) { + cflags += [ "-gsplit-dwarf" ] +@@ -2110,7 +2104,7 @@ + # DWARF info may be corrupt; offsets in a range list entry are in different + # sections" there. Maybe just a bug in nacl_switch_32.S. + if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && +- (use_gold || use_lld)) { ++ (use_gold || use_lld) && !is_bsd) { + if (is_clang) { + # This flag enables the GNU-format pubnames and pubtypes sections, + # which lld needs in order to generate a correct GDB index. +@@ -2207,7 +2201,7 @@ + if (!is_win && fatal_linker_warnings && + !(is_chromeos && current_cpu == "arm") && + !(is_android && use_order_profiling) && !is_mac && !is_ios && +- current_os != "aix") { ++ current_os != "aix" && !is_bsd) { + # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 + # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 + # crbug.com/485542 Modified: branches/2018Q3/www/chromium/files/extra-patch-llvm-port ============================================================================== --- branches/2018Q3/www/chromium/files/extra-patch-llvm-port Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/extra-patch-llvm-port Mon Jul 23 08:59:43 2018 (r475158) @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2017-06-05 19:03:01 UTC -+++ build/toolchain/gcc_toolchain.gni -@@ -19,6 +19,11 @@ analyzer_wrapper = +--- build/toolchain/gcc_toolchain.gni.orig 2018-06-13 00:10:02.000000000 +0200 ++++ build/toolchain/gcc_toolchain.gni 2018-07-21 12:38:45.107087000 +0200 +@@ -25,6 +25,11 @@ rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", root_build_dir) + " --mode=clang" @@ -12,7 +12,22 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -548,13 +553,22 @@ template("clang_toolchain") { +@@ -343,12 +348,12 @@ + # We use slightly different arflags for AIX. + extra_arflags = "-r -c -s" + } else { +- extra_arflags = "-r -c -s -D" ++ extra_arflags = "rcsD" + } + + # Almost all targets build with //build/config/compiler:thin_archive which + # adds -T to arflags. +- command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" \"{{arflags}} $extra_arflags\" @\"$rspfile\"" ++ command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" {{arflags}} $extra_arflags @\"$rspfile\"" + description = "AR {{output}}" + rspfile_content = "{{inputs}}" + outputs = [ +@@ -608,13 +613,22 @@ } gcc_toolchain(target_name) { @@ -42,3 +57,92 @@ forward_variables_from(invoker, [ +--- build/config/compiler/BUILD.gn.orig 2018-06-13 00:10:02.000000000 +0200 ++++ build/config/compiler/BUILD.gn 2018-07-21 12:57:03.823912000 +0200 +@@ -51,7 +51,7 @@ + # only two architectures that are currently checked in). Turn this off when + # you are using a custom toolchain and need to control -B in cflags. + linux_use_bundled_binutils = +- linux_use_bundled_binutils_override && is_linux && ++ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && + (current_cpu == "x64" || current_cpu == "x86") + binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", + root_build_dir) +@@ -375,8 +375,6 @@ + "-Wl,-z,relro", + ] + if (!using_sanitizer) { +- ldflags += [ "-Wl,-z,defs" ] +- + # Functions interposed by the sanitizers can make ld think + # that some libraries aren't needed when they actually are, + # http://crbug.com/234010. As workaround, disable --as-needed. +@@ -467,7 +465,7 @@ + # TODO(hans): Remove this once Clang generates better optimized debug info by + # default. https://crbug.com/765793 + if (is_clang && !is_nacl && current_toolchain == host_toolchain && +- target_os != "chromeos") { ++ target_os != "chromeos" && !is_bsd) { + cflags += [ + "-Xclang", + "-mllvm", +@@ -708,7 +706,7 @@ + cflags += [ "-mtune=$arm_tune" ] + } + } else if (current_cpu == "arm64") { +- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { ++ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { + cflags += [ "--target=aarch64-linux-gnu" ] + ldflags += [ "--target=aarch64-linux-gnu" ] + } +@@ -1387,10 +1385,6 @@ + + # TODO(hans): https://crbug.com/766891 + "-Wno-null-pointer-arithmetic", +- +- # Ignore warnings about MSVC optimization pragmas. +- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 +- "-Wno-ignored-pragma-optimize", + ] + if (llvm_force_head_revision) { + cflags += [ +@@ -1572,9 +1566,9 @@ + if ((is_posix && !is_nacl) || is_fuchsia) { + # TODO(thomasanderson): Enable on ChromeOS builds once + # https://crbug.com/829956 is fixed. +- if (default_toolchain != "//build/toolchain/cros:target") { +- arflags = [ "-T" ] +- } ++ # if (default_toolchain != "//build/toolchain/cros:target") { ++ # arflags = [ "-T" ] ++ # } + } + } + +@@ -2096,7 +2090,7 @@ + # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f + cflags += [ "-gdwarf-3" ] + } +- cflags += [ "-g2" ] ++ cflags += [ "-g0" ] + } + if (use_debug_fission && !is_nacl) { + cflags += [ "-gsplit-dwarf" ] +@@ -2110,7 +2104,7 @@ + # DWARF info may be corrupt; offsets in a range list entry are in different + # sections" there. Maybe just a bug in nacl_switch_32.S. + if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && +- (use_gold || use_lld)) { ++ (use_gold || use_lld) && !is_bsd) { + if (is_clang) { + # This flag enables the GNU-format pubnames and pubtypes sections, + # which lld needs in order to generate a correct GDB index. +@@ -2207,7 +2201,7 @@ + if (!is_win && fatal_linker_warnings && + !(is_chromeos && current_cpu == "arm") && + !(is_android && use_order_profiling) && !is_mac && !is_ios && +- current_os != "aix") { ++ current_os != "aix" && !is_bsd) { + # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 + # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 + # crbug.com/485542 Modified: branches/2018Q3/www/chromium/files/patch-BUILD.gn ============================================================================== --- branches/2018Q3/www/chromium/files/patch-BUILD.gn Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-BUILD.gn Mon Jul 23 08:59:43 2018 (r475158) @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2018-02-24 16:25:08.000000000 +0100 -+++ BUILD.gn 2018-03-03 19:04:30.972689000 +0100 -@@ -361,7 +361,7 @@ +--- BUILD.gn.orig 2018-06-13 00:09:58.000000000 +0200 ++++ BUILD.gn 2018-07-14 12:26:56.482016000 +0200 +@@ -359,7 +359,7 @@ } } @@ -9,16 +9,16 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -406,8 +406,6 @@ +@@ -401,8 +401,6 @@ "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", - "//sandbox/linux:chrome_sandbox", - "//sandbox/linux:sandbox_linux_unittests", + "//testing:empty_main", ] - if (use_dbus) { -@@ -464,10 +462,6 @@ +@@ -460,10 +458,6 @@ "//chrome/test/chromedriver:chromedriver", "//chrome/test/chromedriver:chromedriver_tests", "//components/sync:run_sync_testserver", @@ -29,8 +29,8 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -522,10 +516,6 @@ - "//mojo/edk/test:mojo_public_system_perftests", +@@ -519,10 +513,6 @@ + "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", - "//third_party/breakpad:dump_syms($host_toolchain)", @@ -40,16 +40,16 @@ ] if (!is_android) { -@@ -593,7 +583,7 @@ - deps += - [ "//chrome/installer/mini_installer:next_version_mini_installer" ] +@@ -598,7 +588,7 @@ + host_os == "win") { + deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } - } else if (!is_android && !is_ios && !is_fuchsia) { + } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -835,7 +825,6 @@ +@@ -818,7 +808,6 @@ "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -57,7 +57,7 @@ # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -939,7 +928,7 @@ +@@ -921,7 +910,7 @@ ] } @@ -66,7 +66,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -948,7 +937,7 @@ +@@ -930,7 +919,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -75,7 +75,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1064,9 +1053,6 @@ +@@ -1055,9 +1044,6 @@ if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] @@ -84,4 +84,4 @@ - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } if (is_win || is_android) { - data_deps += [ "//chrome/test:angle_perftests" ] + data_deps += [ Copied: branches/2018Q3/www/chromium/files/patch-base_files_file__path__watcher__stub.cc (from r475101, head/www/chromium/files/patch-base_files_file__path__watcher__stub.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/www/chromium/files/patch-base_files_file__path__watcher__stub.cc Mon Jul 23 08:59:43 2018 (r475158, copy of r475101, head/www/chromium/files/patch-base_files_file__path__watcher__stub.cc) @@ -0,0 +1,51 @@ +--- base/files/file_path_watcher_stub.cc.orig 2018-07-19 23:00:07.807326000 +0200 ++++ base/files/file_path_watcher_stub.cc 2018-07-19 23:05:24.785603000 +0200 +@@ -1,14 +1,15 @@ +-// Copyright (c) 2012 The Chromium Authors. All rights reserved. ++// Copyright 2014 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + +-// This file exists for Unix systems which don't have the inotify headers, and +-// thus cannot build file_watcher_inotify.cc + +-#include "base/files/file_path_watcher.h" ++#include + ++#include "base/files/file_path_watcher.h" ++#include "base/files/file_path_watcher_kqueue.h" + #include "base/macros.h" + #include "base/memory/ptr_util.h" ++#include "build/build_config.h" + + namespace base { + +@@ -22,12 +23,26 @@ + bool Watch(const FilePath& path, + bool recursive, + const FilePathWatcher::Callback& callback) override { +- return false; ++ DCHECK(!impl_.get()); ++ if (recursive) { ++ if (!FilePathWatcher::RecursiveWatchAvailable()) ++ return false; ++ } else { ++ impl_ = std::make_unique(); ++ } ++ DCHECK(impl_.get()); ++ return impl_->Watch(path, recursive, callback); + } + +- void Cancel() override {} ++ void Cancel() override { ++ if (impl_.get()) ++ impl_->Cancel(); ++ set_cancelled(); ++ } + + private: ++ std::unique_ptr impl_; ++ + DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl); + }; + Copied: branches/2018Q3/www/chromium/files/patch-base_process_kill.h (from r475101, head/www/chromium/files/patch-base_process_kill.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/www/chromium/files/patch-base_process_kill.h Mon Jul 23 08:59:43 2018 (r475158, copy of r475101, head/www/chromium/files/patch-base_process_kill.h) @@ -0,0 +1,11 @@ +--- base/process/kill.h.orig 2018-07-19 22:11:43.638992000 +0200 ++++ base/process/kill.h 2018-07-19 22:12:06.613065000 +0200 +@@ -111,7 +111,7 @@ + BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( + ProcessHandle handle, int* exit_code); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Spawns a thread to wait asynchronously for the child |process| to exit + // and then reaps it. + BASE_EXPORT void EnsureProcessGetsReaped(Process process); Copied: branches/2018Q3/www/chromium/files/patch-base_process_kill_posix.cc (from r475101, head/www/chromium/files/patch-base_process_kill_posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/www/chromium/files/patch-base_process_kill_posix.cc Mon Jul 23 08:59:43 2018 (r475158, copy of r475101, head/www/chromium/files/patch-base_process_kill_posix.cc) @@ -0,0 +1,11 @@ +--- base/process/kill_posix.cc.orig 2018-07-19 22:11:49.327358000 +0200 ++++ base/process/kill_posix.cc 2018-07-19 22:12:22.837132000 +0200 +@@ -167,7 +167,7 @@ + 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void EnsureProcessGetsReaped(Process process) { + DCHECK(!process.is_current()); + Copied: branches/2018Q3/www/chromium/files/patch-base_process_process__handle.cc (from r475101, head/www/chromium/files/patch-base_process_process__handle.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/www/chromium/files/patch-base_process_process__handle.cc Mon Jul 23 08:59:43 2018 (r475158, copy of r475101, head/www/chromium/files/patch-base_process_process__handle.cc) @@ -0,0 +1,11 @@ +--- base/process/process_handle.cc.orig 2018-07-19 22:31:30.212555000 +0200 ++++ base/process/process_handle.cc 2018-07-19 22:32:27.185612000 +0200 +@@ -39,7 +39,7 @@ + return g_unique_id; + } + +-#if defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + + void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) { + g_unique_id = MangleProcessId(pid_outside_of_namespace); Copied: branches/2018Q3/www/chromium/files/patch-base_process_process__handle.h (from r475101, head/www/chromium/files/patch-base_process_process__handle.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/www/chromium/files/patch-base_process_process__handle.h Mon Jul 23 08:59:43 2018 (r475158, copy of r475101, head/www/chromium/files/patch-base_process_process__handle.h) @@ -0,0 +1,11 @@ +--- base/process/process_handle.h.orig 2018-07-19 22:31:39.988330000 +0200 ++++ base/process/process_handle.h 2018-07-19 22:32:06.977544000 +0200 +@@ -64,7 +64,7 @@ + // a process's PID. + BASE_EXPORT uint32_t GetUniqueIdForProcess(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // When a process is started in a different PID namespace from the browser + // process, this function must be called with the process's PID in the browser's + // PID namespace in order to initialize its unique ID. Not thread safe. Modified: branches/2018Q3/www/chromium/files/patch-base_process_process__metrics__freebsd.cc ============================================================================== --- branches/2018Q3/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Mon Jul 23 08:59:43 2018 (r475158) @@ -1,8 +1,8 @@ ---- base/process/process_metrics_freebsd.cc.orig 2018-02-24 16:25:08.000000000 +0100 -+++ base/process/process_metrics_freebsd.cc 2018-03-03 19:25:40.067505000 +0100 -@@ -12,6 +12,10 @@ - #include "base/macros.h" +--- base/process/process_metrics_freebsd.cc.orig 2018-06-13 00:10:01.000000000 +0200 ++++ base/process/process_metrics_freebsd.cc 2018-07-20 00:07:42.005261000 +0200 +@@ -13,6 +13,10 @@ #include "base/memory/ptr_util.h" + #include "base/process/process_metrics_iocounters.h" +#include /* getpagesize() */ +#include /* O_RDONLY */ @@ -11,19 +11,7 @@ namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) -@@ -25,6 +29,11 @@ - return WrapUnique(new ProcessMetrics(process)); - } - -+bool GetVmStatInfo(VmStatInfo* vmstat) { -+ NOTIMPLEMENTED(); -+ return false; -+} -+ - size_t ProcessMetrics::GetPagefileUsage() const { - struct kinfo_proc info; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; -@@ -118,6 +127,60 @@ +@@ -61,6 +65,65 @@ pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); @@ -81,6 +69,11 @@ + meminfo->swap_free = (swap_total - swap_used) * pagesizeKB; + + return true; ++} ++ ++uint64_t ProcessMetrics::GetVmSwapBytes() const { ++ NOTIMPLEMENTED(); ++ return 0; } } // namespace base Modified: branches/2018Q3/www/chromium/files/patch-build_config_allocator.gni ============================================================================== --- branches/2018Q3/www/chromium/files/patch-build_config_allocator.gni Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-build_config_allocator.gni Mon Jul 23 08:59:43 2018 (r475158) @@ -1,15 +1,15 @@ ---- build/config/allocator.gni.orig 2017-07-25 21:04:48.000000000 +0200 -+++ build/config/allocator.gni 2017-08-01 23:13:58.535952000 +0200 -@@ -7,7 +7,7 @@ +--- build/config/allocator.gni.orig 2018-06-13 00:10:02.000000000 +0200 ++++ build/config/allocator.gni 2018-07-14 13:12:35.947359000 +0200 +@@ -6,7 +6,7 @@ + # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors. - if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan || - is_lsan || is_tsan || is_msan || is_win || is_syzyasan || is_fuchsia || -- (is_linux && target_cpu == "arm64")) { -+ (is_linux && target_cpu == "arm64") || is_bsd) { + if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan || +- is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) { ++ is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) { _default_allocator = "none" } else { _default_allocator = "tcmalloc" -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ # against the debug CRT with "is_nacl=false". if ((is_linux || is_android || is_mac || (is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan && Copied: branches/2018Q3/www/chromium/files/patch-build_config_linux_BUILD.gn (from r475101, head/www/chromium/files/patch-build_config_linux_BUILD.gn) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/www/chromium/files/patch-build_config_linux_BUILD.gn Mon Jul 23 08:59:43 2018 (r475158, copy of r475101, head/www/chromium/files/patch-build_config_linux_BUILD.gn) @@ -0,0 +1,11 @@ +--- build/config/linux/BUILD.gn.orig 2018-07-19 22:09:59.968726000 +0200 ++++ build/config/linux/BUILD.gn 2018-07-19 22:10:16.334896000 +0200 +@@ -28,7 +28,7 @@ + } + + if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") && +- (!use_custom_libcxx || current_cpu == "mipsel")) { ++ (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) { + libs = [ "atomic" ] + } + } Copied: branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn (from r475101, head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn Mon Jul 23 08:59:43 2018 (r475158, copy of r475101, head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn) @@ -0,0 +1,22 @@ +--- build/linux/unbundle/ffmpeg.gn.orig 2018-07-20 01:03:59.604084000 +0200 ++++ build/linux/unbundle/ffmpeg.gn 2018-07-20 01:04:45.406745000 +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" ] + } + +@@ -30,7 +30,7 @@ + + source_set("ffmpeg") { + deps = [ +- ":ffmpeg_buildflags", ++ ":ffmpeg_features", + ":ffmpeg_shim", + ] + public_configs = [ ":system_ffmpeg" ] Copied: branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_libusb.gn (from r475101, head/www/chromium/files/patch-build_linux_unbundle_libusb.gn) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_libusb.gn Mon Jul 23 08:59:43 2018 (r475158, copy of r475101, head/www/chromium/files/patch-build_linux_unbundle_libusb.gn) @@ -0,0 +1,27 @@ +--- build/linux/unbundle/libusb.gn.orig 2018-07-20 03:07:05.793992000 +0200 ++++ build/linux/unbundle/libusb.gn 2018-07-20 03:07:35.792417000 +0200 +@@ -0,0 +1,24 @@ ++# Copyright 2016 The Chromium Authors. All rights reserved. ++# Use of this source code is governed by a BSD-style license that can be ++# found in the LICENSE file. ++ ++import("//build/config/linux/pkg_config.gni") ++import("//build/shim_headers.gni") ++ ++pkg_config("system_libusb") { ++ packages = [ "libusb-1.0" ] ++} ++ ++shim_headers("libusb_shim") { ++ root_path = "src/libusb" ++ headers = [ ++ "libusb.h", ++ ] ++} ++ ++source_set("libusb") { ++ deps = [ ++ ":libusb_shim", ++ ] ++ public_configs = [ ":system_libusb" ] ++} Copied: branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py (from r475101, head/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py Mon Jul 23 08:59:43 2018 (r475158, copy of r475101, head/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py) @@ -0,0 +1,10 @@ +--- build/linux/unbundle/replace_gn_files.py.orig 2018-07-20 03:07:59.446131000 +0200 ++++ build/linux/unbundle/replace_gn_files.py 2018-07-20 03:08:31.519350000 +0200 +@@ -27,6 +27,7 @@ + 'libevent': 'base/third_party/libevent/BUILD.gn', + 'libjpeg': 'third_party/libjpeg.gni', + 'libpng': 'third_party/libpng/BUILD.gn', ++ 'libusb': 'third_party/libusb/BUILD.gn', + 'libvpx': 'third_party/libvpx/BUILD.gn', + 'libwebp': 'third_party/libwebp/BUILD.gn', + 'libxml': 'third_party/libxml/BUILD.gn', Modified: branches/2018Q3/www/chromium/files/patch-chrome_browser_about__flags.cc ============================================================================== --- branches/2018Q3/www/chromium/files/patch-chrome_browser_about__flags.cc Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-chrome_browser_about__flags.cc Mon Jul 23 08:59:43 2018 (r475158) @@ -1,6 +1,15 @@ ---- chrome/browser/about_flags.cc.orig 2018-03-20 23:05:16.000000000 +0100 -+++ chrome/browser/about_flags.cc 2018-03-24 13:04:35.001279000 +0100 -@@ -2429,12 +2429,12 @@ +--- chrome/browser/about_flags.cc.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/about_flags.cc 2018-07-20 16:41:11.196156000 +0200 +@@ -593,7 +593,7 @@ + switches::kForceDirectionRTL}, + }; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + // Feature used to enable the identification of open tabs given URLs in + // suggestions, and converting those suggestions to ones that allow switching to + // the tab if found. Currently only on the desktop. Includes button option +@@ -2441,12 +2441,12 @@ flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, #endif // ENABLE_EXTENSIONS @@ -15,7 +24,7 @@ {"enable-origin-trials", flag_descriptions::kOriginTrialsName, flag_descriptions::kOriginTrialsDescription, kOsAll, FEATURE_VALUE_TYPE(features::kOriginTrials)}, -@@ -3047,7 +3047,7 @@ +@@ -3058,7 +3058,7 @@ flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kLeftToRightUrls)}, @@ -24,7 +33,7 @@ {"omnibox-entity-suggestions", flag_descriptions::kOmniboxEntitySuggestionsName, flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, -@@ -3066,7 +3066,7 @@ +@@ -3077,7 +3077,7 @@ {"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName, flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kAnimatedAppMenuIcon)}, Modified: branches/2018Q3/www/chromium/files/patch-chrome_browser_browser__process__impl.cc ============================================================================== --- branches/2018Q3/www/chromium/files/patch-chrome_browser_browser__process__impl.cc Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-chrome_browser_browser__process__impl.cc Mon Jul 23 08:59:43 2018 (r475158) @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2017-12-15 02:04:08.000000000 +0100 -+++ chrome/browser/browser_process_impl.cc 2017-12-24 00:34:24.918627000 +0100 -@@ -170,7 +170,7 @@ +--- chrome/browser/browser_process_impl.cc.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/browser_process_impl.cc 2018-07-14 13:27:02.197056000 +0200 +@@ -180,7 +180,7 @@ #include "chrome/browser/media/webrtc/webrtc_log_uploader.h" #endif @@ -9,12 +9,12 @@ #include "chrome/browser/resource_coordinator/tab_manager.h" #endif -@@ -813,7 +813,7 @@ +@@ -856,7 +856,7 @@ resource_coordinator::TabManager* BrowserProcessImpl::GetTabManager() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - if (!tab_manager_) - tab_manager_ = base::MakeUnique(); - return tab_manager_.get(); + if (!tab_manager_) { + tab_manager_ = std::make_unique(); + tab_lifecycle_unit_source_ = Modified: branches/2018Q3/www/chromium/files/patch-chrome_browser_browser__resources.grd ============================================================================== --- branches/2018Q3/www/chromium/files/patch-chrome_browser_browser__resources.grd Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-chrome_browser_browser__resources.grd Mon Jul 23 08:59:43 2018 (r475158) @@ -1,24 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2018-02-24 16:25:09.000000000 +0100 -+++ chrome/browser/browser_resources.grd 2018-03-04 09:28:51.895810000 +0100 -@@ -77,7 +77,7 @@ - - - -- -+ - - - -@@ -369,7 +369,7 @@ - - - -- -+ - - - -@@ -619,7 +619,7 @@ +--- chrome/browser/browser_resources.grd.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/browser_resources.grd 2018-07-14 13:48:09.392254000 +0200 +@@ -634,7 +634,7 @@ Modified: branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc ============================================================================== --- branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc Mon Jul 23 08:59:43 2018 (r475158) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2018-03-20 23:05:16.000000000 +0100 -+++ chrome/browser/chrome_browser_main.cc 2018-03-24 22:37:46.110352000 +0100 -@@ -206,7 +206,7 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/chrome_browser_main.cc 2018-07-14 13:55:52.288113000 +0200 +@@ -211,7 +211,7 @@ #include "chromeos/settings/cros_settings_names.h" #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -244,7 +244,7 @@ +@@ -251,7 +251,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,25 +18,29 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #endif -@@ -737,7 +737,7 @@ - field_trial_synchronizer_ = new FieldTrialSynchronizer(); +@@ -1342,10 +1342,10 @@ + } + #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) + // Set the product channel for crash reports. + breakpad::SetChannelCrashKey(chrome::GetChannelName()); +-#endif // defined(OS_LINUX) || defined(OS_OPENBSD) ++#endif // defined(OS_LINUX) + + #if defined(OS_MACOSX) + // Get the Keychain API to register for distributed notifications on the main +@@ -1369,7 +1369,7 @@ + } + #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) metrics::DesktopSessionDurationTracker::Initialize(); #endif metrics::RendererUptimeTracker::Initialize(); -@@ -1145,7 +1145,7 @@ - } - #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) - --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) - // Set the product channel for crash reports. - breakpad::SetChannelCrashKey(chrome::GetChannelString()); - #endif // defined(OS_LINUX) || defined(OS_OPENBSD) -@@ -1351,7 +1351,7 @@ +@@ -1514,7 +1514,7 @@ // Start the tab manager here so that we give the most amount of time for the // other services to start up before we start adjusting the oom priority. Modified: branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc ============================================================================== --- branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc Mon Jul 23 08:59:43 2018 (r475158) @@ -1,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2018-02-24 16:25:09.000000000 +0100 -+++ chrome/browser/chrome_content_browser_client.cc 2018-03-03 20:34:31.799512000 +0100 -@@ -281,7 +281,7 @@ +--- chrome/browser/chrome_content_browser_client.cc.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/chrome_content_browser_client.cc 2018-07-14 14:04:47.872292000 +0200 +@@ -305,7 +305,7 @@ #include "chromeos/chromeos_switches.h" #include "components/user_manager/user_manager.h" - #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h" + #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -316,7 +316,7 @@ +@@ -342,7 +342,7 @@ #include "chrome/common/importer/profile_import.mojom.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/webshare/share_service_impl.h" #endif -@@ -330,7 +330,7 @@ +@@ -356,7 +356,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -912,7 +912,7 @@ +@@ -1033,7 +1033,7 @@ main_parts = new ChromeBrowserMainPartsMac(parameters); #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); @@ -36,7 +36,7 @@ main_parts = new ChromeBrowserMainPartsLinux(parameters); #elif defined(OS_ANDROID) main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -928,7 +928,7 @@ +@@ -1049,7 +1049,7 @@ // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -45,7 +45,7 @@ main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1651,7 +1651,7 @@ +@@ -1789,7 +1789,7 @@ command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -54,7 +54,7 @@ bool enable_crash_reporter = breakpad::IsCrashReporterEnabled(); #if defined(OS_CHROMEOS) // Chrome OS uses the OS-level crash_reporter for mash services, so disable -@@ -2913,7 +2913,7 @@ +@@ -3096,7 +3096,7 @@ } } @@ -63,7 +63,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -2949,7 +2949,7 @@ +@@ -3132,7 +3132,7 @@ } #endif // defined(OS_ANDROID) } @@ -72,7 +72,7 @@ #if defined(OS_WIN) base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -3630,7 +3630,7 @@ +@@ -3806,7 +3806,7 @@ #if defined(OS_ANDROID) frame_interfaces_parameterized_->AddInterface(base::Bind( &ForwardToJavaWebContentsRegistry)); Modified: branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h ============================================================================== --- branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h Mon Jul 23 08:59:43 2018 (r475158) @@ -1,9 +1,9 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2017-12-15 02:04:08.000000000 +0100 -+++ chrome/browser/chrome_content_browser_client.h 2017-12-24 00:50:35.917227000 +0100 -@@ -291,12 +291,12 @@ +--- chrome/browser/chrome_content_browser_client.h.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/chrome_content_browser_client.h 2018-07-14 14:13:02.407023000 +0200 +@@ -299,12 +299,12 @@ + void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, - blink::WebPageVisibilityState* visibility_state) override; - + blink::mojom::PageVisibilityState* visibility_state) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( Modified: branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__commands.cc ============================================================================== --- branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__commands.cc Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__commands.cc Mon Jul 23 08:59:43 2018 (r475158) @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/download/download_commands.cc -@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked(Command comman +--- chrome/browser/download/download_commands.cc.orig 2018-06-13 00:10:05.000000000 +0200 ++++ chrome/browser/download/download_commands.cc 2018-07-14 14:30:03.853964000 +0200 +@@ -249,7 +249,7 @@ return download_item_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_item_); case ALWAYS_OPEN_TYPE: @@ -8,17 +8,17 @@ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( - download_item_->GetBrowserContext()); -@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Command command) + content::DownloadItemUtils::GetBrowserContext(download_item_)); +@@ -293,7 +293,7 @@ bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( - download_item_->GetBrowserContext()); + content::DownloadItemUtils::GetBrowserContext(download_item_)); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); DownloadItemModel(download_item_) -@@ -376,7 +376,7 @@ Browser* DownloadCommands::GetBrowser() const { +@@ -408,7 +408,7 @@ return browser_displayer.browser(); } @@ -27,7 +27,7 @@ bool DownloadCommands::IsDownloadPdf() const { base::FilePath path = download_item_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -393,7 +393,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons +@@ -425,7 +425,7 @@ return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); Modified: branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__query.cc ============================================================================== --- branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__query.cc Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__query.cc Mon Jul 23 08:59:43 2018 (r475158) @@ -1,9 +1,9 @@ ---- chrome/browser/download/download_query.cc.orig 2017-04-19 19:06:29 UTC -+++ chrome/browser/download/download_query.cc +--- chrome/browser/download/download_query.cc.orig 2018-06-13 00:10:05.000000000 +0200 ++++ chrome/browser/download/download_query.cc 2018-07-15 13:01:15.987418000 +0200 @@ -27,7 +27,11 @@ + #include "components/download/public/common/download_item.h" #include "components/url_formatter/url_formatter.h" #include "content/public/browser/content_browser_client.h" - #include "content/public/browser/download_item.h" +#if defined(OS_BSD) +#include +#else @@ -11,4 +11,4 @@ +#endif #include "url/gurl.h" - using content::DownloadDangerType; + using download::DownloadDangerType; Modified: branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc ============================================================================== --- branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc Mon Jul 23 08:59:39 2018 (r475157) +++ branches/2018Q3/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc Mon Jul 23 08:59:43 2018 (r475158) @@ -1,5 +1,5 @@ ---- chrome/browser/download/download_status_updater.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/download/download_status_updater.cc +--- chrome/browser/download/download_status_updater.cc.orig 2018-06-13 00:10:05.000000000 +0200 ++++ chrome/browser/download/download_status_updater.cc 2018-07-15 13:07:15.012034000 +0200 @@ -13,7 +13,7 @@ #include "base/memory/ptr_util.h" #include "build/build_config.h" @@ -9,10 +9,10 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated( +@@ -136,7 +136,7 @@ #if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN)) void DownloadStatusUpdater::UpdateAppIconDownloadProgress( - content::DownloadItem* download) { + download::DownloadItem* download) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) const views::LinuxUI* linux_ui = views::LinuxUI::instance(); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Mon Jul 23 14:58:58 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E2B0104D10D; Mon, 23 Jul 2018 14:58:58 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F04C57FDBC; Mon, 23 Jul 2018 14:58:57 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D1DEA1E058; Mon, 23 Jul 2018 14:58:57 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6NEwvQx035795; Mon, 23 Jul 2018 14:58:57 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6NEwvwL035794; Mon, 23 Jul 2018 14:58:57 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201807231458.w6NEwvwL035794@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 23 Jul 2018 14:58:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475179 - branches/2018Q3/devel/libslang2 X-SVN-Group: ports-branches X-SVN-Commit-Author: garga X-SVN-Commit-Paths: branches/2018Q3/devel/libslang2 X-SVN-Commit-Revision: 475179 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2018 14:58:58 -0000 Author: garga Date: Mon Jul 23 14:58:57 2018 New Revision: 475179 URL: https://svnweb.freebsd.org/changeset/ports/475179 Log: MFH: r475177 devel/libslang2: Add missing LDFLAGS Without linking libslang2.so.2.3.2 against libncurses a dependant binary is going to file with `Undefined symbol "tgetent"` error. PR: 229126 Submitted by: olevole@olevole.ru Sponsored by: Rubicon Communications, LLC (Netgate) Approved by: ports-secteam (miwi) Modified: branches/2018Q3/devel/libslang2/Makefile Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/devel/libslang2/Makefile ============================================================================== --- branches/2018Q3/devel/libslang2/Makefile Mon Jul 23 14:58:31 2018 (r475178) +++ branches/2018Q3/devel/libslang2/Makefile Mon Jul 23 14:58:57 2018 (r475179) @@ -2,6 +2,7 @@ PORTNAME= libslang2 PORTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.jedsoft.org/releases/slang/ DISTNAME= slang-${PORTVERSION} @@ -13,13 +14,14 @@ LICENSE= GPLv2 CONFLICTS= libslang-1.*.j[0-9] -USES= tar:bzip2 +USES= ncurses tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes PLIST_SUB+= SHLIB_VERSION=${PORTVERSION} CONFIGURE_ARGS+=--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig +LDFLAGS+= -lncurses ALL_TARGET= all static INSTALL_TARGET= install install-static From owner-svn-ports-branches@freebsd.org Mon Jul 23 15:06:15 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A3FF104D55E; Mon, 23 Jul 2018 15:06:15 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EF3968065F; Mon, 23 Jul 2018 15:06:14 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CD2DC1E1F1; Mon, 23 Jul 2018 15:06:14 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6NF6EnC041282; Mon, 23 Jul 2018 15:06:14 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6NF6Ehh041280; Mon, 23 Jul 2018 15:06:14 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201807231506.w6NF6Ehh041280@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 23 Jul 2018 15:06:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475182 - in branches/2018Q3/security/suricata: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: garga X-SVN-Commit-Paths: in branches/2018Q3/security/suricata: . files X-SVN-Commit-Revision: 475182 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2018 15:06:15 -0000 Author: garga Date: Mon Jul 23 15:06:14 2018 New Revision: 475182 URL: https://svnweb.freebsd.org/changeset/ports/475182 Log: MFH: r475180 Update security/suricata to 4.0.5 PR: 229904 Approved by: maintainer Security: CVE-2018-10242 CVE-2018-10244 Differential Revision: https://reviews.freebsd.org/D16366 Approved by: ports-secteam (miwi via irc) Deleted: branches/2018Q3/security/suricata/files/patch-disable_nss_nspr Modified: branches/2018Q3/security/suricata/Makefile branches/2018Q3/security/suricata/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/security/suricata/Makefile ============================================================================== --- branches/2018Q3/security/suricata/Makefile Mon Jul 23 15:04:55 2018 (r475181) +++ branches/2018Q3/security/suricata/Makefile Mon Jul 23 15:06:14 2018 (r475182) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= suricata -DISTVERSION= 4.0.4 +DISTVERSION= 4.0.5 CATEGORIES= security MASTER_SITES= http://www.openinfosecfoundation.org/download/ Modified: branches/2018Q3/security/suricata/distinfo ============================================================================== --- branches/2018Q3/security/suricata/distinfo Mon Jul 23 15:04:55 2018 (r475181) +++ branches/2018Q3/security/suricata/distinfo Mon Jul 23 15:06:14 2018 (r475182) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522066170 -SHA256 (suricata-4.0.4.tar.gz) = 617e83b6e20b03aa7d5e05a980d3cb6d2810ec18a6f15a36bf66c81c9c0a2abb -SIZE (suricata-4.0.4.tar.gz) = 12511121 +TIMESTAMP = 1532091141 +SHA256 (suricata-4.0.5.tar.gz) = 74dacb4359d57fbd3452e384eeeb1dd77b6ae00f02e9994ad5a7b461d5f4c6c2 +SIZE (suricata-4.0.5.tar.gz) = 12494906 From owner-svn-ports-branches@freebsd.org Mon Jul 23 17:28:30 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCCFE1050A06; Mon, 23 Jul 2018 17:28:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6BE8C863ED; Mon, 23 Jul 2018 17:28:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4CE131F8A6; Mon, 23 Jul 2018 17:28:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6NHSUIE014005; Mon, 23 Jul 2018 17:28:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6NHSU8f014004; Mon, 23 Jul 2018 17:28:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201807231728.w6NHSU8f014004@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 23 Jul 2018 17:28:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475193 - in branches/2018Q3/www/seamonkey: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q3/www/seamonkey: . files X-SVN-Commit-Revision: 475193 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2018 17:28:30 -0000 Author: jbeich Date: Mon Jul 23 17:28:29 2018 New Revision: 475193 URL: https://svnweb.freebsd.org/changeset/ports/475193 Log: MFH: r475191 www/seamonkey: regen distfile (nop after r474292) Changes: https://hg.mozilla.org/releases/comm-esr52/rev/8a9f075930d3 Approved by: ports-secteam blanket Deleted: branches/2018Q3/www/seamonkey/files/patch-bug1473893 Modified: branches/2018Q3/www/seamonkey/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/www/seamonkey/distinfo ============================================================================== --- branches/2018Q3/www/seamonkey/distinfo Mon Jul 23 17:27:12 2018 (r475192) +++ branches/2018Q3/www/seamonkey/distinfo Mon Jul 23 17:28:29 2018 (r475193) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530930170 -SHA256 (seamonkey-2.49.4.source.tar.xz) = 3e9aee0beb0094f26b935016a02ba9e2ab4ab46434e018b55d1f2baf541ee181 -SIZE (seamonkey-2.49.4.source.tar.xz) = 230165332 +TIMESTAMP = 1531362029 +SHA256 (seamonkey-2.49.4.source.tar.xz) = c8a66774d0a3525698b559fa2c41397186f2de99c5733e35b8eafb0ae5ccc4ee +SIZE (seamonkey-2.49.4.source.tar.xz) = 231795176 From owner-svn-ports-branches@freebsd.org Tue Jul 24 00:26:39 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCC5E102A14B; Tue, 24 Jul 2018 00:26:38 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 624C674864; Tue, 24 Jul 2018 00:26:38 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E83323C45; Tue, 24 Jul 2018 00:26:38 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6O0Qces030603; Tue, 24 Jul 2018 00:26:38 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6O0Qbtv030601; Tue, 24 Jul 2018 00:26:37 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201807240026.w6O0Qbtv030601@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 24 Jul 2018 00:26:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475213 - branches/2018Q3/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q3/emulators/rpcs3 X-SVN-Commit-Revision: 475213 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 00:26:39 -0000 Author: jbeich Date: Tue Jul 24 00:26:37 2018 New Revision: 475213 URL: https://svnweb.freebsd.org/changeset/ports/475213 Log: MFH: r475210 emulators/rpcs3: update to 0.0.5.663 Changes: https://github.com/RPCS3/rpcs3/compare/6caffd0e3...c5c0f68b3 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q3/emulators/rpcs3/Makefile branches/2018Q3/emulators/rpcs3/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q3/emulators/rpcs3/Makefile Tue Jul 24 00:25:54 2018 (r475212) +++ branches/2018Q3/emulators/rpcs3/Makefile Tue Jul 24 00:26:37 2018 (r475213) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-651 -DISTVERSIONSUFFIX= -g6caffd0e3 +DISTVERSION= 0.0.5-663 +DISTVERSIONSUFFIX= -gc5c0f68b3 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hidapi/3rdparty/hidapi \ - RPCS3:llvm:60611c0f232c:llvm/llvm \ + RPCS3:llvm:be9f7bfe2068:llvm/llvm \ akrzemi1:Optional:f27e790:Optional/3rdparty/Optional \ Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \ jbeder:yaml-cpp:yaml-cpp-0.6.2-4-g4fb1c4b:yamlcpp/3rdparty/yaml-cpp \ Modified: branches/2018Q3/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q3/emulators/rpcs3/distinfo Tue Jul 24 00:25:54 2018 (r475212) +++ branches/2018Q3/emulators/rpcs3/distinfo Tue Jul 24 00:26:37 2018 (r475213) @@ -1,10 +1,10 @@ -TIMESTAMP = 1532127727 -SHA256 (RPCS3-rpcs3-v0.0.5-651-g6caffd0e3_GH0.tar.gz) = 46d06e073bf310bc26be18150a26b6bff481534bde6bae7af781f808e0475fdd -SIZE (RPCS3-rpcs3-v0.0.5-651-g6caffd0e3_GH0.tar.gz) = 4955512 +TIMESTAMP = 1532274808 +SHA256 (RPCS3-rpcs3-v0.0.5-663-gc5c0f68b3_GH0.tar.gz) = be3bb3766840db90aeba98cb5defa7e08f5cda7af5ee25026823883aaab9cd9e +SIZE (RPCS3-rpcs3-v0.0.5-663-gc5c0f68b3_GH0.tar.gz) = 4953867 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 -SHA256 (RPCS3-llvm-60611c0f232c_GH0.tar.gz) = 52229d88de430293a6dbd4a9473be65dd92898f5e477aa65349aae2983de013d -SIZE (RPCS3-llvm-60611c0f232c_GH0.tar.gz) = 41810844 +SHA256 (RPCS3-llvm-be9f7bfe2068_GH0.tar.gz) = 6fc805799e0853505ce786882e5856d018130fcca37206e7ef5fcef6b72937d3 +SIZE (RPCS3-llvm-be9f7bfe2068_GH0.tar.gz) = 42328799 SHA256 (akrzemi1-Optional-f27e790_GH0.tar.gz) = d9f81fa3699b724812994897180365b7ee2fdef1549239d5086722bd4552baf1 SIZE (akrzemi1-Optional-f27e790_GH0.tar.gz) = 16055 SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95 From owner-svn-ports-branches@freebsd.org Tue Jul 24 00:27:11 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9246102A1C5; Tue, 24 Jul 2018 00:27:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8C3F974951; Tue, 24 Jul 2018 00:27:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D16623C46; Tue, 24 Jul 2018 00:27:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6O0RAch030754; Tue, 24 Jul 2018 00:27:10 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6O0RAlV030752; Tue, 24 Jul 2018 00:27:10 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201807240027.w6O0RAlV030752@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 24 Jul 2018 00:27:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475214 - branches/2018Q3/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q3/emulators/citra X-SVN-Commit-Revision: 475214 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 00:27:11 -0000 Author: jbeich Date: Tue Jul 24 00:27:09 2018 New Revision: 475214 URL: https://svnweb.freebsd.org/changeset/ports/475214 Log: MFH: r475211 emulators/citra: update to s20180723 Changes: https://github.com/citra-emu/citra/compare/78685065c...14878a17d Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q3/emulators/citra/Makefile branches/2018Q3/emulators/citra/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/emulators/citra/Makefile ============================================================================== --- branches/2018Q3/emulators/citra/Makefile Tue Jul 24 00:26:37 2018 (r475213) +++ branches/2018Q3/emulators/citra/Makefile Tue Jul 24 00:27:09 2018 (r475214) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180719 +PORTVERSION= s20180723 PORTREVISION?= 0 CATEGORIES= emulators @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 78685065c +GH_TAGNAME= 14878a17d GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-2-g4b350a3:dynarmic/externals/dynarmic \ Modified: branches/2018Q3/emulators/citra/distinfo ============================================================================== --- branches/2018Q3/emulators/citra/distinfo Tue Jul 24 00:26:37 2018 (r475213) +++ branches/2018Q3/emulators/citra/distinfo Tue Jul 24 00:27:09 2018 (r475214) @@ -1,6 +1,6 @@ -TIMESTAMP = 1531990317 -SHA256 (citra-emu-citra-s20180719-78685065c_GH0.tar.gz) = 89a81ae1ec4c0042cb3f69fddd3c98c9bbac6fb84ee4fa820566a17b26e7f857 -SIZE (citra-emu-citra-s20180719-78685065c_GH0.tar.gz) = 4000885 +TIMESTAMP = 1532368974 +SHA256 (citra-emu-citra-s20180723-14878a17d_GH0.tar.gz) = 257423fd4f8c16563da18b33e75555c7f7f08c4ff99406510663252372292124 +SIZE (citra-emu-citra-s20180723-14878a17d_GH0.tar.gz) = 3999968 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c From owner-svn-ports-branches@freebsd.org Tue Jul 24 08:49:42 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C71010452DD; Tue, 24 Jul 2018 08:49:42 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E519085BAA; Tue, 24 Jul 2018 08:49:41 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5FBE1117; Tue, 24 Jul 2018 08:49:41 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6O8nfKD089630; Tue, 24 Jul 2018 08:49:41 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6O8nfHH089628; Tue, 24 Jul 2018 08:49:41 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201807240849.w6O8nfHH089628@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Tue, 24 Jul 2018 08:49:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475230 - in branches/2018Q3/lang/php71: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in branches/2018Q3/lang/php71: . files X-SVN-Commit-Revision: 475230 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 08:49:42 -0000 Author: tz Date: Tue Jul 24 08:49:41 2018 New Revision: 475230 URL: https://svnweb.freebsd.org/changeset/ports/475230 Log: MFH: r475181 Update PHP 7.1 from 7.1.19 to 7.1.20 Changelog: http://www.php.net/ChangeLog-7.php#7.1.20 Also patch out MySQL 8 auth changes, which makes the hash extension mandatory instead of optional and introduce further bugs: https://github.com/php/php-src/commit/d6e81f0bfd0cb90586dd83d4fd47a4302605261a Approved by: ports-secteam (miwi) Added: branches/2018Q3/lang/php71/files/patch-bug-76600-remove-mysql8-auth - copied unchanged from r475181, head/lang/php71/files/patch-bug-76600-remove-mysql8-auth Modified: branches/2018Q3/lang/php71/Makefile branches/2018Q3/lang/php71/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/lang/php71/Makefile ============================================================================== --- branches/2018Q3/lang/php71/Makefile Tue Jul 24 08:44:32 2018 (r475229) +++ branches/2018Q3/lang/php71/Makefile Tue Jul 24 08:49:41 2018 (r475230) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php71 -PORTVERSION= 7.1.19 +PORTVERSION= 7.1.20 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2018Q3/lang/php71/distinfo ============================================================================== --- branches/2018Q3/lang/php71/distinfo Tue Jul 24 08:44:32 2018 (r475229) +++ branches/2018Q3/lang/php71/distinfo Tue Jul 24 08:49:41 2018 (r475230) @@ -1,5 +1,5 @@ -TIMESTAMP = 1529911273 -SHA256 (php-7.1.19.tar.xz) = 7cab88f269b90a8a38dbcccf3ec0d5c6eba86122431a53eaa94405bbb60370a8 -SIZE (php-7.1.19.tar.xz) = 12215112 +TIMESTAMP = 1531988442 +SHA256 (php-7.1.20.tar.xz) = cd7d1006201459d43fae0790cce4eb3451add5c87f4cadb13b228d4c179b850c +SIZE (php-7.1.20.tar.xz) = 12227052 SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7 SIZE (php-7.1.x-mail-header.patch) = 4504 Copied: branches/2018Q3/lang/php71/files/patch-bug-76600-remove-mysql8-auth (from r475181, head/lang/php71/files/patch-bug-76600-remove-mysql8-auth) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/lang/php71/files/patch-bug-76600-remove-mysql8-auth Tue Jul 24 08:49:41 2018 (r475230, copy of r475181, head/lang/php71/files/patch-bug-76600-remove-mysql8-auth) @@ -0,0 +1,625 @@ +--- ext/mysqlnd/mysqlnd_auth.c.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_auth.c +@@ -89,7 +89,6 @@ mysqlnd_run_authentication( + } + } + +- + { + zend_uchar * switch_to_auth_protocol_data = NULL; + size_t switch_to_auth_protocol_data_len = 0; +@@ -114,11 +113,10 @@ mysqlnd_run_authentication( + DBG_INF_FMT("salt(%d)=[%.*s]", plugin_data_len, plugin_data_len, plugin_data); + /* The data should be allocated with malloc() */ + if (auth_plugin) { +- scrambled_data = auth_plugin->methods.get_auth_data( +- NULL, &scrambled_data_len, conn, user, passwd, +- passwd_len, plugin_data, plugin_data_len, +- session_options, conn->protocol_frame_codec->data, +- mysql_flags); ++ scrambled_data = ++ auth_plugin->methods.get_auth_data(NULL, &scrambled_data_len, conn, user, passwd, passwd_len, ++ plugin_data, plugin_data_len, session_options, ++ conn->protocol_frame_codec->data, mysql_flags); + } + + if (conn->error_info->error_no) { +@@ -129,7 +127,6 @@ mysqlnd_run_authentication( + charset_no, + first_call, + requested_protocol, +- auth_plugin, plugin_data, plugin_data_len, + scrambled_data, scrambled_data_len, + &switch_to_auth_protocol, &switch_to_auth_protocol_len, + &switch_to_auth_protocol_data, &switch_to_auth_protocol_data_len +@@ -251,9 +248,6 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA + unsigned int server_charset_no, + zend_bool use_full_blown_auth_packet, + const char * const auth_protocol, +- struct st_mysqlnd_authentication_plugin * auth_plugin, +- const zend_uchar * const orig_auth_plugin_data, +- const size_t orig_auth_plugin_data_len, + const zend_uchar * const auth_plugin_data, + const size_t auth_plugin_data_len, + char ** switch_to_auth_protocol, +@@ -324,11 +318,6 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA + conn->charset = mysqlnd_find_charset_nr(auth_packet->charset_no); + } + +- if (auth_plugin && auth_plugin->methods.handle_server_response) { +- auth_plugin->methods.handle_server_response(auth_plugin, conn, +- orig_auth_plugin_data, orig_auth_plugin_data_len, passwd, passwd_len); +- } +- + if (FAIL == PACKET_READ(auth_resp_packet) || auth_resp_packet->response_code >= 0xFE) { + if (auth_resp_packet->response_code == 0xFE) { + /* old authentication with new server !*/ +@@ -624,8 +613,7 @@ static struct st_mysqlnd_authentication_ + } + }, + {/* methods */ +- mysqlnd_native_auth_get_auth_data, +- NULL ++ mysqlnd_native_auth_get_auth_data + } + }; + +@@ -674,8 +662,7 @@ static struct st_mysqlnd_authentication_ + } + }, + {/* methods */ +- mysqlnd_pam_auth_get_auth_data, +- NULL ++ mysqlnd_pam_auth_get_auth_data + } + }; + +@@ -859,283 +846,17 @@ static struct st_mysqlnd_authentication_ + } + }, + {/* methods */ +- mysqlnd_sha256_auth_get_auth_data, +- NULL ++ mysqlnd_sha256_auth_get_auth_data + } + }; + #endif + +-/*************************************** CACHING SHA2 Password *******************************/ +- +-#undef L64 +- +-#include "ext/hash/php_hash.h" +-#include "ext/hash/php_hash_sha.h" +- +-#define SHA256_LENGTH 32 +- +-/* {{{ php_mysqlnd_scramble_sha2 */ +-void php_mysqlnd_scramble_sha2(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const password, const size_t password_len) +-{ +- PHP_SHA256_CTX context; +- zend_uchar sha1[SHA256_LENGTH]; +- zend_uchar sha2[SHA256_LENGTH]; +- +- /* Phase 1: hash password */ +- PHP_SHA256Init(&context); +- PHP_SHA256Update(&context, password, password_len); +- PHP_SHA256Final(sha1, &context); +- +- /* Phase 2: hash sha1 */ +- PHP_SHA256Init(&context); +- PHP_SHA256Update(&context, (zend_uchar*)sha1, SHA256_LENGTH); +- PHP_SHA256Final(sha2, &context); +- +- /* Phase 3: hash scramble + sha2 */ +- PHP_SHA256Init(&context); +- PHP_SHA256Update(&context, (zend_uchar*)sha2, SHA256_LENGTH); +- PHP_SHA256Update(&context, scramble, SCRAMBLE_LENGTH); +- PHP_SHA256Final(buffer, &context); +- +- /* let's crypt buffer now */ +- php_mysqlnd_crypt(buffer, (const zend_uchar *)sha1, (const zend_uchar *)buffer, SHA256_LENGTH); +-} +-/* }}} */ +- +- +-/* {{{ mysqlnd_native_auth_get_auth_data */ +-static zend_uchar * +-mysqlnd_caching_sha2_get_auth_data(struct st_mysqlnd_authentication_plugin * self, +- size_t * auth_data_len, +- MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd, +- const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- const MYSQLND_SESSION_OPTIONS * const session_options, +- const MYSQLND_PFC_DATA * const pfc_data, +- zend_ulong mysql_flags +- ) +-{ +- zend_uchar * ret = NULL; +- DBG_ENTER("mysqlnd_caching_sha2_get_auth_data"); +- DBG_INF_FMT("salt(%d)=[%.*s]", auth_plugin_data_len, auth_plugin_data_len, auth_plugin_data); +- *auth_data_len = 0; +- +- DBG_INF("First auth step: send hashed password"); +- /* copy scrambled pass*/ +- if (passwd && passwd_len) { +- ret = malloc(SHA256_LENGTH + 1); +- *auth_data_len = SHA256_LENGTH; +- php_mysqlnd_scramble_sha2((zend_uchar*)ret, auth_plugin_data, (zend_uchar*)passwd, passwd_len); +- ret[SHA256_LENGTH] = '\0'; +- DBG_INF_FMT("hash(%d)=[%.*s]", *auth_data_len, *auth_data_len, ret); +- } +- +- DBG_RETURN(ret); +-} +-/* }}} */ +- +-#ifdef MYSQLND_HAVE_SSL +-static RSA * +-mysqlnd_caching_sha2_get_key(MYSQLND_CONN_DATA *conn) +-{ +- RSA * ret = NULL; +- const MYSQLND_PFC_DATA * const pfc_data = conn->protocol_frame_codec->data; +- const char * fname = (pfc_data->sha256_server_public_key && pfc_data->sha256_server_public_key[0] != '\0')? +- pfc_data->sha256_server_public_key: +- MYSQLND_G(sha256_server_public_key); +- php_stream * stream; +- DBG_ENTER("mysqlnd_cached_sha2_get_key"); +- DBG_INF_FMT("options_s256_pk=[%s] MYSQLND_G(sha256_server_public_key)=[%s]", +- pfc_data->sha256_server_public_key? pfc_data->sha256_server_public_key:"n/a", +- MYSQLND_G(sha256_server_public_key)? MYSQLND_G(sha256_server_public_key):"n/a"); +- if (!fname || fname[0] == '\0') { +- MYSQLND_PACKET_CACHED_SHA2_RESULT *req_packet = NULL; +- MYSQLND_PACKET_SHA256_PK_REQUEST_RESPONSE *pk_resp_packet = NULL; +- +- do { +- DBG_INF("requesting the public key from the server"); +- req_packet = conn->payload_decoder_factory->m.get_cached_sha2_result_packet(conn->payload_decoder_factory, FALSE); +- pk_resp_packet = conn->payload_decoder_factory->m.get_sha256_pk_request_response_packet(conn->payload_decoder_factory, FALSE); +- req_packet->request = 1; +- +- if (! PACKET_WRITE(req_packet)) { +- DBG_ERR_FMT("Error while sending public key request packet"); +- php_error(E_WARNING, "Error while sending public key request packet. PID=%d", getpid()); +- SET_CONNECTION_STATE(&conn->state, CONN_QUIT_SENT); +- break; +- } +- if (FAIL == PACKET_READ(pk_resp_packet) || NULL == pk_resp_packet->public_key) { +- DBG_ERR_FMT("Error while receiving public key"); +- php_error(E_WARNING, "Error while receiving public key. PID=%d", getpid()); +- SET_CONNECTION_STATE(&conn->state, CONN_QUIT_SENT); +- break; +- } +- DBG_INF_FMT("Public key(%d):\n%s", pk_resp_packet->public_key_len, pk_resp_packet->public_key); +- /* now extract the public key */ +- { +- BIO * bio = BIO_new_mem_buf(pk_resp_packet->public_key, pk_resp_packet->public_key_len); +- ret = PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, NULL); +- BIO_free(bio); +- } +- } while (0); +- PACKET_FREE(req_packet); +- PACKET_FREE(pk_resp_packet); +- +- DBG_INF_FMT("ret=%p", ret); +- DBG_RETURN(ret); +- +- SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, +- "caching_sha2_server_public_key is not set for the connection or as mysqlnd.sha256_server_public_key"); +- DBG_ERR("server_public_key is not set"); +- DBG_RETURN(NULL); +- } else { +- zend_string * key_str; +- DBG_INF_FMT("Key in a file. [%s]", fname); +- stream = php_stream_open_wrapper((char *) fname, "rb", REPORT_ERRORS, NULL); +- +- if (stream) { +- if ((key_str = php_stream_copy_to_mem(stream, PHP_STREAM_COPY_ALL, 0)) != NULL) { +- BIO * bio = BIO_new_mem_buf(ZSTR_VAL(key_str), ZSTR_LEN(key_str)); +- ret = PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, NULL); +- BIO_free(bio); +- DBG_INF("Successfully loaded"); +- DBG_INF_FMT("Public key:%*.s", ZSTR_LEN(key_str), ZSTR_VAL(key_str)); +- zend_string_release(key_str); +- } +- php_stream_close(stream); +- } +- } +- DBG_RETURN(ret); +- +-} +-#endif +- +- +-/* {{{ mysqlnd_caching_sha2_get_key */ +-static size_t +-mysqlnd_caching_sha2_get_and_use_key(MYSQLND_CONN_DATA *conn, +- const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- unsigned char **crypted, +- const char * const passwd, +- const size_t passwd_len) +-{ +-#ifdef MYSQLND_HAVE_SSL +- static RSA *server_public_key; +- server_public_key = mysqlnd_caching_sha2_get_key(conn); +- +- DBG_ENTER("mysqlnd_caching_sha2_get_and_use_key("); +- +- if (server_public_key) { +- int server_public_key_len; +- char xor_str[passwd_len + 1]; +- memcpy(xor_str, passwd, passwd_len); +- xor_str[passwd_len] = '\0'; +- mysqlnd_xor_string(xor_str, passwd_len, (char *) auth_plugin_data, auth_plugin_data_len); +- +- server_public_key_len = RSA_size(server_public_key); +- /* +- Because RSA_PKCS1_OAEP_PADDING is used there is a restriction on the passwd_len. +- RSA_PKCS1_OAEP_PADDING is recommended for new applications. See more here: +- http://www.openssl.org/docs/crypto/RSA_public_encrypt.html +- */ +- if ((size_t) server_public_key_len - 41 <= passwd_len) { +- /* password message is to long */ +- SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "password is too long"); +- DBG_ERR("password is too long"); +- DBG_RETURN(0); +- } +- +- *crypted = emalloc(server_public_key_len); +- RSA_public_encrypt(passwd_len + 1, (zend_uchar *) xor_str, *crypted, server_public_key, RSA_PKCS1_OAEP_PADDING); +- DBG_RETURN(server_public_key_len); +- } +- DBG_RETURN(0); +-#else +- DBG_ENTER("mysqlnd_caching_sha2_get_and_use_key("); +- php_error_docref(NULL, E_WARNING, "PHP was built without openssl extension, can't send password encrypted"); +- DBG_RETURN(0); +-#endif +-} +-/* }}} */ +- +-/* {{{ mysqlnd_native_auth_get_auth_data */ +-static void +-mysqlnd_caching_sha2_handle_server_response(struct st_mysqlnd_authentication_plugin *self, +- MYSQLND_CONN_DATA * conn, +- const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- const char * const passwd, +- const size_t passwd_len) +-{ +- DBG_ENTER("mysqlnd_caching_sha2_handle_server_response"); +- MYSQLND_PACKET_CACHED_SHA2_RESULT *result_packet; +- result_packet = conn->payload_decoder_factory->m.get_cached_sha2_result_packet(conn->payload_decoder_factory, FALSE); +- +- if (FAIL == PACKET_READ(result_packet)) { +- DBG_VOID_RETURN; +- } +- +- switch (result_packet->response_code) { +- case 3: +- DBG_INF("fast path suceeded"); +- PACKET_FREE(result_packet); +- DBG_VOID_RETURN; +- case 4: +- if (conn->vio->data->ssl || conn->unix_socket.s) { +- DBG_INF("fast path failed, doing full auth via SSL"); +- result_packet->password = (zend_uchar *)passwd; +- result_packet->password_len = passwd_len + 1; +- PACKET_WRITE(result_packet); +- } else { +- DBG_INF("fast path failed, doing full auth without SSL"); +- result_packet->password_len = mysqlnd_caching_sha2_get_and_use_key(conn, auth_plugin_data, auth_plugin_data_len, &result_packet->password, passwd, passwd_len); +- PACKET_WRITE(result_packet); +- efree(result_packet->password); +- } +- PACKET_FREE(result_packet); +- DBG_VOID_RETURN; +- case 2: +- // The server tried to send a key, which we didn't expect +- // fall-through +- default: +- php_error_docref(NULL, E_WARNING, "Unexpected server respose while doing caching_sha2 auth: %i", result_packet->response_code); +- } +- +- PACKET_FREE(result_packet); +- +- DBG_VOID_RETURN; +-} +-/* }}} */ +- +-static struct st_mysqlnd_authentication_plugin mysqlnd_caching_sha2_auth_plugin = +-{ +- { +- MYSQLND_PLUGIN_API_VERSION, +- "auth_plugin_caching_sha2_password", +- MYSQLND_VERSION_ID, +- PHP_MYSQLND_VERSION, +- "PHP License 3.01", +- "Johannes Schlüter ", +- { +- NULL, /* no statistics , will be filled later if there are some */ +- NULL, /* no statistics */ +- }, +- { +- NULL /* plugin shutdown */ +- } +- }, +- {/* methods */ +- mysqlnd_caching_sha2_get_auth_data, +- mysqlnd_caching_sha2_handle_server_response +- } +-}; +- +- + /* {{{ mysqlnd_register_builtin_authentication_plugins */ + void + mysqlnd_register_builtin_authentication_plugins(void) + { + mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_native_auth_plugin); + mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_pam_authentication_plugin); +- mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_caching_sha2_auth_plugin); + #ifdef MYSQLND_HAVE_SSL + mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_sha256_authentication_plugin); + #endif +--- ext/mysqlnd/mysqlnd_auth.h.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_auth.h +@@ -31,9 +31,26 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA + unsigned int server_charset_no, + zend_bool use_full_blown_auth_packet, + const char * const auth_protocol, +- struct st_mysqlnd_authentication_plugin * auth_plugin, +- const zend_uchar * const orig_auth_plugin_data, +- const size_t orig_auth_plugin_data_len, ++ const zend_uchar * const auth_plugin_data, ++ const size_t auth_plugin_data_len, ++ char ** switch_to_auth_protocol, ++ size_t * switch_to_auth_protocol_len, ++ zend_uchar ** switch_to_auth_protocol_data, ++ size_t * switch_to_auth_protocol_data_len ++ ); ++ ++enum_func_status ++mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, ++ const char * const user, ++ const char * const passwd, ++ const size_t passwd_len, ++ const char * const db, ++ const size_t db_len, ++ const MYSQLND_SESSION_OPTIONS * const session_options, ++ zend_ulong mysql_flags, ++ unsigned int server_charset_no, ++ zend_bool use_full_blown_auth_packet, ++ const char * const auth_protocol, + const zend_uchar * const auth_plugin_data, + const size_t auth_plugin_data_len, + char ** switch_to_auth_protocol, +--- ext/mysqlnd/mysqlnd_connection.c.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_connection.c +@@ -678,10 +678,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connec + + { + const MYSQLND_CSTRING scheme = { transport.s, transport.l }; +- /* This will be overwritten below with a copy, but we can use it during authentication */ +- conn->unix_socket.s = (char *)socket_or_pipe.s; + if (FAIL == conn->m->connect_handshake(conn, &scheme, &username, &password, &database, mysql_flags)) { +- conn->unix_socket.s = NULL; + goto err; + } + conn->unix_socket.s = NULL; +--- ext/mysqlnd/mysqlnd_enum_n_def.h.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_enum_n_def.h +@@ -618,7 +618,6 @@ enum mysqlnd_packet_type + PROT_CHG_USER_RESP_PACKET, + PROT_SHA256_PK_REQUEST_PACKET, + PROT_SHA256_PK_REQUEST_RESPONSE_PACKET, +- PROT_CACHED_SHA2_RESULT_PACKET, + PROT_LAST /* should always be last */ + }; + +--- ext/mysqlnd/mysqlnd_structs.h.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_structs.h +@@ -970,7 +970,6 @@ struct st_mysqlnd_packet_chg_user_resp; + struct st_mysqlnd_packet_auth_pam; + struct st_mysqlnd_packet_sha256_pk_request; + struct st_mysqlnd_packet_sha256_pk_request_response; +-struct st_mysqlnd_packet_cached_sha2_result; + + typedef struct st_mysqlnd_packet_greet * (*func_mysqlnd_protocol_payload_decoder_factory__get_greet_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + typedef struct st_mysqlnd_packet_auth * (*func_mysqlnd_protocol_payload_decoder_factory__get_auth_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); +@@ -987,7 +986,6 @@ typedef struct st_mysqlnd_packet_prepare + typedef struct st_mysqlnd_packet_chg_user_resp*(*func_mysqlnd_protocol_payload_decoder_factory__get_change_user_response_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + typedef struct st_mysqlnd_packet_sha256_pk_request *(*func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + typedef struct st_mysqlnd_packet_sha256_pk_request_response *(*func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_response_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); +-typedef struct st_mysqlnd_packet_cached_sha2_result *(*func_mysqlnd_protocol_payload_decoder_factory__get_cached_sha2_result_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + + typedef enum_func_status (*func_mysqlnd_protocol_payload_decoder_factory__send_command)( + MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * payload_decoder_factory, +@@ -1045,7 +1043,6 @@ MYSQLND_CLASS_METHODS_TYPE(mysqlnd_proto + func_mysqlnd_protocol_payload_decoder_factory__get_change_user_response_packet get_change_user_response_packet; + func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_packet get_sha256_pk_request_packet; + func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_response_packet get_sha256_pk_request_response_packet; +- func_mysqlnd_protocol_payload_decoder_factory__get_cached_sha2_result_packet get_cached_sha2_result_packet; + + func_mysqlnd_protocol_payload_decoder_factory__send_command send_command; + func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response; +@@ -1358,18 +1355,11 @@ typedef zend_uchar * (*func_auth_plugin_ + const MYSQLND_PFC_DATA * const pfc_data, zend_ulong mysql_flags + ); + +-typedef void (*func_auth_plugin__handle_server_response)(struct st_mysqlnd_authentication_plugin * self, +- MYSQLND_CONN_DATA * conn, +- const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- const char * const passwd, +- const size_t passwd_len); +- + struct st_mysqlnd_authentication_plugin + { + struct st_mysqlnd_plugin_header plugin_header; + struct { + func_auth_plugin__get_auth_data get_auth_data; +- func_auth_plugin__handle_server_response handle_server_response; + } methods; + }; + +--- ext/mysqlnd/mysqlnd_wireprotocol.c.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_wireprotocol.c +@@ -2269,85 +2269,6 @@ php_mysqlnd_sha256_pk_request_response_f + } + /* }}} */ + +-static +-size_t php_mysqlnd_cached_sha2_result_write(void * _packet) +-{ +- MYSQLND_PACKET_CACHED_SHA2_RESULT * packet= (MYSQLND_PACKET_CACHED_SHA2_RESULT *) _packet; +- MYSQLND_ERROR_INFO * error_info = packet->header.error_info; +- MYSQLND_PFC * pfc = packet->header.protocol_frame_codec; +- MYSQLND_VIO * vio = packet->header.vio; +- MYSQLND_STATS * stats = packet->header.stats; +-#ifndef _MSC_VER +- zend_uchar buffer[MYSQLND_HEADER_SIZE + packet->password_len + 1]; +-#else +- ALLOCA_FLAG(use_heap) +- zend_uchar *buffer = do_alloca(MYSQLND_HEADER_SIZE + packet->password_len + 1, use_heap); +-#endif +- size_t sent; +- +- DBG_ENTER("php_mysqlnd_cached_sha2_result_write"); +- +- if (packet->request == 1) { +- int1store(buffer + MYSQLND_HEADER_SIZE, '\2'); +- sent = pfc->data->m.send(pfc, vio, buffer, 1, stats, error_info); +- } else { +- memcpy(buffer + MYSQLND_HEADER_SIZE, packet->password, packet->password_len); +- sent = pfc->data->m.send(pfc, vio, buffer, packet->password_len, stats, error_info); +- } +- +-#ifdef _MSC_VER +- free_alloca(buffer, use_heap); +-#endif +- +- DBG_RETURN(sent); +-} +- +-static enum_func_status +-php_mysqlnd_cached_sha2_result_read(void * _packet) +-{ +- MYSQLND_PACKET_CACHED_SHA2_RESULT * packet= (MYSQLND_PACKET_CACHED_SHA2_RESULT *) _packet; +- MYSQLND_ERROR_INFO * error_info = packet->header.error_info; +- MYSQLND_PFC * pfc = packet->header.protocol_frame_codec; +- MYSQLND_VIO * vio = packet->header.vio; +- MYSQLND_STATS * stats = packet->header.stats; +- MYSQLND_CONNECTION_STATE * connection_state = packet->header.connection_state; +- zend_uchar buf[SHA256_PK_REQUEST_RESP_BUFFER_SIZE]; +- zend_uchar *p = buf; +- const zend_uchar * const begin = buf; +- +- DBG_ENTER("php_mysqlnd_cached_sha2_result_read"); +- if (FAIL == mysqlnd_read_packet_header_and_body(&(packet->header), pfc, vio, stats, error_info, connection_state, buf, sizeof(buf), "PROT_CACHED_SHA2_RESULT_PACKET", PROT_CACHED_SHA2_RESULT_PACKET)) { +- DBG_RETURN(FAIL); +- } +- BAIL_IF_NO_MORE_DATA; +- +- p++; +- packet->response_code = uint1korr(p); +- BAIL_IF_NO_MORE_DATA; +- +- p++; +- packet->result = uint1korr(p); +- BAIL_IF_NO_MORE_DATA; +- +- DBG_RETURN(PASS); +- +-premature_end: +- DBG_ERR_FMT("OK packet %d bytes shorter than expected", p - begin - packet->header.size); +- php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected", +- p - begin - packet->header.size); +- DBG_RETURN(FAIL); +-} +- +-static void +-php_mysqlnd_cached_sha2_result_free_mem(void * _packet, zend_bool stack_allocation) +-{ +- MYSQLND_PACKET_CACHED_SHA2_RESULT * p = (MYSQLND_PACKET_CACHED_SHA2_RESULT *) _packet; +- +- if (!stack_allocation) { +- mnd_pefree(p, p->header.persistent); +- } +-} +-/* }}} */ + /* {{{ packet_methods */ + static + mysqlnd_packet_methods packet_methods[PROT_LAST] = +@@ -2441,15 +2362,9 @@ mysqlnd_packet_methods packet_methods[PR + php_mysqlnd_sha256_pk_request_response_read, + NULL, /* write */ + php_mysqlnd_sha256_pk_request_response_free_mem, +- }, /* PROT_SHA256_PK_REQUEST_RESPONSE_PACKET */ +- { +- sizeof(MYSQLND_PACKET_CACHED_SHA2_RESULT), +- php_mysqlnd_cached_sha2_result_read, +- php_mysqlnd_cached_sha2_result_write, +- php_mysqlnd_cached_sha2_result_free_mem +- } /* PROT_CACHED_SHA2_RESULT_PACKET */ ++ } /* PROT_SHA256_PK_REQUEST_RESPONSE_PACKET */ + }; +-/* }}} */ ++/* }}} */ + + + /* {{{ mysqlnd_protocol::get_greet_packet */ +@@ -2798,30 +2713,6 @@ MYSQLND_METHOD(mysqlnd_protocol, get_sha + } + /* }}} */ + +-/* {{{ mysqlnd_protocol::init_cached_sha2_result_packet */ +-static struct st_mysqlnd_packet_cached_sha2_result * +-MYSQLND_METHOD(mysqlnd_protocol, get_cached_sha2_result_packet) +-(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent) +-{ +- struct st_mysqlnd_packet_cached_sha2_result * packet = mnd_pecalloc(1, packet_methods[PROT_CACHED_SHA2_RESULT_PACKET].struct_size, persistent); +- DBG_ENTER("mysqlnd_protocol::init_cached_sha2_result_packet"); +- if (packet) { +- memset(packet, 0, sizeof(*packet)); +- packet->header.m = &packet_methods[PROT_CACHED_SHA2_RESULT_PACKET]; +- packet->header.factory = factory; +- +- packet->header.protocol_frame_codec = factory->conn->protocol_frame_codec; +- packet->header.vio = factory->conn->vio; +- packet->header.stats = factory->conn->stats; +- packet->header.error_info = factory->conn->error_info; +- packet->header.connection_state = &factory->conn->state; +- +- packet->header.persistent = persistent; +- } +- DBG_RETURN(packet); +-} +-/* }}} */ +- + + /* {{{ mysqlnd_protocol::send_command */ + static enum_func_status +@@ -3052,7 +2943,6 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_prot + MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet), + MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_packet), + MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_response_packet), +- MYSQLND_METHOD(mysqlnd_protocol, get_cached_sha2_result_packet), + + MYSQLND_METHOD(mysqlnd_protocol, send_command), + MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_response), +--- ext/mysqlnd/mysqlnd_wireprotocol.h.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_wireprotocol.h +@@ -292,16 +292,6 @@ typedef struct st_mysqlnd_packet_sha256 + size_t public_key_len; + } MYSQLND_PACKET_SHA256_PK_REQUEST_RESPONSE; + +-typedef struct st_mysqlnd_packet_cached_sha2_result { +- MYSQLND_PACKET_HEADER header; +- uint8_t response_code; +- uint8_t result; +- uint8_t request; +- zend_uchar * password; +- size_t password_len; +-} MYSQLND_PACKET_CACHED_SHA2_RESULT; +- +- + + zend_ulong php_mysqlnd_net_field_length(const zend_uchar **packet); + zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, const uint64_t length); From owner-svn-ports-branches@freebsd.org Tue Jul 24 08:50:38 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6ABDC104541E; Tue, 24 Jul 2018 08:50:38 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1DAF385D15; Tue, 24 Jul 2018 08:50:38 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2BE71126; Tue, 24 Jul 2018 08:50:37 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6O8obd7089878; Tue, 24 Jul 2018 08:50:37 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6O8obB0089876; Tue, 24 Jul 2018 08:50:37 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201807240850.w6O8obB0089876@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Tue, 24 Jul 2018 08:50:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475231 - in branches/2018Q3/lang/php72: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in branches/2018Q3/lang/php72: . files X-SVN-Commit-Revision: 475231 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 08:50:38 -0000 Author: tz Date: Tue Jul 24 08:50:37 2018 New Revision: 475231 URL: https://svnweb.freebsd.org/changeset/ports/475231 Log: MFH: r475183 lang/php72: Update from 7.2.7 to 7.2.8 Changelog: http://www.php.net/ChangeLog-7.php#7.2.8 Also patch out MySQL 8 auth changes, which makes the hash extension mandatory instead of optional and introduce further bugs: https://github.com/php/php-src/commit/d6e81f0bfd0cb90586dd83d4fd47a4302605261a Approved by: ports-secteam (miwi) Added: branches/2018Q3/lang/php72/files/patch-bug-76600-remove-mysql8-auth - copied unchanged from r475183, head/lang/php72/files/patch-bug-76600-remove-mysql8-auth Modified: branches/2018Q3/lang/php72/Makefile branches/2018Q3/lang/php72/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/lang/php72/Makefile ============================================================================== --- branches/2018Q3/lang/php72/Makefile Tue Jul 24 08:49:41 2018 (r475230) +++ branches/2018Q3/lang/php72/Makefile Tue Jul 24 08:50:37 2018 (r475231) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= php72 -DISTVERSION= 7.2.7 +DISTVERSION= 7.2.8 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2018Q3/lang/php72/distinfo ============================================================================== --- branches/2018Q3/lang/php72/distinfo Tue Jul 24 08:49:41 2018 (r475230) +++ branches/2018Q3/lang/php72/distinfo Tue Jul 24 08:50:37 2018 (r475231) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529912546 -SHA256 (php-7.2.7.tar.xz) = eb01c0153b3baf1f64b8b044013ce414b52fede222df3f509e8ff209478f31f0 -SIZE (php-7.2.7.tar.xz) = 12115168 +TIMESTAMP = 1531907361 +SHA256 (php-7.2.8.tar.xz) = 53ba0708be8a7db44256e3ae9fcecc91b811e5b5119e6080c951ffe7910ffb0f +SIZE (php-7.2.8.tar.xz) = 12153548 Copied: branches/2018Q3/lang/php72/files/patch-bug-76600-remove-mysql8-auth (from r475183, head/lang/php72/files/patch-bug-76600-remove-mysql8-auth) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/lang/php72/files/patch-bug-76600-remove-mysql8-auth Tue Jul 24 08:50:37 2018 (r475231, copy of r475183, head/lang/php72/files/patch-bug-76600-remove-mysql8-auth) @@ -0,0 +1,625 @@ +--- ext/mysqlnd/mysqlnd_auth.c.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_auth.c +@@ -89,7 +89,6 @@ mysqlnd_run_authentication( + } + } + +- + { + zend_uchar * switch_to_auth_protocol_data = NULL; + size_t switch_to_auth_protocol_data_len = 0; +@@ -114,11 +113,10 @@ mysqlnd_run_authentication( + DBG_INF_FMT("salt(%d)=[%.*s]", plugin_data_len, plugin_data_len, plugin_data); + /* The data should be allocated with malloc() */ + if (auth_plugin) { +- scrambled_data = auth_plugin->methods.get_auth_data( +- NULL, &scrambled_data_len, conn, user, passwd, +- passwd_len, plugin_data, plugin_data_len, +- session_options, conn->protocol_frame_codec->data, +- mysql_flags); ++ scrambled_data = ++ auth_plugin->methods.get_auth_data(NULL, &scrambled_data_len, conn, user, passwd, passwd_len, ++ plugin_data, plugin_data_len, session_options, ++ conn->protocol_frame_codec->data, mysql_flags); + } + + if (conn->error_info->error_no) { +@@ -129,7 +127,6 @@ mysqlnd_run_authentication( + charset_no, + first_call, + requested_protocol, +- auth_plugin, plugin_data, plugin_data_len, + scrambled_data, scrambled_data_len, + &switch_to_auth_protocol, &switch_to_auth_protocol_len, + &switch_to_auth_protocol_data, &switch_to_auth_protocol_data_len +@@ -251,9 +248,6 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA + unsigned int server_charset_no, + zend_bool use_full_blown_auth_packet, + const char * const auth_protocol, +- struct st_mysqlnd_authentication_plugin * auth_plugin, +- const zend_uchar * const orig_auth_plugin_data, +- const size_t orig_auth_plugin_data_len, + const zend_uchar * const auth_plugin_data, + const size_t auth_plugin_data_len, + char ** switch_to_auth_protocol, +@@ -324,11 +318,6 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA + conn->charset = mysqlnd_find_charset_nr(auth_packet->charset_no); + } + +- if (auth_plugin && auth_plugin->methods.handle_server_response) { +- auth_plugin->methods.handle_server_response(auth_plugin, conn, +- orig_auth_plugin_data, orig_auth_plugin_data_len, passwd, passwd_len); +- } +- + if (FAIL == PACKET_READ(auth_resp_packet) || auth_resp_packet->response_code >= 0xFE) { + if (auth_resp_packet->response_code == 0xFE) { + /* old authentication with new server !*/ +@@ -624,8 +613,7 @@ static struct st_mysqlnd_authentication_ + } + }, + {/* methods */ +- mysqlnd_native_auth_get_auth_data, +- NULL ++ mysqlnd_native_auth_get_auth_data + } + }; + +@@ -674,8 +662,7 @@ static struct st_mysqlnd_authentication_ + } + }, + {/* methods */ +- mysqlnd_pam_auth_get_auth_data, +- NULL ++ mysqlnd_pam_auth_get_auth_data + } + }; + +@@ -859,283 +846,17 @@ static struct st_mysqlnd_authentication_ + } + }, + {/* methods */ +- mysqlnd_sha256_auth_get_auth_data, +- NULL ++ mysqlnd_sha256_auth_get_auth_data + } + }; + #endif + +-/*************************************** CACHING SHA2 Password *******************************/ +- +-#undef L64 +- +-#include "ext/hash/php_hash.h" +-#include "ext/hash/php_hash_sha.h" +- +-#define SHA256_LENGTH 32 +- +-/* {{{ php_mysqlnd_scramble_sha2 */ +-void php_mysqlnd_scramble_sha2(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const password, const size_t password_len) +-{ +- PHP_SHA256_CTX context; +- zend_uchar sha1[SHA256_LENGTH]; +- zend_uchar sha2[SHA256_LENGTH]; +- +- /* Phase 1: hash password */ +- PHP_SHA256Init(&context); +- PHP_SHA256Update(&context, password, password_len); +- PHP_SHA256Final(sha1, &context); +- +- /* Phase 2: hash sha1 */ +- PHP_SHA256Init(&context); +- PHP_SHA256Update(&context, (zend_uchar*)sha1, SHA256_LENGTH); +- PHP_SHA256Final(sha2, &context); +- +- /* Phase 3: hash scramble + sha2 */ +- PHP_SHA256Init(&context); +- PHP_SHA256Update(&context, (zend_uchar*)sha2, SHA256_LENGTH); +- PHP_SHA256Update(&context, scramble, SCRAMBLE_LENGTH); +- PHP_SHA256Final(buffer, &context); +- +- /* let's crypt buffer now */ +- php_mysqlnd_crypt(buffer, (const zend_uchar *)sha1, (const zend_uchar *)buffer, SHA256_LENGTH); +-} +-/* }}} */ +- +- +-/* {{{ mysqlnd_native_auth_get_auth_data */ +-static zend_uchar * +-mysqlnd_caching_sha2_get_auth_data(struct st_mysqlnd_authentication_plugin * self, +- size_t * auth_data_len, +- MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd, +- const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- const MYSQLND_SESSION_OPTIONS * const session_options, +- const MYSQLND_PFC_DATA * const pfc_data, +- zend_ulong mysql_flags +- ) +-{ +- zend_uchar * ret = NULL; +- DBG_ENTER("mysqlnd_caching_sha2_get_auth_data"); +- DBG_INF_FMT("salt(%d)=[%.*s]", auth_plugin_data_len, auth_plugin_data_len, auth_plugin_data); +- *auth_data_len = 0; +- +- DBG_INF("First auth step: send hashed password"); +- /* copy scrambled pass*/ +- if (passwd && passwd_len) { +- ret = malloc(SHA256_LENGTH + 1); +- *auth_data_len = SHA256_LENGTH; +- php_mysqlnd_scramble_sha2((zend_uchar*)ret, auth_plugin_data, (zend_uchar*)passwd, passwd_len); +- ret[SHA256_LENGTH] = '\0'; +- DBG_INF_FMT("hash(%d)=[%.*s]", *auth_data_len, *auth_data_len, ret); +- } +- +- DBG_RETURN(ret); +-} +-/* }}} */ +- +-#ifdef MYSQLND_HAVE_SSL +-static RSA * +-mysqlnd_caching_sha2_get_key(MYSQLND_CONN_DATA *conn) +-{ +- RSA * ret = NULL; +- const MYSQLND_PFC_DATA * const pfc_data = conn->protocol_frame_codec->data; +- const char * fname = (pfc_data->sha256_server_public_key && pfc_data->sha256_server_public_key[0] != '\0')? +- pfc_data->sha256_server_public_key: +- MYSQLND_G(sha256_server_public_key); +- php_stream * stream; +- DBG_ENTER("mysqlnd_cached_sha2_get_key"); +- DBG_INF_FMT("options_s256_pk=[%s] MYSQLND_G(sha256_server_public_key)=[%s]", +- pfc_data->sha256_server_public_key? pfc_data->sha256_server_public_key:"n/a", +- MYSQLND_G(sha256_server_public_key)? MYSQLND_G(sha256_server_public_key):"n/a"); +- if (!fname || fname[0] == '\0') { +- MYSQLND_PACKET_CACHED_SHA2_RESULT *req_packet = NULL; +- MYSQLND_PACKET_SHA256_PK_REQUEST_RESPONSE *pk_resp_packet = NULL; +- +- do { +- DBG_INF("requesting the public key from the server"); +- req_packet = conn->payload_decoder_factory->m.get_cached_sha2_result_packet(conn->payload_decoder_factory, FALSE); +- pk_resp_packet = conn->payload_decoder_factory->m.get_sha256_pk_request_response_packet(conn->payload_decoder_factory, FALSE); +- req_packet->request = 1; +- +- if (! PACKET_WRITE(req_packet)) { +- DBG_ERR_FMT("Error while sending public key request packet"); +- php_error(E_WARNING, "Error while sending public key request packet. PID=%d", getpid()); +- SET_CONNECTION_STATE(&conn->state, CONN_QUIT_SENT); +- break; +- } +- if (FAIL == PACKET_READ(pk_resp_packet) || NULL == pk_resp_packet->public_key) { +- DBG_ERR_FMT("Error while receiving public key"); +- php_error(E_WARNING, "Error while receiving public key. PID=%d", getpid()); +- SET_CONNECTION_STATE(&conn->state, CONN_QUIT_SENT); +- break; +- } +- DBG_INF_FMT("Public key(%d):\n%s", pk_resp_packet->public_key_len, pk_resp_packet->public_key); +- /* now extract the public key */ +- { +- BIO * bio = BIO_new_mem_buf(pk_resp_packet->public_key, pk_resp_packet->public_key_len); +- ret = PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, NULL); +- BIO_free(bio); +- } +- } while (0); +- PACKET_FREE(req_packet); +- PACKET_FREE(pk_resp_packet); +- +- DBG_INF_FMT("ret=%p", ret); +- DBG_RETURN(ret); +- +- SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, +- "caching_sha2_server_public_key is not set for the connection or as mysqlnd.sha256_server_public_key"); +- DBG_ERR("server_public_key is not set"); +- DBG_RETURN(NULL); +- } else { +- zend_string * key_str; +- DBG_INF_FMT("Key in a file. [%s]", fname); +- stream = php_stream_open_wrapper((char *) fname, "rb", REPORT_ERRORS, NULL); +- +- if (stream) { +- if ((key_str = php_stream_copy_to_mem(stream, PHP_STREAM_COPY_ALL, 0)) != NULL) { +- BIO * bio = BIO_new_mem_buf(ZSTR_VAL(key_str), ZSTR_LEN(key_str)); +- ret = PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, NULL); +- BIO_free(bio); +- DBG_INF("Successfully loaded"); +- DBG_INF_FMT("Public key:%*.s", ZSTR_LEN(key_str), ZSTR_VAL(key_str)); +- zend_string_release(key_str); +- } +- php_stream_close(stream); +- } +- } +- DBG_RETURN(ret); +- +-} +-#endif +- +- +-/* {{{ mysqlnd_caching_sha2_get_key */ +-static size_t +-mysqlnd_caching_sha2_get_and_use_key(MYSQLND_CONN_DATA *conn, +- const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- unsigned char **crypted, +- const char * const passwd, +- const size_t passwd_len) +-{ +-#ifdef MYSQLND_HAVE_SSL +- static RSA *server_public_key; +- server_public_key = mysqlnd_caching_sha2_get_key(conn); +- +- DBG_ENTER("mysqlnd_caching_sha2_get_and_use_key("); +- +- if (server_public_key) { +- int server_public_key_len; +- char xor_str[passwd_len + 1]; +- memcpy(xor_str, passwd, passwd_len); +- xor_str[passwd_len] = '\0'; +- mysqlnd_xor_string(xor_str, passwd_len, (char *) auth_plugin_data, auth_plugin_data_len); +- +- server_public_key_len = RSA_size(server_public_key); +- /* +- Because RSA_PKCS1_OAEP_PADDING is used there is a restriction on the passwd_len. +- RSA_PKCS1_OAEP_PADDING is recommended for new applications. See more here: +- http://www.openssl.org/docs/crypto/RSA_public_encrypt.html +- */ +- if ((size_t) server_public_key_len - 41 <= passwd_len) { +- /* password message is to long */ +- SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "password is too long"); +- DBG_ERR("password is too long"); +- DBG_RETURN(0); +- } +- +- *crypted = emalloc(server_public_key_len); +- RSA_public_encrypt(passwd_len + 1, (zend_uchar *) xor_str, *crypted, server_public_key, RSA_PKCS1_OAEP_PADDING); +- DBG_RETURN(server_public_key_len); +- } +- DBG_RETURN(0); +-#else +- DBG_ENTER("mysqlnd_caching_sha2_get_and_use_key("); +- php_error_docref(NULL, E_WARNING, "PHP was built without openssl extension, can't send password encrypted"); +- DBG_RETURN(0); +-#endif +-} +-/* }}} */ +- +-/* {{{ mysqlnd_native_auth_get_auth_data */ +-static void +-mysqlnd_caching_sha2_handle_server_response(struct st_mysqlnd_authentication_plugin *self, +- MYSQLND_CONN_DATA * conn, +- const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- const char * const passwd, +- const size_t passwd_len) +-{ +- DBG_ENTER("mysqlnd_caching_sha2_handle_server_response"); +- MYSQLND_PACKET_CACHED_SHA2_RESULT *result_packet; +- result_packet = conn->payload_decoder_factory->m.get_cached_sha2_result_packet(conn->payload_decoder_factory, FALSE); +- +- if (FAIL == PACKET_READ(result_packet)) { +- DBG_VOID_RETURN; +- } +- +- switch (result_packet->response_code) { +- case 3: +- DBG_INF("fast path suceeded"); +- PACKET_FREE(result_packet); +- DBG_VOID_RETURN; +- case 4: +- if (conn->vio->data->ssl || conn->unix_socket.s) { +- DBG_INF("fast path failed, doing full auth via SSL"); +- result_packet->password = (zend_uchar *)passwd; +- result_packet->password_len = passwd_len + 1; +- PACKET_WRITE(result_packet); +- } else { +- DBG_INF("fast path failed, doing full auth without SSL"); +- result_packet->password_len = mysqlnd_caching_sha2_get_and_use_key(conn, auth_plugin_data, auth_plugin_data_len, &result_packet->password, passwd, passwd_len); +- PACKET_WRITE(result_packet); +- efree(result_packet->password); +- } +- PACKET_FREE(result_packet); +- DBG_VOID_RETURN; +- case 2: +- // The server tried to send a key, which we didn't expect +- // fall-through +- default: +- php_error_docref(NULL, E_WARNING, "Unexpected server respose while doing caching_sha2 auth: %i", result_packet->response_code); +- } +- +- PACKET_FREE(result_packet); +- +- DBG_VOID_RETURN; +-} +-/* }}} */ +- +-static struct st_mysqlnd_authentication_plugin mysqlnd_caching_sha2_auth_plugin = +-{ +- { +- MYSQLND_PLUGIN_API_VERSION, +- "auth_plugin_caching_sha2_password", +- MYSQLND_VERSION_ID, +- PHP_MYSQLND_VERSION, +- "PHP License 3.01", +- "Johannes Schlüter ", +- { +- NULL, /* no statistics , will be filled later if there are some */ +- NULL, /* no statistics */ +- }, +- { +- NULL /* plugin shutdown */ +- } +- }, +- {/* methods */ +- mysqlnd_caching_sha2_get_auth_data, +- mysqlnd_caching_sha2_handle_server_response +- } +-}; +- +- + /* {{{ mysqlnd_register_builtin_authentication_plugins */ + void + mysqlnd_register_builtin_authentication_plugins(void) + { + mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_native_auth_plugin); + mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_pam_authentication_plugin); +- mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_caching_sha2_auth_plugin); + #ifdef MYSQLND_HAVE_SSL + mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_sha256_authentication_plugin); + #endif +--- ext/mysqlnd/mysqlnd_auth.h.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_auth.h +@@ -31,9 +31,26 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA + unsigned int server_charset_no, + zend_bool use_full_blown_auth_packet, + const char * const auth_protocol, +- struct st_mysqlnd_authentication_plugin * auth_plugin, +- const zend_uchar * const orig_auth_plugin_data, +- const size_t orig_auth_plugin_data_len, ++ const zend_uchar * const auth_plugin_data, ++ const size_t auth_plugin_data_len, ++ char ** switch_to_auth_protocol, ++ size_t * switch_to_auth_protocol_len, ++ zend_uchar ** switch_to_auth_protocol_data, ++ size_t * switch_to_auth_protocol_data_len ++ ); ++ ++enum_func_status ++mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, ++ const char * const user, ++ const char * const passwd, ++ const size_t passwd_len, ++ const char * const db, ++ const size_t db_len, ++ const MYSQLND_SESSION_OPTIONS * const session_options, ++ zend_ulong mysql_flags, ++ unsigned int server_charset_no, ++ zend_bool use_full_blown_auth_packet, ++ const char * const auth_protocol, + const zend_uchar * const auth_plugin_data, + const size_t auth_plugin_data_len, + char ** switch_to_auth_protocol, +--- ext/mysqlnd/mysqlnd_connection.c.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_connection.c +@@ -678,10 +678,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connec + + { + const MYSQLND_CSTRING scheme = { transport.s, transport.l }; +- /* This will be overwritten below with a copy, but we can use it during authentication */ +- conn->unix_socket.s = (char *)socket_or_pipe.s; + if (FAIL == conn->m->connect_handshake(conn, &scheme, &username, &password, &database, mysql_flags)) { +- conn->unix_socket.s = NULL; + goto err; + } + conn->unix_socket.s = NULL; +--- ext/mysqlnd/mysqlnd_enum_n_def.h.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_enum_n_def.h +@@ -618,7 +618,6 @@ enum mysqlnd_packet_type + PROT_CHG_USER_RESP_PACKET, + PROT_SHA256_PK_REQUEST_PACKET, + PROT_SHA256_PK_REQUEST_RESPONSE_PACKET, +- PROT_CACHED_SHA2_RESULT_PACKET, + PROT_LAST /* should always be last */ + }; + +--- ext/mysqlnd/mysqlnd_structs.h.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_structs.h +@@ -970,7 +970,6 @@ struct st_mysqlnd_packet_chg_user_resp; + struct st_mysqlnd_packet_auth_pam; + struct st_mysqlnd_packet_sha256_pk_request; + struct st_mysqlnd_packet_sha256_pk_request_response; +-struct st_mysqlnd_packet_cached_sha2_result; + + typedef struct st_mysqlnd_packet_greet * (*func_mysqlnd_protocol_payload_decoder_factory__get_greet_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + typedef struct st_mysqlnd_packet_auth * (*func_mysqlnd_protocol_payload_decoder_factory__get_auth_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); +@@ -987,7 +986,6 @@ typedef struct st_mysqlnd_packet_prepare + typedef struct st_mysqlnd_packet_chg_user_resp*(*func_mysqlnd_protocol_payload_decoder_factory__get_change_user_response_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + typedef struct st_mysqlnd_packet_sha256_pk_request *(*func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + typedef struct st_mysqlnd_packet_sha256_pk_request_response *(*func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_response_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); +-typedef struct st_mysqlnd_packet_cached_sha2_result *(*func_mysqlnd_protocol_payload_decoder_factory__get_cached_sha2_result_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + + typedef enum_func_status (*func_mysqlnd_protocol_payload_decoder_factory__send_command)( + MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * payload_decoder_factory, +@@ -1045,7 +1043,6 @@ MYSQLND_CLASS_METHODS_TYPE(mysqlnd_proto + func_mysqlnd_protocol_payload_decoder_factory__get_change_user_response_packet get_change_user_response_packet; + func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_packet get_sha256_pk_request_packet; + func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_response_packet get_sha256_pk_request_response_packet; +- func_mysqlnd_protocol_payload_decoder_factory__get_cached_sha2_result_packet get_cached_sha2_result_packet; + + func_mysqlnd_protocol_payload_decoder_factory__send_command send_command; + func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response; +@@ -1358,18 +1355,11 @@ typedef zend_uchar * (*func_auth_plugin_ + const MYSQLND_PFC_DATA * const pfc_data, zend_ulong mysql_flags + ); + +-typedef void (*func_auth_plugin__handle_server_response)(struct st_mysqlnd_authentication_plugin * self, +- MYSQLND_CONN_DATA * conn, +- const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- const char * const passwd, +- const size_t passwd_len); +- + struct st_mysqlnd_authentication_plugin + { + struct st_mysqlnd_plugin_header plugin_header; + struct { + func_auth_plugin__get_auth_data get_auth_data; +- func_auth_plugin__handle_server_response handle_server_response; + } methods; + }; + +--- ext/mysqlnd/mysqlnd_wireprotocol.c.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_wireprotocol.c +@@ -2269,85 +2269,6 @@ php_mysqlnd_sha256_pk_request_response_f + } + /* }}} */ + +-static +-size_t php_mysqlnd_cached_sha2_result_write(void * _packet) +-{ +- MYSQLND_PACKET_CACHED_SHA2_RESULT * packet= (MYSQLND_PACKET_CACHED_SHA2_RESULT *) _packet; +- MYSQLND_ERROR_INFO * error_info = packet->header.error_info; +- MYSQLND_PFC * pfc = packet->header.protocol_frame_codec; +- MYSQLND_VIO * vio = packet->header.vio; +- MYSQLND_STATS * stats = packet->header.stats; +-#ifndef _MSC_VER +- zend_uchar buffer[MYSQLND_HEADER_SIZE + packet->password_len + 1]; +-#else +- ALLOCA_FLAG(use_heap) +- zend_uchar *buffer = do_alloca(MYSQLND_HEADER_SIZE + packet->password_len + 1, use_heap); +-#endif +- size_t sent; +- +- DBG_ENTER("php_mysqlnd_cached_sha2_result_write"); +- +- if (packet->request == 1) { +- int1store(buffer + MYSQLND_HEADER_SIZE, '\2'); +- sent = pfc->data->m.send(pfc, vio, buffer, 1, stats, error_info); +- } else { +- memcpy(buffer + MYSQLND_HEADER_SIZE, packet->password, packet->password_len); +- sent = pfc->data->m.send(pfc, vio, buffer, packet->password_len, stats, error_info); +- } +- +-#ifdef _MSC_VER +- free_alloca(buffer, use_heap); +-#endif +- +- DBG_RETURN(sent); +-} +- +-static enum_func_status +-php_mysqlnd_cached_sha2_result_read(void * _packet) +-{ +- MYSQLND_PACKET_CACHED_SHA2_RESULT * packet= (MYSQLND_PACKET_CACHED_SHA2_RESULT *) _packet; +- MYSQLND_ERROR_INFO * error_info = packet->header.error_info; +- MYSQLND_PFC * pfc = packet->header.protocol_frame_codec; +- MYSQLND_VIO * vio = packet->header.vio; +- MYSQLND_STATS * stats = packet->header.stats; +- MYSQLND_CONNECTION_STATE * connection_state = packet->header.connection_state; +- zend_uchar buf[SHA256_PK_REQUEST_RESP_BUFFER_SIZE]; +- zend_uchar *p = buf; +- const zend_uchar * const begin = buf; +- +- DBG_ENTER("php_mysqlnd_cached_sha2_result_read"); +- if (FAIL == mysqlnd_read_packet_header_and_body(&(packet->header), pfc, vio, stats, error_info, connection_state, buf, sizeof(buf), "PROT_CACHED_SHA2_RESULT_PACKET", PROT_CACHED_SHA2_RESULT_PACKET)) { +- DBG_RETURN(FAIL); +- } +- BAIL_IF_NO_MORE_DATA; +- +- p++; +- packet->response_code = uint1korr(p); +- BAIL_IF_NO_MORE_DATA; +- +- p++; +- packet->result = uint1korr(p); +- BAIL_IF_NO_MORE_DATA; +- +- DBG_RETURN(PASS); +- +-premature_end: +- DBG_ERR_FMT("OK packet %d bytes shorter than expected", p - begin - packet->header.size); +- php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected", +- p - begin - packet->header.size); +- DBG_RETURN(FAIL); +-} +- +-static void +-php_mysqlnd_cached_sha2_result_free_mem(void * _packet, zend_bool stack_allocation) +-{ +- MYSQLND_PACKET_CACHED_SHA2_RESULT * p = (MYSQLND_PACKET_CACHED_SHA2_RESULT *) _packet; +- +- if (!stack_allocation) { +- mnd_pefree(p, p->header.persistent); +- } +-} +-/* }}} */ + /* {{{ packet_methods */ + static + mysqlnd_packet_methods packet_methods[PROT_LAST] = +@@ -2441,15 +2362,9 @@ mysqlnd_packet_methods packet_methods[PR + php_mysqlnd_sha256_pk_request_response_read, + NULL, /* write */ + php_mysqlnd_sha256_pk_request_response_free_mem, +- }, /* PROT_SHA256_PK_REQUEST_RESPONSE_PACKET */ +- { +- sizeof(MYSQLND_PACKET_CACHED_SHA2_RESULT), +- php_mysqlnd_cached_sha2_result_read, +- php_mysqlnd_cached_sha2_result_write, +- php_mysqlnd_cached_sha2_result_free_mem +- } /* PROT_CACHED_SHA2_RESULT_PACKET */ ++ } /* PROT_SHA256_PK_REQUEST_RESPONSE_PACKET */ + }; +-/* }}} */ ++/* }}} */ + + + /* {{{ mysqlnd_protocol::get_greet_packet */ +@@ -2798,30 +2713,6 @@ MYSQLND_METHOD(mysqlnd_protocol, get_sha + } + /* }}} */ + +-/* {{{ mysqlnd_protocol::init_cached_sha2_result_packet */ +-static struct st_mysqlnd_packet_cached_sha2_result * +-MYSQLND_METHOD(mysqlnd_protocol, get_cached_sha2_result_packet) +-(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent) +-{ +- struct st_mysqlnd_packet_cached_sha2_result * packet = mnd_pecalloc(1, packet_methods[PROT_CACHED_SHA2_RESULT_PACKET].struct_size, persistent); +- DBG_ENTER("mysqlnd_protocol::init_cached_sha2_result_packet"); +- if (packet) { +- memset(packet, 0, sizeof(*packet)); +- packet->header.m = &packet_methods[PROT_CACHED_SHA2_RESULT_PACKET]; +- packet->header.factory = factory; +- +- packet->header.protocol_frame_codec = factory->conn->protocol_frame_codec; +- packet->header.vio = factory->conn->vio; +- packet->header.stats = factory->conn->stats; +- packet->header.error_info = factory->conn->error_info; +- packet->header.connection_state = &factory->conn->state; +- +- packet->header.persistent = persistent; +- } +- DBG_RETURN(packet); +-} +-/* }}} */ +- + + /* {{{ mysqlnd_protocol::send_command */ + static enum_func_status +@@ -3052,7 +2943,6 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_prot + MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet), + MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_packet), + MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_response_packet), +- MYSQLND_METHOD(mysqlnd_protocol, get_cached_sha2_result_packet), + + MYSQLND_METHOD(mysqlnd_protocol, send_command), + MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_response), +--- ext/mysqlnd/mysqlnd_wireprotocol.h.orig 2018-07-19 06:17:29 UTC ++++ ext/mysqlnd/mysqlnd_wireprotocol.h +@@ -292,16 +292,6 @@ typedef struct st_mysqlnd_packet_sha256 + size_t public_key_len; + } MYSQLND_PACKET_SHA256_PK_REQUEST_RESPONSE; + +-typedef struct st_mysqlnd_packet_cached_sha2_result { +- MYSQLND_PACKET_HEADER header; +- uint8_t response_code; +- uint8_t result; +- uint8_t request; +- zend_uchar * password; +- size_t password_len; +-} MYSQLND_PACKET_CACHED_SHA2_RESULT; +- +- + + zend_ulong php_mysqlnd_net_field_length(const zend_uchar **packet); + zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, const uint64_t length); From owner-svn-ports-branches@freebsd.org Tue Jul 24 08:51:35 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C420D10456FF; Tue, 24 Jul 2018 08:51:35 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 724D085F39; Tue, 24 Jul 2018 08:51:35 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5374D1269; Tue, 24 Jul 2018 08:51:35 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6O8pZlP093282; Tue, 24 Jul 2018 08:51:35 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6O8pYle093280; Tue, 24 Jul 2018 08:51:34 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201807240851.w6O8pYle093280@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Tue, 24 Jul 2018 08:51:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475232 - in branches/2018Q3/devel: php71-intl php72-intl X-SVN-Group: ports-branches X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in branches/2018Q3/devel: php71-intl php72-intl X-SVN-Commit-Revision: 475232 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 08:51:36 -0000 Author: tz Date: Tue Jul 24 08:51:34 2018 New Revision: 475232 URL: https://svnweb.freebsd.org/changeset/ports/475232 Log: MFH: r475184 devel/php71-intl and devel/php72-intl Commit missed resets of PORTREVISION after updates of lang/php71 and lang/php72 Approved by: ports-secteam (miwi) Modified: branches/2018Q3/devel/php71-intl/Makefile branches/2018Q3/devel/php72-intl/Makefile Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/devel/php71-intl/Makefile ============================================================================== --- branches/2018Q3/devel/php71-intl/Makefile Tue Jul 24 08:50:37 2018 (r475231) +++ branches/2018Q3/devel/php71-intl/Makefile Tue Jul 24 08:51:34 2018 (r475232) @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php71 Modified: branches/2018Q3/devel/php72-intl/Makefile ============================================================================== --- branches/2018Q3/devel/php72-intl/Makefile Tue Jul 24 08:50:37 2018 (r475231) +++ branches/2018Q3/devel/php72-intl/Makefile Tue Jul 24 08:51:34 2018 (r475232) @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php72 From owner-svn-ports-branches@freebsd.org Tue Jul 24 12:40:51 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3FEE104ADAF; Tue, 24 Jul 2018 12:40:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4EA7E8D582; Tue, 24 Jul 2018 12:40:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F9C939AC; Tue, 24 Jul 2018 12:40:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6OCeonU011192; Tue, 24 Jul 2018 12:40:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6OCeoLR011190; Tue, 24 Jul 2018 12:40:50 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201807241240.w6OCeoLR011190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 24 Jul 2018 12:40:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475244 - branches/2018Q3/audio/jack_umidi X-SVN-Group: ports-branches X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: branches/2018Q3/audio/jack_umidi X-SVN-Commit-Revision: 475244 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 12:40:51 -0000 Author: hselasky (src committer) Date: Tue Jul 24 12:40:50 2018 New Revision: 475244 URL: https://svnweb.freebsd.org/changeset/ports/475244 Log: MFH: r475237 Update jack_umidi to version 1.0.9 Fix for long device names. Approved by: ports-secteam (swills) Modified: branches/2018Q3/audio/jack_umidi/Makefile branches/2018Q3/audio/jack_umidi/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/audio/jack_umidi/Makefile ============================================================================== --- branches/2018Q3/audio/jack_umidi/Makefile Tue Jul 24 12:35:12 2018 (r475243) +++ branches/2018Q3/audio/jack_umidi/Makefile Tue Jul 24 12:40:50 2018 (r475244) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jack_umidi -PORTVERSION= 1.0.8 +PORTVERSION= 1.0.9 CATEGORIES= audio MASTER_SITES= http://www.selasky.org/hans_petter/distfiles/ \ http://home.selasky.org:8192/distfiles/ Modified: branches/2018Q3/audio/jack_umidi/distinfo ============================================================================== --- branches/2018Q3/audio/jack_umidi/distinfo Tue Jul 24 12:35:12 2018 (r475243) +++ branches/2018Q3/audio/jack_umidi/distinfo Tue Jul 24 12:40:50 2018 (r475244) @@ -1,2 +1,3 @@ -SHA256 (jack_umidi-1.0.8.tar.bz2) = 50c67696a43acf2c1d1ad1dcd06ceb484b18ad9867c5b1eb1850fa15aa617036 -SIZE (jack_umidi-1.0.8.tar.bz2) = 6811 +TIMESTAMP = 1532424996 +SHA256 (jack_umidi-1.0.9.tar.bz2) = d15db3ad35f8469ca14d839d938300d0cd2d5f730946e9b162b13c80d4f57984 +SIZE (jack_umidi-1.0.9.tar.bz2) = 6814 From owner-svn-ports-branches@freebsd.org Tue Jul 24 15:54:01 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 954A4104F447; Tue, 24 Jul 2018 15:54:01 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 43CCC744E6; Tue, 24 Jul 2018 15:54:01 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0B9D35B69; Tue, 24 Jul 2018 15:54:01 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6OFs0ox013454; Tue, 24 Jul 2018 15:54:00 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6OFs0RT013451; Tue, 24 Jul 2018 15:54:00 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201807241554.w6OFs0RT013451@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Tue, 24 Jul 2018 15:54:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475264 - in branches/2018Q3/graphics/mesa-dri: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in branches/2018Q3/graphics/mesa-dri: . files X-SVN-Commit-Revision: 475264 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 15:54:01 -0000 Author: zeising Date: Tue Jul 24 15:54:00 2018 New Revision: 475264 URL: https://svnweb.freebsd.org/changeset/ports/475264 Log: MFH: r474016 r475192 graphics/mesa: update to 18.1.3 Obtained from: https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/mesa-18.1 graphics/mesa: Update to 18.1.4 Obtained from: https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/mesa-18.1 X-MFH-with: r474016 Approved by: ports-secteam (swills) Modified: branches/2018Q3/graphics/mesa-dri/Makefile.common branches/2018Q3/graphics/mesa-dri/distinfo branches/2018Q3/graphics/mesa-dri/files/patch-configure Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/graphics/mesa-dri/Makefile.common ============================================================================== --- branches/2018Q3/graphics/mesa-dri/Makefile.common Tue Jul 24 15:37:28 2018 (r475263) +++ branches/2018Q3/graphics/mesa-dri/Makefile.common Tue Jul 24 15:54:00 2018 (r475264) @@ -14,7 +14,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -MESABASEVERSION= 18.1.2 +MESABASEVERSION= 18.1.4 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= Modified: branches/2018Q3/graphics/mesa-dri/distinfo ============================================================================== --- branches/2018Q3/graphics/mesa-dri/distinfo Tue Jul 24 15:37:28 2018 (r475263) +++ branches/2018Q3/graphics/mesa-dri/distinfo Tue Jul 24 15:54:00 2018 (r475264) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529095068 -SHA256 (mesa-18.1.2.tar.xz) = 070bf0648ba5b242d7303ceed32aed80842f4c0ba16e5acc1a650a46eadfb1f9 -SIZE (mesa-18.1.2.tar.xz) = 11124408 +TIMESTAMP = 1532365329 +SHA256 (mesa-18.1.4.tar.xz) = 3061488b5d85504092cf4343816cfb2d96f2ad9bc2edec31fc96933d184cf58b +SIZE (mesa-18.1.4.tar.xz) = 11133392 Modified: branches/2018Q3/graphics/mesa-dri/files/patch-configure ============================================================================== --- branches/2018Q3/graphics/mesa-dri/files/patch-configure Tue Jul 24 15:37:28 2018 (r475263) +++ branches/2018Q3/graphics/mesa-dri/files/patch-configure Tue Jul 24 15:54:00 2018 (r475264) @@ -51,22 +51,6 @@ dri3_default=yes ;; *) -@@ -26765,13 +26765,13 @@ - have_vdpau_platform=no - fi - --if echo $platforms | grep -q "x11\|drm"; then -+if echo $platforms | egrep -q "x11|drm"; then - have_omx_platform=yes - else - have_omx_platform=no - fi - --if echo $platforms | grep -q "x11\|drm\|wayland"; then -+if echo $platforms | egrep -q "x11|drm|wayland"; then - have_va_platform=yes - else - have_va_platform=no @@ -27096,9 +27106,6 @@ rm -f core conftest.err conftest.$ac_obj CLANG_LIBDIR=${LLVM_LIBDIR} fi From owner-svn-ports-branches@freebsd.org Tue Jul 24 23:17:10 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CFAF10588D5; Tue, 24 Jul 2018 23:17:10 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 85ADD843AF; Tue, 24 Jul 2018 23:17:09 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 583AF12374; Tue, 24 Jul 2018 23:17:09 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6ONH9DT043005; Tue, 24 Jul 2018 23:17:09 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6ONH9th043004; Tue, 24 Jul 2018 23:17:09 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201807242317.w6ONH9th043004@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Tue, 24 Jul 2018 23:17:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475281 - branches/2018Q3/www/chromium X-SVN-Group: ports-branches X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: branches/2018Q3/www/chromium X-SVN-Commit-Revision: 475281 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 23:17:10 -0000 Author: cpm Date: Tue Jul 24 23:17:08 2018 New Revision: 475281 URL: https://svnweb.freebsd.org/changeset/ports/475281 Log: MFH: r475280 Put the git dependency in the right place. Now chromedriver needs git dependency at build time. Don't bump PORTREVISION because DRIVER option is enabled by default and does not affect to the generated package. Reported by: Claude Buisson Approved by: ports-secteam (blanket) Modified: branches/2018Q3/www/chromium/Makefile Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/www/chromium/Makefile ============================================================================== --- branches/2018Q3/www/chromium/Makefile Tue Jul 24 23:13:52 2018 (r475280) +++ branches/2018Q3/www/chromium/Makefile Tue Jul 24 23:17:08 2018 (r475281) @@ -18,8 +18,7 @@ BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ .if !defined(GN_ONLY) -BUILD_DEPENDS+= git:devel/git \ - gperf:devel/gperf \ +BUILD_DEPENDS+= gperf:devel/gperf \ yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ flock:sysutils/flock \ @@ -176,6 +175,7 @@ DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=remove_webcore_debug_symbols=true \ WANTSPACE="a fair amount of free disk space (~ 5.8GB)" +DRIVER_BUILD_DEPENDS= git:devel/git DRIVER_MAKE_ARGS= chromedriver KERBEROS_VARS= GN_ARGS+=use_kerberos=true From owner-svn-ports-branches@freebsd.org Tue Jul 24 23:23:59 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DAF3D1058B5F; Tue, 24 Jul 2018 23:23:59 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 855EC848EE; Tue, 24 Jul 2018 23:23:59 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 62DA712508; Tue, 24 Jul 2018 23:23:59 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6ONNxen048025; Tue, 24 Jul 2018 23:23:59 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6ONNxHh048022; Tue, 24 Jul 2018 23:23:59 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201807242323.w6ONNxHh048022@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 24 Jul 2018 23:23:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475283 - in branches/2018Q3/emulators/virtualbox-ose: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in branches/2018Q3/emulators/virtualbox-ose: . files X-SVN-Commit-Revision: 475283 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 23:24:00 -0000 Author: bdrewery Date: Tue Jul 24 23:23:58 2018 New Revision: 475283 URL: https://svnweb.freebsd.org/changeset/ports/475283 Log: MFH: r475282 vboxheadless: Fix start of specific machine after base r291770. The vboxheadless rc script has its own pid checking, so the rc.subr version in run_rc_command is not needed. PR: 212074 Approved by: portmgr (implicit) Modified: branches/2018Q3/emulators/virtualbox-ose/Makefile branches/2018Q3/emulators/virtualbox-ose/files/vboxheadless.in Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/emulators/virtualbox-ose/Makefile ============================================================================== --- branches/2018Q3/emulators/virtualbox-ose/Makefile Tue Jul 24 23:22:27 2018 (r475282) +++ branches/2018Q3/emulators/virtualbox-ose/Makefile Tue Jul 24 23:23:58 2018 (r475283) @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.2.12 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} Modified: branches/2018Q3/emulators/virtualbox-ose/files/vboxheadless.in ============================================================================== --- branches/2018Q3/emulators/virtualbox-ose/files/vboxheadless.in Tue Jul 24 23:22:27 2018 (r475282) +++ branches/2018Q3/emulators/virtualbox-ose/files/vboxheadless.in Tue Jul 24 23:23:58 2018 (r475283) @@ -27,6 +27,7 @@ name="vboxheadless" rcvar=vboxheadless_enable +rc_fast="YES" command="%%VBOXDIR%%/VBoxHeadless" pidbase="/var/run/${name}" From owner-svn-ports-branches@freebsd.org Wed Jul 25 16:08:09 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20900104E976; Wed, 25 Jul 2018 16:08:09 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C96AA83E53; Wed, 25 Jul 2018 16:08:08 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABAB21C609; Wed, 25 Jul 2018 16:08:08 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6PG8844063018; Wed, 25 Jul 2018 16:08:08 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6PG88oX063016; Wed, 25 Jul 2018 16:08:08 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <201807251608.w6PG88oX063016@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Wed, 25 Jul 2018 16:08:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475317 - branches/2018Q3/graphics/libsixel X-SVN-Group: ports-branches X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: branches/2018Q3/graphics/libsixel X-SVN-Commit-Revision: 475317 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jul 2018 16:08:09 -0000 Author: fernape Date: Wed Jul 25 16:08:08 2018 New Revision: 475317 URL: https://svnweb.freebsd.org/changeset/ports/475317 Log: MFH: r475268 devel/libsixel: update to 1.8.2 Fixes: * CVE-2018-14072 * CVE-2018-14073 PR: 229975 Submitted by: sue@iwmt.org (maintainer) Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D16421 Approved by: ports-secteam (swills) Modified: branches/2018Q3/graphics/libsixel/Makefile branches/2018Q3/graphics/libsixel/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/graphics/libsixel/Makefile ============================================================================== --- branches/2018Q3/graphics/libsixel/Makefile Wed Jul 25 15:16:34 2018 (r475316) +++ branches/2018Q3/graphics/libsixel/Makefile Wed Jul 25 16:08:08 2018 (r475317) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libsixel -PORTVERSION= 1.8.1 +PORTVERSION= 1.8.2 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= https://github.com/saitoha/libsixel/releases/download/v${PORTVERSION}/ Modified: branches/2018Q3/graphics/libsixel/distinfo ============================================================================== --- branches/2018Q3/graphics/libsixel/distinfo Wed Jul 25 15:16:34 2018 (r475316) +++ branches/2018Q3/graphics/libsixel/distinfo Wed Jul 25 16:08:08 2018 (r475317) @@ -1,3 +1,3 @@ -TIMESTAMP = 1528698296 -SHA256 (libsixel-1.8.1.tar.gz) = 6f31a5db6a195155b2168aad5c1b6b62ac3b10919e16576029f9b4ced5384e8d -SIZE (libsixel-1.8.1.tar.gz) = 4777791 +TIMESTAMP = 1532317736 +SHA256 (libsixel-1.8.2.tar.gz) = c464d2a6fcf35e9e6bad1876729e853a8b9f6abfe97d9e3487c9bfac45cf2a5f +SIZE (libsixel-1.8.2.tar.gz) = 4778776 From owner-svn-ports-branches@freebsd.org Wed Jul 25 21:35:00 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 148461054CA9; Wed, 25 Jul 2018 21:35:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AC7FF8F43E; Wed, 25 Jul 2018 21:34:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 87F9B1FBE8; Wed, 25 Jul 2018 21:34:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6PLYxBW034490; Wed, 25 Jul 2018 21:34:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6PLYxth034489; Wed, 25 Jul 2018 21:34:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201807252134.w6PLYxth034489@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 25 Jul 2018 21:34:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475338 - branches/2018Q3/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q3/emulators/citra X-SVN-Commit-Revision: 475338 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jul 2018 21:35:00 -0000 Author: jbeich Date: Wed Jul 25 21:34:58 2018 New Revision: 475338 URL: https://svnweb.freebsd.org/changeset/ports/475338 Log: MFH: r475337 emulators/citra: update to s20180725 Changes: https://github.com/citra-emu/citra/compare/14878a17d...4a3c4f5f6 Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q3/emulators/citra/Makefile branches/2018Q3/emulators/citra/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/emulators/citra/Makefile ============================================================================== --- branches/2018Q3/emulators/citra/Makefile Wed Jul 25 21:34:07 2018 (r475337) +++ branches/2018Q3/emulators/citra/Makefile Wed Jul 25 21:34:58 2018 (r475338) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180723 +PORTVERSION= s20180725 PORTREVISION?= 0 CATEGORIES= emulators @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 14878a17d +GH_TAGNAME= 4a3c4f5f6 GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-2-g4b350a3:dynarmic/externals/dynarmic \ Modified: branches/2018Q3/emulators/citra/distinfo ============================================================================== --- branches/2018Q3/emulators/citra/distinfo Wed Jul 25 21:34:07 2018 (r475337) +++ branches/2018Q3/emulators/citra/distinfo Wed Jul 25 21:34:58 2018 (r475338) @@ -1,6 +1,6 @@ -TIMESTAMP = 1532368974 -SHA256 (citra-emu-citra-s20180723-14878a17d_GH0.tar.gz) = 257423fd4f8c16563da18b33e75555c7f7f08c4ff99406510663252372292124 -SIZE (citra-emu-citra-s20180723-14878a17d_GH0.tar.gz) = 3999968 +TIMESTAMP = 1532535551 +SHA256 (citra-emu-citra-s20180725-4a3c4f5f6_GH0.tar.gz) = 2558663b4e8b53163187cd0f12917297bf2f473a1454e3fc609f31ec4b45d214 +SIZE (citra-emu-citra-s20180725-4a3c4f5f6_GH0.tar.gz) = 4003640 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c From owner-svn-ports-branches@freebsd.org Thu Jul 26 09:34:16 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0ACB10493A2; Thu, 26 Jul 2018 09:34:16 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9615F8725D; Thu, 26 Jul 2018 09:34:16 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78ADB273BC; Thu, 26 Jul 2018 09:34:16 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6Q9YGYb002569; Thu, 26 Jul 2018 09:34:16 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6Q9YGxw002568; Thu, 26 Jul 2018 09:34:16 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <201807260934.w6Q9YGxw002568@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Thu, 26 Jul 2018 09:34:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475357 - branches/2018Q3/net-p2p/verlihub-plugins-luascript X-SVN-Group: ports-branches X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: branches/2018Q3/net-p2p/verlihub-plugins-luascript X-SVN-Commit-Revision: 475357 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2018 09:34:17 -0000 Author: fluffy Date: Thu Jul 26 09:34:16 2018 New Revision: 475357 URL: https://svnweb.freebsd.org/changeset/ports/475357 Log: MFH: r475345 - Use corresponded luasocket while SOCKET option enabled No PORTREVISION bump 'cause option was always broken due to lua52 is default PR: 229685 Submitted by: fluffy Approved by: maintainer timeout (2 weeks) Approved by: portmgr (miwi) Modified: branches/2018Q3/net-p2p/verlihub-plugins-luascript/Makefile Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/net-p2p/verlihub-plugins-luascript/Makefile ============================================================================== --- branches/2018Q3/net-p2p/verlihub-plugins-luascript/Makefile Thu Jul 26 09:31:36 2018 (r475356) +++ branches/2018Q3/net-p2p/verlihub-plugins-luascript/Makefile Thu Jul 26 09:34:16 2018 (r475357) @@ -31,8 +31,8 @@ SOCKET_DESC= Build with LuaSocket support .include .if ${PORT_OPTIONS:MSOCKET} -BUILD_DEPENDS+= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket -RUN_DEPENDS+= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket +BUILD_DEPENDS+= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51 +RUN_DEPENDS+= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51 CONFIGURE_ARGS+= --with-luasocket .endif From owner-svn-ports-branches@freebsd.org Thu Jul 26 16:46:19 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D58410548DA; Thu, 26 Jul 2018 16:46:19 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 545A3978DB; Thu, 26 Jul 2018 16:46:19 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3577B3F1B; Thu, 26 Jul 2018 16:46:19 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6QGkJ67023851; Thu, 26 Jul 2018 16:46:19 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6QGkIBH023848; Thu, 26 Jul 2018 16:46:18 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201807261646.w6QGkIBH023848@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 26 Jul 2018 16:46:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475386 - in branches/2018Q3: devel/php70-intl lang/php70 X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in branches/2018Q3: devel/php70-intl lang/php70 X-SVN-Commit-Revision: 475386 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2018 16:46:19 -0000 Author: joneum Date: Thu Jul 26 16:46:18 2018 New Revision: 475386 URL: https://svnweb.freebsd.org/changeset/ports/475386 Log: MFH: r475028 Update to 7.0.31 Changelog: http://www.php.net/ChangeLog-7.php#7.0.31 Approved by: tz (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q3/devel/php70-intl/Makefile branches/2018Q3/lang/php70/Makefile branches/2018Q3/lang/php70/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/devel/php70-intl/Makefile ============================================================================== --- branches/2018Q3/devel/php70-intl/Makefile Thu Jul 26 16:42:35 2018 (r475385) +++ branches/2018Q3/devel/php70-intl/Makefile Thu Jul 26 16:46:18 2018 (r475386) @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php70 Modified: branches/2018Q3/lang/php70/Makefile ============================================================================== --- branches/2018Q3/lang/php70/Makefile Thu Jul 26 16:42:35 2018 (r475385) +++ branches/2018Q3/lang/php70/Makefile Thu Jul 26 16:46:18 2018 (r475386) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php70 -PORTVERSION= 7.0.30 +PORTVERSION= 7.0.31 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2018Q3/lang/php70/distinfo ============================================================================== --- branches/2018Q3/lang/php70/distinfo Thu Jul 26 16:42:35 2018 (r475385) +++ branches/2018Q3/lang/php70/distinfo Thu Jul 26 16:46:18 2018 (r475386) @@ -1,5 +1,3 @@ -TIMESTAMP = 1524645186 -SHA256 (php-7.0.30.tar.xz) = c90892fb68ab9b8476519658d3f78f6388f2609ae1309bdc2a2e1cc9f92dd686 -SIZE (php-7.0.30.tar.xz) = 12030228 -SHA256 (php-7.0.x-mail-header.patch) = b78cd5a36a4709ea4e43e5babe73648ae6ace870cc0e34a5417177045834b4f0 -SIZE (php-7.0.x-mail-header.patch) = 4504 +TIMESTAMP = 1532106418 +SHA256 (php-7.0.31.tar.xz) = 68f57b3f4587071fb54a620cb83a1cfb3f0bd4ee071e0ce3bf7046a5f2d2f3cf +SIZE (php-7.0.31.tar.xz) = 12029516 From owner-svn-ports-branches@freebsd.org Thu Jul 26 16:47:08 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D2E61054949; Thu, 26 Jul 2018 16:47:08 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E797197A07; Thu, 26 Jul 2018 16:47:07 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C8DA93F1C; Thu, 26 Jul 2018 16:47:07 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6QGl7Xt024035; Thu, 26 Jul 2018 16:47:07 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6QGl76r024034; Thu, 26 Jul 2018 16:47:07 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201807261647.w6QGl76r024034@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 26 Jul 2018 16:47:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475387 - branches/2018Q3/lang/php70 X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: branches/2018Q3/lang/php70 X-SVN-Commit-Revision: 475387 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2018 16:47:08 -0000 Author: joneum Date: Thu Jul 26 16:47:07 2018 New Revision: 475387 URL: https://svnweb.freebsd.org/changeset/ports/475387 Log: MFH: r475029 revert php-7.0.x-mail-header.patch into distinfo Point hat: joneum Approved by: ports-secteam (miwi) Modified: branches/2018Q3/lang/php70/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/lang/php70/distinfo ============================================================================== --- branches/2018Q3/lang/php70/distinfo Thu Jul 26 16:46:18 2018 (r475386) +++ branches/2018Q3/lang/php70/distinfo Thu Jul 26 16:47:07 2018 (r475387) @@ -1,3 +1,5 @@ -TIMESTAMP = 1532106418 +TIMESTAMP = 1532106799 SHA256 (php-7.0.31.tar.xz) = 68f57b3f4587071fb54a620cb83a1cfb3f0bd4ee071e0ce3bf7046a5f2d2f3cf SIZE (php-7.0.31.tar.xz) = 12029516 +SHA256 (php-7.0.x-mail-header.patch) = b78cd5a36a4709ea4e43e5babe73648ae6ace870cc0e34a5417177045834b4f0 +SIZE (php-7.0.x-mail-header.patch) = 4504 From owner-svn-ports-branches@freebsd.org Thu Jul 26 17:12:48 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9EAB510553A3; Thu, 26 Jul 2018 17:12:48 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 549EB70D1F; Thu, 26 Jul 2018 17:12:48 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 35EF5443A; Thu, 26 Jul 2018 17:12:48 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6QHCmu8039772; Thu, 26 Jul 2018 17:12:48 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6QHClLv039768; Thu, 26 Jul 2018 17:12:47 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201807261712.w6QHClLv039768@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Thu, 26 Jul 2018 17:12:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475390 - branches/2018Q3/graphics/vips X-SVN-Group: ports-branches X-SVN-Commit-Author: danilo X-SVN-Commit-Paths: branches/2018Q3/graphics/vips X-SVN-Commit-Revision: 475390 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2018 17:12:49 -0000 Author: danilo Date: Thu Jul 26 17:12:47 2018 New Revision: 475390 URL: https://svnweb.freebsd.org/changeset/ports/475390 Log: MFH: r475381 - Update to 8.6.5 Fix a buffer overflow in the tiff reader. Approved by: ports-secteam (swills) Modified: branches/2018Q3/graphics/vips/Makefile branches/2018Q3/graphics/vips/distinfo branches/2018Q3/graphics/vips/pkg-plist Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/graphics/vips/Makefile ============================================================================== --- branches/2018Q3/graphics/vips/Makefile Thu Jul 26 17:05:19 2018 (r475389) +++ branches/2018Q3/graphics/vips/Makefile Thu Jul 26 17:12:47 2018 (r475390) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vips -PORTVERSION= 8.6.4 +PORTVERSION= 8.6.5 CATEGORIES= graphics MASTER_SITES= https://github.com/${GH_ACCOUNT}/libvips/releases/download/v${PORTVERSION}/ Modified: branches/2018Q3/graphics/vips/distinfo ============================================================================== --- branches/2018Q3/graphics/vips/distinfo Thu Jul 26 17:05:19 2018 (r475389) +++ branches/2018Q3/graphics/vips/distinfo Thu Jul 26 17:12:47 2018 (r475390) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529934562 -SHA256 (vips-8.6.4.tar.gz) = 4631a080c92b2b371379252e451818604858942b754c924b09843a7f528a8af4 -SIZE (vips-8.6.4.tar.gz) = 12176633 +TIMESTAMP = 1532549699 +SHA256 (vips-8.6.5.tar.gz) = 8702af0e340e220e0c08f8ded6c8248b18e7043938d9e8a2426631fd37a9d5db +SIZE (vips-8.6.5.tar.gz) = 12151424 Modified: branches/2018Q3/graphics/vips/pkg-plist ============================================================================== --- branches/2018Q3/graphics/vips/pkg-plist Thu Jul 26 17:05:19 2018 (r475389) +++ branches/2018Q3/graphics/vips/pkg-plist Thu Jul 26 17:12:47 2018 (r475390) @@ -73,15 +73,15 @@ lib/girepository-1.0/Vips-8.0.typelib lib/libvips-cpp.a lib/libvips-cpp.so lib/libvips-cpp.so.42 -lib/libvips-cpp.so.42.8.3 +lib/libvips-cpp.so.42.8.4 lib/libvips.a lib/libvips.so lib/libvips.so.42 -lib/libvips.so.42.8.3 +lib/libvips.so.42.8.4 lib/libvipsCC.a lib/libvipsCC.so lib/libvipsCC.so.42 -lib/libvipsCC.so.42.8.3 +lib/libvipsCC.so.42.8.4 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Vips.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Vips.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Vips.%%PYTHON_PYOEXTENSION%% From owner-svn-ports-branches@freebsd.org Fri Jul 27 12:35:23 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A271104945C; Fri, 27 Jul 2018 12:35:23 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0029A724E3; Fri, 27 Jul 2018 12:35:23 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D59EF17F20; Fri, 27 Jul 2018 12:35:22 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6RCZMFT033758; Fri, 27 Jul 2018 12:35:22 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6RCZMmB033751; Fri, 27 Jul 2018 12:35:22 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201807271235.w6RCZMmB033751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Fri, 27 Jul 2018 12:35:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475431 - in branches/2018Q3/graphics/gd: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in branches/2018Q3/graphics/gd: . files X-SVN-Commit-Revision: 475431 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2018 12:35:23 -0000 Author: tz Date: Fri Jul 27 12:35:21 2018 New Revision: 475431 URL: https://svnweb.freebsd.org/changeset/ports/475431 Log: MFH: r475415 graphics/gd: Update from 2.2.4 to 2.2.5 This update fixes 2 security issues: - Double-free in gdImagePngPtr(). (CVE-2017-6362) - Buffer over-read into uninitialized memory. (CVE-2017-7890) Full Changelog: https://github.com/libgd/libgd/blob/gd-2.2.5/CHANGELOG.md PR: 229707 Submitted by: Mikhail Teterin Approved by: maintainer timeout (dinoex, 2 weeks) Security: CVE-2017-6362 Security: CVE-2017-7890 Approved by: ports-secteam (miwi) Added: branches/2018Q3/graphics/gd/files/patch-gd_gif_in.c - copied unchanged from r475415, head/graphics/gd/files/patch-gd_gif_in.c Modified: branches/2018Q3/graphics/gd/Makefile branches/2018Q3/graphics/gd/distinfo branches/2018Q3/graphics/gd/pkg-plist Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/graphics/gd/Makefile ============================================================================== --- branches/2018Q3/graphics/gd/Makefile Fri Jul 27 12:34:57 2018 (r475430) +++ branches/2018Q3/graphics/gd/Makefile Fri Jul 27 12:35:21 2018 (r475431) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libgd -PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTVERSION= 2.2.5 PORTEPOCH= 1 CATEGORIES+= graphics MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/ @@ -24,6 +23,7 @@ USES= tar:xz pkgconfig pathfix libtool:keepla shebang SHEBANG_FILES= ${WRKSRC}/src/bdftogd GNU_CONFIGURE= yes USE_LDCONFIG= yes +TEST_TARGET= check OPTIONS_DEFINE= FONTCONFIG ICONV XPM WEBP OPTIONS_DEFAULT=FONTCONFIG WEBP @@ -90,6 +90,6 @@ pre-build: post-install: ${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \ ${STAGEDIR}${PREFIX}/include/ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.4 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6* .include Modified: branches/2018Q3/graphics/gd/distinfo ============================================================================== --- branches/2018Q3/graphics/gd/distinfo Fri Jul 27 12:34:57 2018 (r475430) +++ branches/2018Q3/graphics/gd/distinfo Fri Jul 27 12:35:21 2018 (r475431) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485463341 -SHA256 (libgd-2.2.4.tar.xz) = 137f13a7eb93ce72e32ccd7cebdab6874f8cf7ddf31d3a455a68e016ecd9e4e6 -SIZE (libgd-2.2.4.tar.xz) = 2478528 +TIMESTAMP = 1531337629 +SHA256 (libgd-2.2.5.tar.xz) = 8c302ccbf467faec732f0741a859eef4ecae22fea2d2ab87467be940842bde51 +SIZE (libgd-2.2.5.tar.xz) = 2594092 Copied: branches/2018Q3/graphics/gd/files/patch-gd_gif_in.c (from r475415, head/graphics/gd/files/patch-gd_gif_in.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/graphics/gd/files/patch-gd_gif_in.c Fri Jul 27 12:35:21 2018 (r475431, copy of r475415, head/graphics/gd/files/patch-gd_gif_in.c) @@ -0,0 +1,34 @@ +See: + + https://bugs.php.net/bug.php?id=75571 + +--- src/gd_gif_in.c 2017-08-30 07:05:54.000000000 -0400 ++++ src/gd_gif_in.c 2018-07-11 15:39:11.746181000 -0400 +@@ -336,9 +336,4 @@ + } + +- if(!im->colorsTotal) { +- gdImageDestroy(im); +- return 0; +- } +- + /* Check for open colors at the end, so + * we can reduce colorsTotal and ultimately +@@ -352,4 +347,9 @@ + } + ++ if(!im->colorsTotal) { ++ gdImageDestroy(im); ++ return 0; ++ } ++ + return im; + } +@@ -447,6 +447,5 @@ + GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP) + { +- int i, j, ret; +- unsigned char count; ++ int i, j, ret, count; + + if(flag) { Modified: branches/2018Q3/graphics/gd/pkg-plist ============================================================================== --- branches/2018Q3/graphics/gd/pkg-plist Fri Jul 27 12:34:57 2018 (r475430) +++ branches/2018Q3/graphics/gd/pkg-plist Fri Jul 27 12:35:21 2018 (r475431) @@ -29,5 +29,5 @@ lib/libgd.a lib/libgd.la lib/libgd.so lib/libgd.so.6 -lib/libgd.so.6.0.4 +lib/libgd.so.6.0.5 libdata/pkgconfig/gdlib.pc From owner-svn-ports-branches@freebsd.org Fri Jul 27 12:39:56 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD7E61049642; Fri, 27 Jul 2018 12:39:55 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 94093728E7; Fri, 27 Jul 2018 12:39:55 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7626717F2B; Fri, 27 Jul 2018 12:39:55 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6RCdt1a034411; Fri, 27 Jul 2018 12:39:55 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6RCds70034409; Fri, 27 Jul 2018 12:39:54 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201807271239.w6RCds70034409@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 27 Jul 2018 12:39:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475434 - branches/2018Q3/ftp/curl X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: branches/2018Q3/ftp/curl X-SVN-Commit-Revision: 475434 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2018 12:39:56 -0000 Author: swills Date: Fri Jul 27 12:39:54 2018 New Revision: 475434 URL: https://svnweb.freebsd.org/changeset/ports/475434 Log: MFH: r475433 ftp/curl: Update to 7.61.0 PR: 229753 Submitted by: Yasuhiro KIMURA Approved by: maintainer timeout (sunpoet, >2 weeks) Security: 3849e28f-8693-11e8-9610-9c5c8e75236a Approved by: ports-ecteam (implicit) Modified: branches/2018Q3/ftp/curl/Makefile branches/2018Q3/ftp/curl/distinfo branches/2018Q3/ftp/curl/pkg-plist Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/ftp/curl/Makefile ============================================================================== --- branches/2018Q3/ftp/curl/Makefile Fri Jul 27 12:38:06 2018 (r475433) +++ branches/2018Q3/ftp/curl/Makefile Fri Jul 27 12:39:54 2018 (r475434) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.60.0 +PORTVERSION= 7.61.0 CATEGORIES= ftp net www MASTER_SITES= https://curl.haxx.se/download/ \ LOCAL/sunpoet @@ -62,7 +62,7 @@ CPE_VENDOR= haxx DOCS= BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUTE.md FAQ \ FEATURES HISTORY.md HTTP-COOKIES.md HTTP2.md INSTALL \ INTERNALS.md KNOWN_BUGS LICENSE-MIXING.md MAIL-ETIQUETTE \ - MANUAL RELEASE-PROCEDURE RESOURCES ROADMAP.md \ + MANUAL RESOURCES ROADMAP.md \ SECURITY-PROCESS.md SSL-PROBLEMS.md SSLCERTS.md THANKS TODO \ TheArtOfHttpScripting VERSIONS Modified: branches/2018Q3/ftp/curl/distinfo ============================================================================== --- branches/2018Q3/ftp/curl/distinfo Fri Jul 27 12:38:06 2018 (r475433) +++ branches/2018Q3/ftp/curl/distinfo Fri Jul 27 12:39:54 2018 (r475434) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526504732 -SHA256 (curl-7.60.0.tar.xz) = 8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0 -SIZE (curl-7.60.0.tar.xz) = 2338104 +TIMESTAMP = 1531483394 +SHA256 (curl-7.61.0.tar.xz) = ef6e55192d04713673b4409ccbcb4cb6cd723137d6e10ca45b0c593a454e1720 +SIZE (curl-7.61.0.tar.xz) = 2348892 Modified: branches/2018Q3/ftp/curl/pkg-plist ============================================================================== --- branches/2018Q3/ftp/curl/pkg-plist Fri Jul 27 12:38:06 2018 (r475433) +++ branches/2018Q3/ftp/curl/pkg-plist Fri Jul 27 12:39:54 2018 (r475434) @@ -17,9 +17,11 @@ man/man1/curl-config.1.gz man/man1/curl.1.gz man/man3/CURLINFO_ACTIVESOCKET.3.gz man/man3/CURLINFO_APPCONNECT_TIME.3.gz +man/man3/CURLINFO_APPCONNECT_TIME_T.3.gz man/man3/CURLINFO_CERTINFO.3.gz man/man3/CURLINFO_CONDITION_UNMET.3.gz man/man3/CURLINFO_CONNECT_TIME.3.gz +man/man3/CURLINFO_CONNECT_TIME_T.3.gz man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3.gz man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3.gz man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3.gz @@ -38,9 +40,11 @@ man/man3/CURLINFO_LASTSOCKET.3.gz man/man3/CURLINFO_LOCAL_IP.3.gz man/man3/CURLINFO_LOCAL_PORT.3.gz man/man3/CURLINFO_NAMELOOKUP_TIME.3.gz +man/man3/CURLINFO_NAMELOOKUP_TIME_T.3.gz man/man3/CURLINFO_NUM_CONNECTS.3.gz man/man3/CURLINFO_OS_ERRNO.3.gz man/man3/CURLINFO_PRETRANSFER_TIME.3.gz +man/man3/CURLINFO_PRETRANSFER_TIME_T.3.gz man/man3/CURLINFO_PRIMARY_IP.3.gz man/man3/CURLINFO_PRIMARY_PORT.3.gz man/man3/CURLINFO_PRIVATE.3.gz @@ -49,6 +53,7 @@ man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3.gz man/man3/CURLINFO_REDIRECT_COUNT.3.gz man/man3/CURLINFO_REDIRECT_TIME.3.gz +man/man3/CURLINFO_REDIRECT_TIME_T.3.gz man/man3/CURLINFO_REDIRECT_URL.3.gz man/man3/CURLINFO_REQUEST_SIZE.3.gz man/man3/CURLINFO_RESPONSE_CODE.3.gz @@ -68,9 +73,11 @@ man/man3/CURLINFO_SPEED_UPLOAD_T.3.gz man/man3/CURLINFO_SSL_ENGINES.3.gz man/man3/CURLINFO_SSL_VERIFYRESULT.3.gz man/man3/CURLINFO_STARTTRANSFER_TIME.3.gz +man/man3/CURLINFO_STARTTRANSFER_TIME_T.3.gz man/man3/CURLINFO_TLS_SESSION.3.gz man/man3/CURLINFO_TLS_SSL_PTR.3.gz man/man3/CURLINFO_TOTAL_TIME.3.gz +man/man3/CURLINFO_TOTAL_TIME_T.3.gz man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3.gz man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3.gz man/man3/CURLMOPT_MAXCONNECTS.3.gz @@ -121,6 +128,7 @@ man/man3/CURLOPT_DEBUGDATA.3.gz man/man3/CURLOPT_DEBUGFUNCTION.3.gz man/man3/CURLOPT_DEFAULT_PROTOCOL.3.gz man/man3/CURLOPT_DIRLISTONLY.3.gz +man/man3/CURLOPT_DISALLOW_USERNAME_IN_URL.3.gz man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3.gz man/man3/CURLOPT_DNS_INTERFACE.3.gz man/man3/CURLOPT_DNS_LOCAL_IP4.3.gz @@ -244,6 +252,7 @@ man/man3/CURLOPT_PROXY_SSL_CIPHER_LIST.3.gz man/man3/CURLOPT_PROXY_SSL_OPTIONS.3.gz man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3.gz man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3.gz +man/man3/CURLOPT_PROXY_TLS13_CIPHERS.3.gz man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3.gz man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3.gz man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3.gz @@ -322,6 +331,7 @@ man/man3/CURLOPT_TIMEOUT.3.gz man/man3/CURLOPT_TIMEOUT_MS.3.gz man/man3/CURLOPT_TIMEVALUE.3.gz man/man3/CURLOPT_TIMEVALUE_LARGE.3.gz +man/man3/CURLOPT_TLS13_CIPHERS.3.gz man/man3/CURLOPT_TLSAUTH_PASSWORD.3.gz man/man3/CURLOPT_TLSAUTH_TYPE.3.gz man/man3/CURLOPT_TLSAUTH_USERNAME.3.gz From owner-svn-ports-branches@freebsd.org Fri Jul 27 20:59:03 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB5FF105692C; Fri, 27 Jul 2018 20:59:03 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7F7F7880AF; Fri, 27 Jul 2018 20:59:03 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 609371CFA5; Fri, 27 Jul 2018 20:59:03 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6RKx3X7092619; Fri, 27 Jul 2018 20:59:03 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6RKx3vF092618; Fri, 27 Jul 2018 20:59:03 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201807272059.w6RKx3vF092618@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 27 Jul 2018 20:59:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475462 - branches/2018Q3/net-mgmt/nstat/files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: branches/2018Q3/net-mgmt/nstat/files X-SVN-Commit-Revision: 475462 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2018 20:59:04 -0000 Author: swills Date: Fri Jul 27 20:59:02 2018 New Revision: 475462 URL: https://svnweb.freebsd.org/changeset/ports/475462 Log: MFH: r475392 net-mgmt/nstat: don't assume timespecadd is undefined PR: 230058 Submitted by: asomers Approved by: ports-secteam (implicit) Added: branches/2018Q3/net-mgmt/nstat/files/ - copied from r475392, head/net-mgmt/nstat/files/ Modified: Directory Properties: branches/2018Q3/ (props changed) From owner-svn-ports-branches@freebsd.org Fri Jul 27 23:05:51 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07B341059CFC; Fri, 27 Jul 2018 23:05:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 94EE38E01D; Fri, 27 Jul 2018 23:05:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 702F71E475; Fri, 27 Jul 2018 23:05:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6RN5oxI060189; Fri, 27 Jul 2018 23:05:50 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6RN5oRu060187; Fri, 27 Jul 2018 23:05:50 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201807272305.w6RN5oRu060187@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 27 Jul 2018 23:05:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475473 - branches/2018Q3/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q3/emulators/rpcs3 X-SVN-Commit-Revision: 475473 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2018 23:05:51 -0000 Author: jbeich Date: Fri Jul 27 23:05:49 2018 New Revision: 475473 URL: https://svnweb.freebsd.org/changeset/ports/475473 Log: MFH: r475471 emulators/rpcs3: update to 0.0.5.678 Changes: https://github.com/RPCS3/rpcs3/compare/c5c0f68b3...b0f464d11 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q3/emulators/rpcs3/Makefile branches/2018Q3/emulators/rpcs3/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q3/emulators/rpcs3/Makefile Fri Jul 27 23:05:18 2018 (r475472) +++ branches/2018Q3/emulators/rpcs3/Makefile Fri Jul 27 23:05:49 2018 (r475473) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-663 -DISTVERSIONSUFFIX= -gc5c0f68b3 +DISTVERSION= 0.0.5-678 +DISTVERSIONSUFFIX= -gb0f464d11 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q3/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q3/emulators/rpcs3/distinfo Fri Jul 27 23:05:18 2018 (r475472) +++ branches/2018Q3/emulators/rpcs3/distinfo Fri Jul 27 23:05:49 2018 (r475473) @@ -1,6 +1,6 @@ -TIMESTAMP = 1532274808 -SHA256 (RPCS3-rpcs3-v0.0.5-663-gc5c0f68b3_GH0.tar.gz) = be3bb3766840db90aeba98cb5defa7e08f5cda7af5ee25026823883aaab9cd9e -SIZE (RPCS3-rpcs3-v0.0.5-663-gc5c0f68b3_GH0.tar.gz) = 4953867 +TIMESTAMP = 1532714216 +SHA256 (RPCS3-rpcs3-v0.0.5-678-gb0f464d11_GH0.tar.gz) = 3620a02dd87f4ea63bccda643526a3cf2d269841c6158a8ca7d8050ded8ed212 +SIZE (RPCS3-rpcs3-v0.0.5-678-gb0f464d11_GH0.tar.gz) = 4959841 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-llvm-be9f7bfe2068_GH0.tar.gz) = 6fc805799e0853505ce786882e5856d018130fcca37206e7ef5fcef6b72937d3 From owner-svn-ports-branches@freebsd.org Fri Jul 27 23:07:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D9F11059D64; Fri, 27 Jul 2018 23:07:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F8438E11C; Fri, 27 Jul 2018 23:07:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA87C1E477; Fri, 27 Jul 2018 23:07:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6RN76Eh060374; Fri, 27 Jul 2018 23:07:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6RN76es060372; Fri, 27 Jul 2018 23:07:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201807272307.w6RN76es060372@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 27 Jul 2018 23:07:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475474 - branches/2018Q3/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q3/emulators/citra X-SVN-Commit-Revision: 475474 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2018 23:07:07 -0000 Author: jbeich Date: Fri Jul 27 23:07:06 2018 New Revision: 475474 URL: https://svnweb.freebsd.org/changeset/ports/475474 Log: MFH: r475472 emulators/citra: update to s20180727 Changes: https://github.com/citra-emu/citra/compare/4a3c4f5f6...be193869c Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q3/emulators/citra/Makefile branches/2018Q3/emulators/citra/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/emulators/citra/Makefile ============================================================================== --- branches/2018Q3/emulators/citra/Makefile Fri Jul 27 23:05:49 2018 (r475473) +++ branches/2018Q3/emulators/citra/Makefile Fri Jul 27 23:07:06 2018 (r475474) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180725 +PORTVERSION= s20180727 PORTREVISION?= 0 CATEGORIES= emulators @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 4a3c4f5f6 +GH_TAGNAME= be193869c GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-2-g4b350a3:dynarmic/externals/dynarmic \ @@ -37,7 +37,7 @@ GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libr neobrain:nihstro:fd69de1:nihstro/externals/nihstro \ weidai11:cryptopp:CRYPTOPP_7_0_0-23-gf320e7d9:cryptopp/externals/cryptopp/cryptopp -USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags +USES= cmake:outsource compiler:c++17-lang iconv localbase:ldflags USE_SDL= sdl2 EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL:R}} EXTRA_PATCHES_FreeBSD_10= ${PATCHDIR}/extra-patch-c++14 Modified: branches/2018Q3/emulators/citra/distinfo ============================================================================== --- branches/2018Q3/emulators/citra/distinfo Fri Jul 27 23:05:49 2018 (r475473) +++ branches/2018Q3/emulators/citra/distinfo Fri Jul 27 23:07:06 2018 (r475474) @@ -1,6 +1,6 @@ -TIMESTAMP = 1532535551 -SHA256 (citra-emu-citra-s20180725-4a3c4f5f6_GH0.tar.gz) = 2558663b4e8b53163187cd0f12917297bf2f473a1454e3fc609f31ec4b45d214 -SIZE (citra-emu-citra-s20180725-4a3c4f5f6_GH0.tar.gz) = 4003640 +TIMESTAMP = 1532710558 +SHA256 (citra-emu-citra-s20180727-be193869c_GH0.tar.gz) = 28d2b95f00cc4305ff78cffcea76393ba78b186f7d93a14782dfcf8adda05373 +SIZE (citra-emu-citra-s20180727-be193869c_GH0.tar.gz) = 4006309 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c From owner-svn-ports-branches@freebsd.org Sat Jul 28 03:37:55 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3884D1061991; Sat, 28 Jul 2018 03:37:55 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D646777964; Sat, 28 Jul 2018 03:37:54 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B60A5211F8; Sat, 28 Jul 2018 03:37:54 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6S3bsAj000852; Sat, 28 Jul 2018 03:37:54 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6S3bsvO000849; Sat, 28 Jul 2018 03:37:54 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <201807280337.w6S3bsvO000849@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Sat, 28 Jul 2018 03:37:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475488 - in branches/2018Q3: Mk lang/ruby24/files lang/ruby25/files X-SVN-Group: ports-branches X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in branches/2018Q3: Mk lang/ruby24/files lang/ruby25/files X-SVN-Commit-Revision: 475488 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 03:37:55 -0000 Author: fluffy Date: Sat Jul 28 03:37:53 2018 New Revision: 475488 URL: https://svnweb.freebsd.org/changeset/ports/475488 Log: MFH: r475483 lang/ruby2[4|5]: Use internal RUBY_DLDFLAGS right way, get rid of unescaped macro '$@' in the pkg-config template lang/ruby23 is already fixed same way, port it to newer releases By the way, this unbreak ninja builds with any port relied on libruby.so PR: 229898 Submitted by: fluffy Reviewed by: ruby (miwi) Approved by: ruby (miwi) Exp-run by: antoine Differential Revision: D16341 Approved by: ports-secteam (miwi) Added: branches/2018Q3/lang/ruby24/files/patch-configure.in - copied unchanged from r475483, head/lang/ruby24/files/patch-configure.in branches/2018Q3/lang/ruby25/files/patch-configure.ac - copied unchanged from r475483, head/lang/ruby25/files/patch-configure.ac Modified: branches/2018Q3/Mk/bsd.ruby.mk Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/Mk/bsd.ruby.mk ============================================================================== --- branches/2018Q3/Mk/bsd.ruby.mk Sat Jul 28 03:26:52 2018 (r475487) +++ branches/2018Q3/Mk/bsd.ruby.mk Sat Jul 28 03:37:53 2018 (r475488) @@ -165,7 +165,7 @@ RUBY23= "" # PLIST_SUB helpers # Ruby 2.4 # RUBY_RELVERSION= 2.4.4 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY24= "" # PLIST_SUB helpers @@ -175,7 +175,7 @@ RUBY24= "" # PLIST_SUB helpers # Ruby 2.5 # RUBY_RELVERSION= 2.5.1 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY25= "" # PLIST_SUB helpers Copied: branches/2018Q3/lang/ruby24/files/patch-configure.in (from r475483, head/lang/ruby24/files/patch-configure.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/lang/ruby24/files/patch-configure.in Sat Jul 28 03:37:53 2018 (r475488, copy of r475483, head/lang/ruby24/files/patch-configure.in) @@ -0,0 +1,19 @@ +--- configure.in.orig 2018-03-02 20:59:11.000000000 +0800 ++++ configure.in 2018-07-19 14:22:04.753721000 +0800 +@@ -3423,7 +3423,6 @@ + : ${LDSHARED='$(CC) -shared'} + if test "$rb_cv_binary_elf" = yes; then + LDFLAGS="$LDFLAGS -rdynamic" +- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@' + else + test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' + fi +@@ -3896,6 +3895,8 @@ + [freebsd*|dragonfly*], [ + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' ++ RUBY_APPEND_OPTIONS(DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"]) ++ RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"]) + if test "$rb_cv_binary_elf" != "yes" ; then + LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" + LIBRUBY_ALIASES='' Copied: branches/2018Q3/lang/ruby25/files/patch-configure.ac (from r475483, head/lang/ruby25/files/patch-configure.ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/lang/ruby25/files/patch-configure.ac Sat Jul 28 03:37:53 2018 (r475488, copy of r475483, head/lang/ruby25/files/patch-configure.ac) @@ -0,0 +1,19 @@ +--- configure.ac.orig 2018-01-04 02:12:16.000000000 +0800 ++++ configure.ac 2018-07-19 14:45:11.636321000 +0800 +@@ -3245,7 +3245,6 @@ + : ${LDSHARED='$(CC) -shared'} + AS_IF([test "$rb_cv_binary_elf" = yes], [ + LDFLAGS="$LDFLAGS -rdynamic" +- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@' + ], [ + test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' + ]) +@@ -3724,6 +3723,8 @@ + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' + LIBRUBY_SONAME='$(LIBRUBY_SO)' ++ RUBY_APPEND_OPTIONS(DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"]) ++ RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"]) + AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ + LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" + LIBRUBY_ALIASES='' From owner-svn-ports-branches@freebsd.org Sat Jul 28 13:02:20 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 253F61050EA0; Sat, 28 Jul 2018 13:02:20 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CF7598D9DE; Sat, 28 Jul 2018 13:02:19 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B129D27079; Sat, 28 Jul 2018 13:02:19 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SD2JKO000920; Sat, 28 Jul 2018 13:02:19 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SD2J44000918; Sat, 28 Jul 2018 13:02:19 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <201807281302.w6SD2J44000918@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Sat, 28 Jul 2018 13:02:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475554 - branches/2018Q3/devel/ruby-sdl X-SVN-Group: ports-branches X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: branches/2018Q3/devel/ruby-sdl X-SVN-Commit-Revision: 475554 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 13:02:20 -0000 Author: fluffy Date: Sat Jul 28 13:02:19 2018 New Revision: 475554 URL: https://svnweb.freebsd.org/changeset/ports/475554 Log: MFH: r475063 - Update to 2.2.0 release - Pass linker flags to LDFLAGS Reported by: antoine via exp-run Approved by: ports-secteam (miwi) Modified: branches/2018Q3/devel/ruby-sdl/Makefile branches/2018Q3/devel/ruby-sdl/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/devel/ruby-sdl/Makefile ============================================================================== --- branches/2018Q3/devel/ruby-sdl/Makefile Sat Jul 28 13:00:44 2018 (r475553) +++ branches/2018Q3/devel/ruby-sdl/Makefile Sat Jul 28 13:02:19 2018 (r475554) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sdl -PORTVERSION= 2.1.3.1 -PORTREVISION= 4 +PORTVERSION= 2.2.0 CATEGORIES= devel graphics audio ruby MASTER_SITES= https://ohai.github.io/rubysdl/archives/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -50,6 +49,9 @@ DOC_FILESEN= *.rsd *ref.en.html OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_SUB= yes + +post-patch: + @${REINPLACE_CMD} -e 's|LOCAL_LIBS|LDFLAGS|g' ${WRKSRC}/extconf.rb post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/*/sdl_ext.so Modified: branches/2018Q3/devel/ruby-sdl/distinfo ============================================================================== --- branches/2018Q3/devel/ruby-sdl/distinfo Sat Jul 28 13:00:44 2018 (r475553) +++ branches/2018Q3/devel/ruby-sdl/distinfo Sat Jul 28 13:02:19 2018 (r475554) @@ -1,2 +1,3 @@ -SHA256 (ruby/rubysdl-2.1.3.1.tar.gz) = 167f162766a9309ac3b241591be2928a7fbefe32559f1458d89b4a0121500f72 -SIZE (ruby/rubysdl-2.1.3.1.tar.gz) = 795543 +TIMESTAMP = 1532165196 +SHA256 (ruby/rubysdl-2.2.0.tar.gz) = 2f4787b57faef7722bca2d7030ee72ee6ce6d03a2124ee48682d7613b21239a7 +SIZE (ruby/rubysdl-2.2.0.tar.gz) = 799369 From owner-svn-ports-branches@freebsd.org Sat Jul 28 17:40:23 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5049410580C9; Sat, 28 Jul 2018 17:40:23 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 05B8276EB7; Sat, 28 Jul 2018 17:40:23 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB4291D37; Sat, 28 Jul 2018 17:40:22 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SHeMDi042923; Sat, 28 Jul 2018 17:40:22 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SHeMlY042919; Sat, 28 Jul 2018 17:40:22 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201807281740.w6SHeMlY042919@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 28 Jul 2018 17:40:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475590 - in branches/2018Q3/devel/gitaly: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in branches/2018Q3/devel/gitaly: . files X-SVN-Commit-Revision: 475590 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 17:40:23 -0000 Author: mfechner Date: Sat Jul 28 17:40:21 2018 New Revision: 475590 URL: https://svnweb.freebsd.org/changeset/ports/475590 Log: MFH: r475371 Update to 0.111.2 which is required for gitlab 11.1.1. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q3/devel/gitaly/Makefile branches/2018Q3/devel/gitaly/distinfo branches/2018Q3/devel/gitaly/files/patch-ruby_Gemfile branches/2018Q3/devel/gitaly/pkg-plist Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/devel/gitaly/Makefile ============================================================================== --- branches/2018Q3/devel/gitaly/Makefile Sat Jul 28 17:38:01 2018 (r475589) +++ branches/2018Q3/devel/gitaly/Makefile Sat Jul 28 17:40:21 2018 (r475590) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 0.105.0 -PORTREVISION= 1 +DISTVERSION= 0.111.2 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -12,13 +11,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.16.2:devel/git \ +MY_DEPENDS= git>=2.17:devel/git \ rubygem-i18n>=0:devel/rubygem-i18n \ - rubygem-rugged>=0.27.1:devel/rubygem-rugged \ + rubygem-rugged>=0.27.2:devel/rubygem-rugged \ rubygem-github-linguist53>=5.3.3:textproc/rubygem-github-linguist53 \ rubygem-bundler>0:sysutils/rubygem-bundler \ rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \ - rubygem-gitaly-proto>=0.101.0:net/rubygem-gitaly-proto \ + rubygem-gitaly-proto>=0.105.0:net/rubygem-gitaly-proto \ rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \ rubygem-rdoc>=6.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2:www/rubygem-gitlab-gollum-lib \ @@ -29,7 +28,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \ rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 -BUILD_DEPENDS= go>=1.8:lang/go \ +BUILD_DEPENDS= go>=1.9:lang/go \ gem:devel/ruby-gems \ ${MY_DEPENDS} @@ -42,7 +41,7 @@ USE_RUBY= yes USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= 90ec422b0e76840075010476898637a92f287245 +GL_COMMIT= 39b113e394a7773d3c5781180119f4dbcbec7bd5 post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example Modified: branches/2018Q3/devel/gitaly/distinfo ============================================================================== --- branches/2018Q3/devel/gitaly/distinfo Sat Jul 28 17:38:01 2018 (r475589) +++ branches/2018Q3/devel/gitaly/distinfo Sat Jul 28 17:40:21 2018 (r475590) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530370061 -SHA256 (gitlab-org-gitaly-90ec422b0e76840075010476898637a92f287245_GL0.tar.gz) = 0ec6140877d53dae22247d16ddb89374cade68ab47800b74e649e2a073c63e71 -SIZE (gitlab-org-gitaly-90ec422b0e76840075010476898637a92f287245_GL0.tar.gz) = 4145322 +TIMESTAMP = 1532595343 +SHA256 (gitlab-org-gitaly-39b113e394a7773d3c5781180119f4dbcbec7bd5_GL0.tar.gz) = 881bd5b82e33462029d483bd416adba453330bd6d4f22197a11626fa140ecdde +SIZE (gitlab-org-gitaly-39b113e394a7773d3c5781180119f4dbcbec7bd5_GL0.tar.gz) = 3604279 Modified: branches/2018Q3/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- branches/2018Q3/devel/gitaly/files/patch-ruby_Gemfile Sat Jul 28 17:38:01 2018 (r475589) +++ branches/2018Q3/devel/gitaly/files/patch-ruby_Gemfile Sat Jul 28 17:40:21 2018 (r475590) @@ -1,8 +1,8 @@ ---- ruby/Gemfile.orig 2018-06-04 16:17:50 UTC +--- ruby/Gemfile.orig 2018-07-20 10:35:57 UTC +++ ruby/Gemfile @@ -5,12 +5,13 @@ gem 'github-linguist', '~> 5.3.3', requi gem 'gitlab-markup', '~> 1.6.2' - gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly' + gem 'gitaly-proto', '~> 0.105.0', require: 'gitaly' gem 'activesupport', '~> 5.0.2' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' Modified: branches/2018Q3/devel/gitaly/pkg-plist ============================================================================== --- branches/2018Q3/devel/gitaly/pkg-plist Sat Jul 28 17:38:01 2018 (r475589) +++ branches/2018Q3/devel/gitaly/pkg-plist Sat Jul 28 17:40:21 2018 (r475590) @@ -20,9 +20,15 @@ %%DATADIR%%/ruby/lib/gitaly_server/wiki_service.rb %%DATADIR%%/ruby/lib/gitlab/config.rb %%DATADIR%%/ruby/lib/gitlab/git.rb +%%DATADIR%%/ruby/lib/gitlab/git/blob.rb +%%DATADIR%%/ruby/lib/gitlab/git/commit.rb %%DATADIR%%/ruby/lib/gitlab/git/gitaly_remote_repository.rb %%DATADIR%%/ruby/lib/gitlab/git/gitlab_projects.rb +%%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.rb +%%DATADIR%%/ruby/lib/gitlab/git/pre_receive_error.rb +%%DATADIR%%/ruby/lib/gitlab/git/remote_mirror.rb %%DATADIR%%/ruby/lib/gitlab/git/repository.rb +%%DATADIR%%/ruby/lib/gitlab/git/wiki.rb %%DATADIR%%/ruby/lib/gitlab/git_logger.rb %%DATADIR%%/ruby/lib/gitlab/gitaly_client.rb %%DATADIR%%/ruby/lib/gitlab/gollum.rb @@ -69,6 +75,7 @@ %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/operation_service.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/path_helper.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/popen.rb +%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/pre_receive_error.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/raw_diff_change.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/ref.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_mirror.rb @@ -89,11 +96,13 @@ %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/tree.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/user.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/util.rb +%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/version.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/wiki.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/wiki_file.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/wiki_page.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/wiki_page_version.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/utils/strong_memoize.rb +%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/version_info.rb @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-ssh @sample %%DATADIR%%/config.toml.sample From owner-svn-ports-branches@freebsd.org Sat Jul 28 17:51:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2E73105836D; Sat, 28 Jul 2018 17:51:06 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A76CF773BF; Sat, 28 Jul 2018 17:51:06 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 89E751EF6; Sat, 28 Jul 2018 17:51:06 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SHp6EW050831; Sat, 28 Jul 2018 17:51:06 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SHp6cQ050829; Sat, 28 Jul 2018 17:51:06 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201807281751.w6SHp6cQ050829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 28 Jul 2018 17:51:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475591 - branches/2018Q3/net/rubygem-gitaly-proto X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q3/net/rubygem-gitaly-proto X-SVN-Commit-Revision: 475591 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 17:51:07 -0000 Author: mfechner Date: Sat Jul 28 17:51:05 2018 New Revision: 475591 URL: https://svnweb.freebsd.org/changeset/ports/475591 Log: MFH: r475372 Update to 0.105.0 which is required for gitlab 11.1.1. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q3/net/rubygem-gitaly-proto/Makefile branches/2018Q3/net/rubygem-gitaly-proto/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/net/rubygem-gitaly-proto/Makefile ============================================================================== --- branches/2018Q3/net/rubygem-gitaly-proto/Makefile Sat Jul 28 17:40:21 2018 (r475590) +++ branches/2018Q3/net/rubygem-gitaly-proto/Makefile Sat Jul 28 17:51:05 2018 (r475591) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitaly-proto -PORTVERSION= 0.101.0 +PORTVERSION= 0.105.0 CATEGORIES= net rubygems MASTER_SITES= RG Modified: branches/2018Q3/net/rubygem-gitaly-proto/distinfo ============================================================================== --- branches/2018Q3/net/rubygem-gitaly-proto/distinfo Sat Jul 28 17:40:21 2018 (r475590) +++ branches/2018Q3/net/rubygem-gitaly-proto/distinfo Sat Jul 28 17:51:05 2018 (r475591) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530442465 -SHA256 (rubygem/gitaly-proto-0.101.0.gem) = e0d566504249cf823eeeb114e874b3043d93d40a95bd38802c6a8b91e9ca0131 -SIZE (rubygem/gitaly-proto-0.101.0.gem) = 16896 +TIMESTAMP = 1532162098 +SHA256 (rubygem/gitaly-proto-0.105.0.gem) = c45566692df004d39cb0ece035a4923cef3115c1944d5486c8fb677ad0963fd0 +SIZE (rubygem/gitaly-proto-0.105.0.gem) = 17408 From owner-svn-ports-branches@freebsd.org Sat Jul 28 18:07:18 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C08E1058A99; Sat, 28 Jul 2018 18:07:18 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E6F2A77C90; Sat, 28 Jul 2018 18:07:17 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C8B4D2204; Sat, 28 Jul 2018 18:07:17 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SI7HOf058422; Sat, 28 Jul 2018 18:07:17 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SI7HcD058421; Sat, 28 Jul 2018 18:07:17 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201807281807.w6SI7HcD058421@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 28 Jul 2018 18:07:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475592 - branches/2018Q3/security/rubygem-doorkeeper-openid_connect X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q3/security/rubygem-doorkeeper-openid_connect X-SVN-Commit-Revision: 475592 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 18:07:18 -0000 Author: mfechner Date: Sat Jul 28 18:07:17 2018 New Revision: 475592 URL: https://svnweb.freebsd.org/changeset/ports/475592 Log: MFH: r475373 Update to 1.5.0 which is required for gitlab 11.1.1. Take maintainer. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q3/security/rubygem-doorkeeper-openid_connect/Makefile branches/2018Q3/security/rubygem-doorkeeper-openid_connect/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/security/rubygem-doorkeeper-openid_connect/Makefile ============================================================================== --- branches/2018Q3/security/rubygem-doorkeeper-openid_connect/Makefile Sat Jul 28 17:51:05 2018 (r475591) +++ branches/2018Q3/security/rubygem-doorkeeper-openid_connect/Makefile Sat Jul 28 18:07:17 2018 (r475592) @@ -1,11 +1,11 @@ # $FreeBSD$ PORTNAME= doorkeeper-openid_connect -PORTVERSION= 1.4.0 +PORTVERSION= 1.5.0 CATEGORIES= security rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= mfechner@FreeBSD.org COMMENT= OpenID Connect extension for Doorkeeper LICENSE= MIT @@ -14,8 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-doorkeeper>=4.3:security/rubygem-doorkeeper \ rubygem-json-jwt>=1.6:www/rubygem-json-jwt -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include Modified: branches/2018Q3/security/rubygem-doorkeeper-openid_connect/distinfo ============================================================================== --- branches/2018Q3/security/rubygem-doorkeeper-openid_connect/distinfo Sat Jul 28 17:51:05 2018 (r475591) +++ branches/2018Q3/security/rubygem-doorkeeper-openid_connect/distinfo Sat Jul 28 18:07:17 2018 (r475592) @@ -1,3 +1,3 @@ -TIMESTAMP = 1527884666 -SHA256 (rubygem/doorkeeper-openid_connect-1.4.0.gem) = 03469af29a5430e64fd92362180d05d457c25c8dae90f01d45a083d4105eaa53 -SIZE (rubygem/doorkeeper-openid_connect-1.4.0.gem) = 22016 +TIMESTAMP = 1532163960 +SHA256 (rubygem/doorkeeper-openid_connect-1.5.0.gem) = 2539f3e9f38b272f34f75caf2316d8c42ec6315dc2d4d00cddc5d3cb3af8f9f1 +SIZE (rubygem/doorkeeper-openid_connect-1.5.0.gem) = 22016 From owner-svn-ports-branches@freebsd.org Sat Jul 28 18:33:16 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B1261059A99; Sat, 28 Jul 2018 18:33:16 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 301EA797EF; Sat, 28 Jul 2018 18:33:16 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EB89626ED; Sat, 28 Jul 2018 18:33:15 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SIXFZK074033; Sat, 28 Jul 2018 18:33:15 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SIXFxE074027; Sat, 28 Jul 2018 18:33:15 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201807281833.w6SIXFxE074027@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 28 Jul 2018 18:33:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475597 - branches/2018Q3/textproc/rubygem-gitlab-markup X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q3/textproc/rubygem-gitlab-markup X-SVN-Commit-Revision: 475597 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 18:33:16 -0000 Author: mfechner Date: Sat Jul 28 18:33:15 2018 New Revision: 475597 URL: https://svnweb.freebsd.org/changeset/ports/475597 Log: MFH: r475374 Update to 1.6.4 which is required for gitlab 11.1.1. Take maintainer. Made portlint happy. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q3/textproc/rubygem-gitlab-markup/Makefile branches/2018Q3/textproc/rubygem-gitlab-markup/distinfo branches/2018Q3/textproc/rubygem-gitlab-markup/pkg-descr Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/textproc/rubygem-gitlab-markup/Makefile ============================================================================== --- branches/2018Q3/textproc/rubygem-gitlab-markup/Makefile Sat Jul 28 18:31:27 2018 (r475596) +++ branches/2018Q3/textproc/rubygem-gitlab-markup/Makefile Sat Jul 28 18:33:15 2018 (r475597) @@ -1,20 +1,20 @@ # $FreeBSD$ PORTNAME= gitlab-markup -PORTVERSION= 1.6.3 -PORTREVISION= 1 +PORTVERSION= 1.6.4 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= mfechner@FreeBSD.org COMMENT= Render any fancy GitLab markup LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -NO_ARCH= yes -USE_RUBY= yes USES= gem python:run shebangfix +USE_RUBY= yes + +NO_ARCH= yes PLIST_FILES= bin/github-markup Modified: branches/2018Q3/textproc/rubygem-gitlab-markup/distinfo ============================================================================== --- branches/2018Q3/textproc/rubygem-gitlab-markup/distinfo Sat Jul 28 18:31:27 2018 (r475596) +++ branches/2018Q3/textproc/rubygem-gitlab-markup/distinfo Sat Jul 28 18:33:15 2018 (r475597) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509542873 -SHA256 (rubygem/gitlab-markup-1.6.3.gem) = 71462b19b9f56580040a2ad1249ae7561c69df958f92b3b60720dfaf4e117ddf -SIZE (rubygem/gitlab-markup-1.6.3.gem) = 28160 +TIMESTAMP = 1532162886 +SHA256 (rubygem/gitlab-markup-1.6.4.gem) = 66c930854b295210e5f25fdf8fa9ab7107f3f07df091052fb478d6aacf1fdcec +SIZE (rubygem/gitlab-markup-1.6.4.gem) = 28160 Modified: branches/2018Q3/textproc/rubygem-gitlab-markup/pkg-descr ============================================================================== --- branches/2018Q3/textproc/rubygem-gitlab-markup/pkg-descr Sat Jul 28 18:31:27 2018 (r475596) +++ branches/2018Q3/textproc/rubygem-gitlab-markup/pkg-descr Sat Jul 28 18:33:15 2018 (r475597) @@ -1,4 +1,4 @@ This gem is used by GitLab to render any fancy markup such as Markdown, Textile, Org-Mode, etc. Fork it and add your own! -https://gitlab.com/gitlab-org/gitlab-markup +WWW: https://gitlab.com/gitlab-org/gitlab-markup From owner-svn-ports-branches@freebsd.org Sat Jul 28 18:51:38 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90410105A3EC; Sat, 28 Jul 2018 18:51:38 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46BED7A7A9; Sat, 28 Jul 2018 18:51:38 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 282FD28D2; Sat, 28 Jul 2018 18:51:38 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SIpcot082964; Sat, 28 Jul 2018 18:51:38 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SIpbNU082905; Sat, 28 Jul 2018 18:51:37 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201807281851.w6SIpbNU082905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 28 Jul 2018 18:51:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475600 - branches/2018Q3/www/gitlab-workhorse X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q3/www/gitlab-workhorse X-SVN-Commit-Revision: 475600 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 18:51:38 -0000 Author: mfechner Date: Sat Jul 28 18:51:37 2018 New Revision: 475600 URL: https://svnweb.freebsd.org/changeset/ports/475600 Log: MFH: r475375 Update to 5.0.0 which is required for gitlab 11.1.1. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q3/www/gitlab-workhorse/Makefile branches/2018Q3/www/gitlab-workhorse/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/www/gitlab-workhorse/Makefile ============================================================================== --- branches/2018Q3/www/gitlab-workhorse/Makefile Sat Jul 28 18:40:01 2018 (r475599) +++ branches/2018Q3/www/gitlab-workhorse/Makefile Sat Jul 28 18:51:37 2018 (r475600) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-workhorse -PORTVERSION= 4.3.1 +PORTVERSION= 5.0.0 CATEGORIES= www MAINTAINER= mfechner@FreeBSD.org @@ -19,7 +19,7 @@ USES= gmake USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags -GL_COMMIT= 446895592041200b2e0f16c207ef9d1812d9e7fd +GL_COMMIT= 1ef6d8e75d435316715d6a221f2ab4451373ebf2 PLIST_FILES= bin/gitlab-workhorse \ bin/gitlab-zip-cat \ Modified: branches/2018Q3/www/gitlab-workhorse/distinfo ============================================================================== --- branches/2018Q3/www/gitlab-workhorse/distinfo Sat Jul 28 18:40:01 2018 (r475599) +++ branches/2018Q3/www/gitlab-workhorse/distinfo Sat Jul 28 18:51:37 2018 (r475600) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530372136 -SHA256 (gitlab-org-gitlab-workhorse-446895592041200b2e0f16c207ef9d1812d9e7fd_GL0.tar.gz) = 23ec8c4880954faef84b5da38cf30667cf3c2566c8cc1899e74e435f51193907 -SIZE (gitlab-org-gitlab-workhorse-446895592041200b2e0f16c207ef9d1812d9e7fd_GL0.tar.gz) = 1764081 +TIMESTAMP = 1532160772 +SHA256 (gitlab-org-gitlab-workhorse-1ef6d8e75d435316715d6a221f2ab4451373ebf2_GL0.tar.gz) = 8996bbae4575934e4d7b8b13d3f831b73bd8cad71089e31b8850b1343c248f5c +SIZE (gitlab-org-gitlab-workhorse-1ef6d8e75d435316715d6a221f2ab4451373ebf2_GL0.tar.gz) = 1763476 From owner-svn-ports-branches@freebsd.org Sat Jul 28 19:09:54 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 95356105AD70; Sat, 28 Jul 2018 19:09:54 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 490487B456; Sat, 28 Jul 2018 19:09:54 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27ABF2BDD; Sat, 28 Jul 2018 19:09:54 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SJ9sab090187; Sat, 28 Jul 2018 19:09:54 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SJ9rjs090183; Sat, 28 Jul 2018 19:09:53 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201807281909.w6SJ9rjs090183@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 28 Jul 2018 19:09:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475603 - branches/2018Q3/www/gitlab-pages X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q3/www/gitlab-pages X-SVN-Commit-Revision: 475603 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 19:09:54 -0000 Author: mfechner Date: Sat Jul 28 19:09:53 2018 New Revision: 475603 URL: https://svnweb.freebsd.org/changeset/ports/475603 Log: MFH: r475376 Update to 1.0.0 which is required for gitlab 11.1.1. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q3/www/gitlab-pages/Makefile branches/2018Q3/www/gitlab-pages/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/www/gitlab-pages/Makefile ============================================================================== --- branches/2018Q3/www/gitlab-pages/Makefile Sat Jul 28 19:08:59 2018 (r475602) +++ branches/2018Q3/www/gitlab-pages/Makefile Sat Jul 28 19:09:53 2018 (r475603) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitlab-pages -PORTVERSION= 0.9.1 +PORTVERSION= 1.0.0 CATEGORIES= www MAINTAINER= swills@FreeBSD.org @@ -15,7 +15,7 @@ BUILD_DEPENDS= go:lang/go USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags -GL_COMMIT= 69b7e196fe0336c91a44da72110f44c2ec0869b0 +GL_COMMIT= 7edf64c1951e2184890403ab60c26381dd81e942 PLIST_FILES= bin/gitlab-pages Modified: branches/2018Q3/www/gitlab-pages/distinfo ============================================================================== --- branches/2018Q3/www/gitlab-pages/distinfo Sat Jul 28 19:08:59 2018 (r475602) +++ branches/2018Q3/www/gitlab-pages/distinfo Sat Jul 28 19:09:53 2018 (r475603) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526695044 -SHA256 (gitlab-org-gitlab-pages-69b7e196fe0336c91a44da72110f44c2ec0869b0_GL0.tar.gz) = d993cb8c584d0366837e723f29bee9a3fb67ea0044448f185dc6cec255ff1f39 -SIZE (gitlab-org-gitlab-pages-69b7e196fe0336c91a44da72110f44c2ec0869b0_GL0.tar.gz) = 1692719 +TIMESTAMP = 1532164199 +SHA256 (gitlab-org-gitlab-pages-7edf64c1951e2184890403ab60c26381dd81e942_GL0.tar.gz) = 89be884ad5cff68dbe01faa77b2a5f0b86bc069d02ab5ee664467d85a68558de +SIZE (gitlab-org-gitlab-pages-7edf64c1951e2184890403ab60c26381dd81e942_GL0.tar.gz) = 1693802 From owner-svn-ports-branches@freebsd.org Sat Jul 28 20:07:55 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71480105C968; Sat, 28 Jul 2018 20:07:55 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 268267DEEC; Sat, 28 Jul 2018 20:07:55 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 048073953; Sat, 28 Jul 2018 20:07:55 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SK7sqU021753; Sat, 28 Jul 2018 20:07:54 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SK7rPF021748; Sat, 28 Jul 2018 20:07:53 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201807282007.w6SK7rPF021748@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 28 Jul 2018 20:07:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r475609 - in branches/2018Q3/www/gitlab-ce: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in branches/2018Q3/www/gitlab-ce: . files X-SVN-Commit-Revision: 475609 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 20:07:56 -0000 Author: mfechner Date: Sat Jul 28 20:07:53 2018 New Revision: 475609 URL: https://svnweb.freebsd.org/changeset/ports/475609 Log: MFH: r475377 r475417 - Update to 11.1.1, for more details please check: https://about.gitlab.com/2018/07/22/gitlab-11-1-released/ - Fixed a typo in config/gitlab.yml.example that was introduced by the prefix update. Approved by: mentors (implicit) Security update to 11.1.2. For more info see here: https://about.gitlab.com/2018/07/26/security-release-gitlab-11-dot-1-dot-2-released/ Approved by: mentors (implicit) Security: 2da838f9-9168-11e8-8c75-d8cb8abf62dd Approved by: ports-secteam (miwi) Modified: branches/2018Q3/www/gitlab-ce/Makefile branches/2018Q3/www/gitlab-ce/distinfo branches/2018Q3/www/gitlab-ce/files/patch-Gemfile branches/2018Q3/www/gitlab-ce/files/patch-config_gitlab.yml.example branches/2018Q3/www/gitlab-ce/pkg-message branches/2018Q3/www/gitlab-ce/pkg-plist Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/www/gitlab-ce/Makefile ============================================================================== --- branches/2018Q3/www/gitlab-ce/Makefile Sat Jul 28 20:05:23 2018 (r475608) +++ branches/2018Q3/www/gitlab-ce/Makefile Sat Jul 28 20:07:53 2018 (r475609) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.0.4 +PORTVERSION= 11.1.2 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -25,9 +25,9 @@ BUILD_DEPENDS= gem:devel/ruby-gems # for the options RUN_DEPENDS= git>=2.16.2:devel/git \ gitlab-shell>=7.1.4:devel/gitlab-shell \ - gitlab-workhorse>=4.3.1:www/gitlab-workhorse \ - gitaly>=0.105.0:devel/gitaly \ - gitlab-pages>=0.9.1:www/gitlab-pages \ + gitlab-workhorse>=5.0.0:www/gitlab-workhorse \ + gitaly>=0.111.2:devel/gitaly \ + gitlab-pages>=1.0.0:www/gitlab-pages \ redis>=2.8.23:databases/redis \ npm>=4.3.0:www/npm \ yarn>=0.17.0:www/yarn \ @@ -41,7 +41,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-faraday>=0.12.0:www/rubygem-faraday \ rubygem-devise>=4.4:devel/rubygem-devise \ rubygem-doorkeeper>=4.3:security/rubygem-doorkeeper \ - rubygem-doorkeeper-openid_connect>=1.3:security/rubygem-doorkeeper-openid_connect \ + rubygem-doorkeeper-openid_connect>=1.5:security/rubygem-doorkeeper-openid_connect \ rubygem-omniauth>=1.8:security/rubygem-omniauth \ rubygem-omniauth-auth0>=2.0.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \ @@ -53,7 +53,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-omniauth-kerberos>=0.3.0:net/rubygem-omniauth-kerberos \ rubygem-omniauth-oauth2-generic>=0.2.2:security/rubygem-omniauth-oauth2-generic \ rubygem-omniauth-saml>=1.10:security/rubygem-omniauth-saml \ - rubygem-omniauth-shibboleth12>=1.2.0:security/rubygem-omniauth-shibboleth12 \ + rubygem-omniauth-shibboleth>=1.3.0:security/rubygem-omniauth-shibboleth \ rubygem-omniauth-twitter>=1.4:net/rubygem-omniauth-twitter \ rubygem-omniauth_crowd22>=2.2.0:devel/rubygem-omniauth_crowd22 \ rubygem-omniauth-authentiq>=0.3.3:net/rubygem-omniauth-authentiq \ @@ -94,9 +94,9 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-google-api-client>=0.19.8:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \ - rubygem-html-pipeline-gitlab>=2.7.1:textproc/rubygem-html-pipeline-gitlab \ + rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \ - rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \ + rubygem-gitlab-markup>=1.6.4:textproc/rubygem-gitlab-markup \ rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \ rubygem-commonmarker>=0.17:textproc/rubygem-commonmarker \ rubygem-redcloth>=4.3.2:www/rubygem-redcloth \ @@ -190,7 +190,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-sshkey>=1.9.0:security/rubygem-sshkey \ rubygem-ed25519>=1.2:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ - rubygem-gitaly-proto>=0.101.0:net/rubygem-gitaly-proto \ + rubygem-gitaly-proto>=0.105.0:net/rubygem-gitaly-proto \ rubygem-grpc>=1.11.0:net/rubygem-grpc \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 \ @@ -213,7 +213,7 @@ USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags -GL_COMMIT= edb037cbc85225261e8ede5455be4aad771ba3bb +GL_COMMIT= 35936b0b6282db026128d21abe8f3490c1d376f2 USERS= git GROUPS= git Modified: branches/2018Q3/www/gitlab-ce/distinfo ============================================================================== --- branches/2018Q3/www/gitlab-ce/distinfo Sat Jul 28 20:05:23 2018 (r475608) +++ branches/2018Q3/www/gitlab-ce/distinfo Sat Jul 28 20:07:53 2018 (r475609) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531901551 -SHA256 (gitlab-org-gitlab-ce-edb037cbc85225261e8ede5455be4aad771ba3bb_GL0.tar.gz) = e93a0e8b8dc7f759830eccfdef4cba12223644d2abbf36b0487d37d5491f5d54 -SIZE (gitlab-org-gitlab-ce-edb037cbc85225261e8ede5455be4aad771ba3bb_GL0.tar.gz) = 49742351 +TIMESTAMP = 1532671627 +SHA256 (gitlab-org-gitlab-ce-35936b0b6282db026128d21abe8f3490c1d376f2_GL0.tar.gz) = 732295b8fa10381ae867042fd1173e86033014b8f76ddbc8f5cc70bc324a718e +SIZE (gitlab-org-gitlab-ce-35936b0b6282db026128d21abe8f3490c1d376f2_GL0.tar.gz) = 51962312 Modified: branches/2018Q3/www/gitlab-ce/files/patch-Gemfile ============================================================================== --- branches/2018Q3/www/gitlab-ce/files/patch-Gemfile Sat Jul 28 20:05:23 2018 (r475608) +++ branches/2018Q3/www/gitlab-ce/files/patch-Gemfile Sat Jul 28 20:07:53 2018 (r475609) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2018-06-21 15:14:17 UTC +--- Gemfile.orig 2018-07-20 09:55:24 UTC +++ Gemfile @@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', gem_versions['default_value_for'] @@ -36,11 +36,10 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -@@ -299,96 +299,11 @@ gem 'peek-sidekiq', '~> 1.0.3' +@@ -299,95 +299,11 @@ gem 'peek-sidekiq', '~> 1.0.3' # Metrics group :metrics do -- gem 'allocations', '~> 1.0', require: false, platform: :mri - gem 'method_source', '~> 0.8', require: false - gem 'influxdb', '~> 0.2', require: false - @@ -74,7 +73,7 @@ - - gem 'database_cleaner', '~> 1.5.0' - gem 'factory_bot_rails', '~> 4.8.2' -- gem 'rspec-rails', '~> 3.6.0' +- gem 'rspec-rails', '~> 3.7.0' - gem 'rspec-retry', '~> 0.4.5' - gem 'rspec_profiling', '~> 0.0.5' - gem 'rspec-set', '~> 0.1.3' @@ -133,12 +132,3 @@ gem 'octokit', '~> 4.9' gem 'mail_room', '~> 0.9.1' -@@ -419,7 +334,7 @@ group :ed25519 do - end - - # Gitaly GRPC client --gem 'gitaly-proto', '~> 0.100.0', require: 'gitaly' -+gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly' - gem 'grpc', '~> 1.11.0' - - # Locked until https://github.com/google/protobuf/issues/4210 is closed Modified: branches/2018Q3/www/gitlab-ce/files/patch-config_gitlab.yml.example ============================================================================== --- branches/2018Q3/www/gitlab-ce/files/patch-config_gitlab.yml.example Sat Jul 28 20:05:23 2018 (r475608) +++ branches/2018Q3/www/gitlab-ce/files/patch-config_gitlab.yml.example Sat Jul 28 20:07:53 2018 (r475609) @@ -36,7 +36,7 @@ - path: /home/git/gitlab-shell/ - hooks_path: /home/git/gitlab-shell/hooks/ + path: %%PREFIX%%/share/gitlab-shell/ -+ hooks_path: %%PREFIX/share/gitlab-shell/hooks/ ++ hooks_path: %%PREFIX%%/share/gitlab-shell/hooks/ # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). Modified: branches/2018Q3/www/gitlab-ce/pkg-message ============================================================================== --- branches/2018Q3/www/gitlab-ce/pkg-message Sat Jul 28 20:05:23 2018 (r475608) +++ branches/2018Q3/www/gitlab-ce/pkg-message Sat Jul 28 20:07:53 2018 (r475609) @@ -4,12 +4,12 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/10.8-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.1-freebsd.md If you just installed an major upgrade of GitLab, for example you -switched from 10.8.x to 11.0.x, please follow the instructions in the guide at: +switched from 11.0.x to 11.1.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.8-11.0-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.0-11.1-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: Modified: branches/2018Q3/www/gitlab-ce/pkg-plist ============================================================================== --- branches/2018Q3/www/gitlab-ce/pkg-plist Sat Jul 28 20:05:23 2018 (r475608) +++ branches/2018Q3/www/gitlab-ce/pkg-plist Sat Jul 28 20:07:53 2018 (r475609) @@ -9,10 +9,10 @@ %%WWWDIR%%/.github/PULL_REQUEST_TEMPLATE.md %%WWWDIR%%/.gitlab-ci.yml %%WWWDIR%%/.gitlab/issue_templates/Bug.md -%%WWWDIR%%/.gitlab/issue_templates/Feature Proposal.md -%%WWWDIR%%/.gitlab/issue_templates/Research Proposal.md -%%WWWDIR%%/.gitlab/issue_templates/Security Developer Workflow.md -%%WWWDIR%%/.gitlab/merge_request_templates/Database Changes.md +%%WWWDIR%%/.gitlab/issue_templates/Feature proposal.md +%%WWWDIR%%/.gitlab/issue_templates/Research proposal.md +%%WWWDIR%%/.gitlab/issue_templates/Security developer workflow.md +%%WWWDIR%%/.gitlab/merge_request_templates/Database changes.md %%WWWDIR%%/.gitlab/merge_request_templates/Documentation.md %%WWWDIR%%/.gitlab/route-map.yml %%WWWDIR%%/.haml-lint.yml @@ -1870,7 +1870,6 @@ %%WWWDIR%%/app/assets/images/emoji@2x.png %%WWWDIR%%/app/assets/images/ext_snippet_icons/ext_snippet_icons.png %%WWWDIR%%/app/assets/images/ext_snippet_icons/logo.png -%%WWWDIR%%/app/assets/images/favicon-blue.ico %%WWWDIR%%/app/assets/images/favicon-blue.png %%WWWDIR%%/app/assets/images/favicon-yellow.png %%WWWDIR%%/app/assets/images/favicon.png @@ -1975,18 +1974,18 @@ %%WWWDIR%%/app/assets/javascripts/boards/components/board_list.vue %%WWWDIR%%/app/assets/javascripts/boards/components/board_new_issue.vue %%WWWDIR%%/app/assets/javascripts/boards/components/board_sidebar.js -%%WWWDIR%%/app/assets/javascripts/boards/components/issue_card_inner.js -%%WWWDIR%%/app/assets/javascripts/boards/components/modal/empty_state.js +%%WWWDIR%%/app/assets/javascripts/boards/components/issue_card_inner.vue +%%WWWDIR%%/app/assets/javascripts/boards/components/modal/empty_state.vue %%WWWDIR%%/app/assets/javascripts/boards/components/modal/filters.js -%%WWWDIR%%/app/assets/javascripts/boards/components/modal/footer.js -%%WWWDIR%%/app/assets/javascripts/boards/components/modal/header.js -%%WWWDIR%%/app/assets/javascripts/boards/components/modal/index.js -%%WWWDIR%%/app/assets/javascripts/boards/components/modal/list.js -%%WWWDIR%%/app/assets/javascripts/boards/components/modal/lists_dropdown.js -%%WWWDIR%%/app/assets/javascripts/boards/components/modal/tabs.js +%%WWWDIR%%/app/assets/javascripts/boards/components/modal/footer.vue +%%WWWDIR%%/app/assets/javascripts/boards/components/modal/header.vue +%%WWWDIR%%/app/assets/javascripts/boards/components/modal/index.vue +%%WWWDIR%%/app/assets/javascripts/boards/components/modal/list.vue +%%WWWDIR%%/app/assets/javascripts/boards/components/modal/lists_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/boards/components/modal/tabs.vue %%WWWDIR%%/app/assets/javascripts/boards/components/new_list_dropdown.js %%WWWDIR%%/app/assets/javascripts/boards/components/project_select.vue -%%WWWDIR%%/app/assets/javascripts/boards/components/sidebar/remove_issue.js +%%WWWDIR%%/app/assets/javascripts/boards/components/sidebar/remove_issue.vue %%WWWDIR%%/app/assets/javascripts/boards/eventhub.js %%WWWDIR%%/app/assets/javascripts/boards/filtered_search_boards.js %%WWWDIR%%/app/assets/javascripts/boards/filters/due_date_filters.js @@ -2079,6 +2078,38 @@ %%WWWDIR%%/app/assets/javascripts/diff_notes/models/note.js %%WWWDIR%%/app/assets/javascripts/diff_notes/services/resolve.js %%WWWDIR%%/app/assets/javascripts/diff_notes/stores/comments.js +%%WWWDIR%%/app/assets/javascripts/diffs/components/app.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/changed_files.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/changed_files_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/compare_versions.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/diff_content.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/diff_discussions.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/diff_file.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/diff_file_header.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/diff_line_note_form.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/diff_table_cell.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/edit_button.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/hidden_files_warning.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/inline_diff_comment_row.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/inline_diff_table_row.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/inline_diff_view.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/no_changes.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/parallel_diff_view.vue +%%WWWDIR%%/app/assets/javascripts/diffs/constants.js +%%WWWDIR%%/app/assets/javascripts/diffs/index.js +%%WWWDIR%%/app/assets/javascripts/diffs/mixins/changed_files.js +%%WWWDIR%%/app/assets/javascripts/diffs/store/actions.js +%%WWWDIR%%/app/assets/javascripts/diffs/store/getters.js +%%WWWDIR%%/app/assets/javascripts/diffs/store/modules/diff_state.js +%%WWWDIR%%/app/assets/javascripts/diffs/store/modules/index.js +%%WWWDIR%%/app/assets/javascripts/diffs/store/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/diffs/store/mutations.js +%%WWWDIR%%/app/assets/javascripts/diffs/store/utils.js %%WWWDIR%%/app/assets/javascripts/dispatcher.js %%WWWDIR%%/app/assets/javascripts/docs/docs_bundle.js %%WWWDIR%%/app/assets/javascripts/droplab/constants.js @@ -2143,6 +2174,21 @@ %%WWWDIR%%/app/assets/javascripts/filtered_search/stores/recent_searches_store.js %%WWWDIR%%/app/assets/javascripts/flash.js %%WWWDIR%%/app/assets/javascripts/fly_out_nav.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/components/app.vue +%%WWWDIR%%/app/assets/javascripts/frequent_items/components/frequent_items_list.vue +%%WWWDIR%%/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue +%%WWWDIR%%/app/assets/javascripts/frequent_items/components/frequent_items_mixin.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/components/frequent_items_search_input.vue +%%WWWDIR%%/app/assets/javascripts/frequent_items/constants.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/event_hub.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/index.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/store/actions.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/store/getters.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/store/index.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/store/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/store/mutations.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/store/state.js +%%WWWDIR%%/app/assets/javascripts/frequent_items/utils.js %%WWWDIR%%/app/assets/javascripts/gfm_auto_complete.js %%WWWDIR%%/app/assets/javascripts/gl_dropdown.js %%WWWDIR%%/app/assets/javascripts/gl_field_error.js @@ -2189,6 +2235,7 @@ %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/success_message.vue %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue %%WWWDIR%%/app/assets/javascripts/ide/components/editor_mode_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/error_message.vue %%WWWDIR%%/app/assets/javascripts/ide/components/external_link.vue %%WWWDIR%%/app/assets/javascripts/ide/components/file_finder/index.vue %%WWWDIR%%/app/assets/javascripts/ide/components/file_finder/item.vue @@ -2205,6 +2252,7 @@ %%WWWDIR%%/app/assets/javascripts/ide/components/jobs/list.vue %%WWWDIR%%/app/assets/javascripts/ide/components/jobs/stage.vue %%WWWDIR%%/app/assets/javascripts/ide/components/merge_requests/dropdown.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/merge_requests/info.vue %%WWWDIR%%/app/assets/javascripts/ide/components/merge_requests/item.vue %%WWWDIR%%/app/assets/javascripts/ide/components/merge_requests/list.vue %%WWWDIR%%/app/assets/javascripts/ide/components/mr_file_icon.vue @@ -2402,6 +2450,12 @@ %%WWWDIR%%/app/assets/javascripts/monitoring/utils/measurements.js %%WWWDIR%%/app/assets/javascripts/monitoring/utils/multiple_time_series.js %%WWWDIR%%/app/assets/javascripts/mr_notes/index.js +%%WWWDIR%%/app/assets/javascripts/mr_notes/stores/actions.js +%%WWWDIR%%/app/assets/javascripts/mr_notes/stores/getters.js +%%WWWDIR%%/app/assets/javascripts/mr_notes/stores/index.js +%%WWWDIR%%/app/assets/javascripts/mr_notes/stores/modules/index.js +%%WWWDIR%%/app/assets/javascripts/mr_notes/stores/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/mr_notes/stores/mutations.js %%WWWDIR%%/app/assets/javascripts/namespace_select.js %%WWWDIR%%/app/assets/javascripts/network/branch_graph.js %%WWWDIR%%/app/assets/javascripts/network/raphael.js @@ -2446,6 +2500,7 @@ %%WWWDIR%%/app/assets/javascripts/notes/stores/collapse_utils.js %%WWWDIR%%/app/assets/javascripts/notes/stores/getters.js %%WWWDIR%%/app/assets/javascripts/notes/stores/index.js +%%WWWDIR%%/app/assets/javascripts/notes/stores/modules/index.js %%WWWDIR%%/app/assets/javascripts/notes/stores/mutation_types.js %%WWWDIR%%/app/assets/javascripts/notes/stores/mutations.js %%WWWDIR%%/app/assets/javascripts/notes/stores/utils.js @@ -2521,6 +2576,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/profiles/accounts/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/profiles/index.js %%WWWDIR%%/app/assets/javascripts/pages/profiles/index/index.js +%%WWWDIR%%/app/assets/javascripts/pages/profiles/keys/index.js %%WWWDIR%%/app/assets/javascripts/pages/profiles/notifications/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/profiles/personal_access_tokens/index.js %%WWWDIR%%/app/assets/javascripts/pages/profiles/two_factor_auths/index.js @@ -2538,10 +2594,8 @@ %%WWWDIR%%/app/assets/javascripts/pages/projects/ci/lints/new/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/ci/lints/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/destroy/index.js -%%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/gcp/login/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/gcp/new/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/index/index.js -%%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/new/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/update/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/commit/pipelines/index.js @@ -2574,6 +2628,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/projects/issues/show.js %%WWWDIR%%/app/assets/javascripts/pages/projects/issues/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/jobs/show/index.js +%%WWWDIR%%/app/assets/javascripts/pages/projects/jobs/terminal/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue %%WWWDIR%%/app/assets/javascripts/pages/projects/labels/edit/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/labels/event_hub.js @@ -2699,6 +2754,7 @@ %%WWWDIR%%/app/assets/javascripts/profile/account/components/delete_account_modal.vue %%WWWDIR%%/app/assets/javascripts/profile/account/components/update_username.vue %%WWWDIR%%/app/assets/javascripts/profile/account/index.js +%%WWWDIR%%/app/assets/javascripts/profile/add_ssh_key_validation.js %%WWWDIR%%/app/assets/javascripts/profile/gl_crop.js %%WWWDIR%%/app/assets/javascripts/profile/profile.js %%WWWDIR%%/app/assets/javascripts/project_edit.js @@ -2725,16 +2781,6 @@ %%WWWDIR%%/app/assets/javascripts/projects/project_new.js %%WWWDIR%%/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue %%WWWDIR%%/app/assets/javascripts/projects/tree/services/commit_pipeline_service.js -%%WWWDIR%%/app/assets/javascripts/projects_dropdown/components/app.vue -%%WWWDIR%%/app/assets/javascripts/projects_dropdown/components/projects_list_frequent.vue -%%WWWDIR%%/app/assets/javascripts/projects_dropdown/components/projects_list_item.vue -%%WWWDIR%%/app/assets/javascripts/projects_dropdown/components/projects_list_search.vue -%%WWWDIR%%/app/assets/javascripts/projects_dropdown/components/search.vue -%%WWWDIR%%/app/assets/javascripts/projects_dropdown/constants.js -%%WWWDIR%%/app/assets/javascripts/projects_dropdown/event_hub.js -%%WWWDIR%%/app/assets/javascripts/projects_dropdown/index.js -%%WWWDIR%%/app/assets/javascripts/projects_dropdown/service/projects_service.js -%%WWWDIR%%/app/assets/javascripts/projects_dropdown/store/projects_store.js %%WWWDIR%%/app/assets/javascripts/projects_list.js %%WWWDIR%%/app/assets/javascripts/prometheus_metrics/constants.js %%WWWDIR%%/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js @@ -2851,6 +2897,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue @@ -2877,6 +2924,13 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/deprecated_modal.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/constants.js +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/download_diff_viewer.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/two_up_viewer.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/dropdown/dropdown_hidden_input.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/dropdown/dropdown_search_input.vue @@ -2888,6 +2942,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/identicon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/lib/utils/dom_utils.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/loading_button.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/loading_icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -2941,6 +2996,7 @@ %%WWWDIR%%/app/assets/javascripts/zen_mode.js %%WWWDIR%%/app/assets/stylesheets/application.scss %%WWWDIR%%/app/assets/stylesheets/behaviors.scss +%%WWWDIR%%/app/assets/stylesheets/bootstrap.scss %%WWWDIR%%/app/assets/stylesheets/bootstrap_migration.scss %%WWWDIR%%/app/assets/stylesheets/emoji_sprites.scss %%WWWDIR%%/app/assets/stylesheets/errors.scss @@ -3230,8 +3286,6 @@ %%WWWDIR%%/app/controllers/projects/builds_controller.rb %%WWWDIR%%/app/controllers/projects/ci/lints_controller.rb %%WWWDIR%%/app/controllers/projects/clusters/applications_controller.rb -%%WWWDIR%%/app/controllers/projects/clusters/gcp_controller.rb -%%WWWDIR%%/app/controllers/projects/clusters/user_controller.rb %%WWWDIR%%/app/controllers/projects/clusters_controller.rb %%WWWDIR%%/app/controllers/projects/commit_controller.rb %%WWWDIR%%/app/controllers/projects/commits_controller.rb @@ -3363,8 +3417,11 @@ %%WWWDIR%%/app/graphql/gitlab_schema.rb %%WWWDIR%%/app/graphql/mutations/.keep %%WWWDIR%%/app/graphql/resolvers/base_resolver.rb +%%WWWDIR%%/app/graphql/resolvers/concerns/resolves_pipelines.rb %%WWWDIR%%/app/graphql/resolvers/full_path_resolver.rb +%%WWWDIR%%/app/graphql/resolvers/merge_request_pipelines_resolver.rb %%WWWDIR%%/app/graphql/resolvers/merge_request_resolver.rb +%%WWWDIR%%/app/graphql/resolvers/project_pipelines_resolver.rb %%WWWDIR%%/app/graphql/resolvers/project_resolver.rb %%WWWDIR%%/app/graphql/types/base_enum.rb %%WWWDIR%%/app/graphql/types/base_field.rb @@ -3373,8 +3430,14 @@ %%WWWDIR%%/app/graphql/types/base_object.rb %%WWWDIR%%/app/graphql/types/base_scalar.rb %%WWWDIR%%/app/graphql/types/base_union.rb +%%WWWDIR%%/app/graphql/types/ci/pipeline_status_enum.rb +%%WWWDIR%%/app/graphql/types/ci/pipeline_type.rb %%WWWDIR%%/app/graphql/types/merge_request_type.rb %%WWWDIR%%/app/graphql/types/mutation_type.rb +%%WWWDIR%%/app/graphql/types/permission_types/base_permission_type.rb +%%WWWDIR%%/app/graphql/types/permission_types/ci/pipeline.rb +%%WWWDIR%%/app/graphql/types/permission_types/merge_request.rb +%%WWWDIR%%/app/graphql/types/permission_types/project.rb %%WWWDIR%%/app/graphql/types/project_type.rb %%WWWDIR%%/app/graphql/types/query_type.rb %%WWWDIR%%/app/graphql/types/time_type.rb @@ -3489,6 +3552,10 @@ %%WWWDIR%%/app/mailers/emails/profile.rb %%WWWDIR%%/app/mailers/emails/projects.rb %%WWWDIR%%/app/mailers/notify.rb +%%WWWDIR%%/app/mailers/previews/devise_mailer_preview.rb +%%WWWDIR%%/app/mailers/previews/email_rejection_mailer_preview.rb +%%WWWDIR%%/app/mailers/previews/notify_preview.rb +%%WWWDIR%%/app/mailers/previews/repository_check_mailer_preview.rb %%WWWDIR%%/app/mailers/repository_check_mailer.rb %%WWWDIR%%/app/models/ability.rb %%WWWDIR%%/app/models/abuse_report.rb @@ -3547,7 +3614,11 @@ %%WWWDIR%%/app/models/ci/artifact_blob.rb %%WWWDIR%%/app/models/ci/build.rb %%WWWDIR%%/app/models/ci/build_metadata.rb +%%WWWDIR%%/app/models/ci/build_runner_session.rb %%WWWDIR%%/app/models/ci/build_trace_chunk.rb +%%WWWDIR%%/app/models/ci/build_trace_chunks/database.rb +%%WWWDIR%%/app/models/ci/build_trace_chunks/fog.rb +%%WWWDIR%%/app/models/ci/build_trace_chunks/redis.rb %%WWWDIR%%/app/models/ci/build_trace_section.rb %%WWWDIR%%/app/models/ci/build_trace_section_name.rb %%WWWDIR%%/app/models/ci/group.rb @@ -3601,6 +3672,7 @@ %%WWWDIR%%/app/models/concerns/discussion_on_diff.rb %%WWWDIR%%/app/models/concerns/each_batch.rb %%WWWDIR%%/app/models/concerns/editable.rb +%%WWWDIR%%/app/models/concerns/enum_with_nil.rb %%WWWDIR%%/app/models/concerns/expirable.rb %%WWWDIR%%/app/models/concerns/fast_destroy_all.rb %%WWWDIR%%/app/models/concerns/faster_cache_keys.rb @@ -3709,6 +3781,7 @@ %%WWWDIR%%/app/models/hooks/web_hook.rb %%WWWDIR%%/app/models/hooks/web_hook_log.rb %%WWWDIR%%/app/models/identity.rb +%%WWWDIR%%/app/models/import_export_upload.rb %%WWWDIR%%/app/models/individual_note_discussion.rb %%WWWDIR%%/app/models/instance_configuration.rb %%WWWDIR%%/app/models/internal_id.rb @@ -3942,6 +4015,8 @@ %%WWWDIR%%/app/serializers/deployment_entity.rb %%WWWDIR%%/app/serializers/deployment_serializer.rb %%WWWDIR%%/app/serializers/diff_file_entity.rb +%%WWWDIR%%/app/serializers/diffs_entity.rb +%%WWWDIR%%/app/serializers/diffs_serializer.rb %%WWWDIR%%/app/serializers/discussion_entity.rb %%WWWDIR%%/app/serializers/discussion_serializer.rb %%WWWDIR%%/app/serializers/entity_date_helper.rb @@ -3969,8 +4044,10 @@ %%WWWDIR%%/app/serializers/merge_request_basic_serializer.rb %%WWWDIR%%/app/serializers/merge_request_create_entity.rb %%WWWDIR%%/app/serializers/merge_request_create_serializer.rb +%%WWWDIR%%/app/serializers/merge_request_diff_entity.rb %%WWWDIR%%/app/serializers/merge_request_metrics_entity.rb %%WWWDIR%%/app/serializers/merge_request_serializer.rb +%%WWWDIR%%/app/serializers/merge_request_user_entity.rb %%WWWDIR%%/app/serializers/merge_request_widget_entity.rb %%WWWDIR%%/app/serializers/note_attachment_entity.rb %%WWWDIR%%/app/serializers/note_entity.rb @@ -4141,14 +4218,15 @@ %%WWWDIR%%/app/services/merge_requests/conflicts/resolve_service.rb %%WWWDIR%%/app/services/merge_requests/create_from_issue_service.rb %%WWWDIR%%/app/services/merge_requests/create_service.rb +%%WWWDIR%%/app/services/merge_requests/delete_non_latest_diffs_service.rb %%WWWDIR%%/app/services/merge_requests/ff_merge_service.rb %%WWWDIR%%/app/services/merge_requests/get_urls_service.rb -%%WWWDIR%%/app/services/merge_requests/merge_request_diff_cache_service.rb %%WWWDIR%%/app/services/merge_requests/merge_service.rb %%WWWDIR%%/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb %%WWWDIR%%/app/services/merge_requests/post_merge_service.rb %%WWWDIR%%/app/services/merge_requests/rebase_service.rb %%WWWDIR%%/app/services/merge_requests/refresh_service.rb +%%WWWDIR%%/app/services/merge_requests/reload_diffs_service.rb %%WWWDIR%%/app/services/merge_requests/reopen_service.rb %%WWWDIR%%/app/services/merge_requests/resolved_discussion_notification_service.rb %%WWWDIR%%/app/services/merge_requests/squash_service.rb @@ -4282,6 +4360,7 @@ %%WWWDIR%%/app/uploaders/file_mover.rb %%WWWDIR%%/app/uploaders/file_uploader.rb %%WWWDIR%%/app/uploaders/gitlab_uploader.rb +%%WWWDIR%%/app/uploaders/import_export_uploader.rb %%WWWDIR%%/app/uploaders/job_artifact_uploader.rb %%WWWDIR%%/app/uploaders/legacy_artifact_uploader.rb %%WWWDIR%%/app/uploaders/lfs_object_uploader.rb @@ -4345,6 +4424,7 @@ %%WWWDIR%%/app/views/admin/application_settings/_spam.html.haml %%WWWDIR%%/app/views/admin/application_settings/_terminal.html.haml %%WWWDIR%%/app/views/admin/application_settings/_terms.html.haml +%%WWWDIR%%/app/views/admin/application_settings/_third_party_offers.html.haml %%WWWDIR%%/app/views/admin/application_settings/_usage.html.haml %%WWWDIR%%/app/views/admin/application_settings/_visibility_and_access.html.haml %%WWWDIR%%/app/views/admin/application_settings/show.html.haml @@ -4658,6 +4738,7 @@ %%WWWDIR%%/app/views/layouts/nav/_dashboard.html.haml %%WWWDIR%%/app/views/layouts/nav/_explore.html.haml %%WWWDIR%%/app/views/layouts/nav/breadcrumbs/_collapsed_dropdown.html.haml +%%WWWDIR%%/app/views/layouts/nav/groups_dropdown/_show.html.haml %%WWWDIR%%/app/views/layouts/nav/projects_dropdown/_show.html.haml %%WWWDIR%%/app/views/layouts/nav/sidebar/_admin.html.haml %%WWWDIR%%/app/views/layouts/nav/sidebar/_group.html.haml @@ -4900,7 +4981,6 @@ %%WWWDIR%%/app/views/projects/clusters/_advanced_settings.html.haml %%WWWDIR%%/app/views/projects/clusters/_banner.html.haml %%WWWDIR%%/app/views/projects/clusters/_cluster.html.haml -%%WWWDIR%%/app/views/projects/clusters/_dropdown.html.haml %%WWWDIR%%/app/views/projects/clusters/_empty_state.html.haml %%WWWDIR%%/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml %%WWWDIR%%/app/views/projects/clusters/_integration_form.html.haml @@ -4908,15 +4988,12 @@ %%WWWDIR%%/app/views/projects/clusters/gcp/_form.html.haml %%WWWDIR%%/app/views/projects/clusters/gcp/_header.html.haml %%WWWDIR%%/app/views/projects/clusters/gcp/_show.html.haml -%%WWWDIR%%/app/views/projects/clusters/gcp/login.html.haml -%%WWWDIR%%/app/views/projects/clusters/gcp/new.html.haml %%WWWDIR%%/app/views/projects/clusters/index.html.haml %%WWWDIR%%/app/views/projects/clusters/new.html.haml %%WWWDIR%%/app/views/projects/clusters/show.html.haml %%WWWDIR%%/app/views/projects/clusters/user/_form.html.haml %%WWWDIR%%/app/views/projects/clusters/user/_header.html.haml %%WWWDIR%%/app/views/projects/clusters/user/_show.html.haml -%%WWWDIR%%/app/views/projects/clusters/user/new.html.haml %%WWWDIR%%/app/views/projects/commit/_ajax_signature.html.haml %%WWWDIR%%/app/views/projects/commit/_change.html.haml %%WWWDIR%%/app/views/projects/commit/_ci_menu.html.haml @@ -4992,6 +5069,7 @@ %%WWWDIR%%/app/views/projects/environments/_stop.html.haml %%WWWDIR%%/app/views/projects/environments/_terminal_button.html.haml %%WWWDIR%%/app/views/projects/environments/edit.html.haml +%%WWWDIR%%/app/views/projects/environments/empty.html.haml %%WWWDIR%%/app/views/projects/environments/folder.html.haml %%WWWDIR%%/app/views/projects/environments/index.html.haml %%WWWDIR%%/app/views/projects/environments/metrics.html.haml @@ -5039,6 +5117,7 @@ %%WWWDIR%%/app/views/projects/jobs/_user.html.haml %%WWWDIR%%/app/views/projects/jobs/index.html.haml %%WWWDIR%%/app/views/projects/jobs/show.html.haml +%%WWWDIR%%/app/views/projects/jobs/terminal.html.haml %%WWWDIR%%/app/views/projects/labels/edit.html.haml %%WWWDIR%%/app/views/projects/labels/index.html.haml %%WWWDIR%%/app/views/projects/labels/new.html.haml @@ -5300,6 +5379,7 @@ %%WWWDIR%%/app/views/shared/_service_settings.html.haml %%WWWDIR%%/app/views/shared/_sidebar_toggle_button.html.haml %%WWWDIR%%/app/views/shared/_sort_dropdown.html.haml +%%WWWDIR%%/app/views/shared/_user_dropdown_contributing_link.html.haml %%WWWDIR%%/app/views/shared/_visibility_level.html.haml %%WWWDIR%%/app/views/shared/_visibility_radios.html.haml %%WWWDIR%%/app/views/shared/badges/_badge_settings.html.haml @@ -5594,6 +5674,7 @@ %%WWWDIR%%/app/workers/concerns/cluster_applications.rb %%WWWDIR%%/app/workers/concerns/cluster_queue.rb %%WWWDIR%%/app/workers/concerns/cronjob_queue.rb +%%WWWDIR%%/app/workers/concerns/each_shard_worker.rb %%WWWDIR%%/app/workers/concerns/exception_backtrace.rb %%WWWDIR%%/app/workers/concerns/gitlab/github_import/notify_upon_death.rb %%WWWDIR%%/app/workers/concerns/gitlab/github_import/object_importer.rb @@ -5612,6 +5693,7 @@ %%WWWDIR%%/app/workers/create_gpg_signature_worker.rb %%WWWDIR%%/app/workers/create_note_diff_file_worker.rb %%WWWDIR%%/app/workers/create_pipeline_worker.rb +%%WWWDIR%%/app/workers/delete_diff_files_worker.rb %%WWWDIR%%/app/workers/delete_merged_branches_worker.rb %%WWWDIR%%/app/workers/delete_user_worker.rb %%WWWDIR%%/app/workers/email_receiver_worker.rb @@ -5651,7 +5733,6 @@ %%WWWDIR%%/app/workers/new_note_worker.rb %%WWWDIR%%/app/workers/object_storage/background_move_worker.rb %%WWWDIR%%/app/workers/object_storage/migrate_uploads_worker.rb -%%WWWDIR%%/app/workers/object_storage_upload_worker.rb %%WWWDIR%%/app/workers/pages_domain_verification_cron_worker.rb %%WWWDIR%%/app/workers/pages_domain_verification_worker.rb %%WWWDIR%%/app/workers/pages_worker.rb @@ -5672,6 +5753,7 @@ %%WWWDIR%%/app/workers/project_service_worker.rb %%WWWDIR%%/app/workers/propagate_service_template_worker.rb %%WWWDIR%%/app/workers/prune_old_events_worker.rb +%%WWWDIR%%/app/workers/prune_web_hook_logs_worker.rb %%WWWDIR%%/app/workers/reactive_caching_worker.rb %%WWWDIR%%/app/workers/rebase_worker.rb %%WWWDIR%%/app/workers/remove_expired_group_links_worker.rb @@ -5681,6 +5763,7 @@ %%WWWDIR%%/app/workers/repository_archive_cache_worker.rb %%WWWDIR%%/app/workers/repository_check/batch_worker.rb %%WWWDIR%%/app/workers/repository_check/clear_worker.rb +%%WWWDIR%%/app/workers/repository_check/dispatch_worker.rb %%WWWDIR%%/app/workers/repository_check/single_repository_worker.rb %%WWWDIR%%/app/workers/repository_fork_worker.rb %%WWWDIR%%/app/workers/repository_import_worker.rb @@ -5723,11 +5806,9 @@ @(git,,544) %%WWWDIR%%/bin/web @(git,,544) %%WWWDIR%%/bin/with_env %%WWWDIR%%/changelogs/archive.md -%%WWWDIR%%/changelogs/no-rm-rf-gitlab-basics.yml %%WWWDIR%%/config.ru %%WWWDIR%%/config/README.md %%WWWDIR%%/config/application.rb -%%WWWDIR%%/config/aws.yml.example %%WWWDIR%%/config/boot.rb %%WWWDIR%%/config/database.yml.env %%WWWDIR%%/config/database.yml.mysql @@ -5755,6 +5836,7 @@ %%WWWDIR%%/config/initializers/active_record_avoid_type_casting_in_uniqueness_validator.rb %%WWWDIR%%/config/initializers/active_record_data_types.rb %%WWWDIR%%/config/initializers/active_record_locking.rb +%%WWWDIR%%/config/initializers/active_record_migration.rb %%WWWDIR%%/config/initializers/active_record_mysql_timestamp.rb %%WWWDIR%%/config/initializers/active_record_preloader.rb %%WWWDIR%%/config/initializers/active_record_schema_ignore_tables.rb @@ -5771,8 +5853,6 @@ %%WWWDIR%%/config/initializers/batch_loader.rb %%WWWDIR%%/config/initializers/bootstrap_form.rb %%WWWDIR%%/config/initializers/bullet.rb -%%WWWDIR%%/config/initializers/carrierwave.rb -%%WWWDIR%%/config/initializers/carrierwave_monkey_patch.rb %%WWWDIR%%/config/initializers/chronic_duration.rb %%WWWDIR%%/config/initializers/connection_fix.rb %%WWWDIR%%/config/initializers/console_message.rb @@ -6710,6 +6790,11 @@ %%WWWDIR%%/db/migrate/20180531220618_change_default_value_for_dsa_key_restriction.rb %%WWWDIR%%/db/migrate/20180601213245_add_deploy_strategy_to_project_auto_devops.rb %%WWWDIR%%/db/migrate/20180608110058_rename_merge_requests_allow_collaboration.rb +%%WWWDIR%%/db/migrate/20180613081317_create_ci_builds_runner_session.rb +%%WWWDIR%%/db/migrate/20180625113853_create_import_export_uploads.rb +%%WWWDIR%%/db/migrate/20180626125654_add_index_on_deployable_for_deployments.rb +%%WWWDIR%%/db/migrate/20180628124813_alter_web_hook_logs_indexes.rb +%%WWWDIR%%/db/migrate/20180704204006_add_hide_third_party_offers_to_application_settings.rb %%WWWDIR%%/db/migrate/gpg_keys_limits_to_mysql.rb %%WWWDIR%%/db/migrate/limits_ci_build_trace_chunks_raw_data_for_mysql.rb %%WWWDIR%%/db/migrate/limits_to_mysql.rb @@ -6859,7 +6944,10 @@ %%WWWDIR%%/db/post_migrate/20180523125103_cleanup_merge_requests_allow_maintainer_to_push_rename.rb %%WWWDIR%%/db/post_migrate/20180529152628_schedule_to_archive_legacy_traces.rb %%WWWDIR%%/db/post_migrate/20180603190921_migrate_object_storage_upload_sidekiq_queue.rb +%%WWWDIR%%/db/post_migrate/20180604123514_cleanup_stages_position_migration.rb %%WWWDIR%%/db/post_migrate/20180608201435_cleanup_merge_requests_allow_collaboration_rename.rb +%%WWWDIR%%/db/post_migrate/20180629191052_add_partial_index_to_projects_for_last_repository_check_at.rb +%%WWWDIR%%/db/post_migrate/20180702120647_enqueue_fix_cross_project_label_links.rb @(git,,) %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb %%WWWDIR%%/doc/README.md @@ -7070,6 +7158,7 @@ %%WWWDIR%%/doc/ci/examples/artifactory_and_gitlab/index.md %%WWWDIR%%/doc/ci/examples/browser_performance.md %%WWWDIR%%/doc/ci/examples/code_climate.md +%%WWWDIR%%/doc/ci/examples/code_quality.md %%WWWDIR%%/doc/ci/examples/container_scanning.md %%WWWDIR%%/doc/ci/examples/dast.md %%WWWDIR%%/doc/ci/examples/deploy_spring_boot_to_cloud_foundry/img/cloud_foundry_secret_variables.png @@ -7772,6 +7861,7 @@ %%WWWDIR%%/doc/update/10.6-to-10.7.md %%WWWDIR%%/doc/update/10.7-to-10.8.md %%WWWDIR%%/doc/update/10.8-to-11.0.md +%%WWWDIR%%/doc/update/11.0-to-11.1.md %%WWWDIR%%/doc/update/2.6-to-3.0.md %%WWWDIR%%/doc/update/2.9-to-3.0.md %%WWWDIR%%/doc/update/3.0-to-3.1.md @@ -7865,6 +7955,7 @@ %%WWWDIR%%/doc/user/admin_area/settings/img/update-available.png %%WWWDIR%%/doc/user/admin_area/settings/sign_up_restrictions.md %%WWWDIR%%/doc/user/admin_area/settings/terms.md +%%WWWDIR%%/doc/user/admin_area/settings/third_party_offers.md %%WWWDIR%%/doc/user/admin_area/settings/usage_statistics.md %%WWWDIR%%/doc/user/admin_area/settings/visibility_and_access_controls.md %%WWWDIR%%/doc/user/admin_area/user_cohorts.md @@ -7970,12 +8061,19 @@ %%WWWDIR%%/doc/user/project/img/container_registry.png %%WWWDIR%%/doc/user/project/img/cycle_analytics_landing_page.png %%WWWDIR%%/doc/user/project/img/description_templates.png +%%WWWDIR%%/doc/user/project/img/group_issue_board.png %%WWWDIR%%/doc/user/project/img/issue_board.png %%WWWDIR%%/doc/user/project/img/issue_board_add_list.png +%%WWWDIR%%/doc/user/project/img/issue_board_assignee_lists.png +%%WWWDIR%%/doc/user/project/img/issue_board_creation.png +%%WWWDIR%%/doc/user/project/img/issue_board_edit_button.png +%%WWWDIR%%/doc/user/project/img/issue_board_focus_mode.gif %%WWWDIR%%/doc/user/project/img/issue_board_move_issue_card_list.png %%WWWDIR%%/doc/user/project/img/issue_board_system_notes.png +%%WWWDIR%%/doc/user/project/img/issue_board_view_scope.png %%WWWDIR%%/doc/user/project/img/issue_board_welcome_message.png %%WWWDIR%%/doc/user/project/img/issue_boards_add_issues_modal.png +%%WWWDIR%%/doc/user/project/img/issue_boards_multiple.png %%WWWDIR%%/doc/user/project/img/issue_boards_remove_issue.png %%WWWDIR%%/doc/user/project/img/koding_build-in-progress.png %%WWWDIR%%/doc/user/project/img/koding_build-logs.png @@ -8480,6 +8578,7 @@ %%WWWDIR%%/lib/api/helpers/common_helpers.rb %%WWWDIR%%/lib/api/helpers/custom_attributes.rb %%WWWDIR%%/lib/api/helpers/custom_validators.rb +%%WWWDIR%%/lib/api/helpers/headers_helpers.rb %%WWWDIR%%/lib/api/helpers/internal_helpers.rb %%WWWDIR%%/lib/api/helpers/members_helpers.rb %%WWWDIR%%/lib/api/helpers/notes_helpers.rb @@ -8726,15 +8825,19 @@ %%WWWDIR%%/lib/gitlab/background_migration/.rubocop.yml %%WWWDIR%%/lib/gitlab/background_migration/add_merge_request_diff_commits_count.rb %%WWWDIR%%/lib/gitlab/background_migration/archive_legacy_traces.rb +%%WWWDIR%%/lib/gitlab/background_migration/cleanup_concurrent_rename.rb +%%WWWDIR%%/lib/gitlab/background_migration/cleanup_concurrent_schema_change.rb %%WWWDIR%%/lib/gitlab/background_migration/cleanup_concurrent_type_change.rb %%WWWDIR%%/lib/gitlab/background_migration/copy_column.rb %%WWWDIR%%/lib/gitlab/background_migration/create_fork_network_memberships_range.rb %%WWWDIR%%/lib/gitlab/background_migration/create_gpg_key_subkeys_from_gpg_keys.rb %%WWWDIR%%/lib/gitlab/background_migration/delete_conflicting_redirect_routes_range.rb +%%WWWDIR%%/lib/gitlab/background_migration/delete_diff_files.rb %%WWWDIR%%/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb %%WWWDIR%%/lib/gitlab/background_migration/fill_file_store_job_artifact.rb %%WWWDIR%%/lib/gitlab/background_migration/fill_file_store_lfs_object.rb %%WWWDIR%%/lib/gitlab/background_migration/fill_store_upload.rb +%%WWWDIR%%/lib/gitlab/background_migration/fix_cross_project_label_links.rb %%WWWDIR%%/lib/gitlab/background_migration/migrate_build_stage.rb %%WWWDIR%%/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb %%WWWDIR%%/lib/gitlab/background_migration/migrate_events_to_push_event_payloads.rb @@ -9029,6 +9132,7 @@ %%WWWDIR%%/lib/gitlab/etag_caching/router.rb %%WWWDIR%%/lib/gitlab/etag_caching/store.rb %%WWWDIR%%/lib/gitlab/exclusive_lease.rb +%%WWWDIR%%/lib/gitlab/exclusive_lease_helpers.rb %%WWWDIR%%/lib/gitlab/fake_application_settings.rb %%WWWDIR%%/lib/gitlab/favicon.rb %%WWWDIR%%/lib/gitlab/file_detector.rb @@ -9067,6 +9171,7 @@ %%WWWDIR%%/lib/gitlab/git/operation_service.rb %%WWWDIR%%/lib/gitlab/git/path_helper.rb %%WWWDIR%%/lib/gitlab/git/popen.rb +%%WWWDIR%%/lib/gitlab/git/pre_receive_error.rb %%WWWDIR%%/lib/gitlab/git/raw_diff_change.rb %%WWWDIR%%/lib/gitlab/git/ref.rb %%WWWDIR%%/lib/gitlab/git/remote_mirror.rb @@ -9087,6 +9192,7 @@ %%WWWDIR%%/lib/gitlab/git/tree.rb %%WWWDIR%%/lib/gitlab/git/user.rb %%WWWDIR%%/lib/gitlab/git/util.rb +%%WWWDIR%%/lib/gitlab/git/version.rb %%WWWDIR%%/lib/gitlab/git/wiki.rb %%WWWDIR%%/lib/gitlab/git/wiki_file.rb %%WWWDIR%%/lib/gitlab/git/wiki_page.rb @@ -9178,6 +9284,10 @@ %%WWWDIR%%/lib/gitlab/graphql.rb %%WWWDIR%%/lib/gitlab/graphql/authorize.rb %%WWWDIR%%/lib/gitlab/graphql/authorize/instrumentation.rb +%%WWWDIR%%/lib/gitlab/graphql/connections.rb +%%WWWDIR%%/lib/gitlab/graphql/connections/keyset_connection.rb +%%WWWDIR%%/lib/gitlab/graphql/errors.rb +%%WWWDIR%%/lib/gitlab/graphql/expose_permissions.rb %%WWWDIR%%/lib/gitlab/graphql/present.rb %%WWWDIR%%/lib/gitlab/graphql/present/instrumentation.rb %%WWWDIR%%/lib/gitlab/graphql/variables.rb @@ -9187,7 +9297,6 @@ %%WWWDIR%%/lib/gitlab/hashed_storage/rake_helper.rb %%WWWDIR%%/lib/gitlab/health_checks/base_abstract_check.rb %%WWWDIR%%/lib/gitlab/health_checks/db_check.rb -%%WWWDIR%%/lib/gitlab/health_checks/fs_shards_check.rb %%WWWDIR%%/lib/gitlab/health_checks/gitaly_check.rb %%WWWDIR%%/lib/gitlab/health_checks/metric.rb %%WWWDIR%%/lib/gitlab/health_checks/prometheus_text_format.rb @@ -9219,6 +9328,7 @@ %%WWWDIR%%/lib/gitlab/import_export/command_line_util.rb %%WWWDIR%%/lib/gitlab/import_export/error.rb %%WWWDIR%%/lib/gitlab/import_export/file_importer.rb +%%WWWDIR%%/lib/gitlab/import_export/group_project_object_builder.rb %%WWWDIR%%/lib/gitlab/import_export/hash_util.rb %%WWWDIR%%/lib/gitlab/import_export/import_export.yml %%WWWDIR%%/lib/gitlab/import_export/importer.rb @@ -9236,6 +9346,7 @@ %%WWWDIR%%/lib/gitlab/import_export/saver.rb %%WWWDIR%%/lib/gitlab/import_export/shared.rb %%WWWDIR%%/lib/gitlab/import_export/statistics_restorer.rb +%%WWWDIR%%/lib/gitlab/import_export/uploads_manager.rb %%WWWDIR%%/lib/gitlab/import_export/uploads_restorer.rb %%WWWDIR%%/lib/gitlab/import_export/uploads_saver.rb %%WWWDIR%%/lib/gitlab/import_export/version_checker.rb @@ -9378,12 +9489,15 @@ %%WWWDIR%%/lib/gitlab/routing.rb %%WWWDIR%%/lib/gitlab/sanitizers/svg.rb %%WWWDIR%%/lib/gitlab/sanitizers/svg/whitelist.rb +%%WWWDIR%%/lib/gitlab/search/parsed_query.rb +%%WWWDIR%%/lib/gitlab/search/query.rb %%WWWDIR%%/lib/gitlab/search_results.rb %%WWWDIR%%/lib/gitlab/seeder.rb %%WWWDIR%%/lib/gitlab/sentry.rb %%WWWDIR%%/lib/gitlab/serializer/ci/variables.rb %%WWWDIR%%/lib/gitlab/serializer/pagination.rb %%WWWDIR%%/lib/gitlab/setup_helper.rb +%%WWWDIR%%/lib/gitlab/shard_health_cache.rb %%WWWDIR%%/lib/gitlab/shell.rb %%WWWDIR%%/lib/gitlab/shell_adapter.rb %%WWWDIR%%/lib/gitlab/sherlock.rb @@ -9428,6 +9542,7 @@ %%WWWDIR%%/lib/gitlab/slash_commands/presenters/issue_show.rb %%WWWDIR%%/lib/gitlab/slash_commands/result.rb %%WWWDIR%%/lib/gitlab/snippet_search_results.rb +%%WWWDIR%%/lib/gitlab/sql/cte.rb %%WWWDIR%%/lib/gitlab/sql/glob.rb %%WWWDIR%%/lib/gitlab/sql/pattern.rb %%WWWDIR%%/lib/gitlab/sql/recursive_cte.rb @@ -9501,6 +9616,7 @@ %%WWWDIR%%/lib/microsoft_teams/activity.rb %%WWWDIR%%/lib/microsoft_teams/notifier.rb %%WWWDIR%%/lib/milestone_array.rb +%%WWWDIR%%/lib/mysql_zero_date.rb %%WWWDIR%%/lib/object_storage/direct_upload.rb %%WWWDIR%%/lib/omni_auth/strategies/bitbucket.rb %%WWWDIR%%/lib/omni_auth/strategies/jwt.rb @@ -9621,6 +9737,7 @@ %%WWWDIR%%/lib/version_check.rb @(git,,) %%WWWDIR%%/locale/bg/gitlab.po @(git,,) %%WWWDIR%%/locale/bg/gitlab.po.time_stamp +@(git,,) %%WWWDIR%%/locale/cs_CZ/gitlab.po @(git,,) %%WWWDIR%%/locale/de/gitlab.po @(git,,) %%WWWDIR%%/locale/de/gitlab.po.time_stamp @(git,,) %%WWWDIR%%/locale/en/gitlab.po @@ -9633,6 +9750,7 @@ @(git,,) %%WWWDIR%%/locale/fr/gitlab.po @(git,,) %%WWWDIR%%/locale/fr/gitlab.po.time_stamp @(git,,) %%WWWDIR%%/locale/gitlab.pot +@(git,,) %%WWWDIR%%/locale/gl_ES/gitlab.po @(git,,) %%WWWDIR%%/locale/id_ID/gitlab.po @(git,,) %%WWWDIR%%/locale/it/gitlab.po @(git,,) %%WWWDIR%%/locale/it/gitlab.po.time_stamp @@ -9690,6 +9808,7 @@ %%WWWDIR%%/qa/qa/factory/resource/merge_request.rb %%WWWDIR%%/qa/qa/factory/resource/personal_access_token.rb %%WWWDIR%%/qa/qa/factory/resource/project.rb +%%WWWDIR%%/qa/qa/factory/resource/project_imported_from_github.rb %%WWWDIR%%/qa/qa/factory/resource/runner.rb %%WWWDIR%%/qa/qa/factory/resource/sandbox.rb %%WWWDIR%%/qa/qa/factory/resource/secret_variable.rb @@ -9705,11 +9824,13 @@ %%WWWDIR%%/qa/qa/page/admin/settings/repository_storage.rb %%WWWDIR%%/qa/qa/page/base.rb %%WWWDIR%%/qa/qa/page/component/dropzone.rb +%%WWWDIR%%/qa/qa/page/component/select2.rb %%WWWDIR%%/qa/qa/page/dashboard/groups.rb %%WWWDIR%%/qa/qa/page/dashboard/projects.rb %%WWWDIR%%/qa/qa/page/element.rb %%WWWDIR%%/qa/qa/page/group/new.rb %%WWWDIR%%/qa/qa/page/group/show.rb +%%WWWDIR%%/qa/qa/page/issuable/sidebar.rb %%WWWDIR%%/qa/qa/page/main/login.rb %%WWWDIR%%/qa/qa/page/main/oauth.rb %%WWWDIR%%/qa/qa/page/mattermost/login.rb @@ -9722,6 +9843,7 @@ %%WWWDIR%%/qa/qa/page/merge_request/show.rb %%WWWDIR%%/qa/qa/page/profile/personal_access_tokens.rb %%WWWDIR%%/qa/qa/page/project/activity.rb +%%WWWDIR%%/qa/qa/page/project/import/github.rb %%WWWDIR%%/qa/qa/page/project/issue/index.rb %%WWWDIR%%/qa/qa/page/project/issue/new.rb %%WWWDIR%%/qa/qa/page/project/issue/show.rb @@ -9769,6 +9891,7 @@ %%WWWDIR%%/qa/qa/scenario/taggable.rb %%WWWDIR%%/qa/qa/scenario/template.rb %%WWWDIR%%/qa/qa/scenario/test/instance.rb +%%WWWDIR%%/qa/qa/scenario/test/integration/github.rb %%WWWDIR%%/qa/qa/scenario/test/integration/kubernetes.rb %%WWWDIR%%/qa/qa/scenario/test/integration/ldap.rb %%WWWDIR%%/qa/qa/scenario/test/integration/mattermost.rb @@ -9793,6 +9916,7 @@ %%WWWDIR%%/qa/qa/specs/features/project/create_issue_spec.rb %%WWWDIR%%/qa/qa/specs/features/project/create_spec.rb %%WWWDIR%%/qa/qa/specs/features/project/deploy_key_clone_spec.rb +%%WWWDIR%%/qa/qa/specs/features/project/import_from_github_spec.rb %%WWWDIR%%/qa/qa/specs/features/project/pipelines_spec.rb %%WWWDIR%%/qa/qa/specs/features/project/wikis_spec.rb %%WWWDIR%%/qa/qa/specs/features/repository/clone_spec.rb @@ -9826,6 +9950,7 @@ %%WWWDIR%%/qa/spec/support/stub_env.rb %%WWWDIR%%/rubocop/cop/avoid_break_from_strong_memoize.rb %%WWWDIR%%/rubocop/cop/avoid_return_from_blocks.rb +%%WWWDIR%%/rubocop/cop/gitlab/finder_with_find_by.rb %%WWWDIR%%/rubocop/cop/gitlab/httparty.rb %%WWWDIR%%/rubocop/cop/gitlab/module_with_instance_variables.rb %%WWWDIR%%/rubocop/cop/gitlab/predicate_memoization.rb @@ -9857,6 +9982,7 @@ %%WWWDIR%%/scripts/create_postgres_user.sh %%WWWDIR%%/scripts/detect-new-flaky-examples %%WWWDIR%%/scripts/frontend/frontend_script_utils.js +%%WWWDIR%%/scripts/frontend/postinstall.js %%WWWDIR%%/scripts/frontend/prettier.js %%WWWDIR%%/scripts/gitaly-test-build %%WWWDIR%%/scripts/gitaly-test-spawn @@ -9870,13 +9996,13 @@ %%WWWDIR%%/scripts/no-ee-check %%WWWDIR%%/scripts/prepare_build.sh %%WWWDIR%%/scripts/prune-old-flaky-specs +%%WWWDIR%%/scripts/rails5-gemfile-lock-check %%WWWDIR%%/scripts/schema_changed.sh %%WWWDIR%%/scripts/security-harness %%WWWDIR%%/scripts/static-analysis %%WWWDIR%%/scripts/sync-reports -%%WWWDIR%%/scripts/trigger-build-cloud-native +%%WWWDIR%%/scripts/trigger-build %%WWWDIR%%/scripts/trigger-build-docs -%%WWWDIR%%/scripts/trigger-build-omnibus %%WWWDIR%%/scripts/utils.sh %%WWWDIR%%/spec/bin/changelog_spec.rb %%WWWDIR%%/spec/bin/storage_check_spec.rb @@ -9965,8 +10091,6 @@ %%WWWDIR%%/spec/controllers/projects/branches_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/ci/lints_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/clusters/applications_controller_spec.rb -%%WWWDIR%%/spec/controllers/projects/clusters/gcp_controller_spec.rb -%%WWWDIR%%/spec/controllers/projects/clusters/user_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/clusters_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/commit_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/commits_controller_spec.rb @@ -10034,6 +10158,7 @@ %%WWWDIR%%/spec/controllers/users/terms_controller_spec.rb %%WWWDIR%%/spec/controllers/users_controller_spec.rb %%WWWDIR%%/spec/db/production/settings_spec.rb +%%WWWDIR%%/spec/dependencies/omniauth_saml_spec.rb %%WWWDIR%%/spec/factories/abuse_reports.rb %%WWWDIR%%/spec/factories/appearances.rb %%WWWDIR%%/spec/factories/application_settings.rb @@ -10086,6 +10211,7 @@ %%WWWDIR%%/spec/factories/group_members.rb %%WWWDIR%%/spec/factories/groups.rb %%WWWDIR%%/spec/factories/identities.rb +%%WWWDIR%%/spec/factories/import_export_uploads.rb %%WWWDIR%%/spec/factories/import_state.rb %%WWWDIR%%/spec/factories/instance_configuration.rb %%WWWDIR%%/spec/factories/internal_ids.rb @@ -10418,6 +10544,7 @@ %%WWWDIR%%/spec/features/projects/commit/comments/user_edits_comments_spec.rb %%WWWDIR%%/spec/features/projects/commit/diff_notes_spec.rb %%WWWDIR%%/spec/features/projects/commit/mini_pipeline_graph_spec.rb +%%WWWDIR%%/spec/features/projects/commit/user_comments_on_commit_spec.rb %%WWWDIR%%/spec/features/projects/commit/user_reverts_commit_spec.rb %%WWWDIR%%/spec/features/projects/commits/rss_spec.rb %%WWWDIR%%/spec/features/projects/commits/user_browses_commits_spec.rb @@ -10562,6 +10689,7 @@ %%WWWDIR%%/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb %%WWWDIR%%/spec/features/projects/settings/user_manages_project_members_spec.rb %%WWWDIR%%/spec/features/projects/settings/user_renames_a_project_spec.rb +%%WWWDIR%%/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb %%WWWDIR%%/spec/features/projects/settings/user_tags_project_spec.rb %%WWWDIR%%/spec/features/projects/settings/user_transfers_a_project_spec.rb %%WWWDIR%%/spec/features/projects/settings/visibility_settings_spec.rb @@ -10745,11 +10873,13 @@ %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/comment.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/commit/basic.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/commit/detail.json +%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/commit/with_stats.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/commit_note.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/commit_notes.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/commit_stats.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/commits.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/commits_details.json +%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/commits_with_stats.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/issue.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/issues.json %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/merge_requests.json @@ -10780,6 +10910,7 @@ %%WWWDIR%%/spec/fixtures/api/schemas/registry/tags.json %%WWWDIR%%/spec/fixtures/api/schemas/variable.json %%WWWDIR%%/spec/fixtures/api/schemas/variables.json +%%WWWDIR%%/spec/fixtures/authentication/saml_response.xml %%WWWDIR%%/spec/fixtures/banana_sample.gif %%WWWDIR%%/spec/fixtures/big-image.png %%WWWDIR%%/spec/fixtures/blockquote_fence_after.md @@ -10850,7 +10981,6 @@ %%WWWDIR%%/spec/fixtures/emails/wrong_incoming_email_token.eml %%WWWDIR%%/spec/fixtures/emails/wrong_mail_key.eml %%WWWDIR%%/spec/fixtures/encoding/Japanese.md -%%WWWDIR%%/spec/fixtures/exported-project.gz %%WWWDIR%%/spec/fixtures/fuzzy.po %%WWWDIR%%/spec/fixtures/invalid.po %%WWWDIR%%/spec/fixtures/logo_sample.svg @@ -10866,6 +10996,7 @@ %%WWWDIR%%/spec/fixtures/pages_empty.tar.gz *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***