From owner-svn-ports-branches@FreeBSD.ORG Mon May 25 10:28:32 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA89534A; Mon, 25 May 2015 10:28:31 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C53C3BC5; Mon, 25 May 2015 10:28:31 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4PASV8n039929; Mon, 25 May 2015 10:28:31 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4PASLYT039879; Mon, 25 May 2015 10:28:21 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201505251028.t4PASLYT039879@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 25 May 2015 10:28:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387377 - in branches/2015Q2/www/chromium: . files X-SVN-Group: ports-branches 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.20 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, 25 May 2015 10:28:32 -0000 Author: rene Date: Mon May 25 10:28:20 2015 New Revision: 387377 URL: https://svnweb.freebsd.org/changeset/ports/387377 Log: MFH: r387371 www/chromium: update to 43.0.2357.65 There are some rough edges, e.g. gmail.com crashes with the EFF Privacy Badger plugin installed. Submitted by: LeFroid Obtained from: https://github.com/Lefrid/chromium Security: http://vuxml.freebsd.org/freebsd/a9d456b4-fe4c-11e4-ad15-00262d5ed8ee.html Approved by: portmgr (erwin) Added: branches/2015Q2/www/chromium/files/patch-base__process__memory.cc - copied unchanged from r387371, head/www/chromium/files/patch-base__process__memory.cc branches/2015Q2/www/chromium/files/patch-base__process__process_posix.cc - copied unchanged from r387371, head/www/chromium/files/patch-base__process__process_posix.cc branches/2015Q2/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc - copied unchanged from r387371, head/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__defaults.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__defaults.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_commands.h - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__download__download_commands.h branches/2015Q2/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__browser.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__ui__browser.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc branches/2015Q2/www/chromium/files/patch-chrome__common__extensions__command.cc - copied unchanged from r387371, head/www/chromium/files/patch-chrome__common__extensions__command.cc branches/2015Q2/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc - copied unchanged from r387371, head/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc branches/2015Q2/www/chromium/files/patch-content__renderer__render_thread_impl.cc - copied unchanged from r387371, head/www/chromium/files/patch-content__renderer__render_thread_impl.cc branches/2015Q2/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.h - copied unchanged from r387371, head/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.h branches/2015Q2/www/chromium/files/patch-content__renderer__webscrollbarbehavior_impl_gtkoraura.cc - copied unchanged from r387371, head/www/chromium/files/patch-content__renderer__webscrollbarbehavior_impl_gtkoraura.cc branches/2015Q2/www/chromium/files/patch-content__shell__browser__shell_browser_context.cc - copied unchanged from r387371, head/www/chromium/files/patch-content__shell__browser__shell_browser_context.cc branches/2015Q2/www/chromium/files/patch-content__shell__browser__shell_browser_main_parts.cc - copied unchanged from r387371, head/www/chromium/files/patch-content__shell__browser__shell_browser_main_parts.cc branches/2015Q2/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.cc - copied unchanged from r387371, head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.cc branches/2015Q2/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc - copied unchanged from r387371, head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc branches/2015Q2/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.cc - copied unchanged from r387371, head/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.cc branches/2015Q2/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.h - copied unchanged from r387371, head/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.h branches/2015Q2/www/chromium/files/patch-net__net_common.gypi - copied unchanged from r387371, head/www/chromium/files/patch-net__net_common.gypi branches/2015Q2/www/chromium/files/patch-ui__accessibility__accessibility.gyp - copied unchanged from r387371, head/www/chromium/files/patch-ui__accessibility__accessibility.gyp branches/2015Q2/www/chromium/files/patch-ui__accessibility__platform__ax_platform_node.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__accessibility__platform__ax_platform_node.cc branches/2015Q2/www/chromium/files/patch-ui__app_list__app_list_menu.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__app_list__app_list_menu.cc branches/2015Q2/www/chromium/files/patch-ui__app_list__views__app_list_view.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__app_list__views__app_list_view.cc branches/2015Q2/www/chromium/files/patch-ui__base__ime__input_method_initializer.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__base__ime__input_method_initializer.cc branches/2015Q2/www/chromium/files/patch-ui__base__resource__resource_bundle.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__base__resource__resource_bundle.cc branches/2015Q2/www/chromium/files/patch-ui__base__web_ui_util.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__base__web_ui_util.cc branches/2015Q2/www/chromium/files/patch-ui__events__keycodes__dom4__keycode_converter.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__events__keycodes__dom4__keycode_converter.cc branches/2015Q2/www/chromium/files/patch-ui__gfx__canvas_skia.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__gfx__canvas_skia.cc branches/2015Q2/www/chromium/files/patch-ui__gl__gl_surface_glx.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__gl__gl_surface_glx.cc branches/2015Q2/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc branches/2015Q2/www/chromium/files/patch-ui__message_center__message_center_style.h - copied unchanged from r387371, head/www/chromium/files/patch-ui__message_center__message_center_style.h branches/2015Q2/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.cc branches/2015Q2/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.h - copied unchanged from r387371, head/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.h branches/2015Q2/www/chromium/files/patch-ui__message_center__views__message_center_view.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__message_center__views__message_center_view.cc branches/2015Q2/www/chromium/files/patch-ui__message_center__views__notification_view.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__message_center__views__notification_view.cc branches/2015Q2/www/chromium/files/patch-ui__views__accessibility__native_view_accessibility.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__views__accessibility__native_view_accessibility.cc branches/2015Q2/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc branches/2015Q2/www/chromium/files/patch-ui__views__controls__menu__menu_scroll_view_container.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__views__controls__menu__menu_scroll_view_container.cc branches/2015Q2/www/chromium/files/patch-ui__views__controls__scrollbar__base_scroll_bar.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__views__controls__scrollbar__base_scroll_bar.cc branches/2015Q2/www/chromium/files/patch-ui__views__controls__textfield__textfield.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__views__controls__textfield__textfield.cc branches/2015Q2/www/chromium/files/patch-ui__views__examples__widget_example.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__views__examples__widget_example.cc branches/2015Q2/www/chromium/files/patch-ui__views__views_switches.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__views__views_switches.cc branches/2015Q2/www/chromium/files/patch-ui__views__window__dialog_delegate.cc - copied unchanged from r387371, head/www/chromium/files/patch-ui__views__window__dialog_delegate.cc Deleted: branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc branches/2015Q2/www/chromium/files/patch-chrome__test__perf__perf_test.cc branches/2015Q2/www/chromium/files/patch-chrome__tools__build__linux__sed.sh branches/2015Q2/www/chromium/files/patch-device__hid__hid_service.cc branches/2015Q2/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc branches/2015Q2/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc Modified: branches/2015Q2/www/chromium/Makefile branches/2015Q2/www/chromium/distinfo branches/2015Q2/www/chromium/files/extra-patch-clang branches/2015Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc branches/2015Q2/www/chromium/files/patch-base__process__launch.cc branches/2015Q2/www/chromium/files/patch-base__process__launch.h branches/2015Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc branches/2015Q2/www/chromium/files/patch-chrome__chrome_browser_ui.gypi branches/2015Q2/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc branches/2015Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc branches/2015Q2/www/chromium/files/patch-content__browser__child_process_launcher.cc branches/2015Q2/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc branches/2015Q2/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc branches/2015Q2/www/chromium/files/patch-media__media.gyp branches/2015Q2/www/chromium/files/patch-net__net.gyp branches/2015Q2/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc branches/2015Q2/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp branches/2015Q2/www/chromium/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/chromium/Makefile ============================================================================== --- branches/2015Q2/www/chromium/Makefile Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/Makefile Mon May 25 10:28:20 2015 (r387377) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 42.0.2311.135 +PORTVERSION= 43.0.2357.65 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -13,7 +13,7 @@ COMMENT= Google web browser based on Web LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -CFLAGS+= -isystem${LOCALBASE}/include +CFLAGS+= -isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0 BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ @@ -62,7 +62,7 @@ CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst -USE_GNOME= glib20 gtk20 dconf libxslt +USE_GNOME= atk glib20 gtk20 dconf libxslt SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes @@ -272,7 +272,7 @@ pre-configure: 'third_party/cld' \ 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ - 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \ + 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ 'third_party/gardiner_mod' \ 'third_party/fips181' \ Modified: branches/2015Q2/www/chromium/distinfo ============================================================================== --- branches/2015Q2/www/chromium/distinfo Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/distinfo Mon May 25 10:28:20 2015 (r387377) @@ -1,4 +1,4 @@ -SHA256 (chromium-42.0.2311.135.tar.xz) = c269d40e653794c219fd3eca2922d881199af5acff5d0a55b3e79f3b6a5a2aa9 -SIZE (chromium-42.0.2311.135.tar.xz) = 306488116 -SHA256 (chromium-42.0.2311.135-testdata.tar.xz) = 357dd7bdb6365f4163b2d6e58e8677561a9f4d6c8e6f106ca95ac083a6eb0ef8 -SIZE (chromium-42.0.2311.135-testdata.tar.xz) = 115723572 +SHA256 (chromium-43.0.2357.65.tar.xz) = 3f8f87d982b5ee14862e49dcfa44e02009e401cb29f9758e253f9fd952c57eed +SIZE (chromium-43.0.2357.65.tar.xz) = 309208380 +SHA256 (chromium-43.0.2357.65-testdata.tar.xz) = 4f05486ac73fc80c4c8a55d32fcdcd963f1661a0180a57899795a86957cb2150 +SIZE (chromium-43.0.2357.65-testdata.tar.xz) = 114556816 Modified: branches/2015Q2/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2015Q2/www/chromium/files/extra-patch-clang Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/extra-patch-clang Mon May 25 10:28:20 2015 (r387377) @@ -86,15 +86,6 @@ EXPECT_EQ(data->run_duration_sum(), 0); EXPECT_EQ(data->run_duration_sample(), 0); EXPECT_EQ(data->queue_duration_sum(), 0); -@@ -489,7 +489,7 @@ - Location location(kFunction, kFile, kLineNumber, NULL); - // Do not delete |birth|. We don't own it. - Births* birth = ThreadData::TallyABirthIfActive(location); -- EXPECT_NE(reinterpret_cast(NULL), birth); -+ EXPECT_NE(static_cast(NULL), birth); - - const unsigned int kTimePosted = 1; - const unsigned int kStartOfRun = 5; --- chrome/browser/sync/glue/synced_session_tracker.cc 2015-04-15 00:18:50.000000000 +0200 +++ chrome/browser/sync/glue/synced_session_tracker.cc 2015-04-18 22:02:15.000000000 +0200 @@ -260,7 +260,7 @@ @@ -224,7 +215,7 @@ --- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-15 00:32:17.000000000 +0200 +++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-18 22:13:27.000000000 +0200 -@@ -1754,7 +1754,7 @@ +@@ -961,7 +961,7 @@ const AudioEncoder* AudioCodingImpl::GetSenderInfo() const { FATAL() << "Not implemented yet."; @@ -233,7 +224,7 @@ } const CodecInst* AudioCodingImpl::GetSenderCodecInst() { -@@ -1773,7 +1773,7 @@ +@@ -980,7 +980,7 @@ const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const { FATAL() << "Not implemented yet."; Modified: branches/2015Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Mon May 25 10:28:20 2015 (r387377) @@ -1,8 +1,8 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2014-10-10 08:54:09 UTC -+++ base/posix/unix_domain_socket_linux.cc -@@ -18,6 +18,15 @@ - #include "base/posix/eintr_wrapper.h" - #include "base/stl_util.h" +--- base/posix/unix_domain_socket_linux.cc.orig 2015-05-13 18:23:01.000000000 -0400 ++++ base/posix/unix_domain_socket_linux.cc 2015-05-20 09:09:12.131544000 -0400 +@@ -21,6 +21,15 @@ + #include + #endif +#if defined(__FreeBSD__) +// Port over Linux ucred structure @@ -15,8 +15,8 @@ + const size_t UnixDomainSocket::kMaxFileDescriptors = 16; - // Creates a connected pair of UNIX-domain SOCK_SEQPACKET sockets, and passes -@@ -35,7 +44,13 @@ + #if !defined(OS_NACL_NONSFI) +@@ -39,7 +48,13 @@ // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { const int enable = 1; @@ -28,17 +28,17 @@ return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; +#endif } + #endif // !defined(OS_NACL_NONSFI) - // static -@@ -131,7 +146,11 @@ - wire_fds_len = payload_len / sizeof(int); - } +@@ -145,7 +160,11 @@ + // The PNaCl toolchain for Non-SFI binary build does not support + // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && +#if defined(__FreeBSD__) + 1) { // XXX(rene) carpet getting full ... +#else cmsg->cmsg_type == SCM_CREDENTIALS) { +#endif - DCHECK(payload_len == sizeof(struct ucred)); - DCHECK(pid == -1); + DCHECK_EQ(payload_len, sizeof(struct ucred)); + DCHECK_EQ(pid, -1); pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; Modified: branches/2015Q2/www/chromium/files/patch-base__process__launch.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-base__process__launch.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-base__process__launch.cc Mon May 25 10:28:20 2015 (r387377) @@ -1,6 +1,6 @@ ---- base/process/launch.cc.orig 2015-04-18 22:25:46.000000000 +0200 -+++ base/process/launch.cc 2015-04-18 22:26:32.000000000 +0200 -@@ -24,10 +24,10 @@ +--- base/process/launch.cc.orig 2015-05-13 18:23:01.000000000 -0400 ++++ base/process/launch.cc 2015-05-20 09:12:01.335764000 -0400 +@@ -24,11 +24,11 @@ fds_to_remap(NULL), maximize_rlimits(NULL), new_process_group(false) @@ -8,6 +8,7 @@ +#if defined(OS_LINUX) || defined(OS_FREEBSD) , clone_flags(0) , allow_new_privs(false) + , kill_on_parent_death(false) -#endif // OS_LINUX +#endif // OS_LINUX || OS_FREEBSD #if defined(OS_POSIX) Modified: branches/2015Q2/www/chromium/files/patch-base__process__launch.h ============================================================================== --- branches/2015Q2/www/chromium/files/patch-base__process__launch.h Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-base__process__launch.h Mon May 25 10:28:20 2015 (r387377) @@ -1,5 +1,5 @@ ---- base/process/launch.h.orig 2015-04-18 22:29:06.000000000 +0200 -+++ base/process/launch.h 2015-04-18 22:30:09.000000000 +0200 +--- base/process/launch.h.orig 2015-05-13 18:23:01.000000000 -0400 ++++ base/process/launch.h 2015-05-20 09:13:38.326203000 -0400 @@ -131,7 +131,7 @@ // will be the same as its pid. bool new_process_group; @@ -9,10 +9,10 @@ // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will -@@ -141,7 +141,7 @@ - // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If - // true, then this bit will not be set in the new child process. - bool allow_new_privs; +@@ -144,7 +144,7 @@ + + // Sets parent process death signal to SIGKILL. + bool kill_on_parent_death; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_FREEBSD) Copied: branches/2015Q2/www/chromium/files/patch-base__process__memory.cc (from r387371, head/www/chromium/files/patch-base__process__memory.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-base__process__memory.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-base__process__memory.cc) @@ -0,0 +1,39 @@ +--- base/process/memory.cc.orig 2015-05-21 15:20:26.547966000 -0400 ++++ base/process/memory.cc 2015-05-21 15:24:31.421919000 -0400 +@@ -45,4 +45,36 @@ + + #endif + ++#if defined(OS_FREEBSD) ++ ++#if defined(USE_TCMALLOC) ++// Used by UncheckedMalloc. If tcmalloc is linked to the executable ++// this will be replaced by a strong symbol that actually implement ++// the semantics and don't call new handler in case the allocation fails. ++extern "C" { ++ ++__attribute__((weak, visibility("default"))) ++void* tc_malloc_skip_new_handler_weak(size_t size); ++ ++void* tc_malloc_skip_new_handler_weak(size_t size) { ++ return malloc(size); ++} ++ ++} ++#endif ++ ++bool UncheckedMalloc(size_t size, void** result) { ++#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || \ ++ (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)) ++ *result = malloc(size); ++#elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC) ++ *result = __libc_malloc(size); ++#elif defined(USE_TCMALLOC) ++ *result = tc_malloc_skip_new_handler_weak(size); ++#endif ++ return *result != NULL; ++} ++ ++#endif // defined(OS_FREEBSD) ++ + } // namespace base Copied: branches/2015Q2/www/chromium/files/patch-base__process__process_posix.cc (from r387371, head/www/chromium/files/patch-base__process__process_posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-base__process__process_posix.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-base__process__process_posix.cc) @@ -0,0 +1,13 @@ +--- base/process/process_posix.cc.orig 2015-05-20 21:26:57.068650000 -0400 ++++ base/process/process_posix.cc 2015-05-20 21:25:28.077153000 -0400 +@@ -17,6 +17,10 @@ + #include + #endif + ++#if defined(OS_BSD) ++#include ++#endif ++ + namespace { + + #if !defined(OS_NACL_NONSFI) Modified: branches/2015Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc Mon May 25 10:28:20 2015 (r387377) @@ -1,16 +1,16 @@ ---- base/threading/platform_thread_linux.cc.orig 2014-10-10 08:54:09 UTC -+++ base/threading/platform_thread_linux.cc -@@ -16,7 +16,9 @@ - #include "base/tracked_objects.h" +--- base/threading/platform_thread_linux.cc.orig 2015-05-13 18:35:44.000000000 -0400 ++++ base/threading/platform_thread_linux.cc 2015-05-20 09:16:20.394597000 -0400 +@@ -15,7 +15,9 @@ #if !defined(OS_NACL) + #include +#if !defined(OS_BSD) #include +#endif - #include - #include - #include -@@ -50,7 +52,7 @@ + #include + #include + #endif +@@ -74,7 +76,7 @@ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); Copied: branches/2015Q2/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc (from r387371, head/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc) @@ -0,0 +1,13 @@ +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2015-05-21 08:37:56.037399000 -0400 ++++ cc/layers/scrollbar_layer_impl_base.cc 2015-05-21 08:38:18.153818000 -0400 +@@ -226,8 +226,8 @@ + int thumb_offset = TrackStart(); + if (maximum_ > 0) { + float ratio = clamped_current_pos / maximum_; +- float max_offset = track_length - thumb_length; +- thumb_offset += static_cast(ratio * max_offset); ++ float max_offset_ = track_length - thumb_length; ++ thumb_offset += static_cast(ratio * max_offset_); + } + + float thumb_thickness_adjustment = Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__defaults.cc (from r387371, head/www/chromium/files/patch-chrome__browser__defaults.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__defaults.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__defaults.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/defaults.cc.orig 2015-04-14 18:31:21.000000000 -0400 ++++ chrome/browser/defaults.cc 2015-04-28 10:13:50.737855000 -0400 +@@ -41,7 +41,7 @@ + const bool kShowOtherBrowsersInAboutMemory = true; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + const bool kScrollEventChangesTab = true; + #else + const bool kScrollEventChangesTab = false; Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_commands.h (from r387371, head/www/chromium/files/patch-chrome__browser__download__download_commands.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_commands.h Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__download__download_commands.h) @@ -0,0 +1,12 @@ +--- chrome/browser/download/download_commands.h.orig 2015-05-21 11:39:00.521239000 -0400 ++++ chrome/browser/download/download_commands.h 2015-05-21 11:39:40.015902000 -0400 +@@ -41,7 +41,8 @@ + void ExecuteCommand(Command command); + + #if defined(OS_WIN) || defined(OS_LINUX) || \ +- (defined(OS_MACOSX) && !defined(OS_IOS)) ++ defined(OS_BSD) || (defined(OS_MACOSX) && \ ++ !defined(OS_IOS)) + bool IsDownloadPdf() const; + bool CanOpenPdfInSystemViewer() const; + #endif Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc Mon May 25 10:28:20 2015 (r387377) @@ -1,37 +1,11 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2015-04-18 23:29:54.000000000 +0200 -+++ chrome/browser/download/download_shelf_context_menu.cc 2015-04-18 23:31:51.000000000 +0200 -@@ -122,7 +122,7 @@ - return download_item_->GetOpenWhenComplete() || - download_crx_util::IsExtensionDownload(*download_item_); - case ALWAYS_OPEN_TYPE: --#if defined(OS_WIN) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - (defined(OS_MACOSX) && !defined(OS_IOS)) - if (CanOpenPdfInSystemViewer()) { - DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( -@@ -162,7 +162,7 @@ - bool is_checked = IsCommandIdChecked(ALWAYS_OPEN_TYPE); - DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( - download_item_->GetBrowserContext()); --#if defined(OS_WIN) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - (defined(OS_MACOSX) && !defined(OS_IOS)) - if (CanOpenPdfInSystemViewer()) { - prefs->SetShouldOpenPdfInSystemReader(!is_checked); -@@ -392,14 +392,14 @@ - return IsAdobeReaderDefaultPDFViewer() - ? IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER - : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2015-05-13 18:23:03.000000000 -0400 ++++ chrome/browser/download/download_shelf_context_menu.cc 2015-05-20 09:21:47.075399000 -0400 +@@ -143,7 +143,7 @@ + : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; + break; + } -#elif defined(OS_MACOSX) || defined(OS_LINUX) +#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - if (CanOpenPdfInSystemViewer()) - return IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; - #endif - return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE; - } - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - bool DownloadShelfContextMenu::IsDownloadPdf() const { - base::FilePath path = download_item_->GetTargetFilePath(); - return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); + if (can_open_pdf_in_system_viewer) { + id = IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; + break; Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Mon May 25 10:28:20 2015 (r387377) @@ -1,14 +1,15 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-10-10 08:54:10 UTC -+++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc -@@ -33,9 +33,11 @@ +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2015-05-13 18:23:03.000000000 -0400 ++++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2015-05-20 09:48:32.273240000 -0400 +@@ -37,10 +37,12 @@ // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed // to be created before use of it expects it to be there. +#if !defined(OS_FREEBSD) - CreateMTPDeviceAsyncDelegate(device_location, + CreateMTPDeviceAsyncDelegate( + device_location, read_only, base::Bind(&MTPDeviceMapService::AddAsyncDelegate, - base::Unretained(this), device_location)); + base::Unretained(this), device_location, read_only)); +#endif - mtp_device_usage_map_[device_location] = 0; + mtp_device_usage_map_[key] = 0; } Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc (from r387371, head/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc) @@ -0,0 +1,16 @@ +--- chrome/browser/metrics/drive_metrics_provider_linux.cc.orig 2015-05-21 11:20:27.603865000 -0400 ++++ chrome/browser/metrics/drive_metrics_provider_linux.cc 2015-05-21 11:22:16.773943000 -0400 +@@ -4,7 +4,13 @@ + + #include "chrome/browser/metrics/drive_metrics_provider.h" + ++#if defined(OS_BSD) ++#include ++#define MAJOR(dev) major(dev) ++#define MINOR(dev) minor(dev) ++#else + #include // For MAJOR()/MINOR(). ++#endif + #include + #include + Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc (from r387371, head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/net/cookie_store_util.cc.orig 2015-04-14 18:31:21.000000000 -0400 ++++ chrome/browser/net/cookie_store_util.cc 2015-04-28 10:11:34.004175000 -0400 +@@ -120,7 +120,7 @@ + new ChromeCookieMonsterDelegate(profile)); + } + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + namespace { + + // Use the operating system's mechanisms to encrypt cookies before writing Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc Mon May 25 10:28:20 2015 (r387377) @@ -1,5 +1,5 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2015-01-26 10:24:50 UTC -+++ chrome/browser/renderer_preferences_util.cc +--- chrome/browser/renderer_preferences_util.cc.orig 2015-05-13 18:35:45.000000000 -0400 ++++ chrome/browser/renderer_preferences_util.cc 2015-05-20 09:51:41.644579000 -0400 @@ -13,7 +13,7 @@ #include "content/public/common/renderer_preferences.h" #include "third_party/skia/include/core/SkColor.h" @@ -18,7 +18,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -71,7 +71,7 @@ +@@ -84,7 +84,7 @@ prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0; #endif @@ -27,12 +27,12 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -93,7 +93,7 @@ +@@ -106,7 +106,7 @@ } #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD) CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(true), NULL))); prefs->should_antialias_text = params.antialiasing; Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc (from r387371, head/www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/sync/profile_sync_components_factory_impl.cc.orig 2015-04-14 18:31:21.000000000 -0400 ++++ chrome/browser/sync/profile_sync_components_factory_impl.cc 2015-04-28 10:10:08.900489000 -0400 +@@ -396,7 +396,7 @@ + } + #endif + +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Dictionary sync is enabled by default. + if (!disabled_types.Has(syncer::DICTIONARY)) { + pss->RegisterDataTypeController( Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc Mon May 25 10:28:20 2015 (r387377) @@ -1,6 +1,15 @@ ---- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc.orig 2015-01-26 10:30:44 -+++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc -@@ -128,7 +128,7 @@ +--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc.orig 2015-05-13 18:23:04.000000000 -0400 ++++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc 2015-05-21 11:12:51.226717000 -0400 +@@ -19,7 +19,7 @@ + #include "ui/gfx/screen.h" + #include "ui/views/widget/native_widget_aura.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + #include "base/prefs/pref_service.h" + #include "chrome/browser/profiles/profile.h" + #include "chrome/common/pref_names.h" +@@ -137,7 +137,7 @@ } void ChromeBrowserMainExtraPartsAura::PreProfileInit() { @@ -9,7 +18,7 @@ // Now that we have some minimal ui initialized, check to see if we're // running as root and bail if we are. DetectRunningAsRoot(); -@@ -142,7 +142,7 @@ +@@ -151,7 +151,7 @@ // after the metrics service is deleted. } @@ -17,4 +26,4 @@ +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) void ChromeBrowserMainExtraPartsAura::DetectRunningAsRoot() { if (getuid() == 0) { - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__browser.cc (from r387371, head/www/chromium/files/patch-chrome__browser__ui__browser.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__browser.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__ui__browser.cc) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/browser.cc.orig 2015-04-14 18:31:21.000000000 -0400 ++++ chrome/browser/ui/browser.cc 2015-04-28 10:02:57.120071000 -0400 +@@ -1284,7 +1284,7 @@ + window_has_shown_ = true; + + // CurrentProcessInfo::CreationTime() is missing on some platforms. +-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + // Measure the latency from startup till the first browser window becomes + // visible. + static bool is_first_browser_window = true; +@@ -1300,7 +1300,7 @@ + base::Time::Now() - process_creation_time); + } + } +-#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + + // Nothing to do for non-tabbed windows. + if (!is_type_tabbed()) Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc (from r387371, head/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2015-04-14 18:31:21.000000000 -0400 ++++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc 2015-04-28 10:00:47.585758000 -0400 +@@ -18,7 +18,7 @@ + + // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding + // here. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const int ExclusiveAccessBubble::kPaddingPx = 8; + #else + const int ExclusiveAccessBubble::kPaddingPx = 15; Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc (from r387371, head/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig 2015-04-14 18:31:21.000000000 -0400 ++++ chrome/browser/ui/toolbar/wrench_menu_model.cc 2015-04-28 09:58:56.258305000 -0400 +@@ -762,7 +762,7 @@ + #endif + case IDC_UPGRADE_DIALOG: + return UpgradeDetector::GetInstance()->notify_upgrade(); +-#if !defined(OS_LINUX) || defined(USE_AURA) ++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA) + case IDC_BOOKMARK_PAGE: + return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile()); + case IDC_BOOKMARK_ALL_TABS: Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc (from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2015-05-20 09:55:54.547216000 -0400 ++++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc 2015-05-20 09:56:51.726483000 -0400 +@@ -34,7 +34,7 @@ + #include "ash/shell_window_ids.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/shell_integration_linux.h" + #endif + +@@ -122,7 +122,7 @@ + const AppWindow::CreateParams& create_params, + views::Widget::InitParams* init_params, + views::Widget* widget) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + std::string app_name = web_app::GenerateApplicationNameFromExtensionId( + app_window()->extension_id()); + // Set up a custom WM_CLASS for app windows. This allows task switchers in Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc (from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2015-04-14 18:18:50.000000000 -0400 ++++ chrome/browser/ui/views/frame/system_menu_model_builder.cc 2015-04-28 09:50:22.925763000 -0400 +@@ -65,7 +65,7 @@ + model->AddSeparator(ui::NORMAL_SEPARATOR); + model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); + } +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + model->AddSeparator(ui::NORMAL_SEPARATOR); + model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, + IDS_SHOW_WINDOW_DECORATIONS_MENU); +@@ -103,7 +103,7 @@ + model->AddSeparator(ui::NORMAL_SEPARATOR); + model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); + } +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + model->AddSeparator(ui::NORMAL_SEPARATOR); + model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE); + #endif Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc (from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig 2015-04-28 09:47:57.763176000 -0400 ++++ chrome/browser/ui/views/message_center/message_center_frame_view.cc 2015-04-28 09:48:19.225959000 -0400 +@@ -13,7 +13,7 @@ + namespace message_center { + + MessageCenterFrameView::MessageCenterFrameView() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + const int kBorderWidth = 1; + SetBorder(views::Border::CreateSolidBorder( + kBorderWidth, message_center::kMessageCenterBorderColor)); Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc (from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/message_center/message_center_widget_delegate.cc.orig 2015-04-14 18:18:50.000000000 -0400 ++++ chrome/browser/ui/views/message_center/message_center_widget_delegate.cc 2015-04-28 09:46:29.443573000 -0400 +@@ -97,7 +97,7 @@ + // immediately after the mouse exists from the bubble, which is a really bad + // experience. Disable hiding until the bug around the focus is fixed. + // TODO(erg, pkotwicz): fix the activation issue and then remove this ifdef. +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) || !defined(OS_BSD) + if (!active) { + tray_->SendHideMessageCenter(); + } Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc (from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/message_center/web_notification_tray.cc.orig 2015-04-28 09:44:00.558139000 -0400 ++++ chrome/browser/ui/views/message_center/web_notification_tray.cc 2015-04-28 09:44:33.539806000 -0400 +@@ -31,7 +31,7 @@ + #include "ui/strings/grit/ui_strings.h" + #include "ui/views/widget/widget.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/environment.h" + #include "base/nix/xdg_util.h" + #endif +@@ -66,7 +66,7 @@ + } + + bool CanDestroyStatusIcon() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Avoid creating multiple system tray icons on KDE4 and newer versions of KDE + // because the OS does not support removing system tray icons. + // TODO(pkotwicz): This is a hack for the sake of M40. Fix this properly. Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc (from r387371, head/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/panels/panel_frame_view.cc.orig 2015-04-28 09:42:09.840501000 -0400 ++++ chrome/browser/ui/views/panels/panel_frame_view.cc 2015-04-28 09:42:33.023800000 -0400 +@@ -581,7 +581,7 @@ + } + + bool PanelFrameView::OnMouseDragged(const ui::MouseEvent& event) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Converting the mouse location to screen coordinates returns an incorrect + // location while the panel is moving. See crbug.com/353393 for more details. + // TODO(pkotwicz): Fix conversion to screen coordinates Modified: branches/2015Q2/www/chromium/files/patch-chrome__chrome_browser_ui.gypi ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Mon May 25 10:28:20 2015 (r387377) @@ -1,6 +1,6 @@ --- chrome/chrome_browser_ui.gypi.orig 2014-10-10 09:15:30 UTC +++ chrome/chrome_browser_ui.gypi -@@ -2743,7 +2743,7 @@ +@@ -2875,7 +2875,7 @@ }], ], }], @@ -9,7 +9,7 @@ 'dependencies': [ # gtk2 is the only component that can interact with gtk2 in our new # world. -@@ -2751,7 +2751,7 @@ +@@ -2883,7 +2883,7 @@ '../build/linux/system.gyp:gio', ], }], @@ -18,8 +18,8 @@ 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ], }], ['use_aura==1', { -@@ -2788,7 +2788,7 @@ - ['enable_printing==1', { +@@ -2918,7 +2918,7 @@ + ['enable_print_preview==1', { 'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ], }], - ['OS=="linux" or OS=="android"', { @@ -27,8 +27,12 @@ 'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ], }], ['OS=="android"', { -@@ -2907,7 +2907,7 @@ - ['desktop_linux==1', { +@@ -3030,10 +3030,10 @@ + }], + ], + }], +- ['desktop_linux==1', { ++ ['desktop_linux==1 or os_bsd==1', { 'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ], }], - ['OS=="linux"', { # Both desktop Linux and ChromeOS. Copied: branches/2015Q2/www/chromium/files/patch-chrome__common__extensions__command.cc (from r387371, head/www/chromium/files/patch-chrome__common__extensions__command.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__common__extensions__command.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-chrome__common__extensions__command.cc) @@ -0,0 +1,11 @@ +--- chrome/common/extensions/command.cc.orig 2015-04-14 18:18:50.000000000 -0400 ++++ chrome/common/extensions/command.cc 2015-04-28 09:31:06.624015000 -0400 +@@ -301,7 +301,7 @@ + return values::kKeybindingPlatformMac; + #elif defined(OS_CHROMEOS) + return values::kKeybindingPlatformChromeOs; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return values::kKeybindingPlatformLinux; + #else + return ""; Modified: branches/2015Q2/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc Mon May 25 10:28:20 2015 (r387377) @@ -5,16 +5,16 @@ } } -#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) ++#elif defined(OS_LINUX) || defined(OS_BSD) void GetApplicationDirs(std::vector* locations) { locations->push_back(base::FilePath("/opt/google/chrome")); locations->push_back(base::FilePath("/usr/local/bin")); -@@ -91,7 +91,7 @@ +@@ -92,7 +92,7 @@ + #elif defined(OS_MACOSX) base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"), base::FilePath("Chromium.app/Contents/MacOS/Chromium") - }; -#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_FREEBSD) - base::FilePath browser_exes_array[] = { ++#elif defined(OS_LINUX) || defined(OS_BSD) base::FilePath("google-chrome"), base::FilePath("chrome"), + base::FilePath("chromium"), Modified: branches/2015Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Mon May 25 10:28:20 2015 (r387377) @@ -63,7 +63,7 @@ + int exit_code = -1; + if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000), + &exit_code)) { -+ base::KillProcess(process.Handle(), -1, false); ++ process.Terminate(-1, false); + base::EnsureProcessTerminated(process.Pass()); + return StorageMonitor::EJECT_FAILURE; + } Modified: branches/2015Q2/www/chromium/files/patch-content__browser__child_process_launcher.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-content__browser__child_process_launcher.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-content__browser__child_process_launcher.cc Mon May 25 10:28:20 2015 (r387377) @@ -1,60 +1,6 @@ ---- content/browser/child_process_launcher.cc.orig 2015-04-19 00:30:35.000000000 +0200 -+++ content/browser/child_process_launcher.cc 2015-04-19 00:43:33.000000000 +0200 -@@ -120,7 +120,7 @@ - // Notifies the client about the result of the operation. - // Runs on the UI thread. - void Notify( --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - bool zygote, - #endif - base::Process process); -@@ -131,7 +131,7 @@ - bool background); - - static void TerminateInternal( --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - bool zygote, - #endif - base::Process process); -@@ -144,7 +144,7 @@ - #if defined(OS_ANDROID) - // The fd to close after creating the process. - base::ScopedFD ipcfd_; --#elif defined(OS_POSIX) && !defined(OS_MACOSX) -+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - bool zygote_; - #endif - bool starting_; -@@ -158,7 +158,7 @@ - client_thread_id_(BrowserThread::UI), - termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), - exit_code_(RESULT_CODE_NORMAL_EXIT), --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - zygote_(false), - #endif - starting_(true), -@@ -238,7 +238,7 @@ - } - - void ChildProcessLauncher::Context::UpdateTerminationStatus(bool known_dead) { --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - if (zygote_) { - termination_status_ = ZygoteHostImpl::GetInstance()-> - GetTerminationStatus(process_.Handle(), known_dead, &exit_code_); -@@ -312,7 +312,7 @@ - bool launch_elevated = delegate->ShouldLaunchElevated(); - #elif defined(OS_ANDROID) - // Uses |ipcfd_| instead of |ipcfd| on Android. --#elif defined(OS_MACOSX) -+#elif defined(OS_MACOSX) || defined(OS_BSD) - base::EnvironmentMap env = delegate->GetEnvironment(); - base::ScopedFD ipcfd = delegate->TakeIpcFd(); - #elif defined(OS_POSIX) -@@ -366,7 +366,7 @@ +--- content/browser/child_process_launcher.cc.orig 2015-05-13 18:23:06.000000000 -0400 ++++ content/browser/child_process_launcher.cc 2015-05-20 11:55:38.781168000 -0400 +@@ -157,7 +157,7 @@ // We need to close the client end of the IPC channel to reliably detect // child termination. @@ -63,7 +9,7 @@ GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess( *cmd_line, child_process_id, files_to_register.get()); if (use_zygote) { -@@ -375,14 +375,14 @@ +@@ -166,14 +166,14 @@ process = base::Process(handle); } else // Fall through to the normal posix case below when we're not zygoting. @@ -80,7 +26,7 @@ if (process_type == switches::kRendererProcess) { const int sandbox_fd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -390,7 +390,7 @@ +@@ -181,7 +181,7 @@ sandbox_fd, GetSandboxFD())); } @@ -89,53 +35,8 @@ // Actually launch the app. base::LaunchOptions options; -@@ -446,7 +446,7 @@ - client_thread_id, FROM_HERE, - base::Bind(&Context::Notify, - this_object.get(), --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - use_zygote, - #endif - base::Passed(&process))); -@@ -454,7 +454,7 @@ - } - - void ChildProcessLauncher::Context::Notify( --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - bool zygote, - #endif - base::Process process) { -@@ -467,7 +467,7 @@ - if (!process_.IsValid()) - LOG(ERROR) << "Failed to launch child process"; - --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - zygote_ = zygote; - #endif - if (client_) { -@@ -493,7 +493,7 @@ - BrowserThread::PostTask( - BrowserThread::PROCESS_LAUNCHER, FROM_HERE, - base::Bind(&Context::TerminateInternal, --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - zygote_, - #endif - base::Passed(&process_))); -@@ -511,7 +511,7 @@ - - // static - void ChildProcessLauncher::Context::TerminateInternal( --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - bool zygote, - #endif - base::Process process) { -@@ -525,13 +525,13 @@ - process.Terminate(RESULT_CODE_NORMAL_EXIT); +@@ -254,13 +254,13 @@ + process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) -#if !defined(OS_MACOSX) @@ -150,3 +51,30 @@ base::EnsureProcessTerminated(process.Pass()); #endif // OS_POSIX #endif // defined(OS_ANDROID) +@@ -351,7 +351,7 @@ + + void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) { + DCHECK(CalledOnValidThread()); +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + if (zygote_) { + termination_status_ = ZygoteHostImpl::GetInstance()-> + GetTerminationStatus(process_.Handle(), known_dead, &exit_code_); +@@ -359,7 +359,7 @@ + termination_status_ = + base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_); + } else { +-#elif defined(OS_MACOSX) ++#elif defined(OS_MACOSX) || defined(OS_BSD) + if (known_dead) { + termination_status_ = + base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_); +@@ -433,7 +433,7 @@ + starting_ = false; + process_ = process.Pass(); + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + zygote_ = zygote; + #endif + if (process_.IsValid()) { Modified: branches/2015Q2/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc Mon May 25 10:28:20 2015 (r387377) @@ -1,5 +1,5 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2014-10-10 08:54:14 UTC -+++ content/browser/gpu/gpu_data_manager_impl_private.cc +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2015-05-13 18:35:46.000000000 -0400 ++++ content/browser/gpu/gpu_data_manager_impl_private.cc 2015-05-20 11:59:04.537631000 -0400 @@ -471,7 +471,9 @@ gpu_info.gl_renderer = gl_renderer; gpu_info.gl_version = gl_version; @@ -10,7 +10,7 @@ UpdateGpuInfo(gpu_info); UpdateGpuSwitchingManager(gpu_info); -@@ -514,10 +516,12 @@ +@@ -513,10 +515,12 @@ // Also declare the driver_vendor to be osmesa to be able to specify // exceptions based on driver_vendor==osmesa for some blacklist rules. gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName; @@ -23,13 +23,13 @@ } #if defined(ARCH_CPU_X86_FAMILY) if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id) { -@@ -569,7 +573,9 @@ - if (use_swiftshader_ || ShouldUseWarp()) +@@ -575,7 +579,9 @@ return; + bool was_info_available = IsCompleteGpuInfoAvailable(); +#ifndef __FreeBSD__ gpu::MergeGPUInfo(&gpu_info_, gpu_info); +#endif - if (IsCompleteGpuInfoAvailable()) + if (IsCompleteGpuInfoAvailable()) { complete_gpu_info_already_requested_ = true; - + } else if (was_info_available) { Copied: branches/2015Q2/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc (from r387371, head/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc) @@ -0,0 +1,13 @@ +--- content/renderer/devtools/v8_sampling_profiler.cc.orig 2015-05-21 09:58:46.394686000 -0400 ++++ content/renderer/devtools/v8_sampling_profiler.cc 2015-05-21 10:11:21.858314000 -0400 +@@ -534,6 +534,10 @@ + state.pc = reinterpret_cast(mcontext->__ss.REG_64_32(__rip, __eip)); + state.sp = reinterpret_cast(mcontext->__ss.REG_64_32(__rsp, __esp)); + state.fp = reinterpret_cast(mcontext->__ss.REG_64_32(__rbp, __ebp)); ++#elif defined(OS_FREEBSD) ++ state.pc = reinterpret_cast(mcontext.REG_64_32(mc_rip, mc_eip)); ++ state.sp = reinterpret_cast(mcontext.REG_64_32(mc_rsp, mc_esp)); ++ state.fp = reinterpret_cast(mcontext.REG_64_32(mc_rbp, mc_ebp)); + #else + state.pc = + reinterpret_cast(mcontext.gregs[REG_64_32(REG_RIP, REG_EIP)]); Copied: branches/2015Q2/www/chromium/files/patch-content__renderer__render_thread_impl.cc (from r387371, head/www/chromium/files/patch-content__renderer__render_thread_impl.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-content__renderer__render_thread_impl.cc Mon May 25 10:28:20 2015 (r387377, copy of r387371, head/www/chromium/files/patch-content__renderer__render_thread_impl.cc) @@ -0,0 +1,11 @@ +--- content/renderer/render_thread_impl.cc.orig 2015-05-13 18:35:46.000000000 -0400 ++++ content/renderer/render_thread_impl.cc 2015-05-20 15:46:14.175833000 -0400 +@@ -673,7 +673,7 @@ + static_cast(compositor_raster_threads_.size() + 1)) + .c_str())); + raster_thread->Start(); +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + if (!command_line.HasSwitch( + switches::kUseNormalPriorityForTileTaskWorkerThreads)) { + raster_thread->SetThreadPriority(base::ThreadPriority::BACKGROUND); Modified: branches/2015Q2/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Mon May 25 10:27:12 2015 (r387376) +++ branches/2015Q2/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Mon May 25 10:28:20 2015 (r387377) @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2015-01-21 20:28:17 UTC *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Tue May 26 17:15:44 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A952DD39; Tue, 26 May 2015 17:15:44 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96916A11; Tue, 26 May 2015 17:15:44 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4QHFiVi066122; Tue, 26 May 2015 17:15:44 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4QHFhP5066118; Tue, 26 May 2015 17:15:43 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201505261715.t4QHFhP5066118@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 26 May 2015 17:15:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387493 - in branches/2015Q2/japanese/k10: . files X-SVN-Group: ports-branches 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.20 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, 26 May 2015 17:15:44 -0000 Author: riggs Date: Tue May 26 17:15:43 2015 New Revision: 387493 URL: https://svnweb.freebsd.org/changeset/ports/387493 Log: MFH: r387258 - Fix runtime behaviour: fonts.alias was not updated properly - Add pkg-message.in; fontpath setting instructions - Bump PORTREVISION - New maintainer: WATANABE Kazuhiro (CQG00620@nifty.ne.jp) PR: 199537 Submitted by: CQG00620@nifty.ne.jp (maintainer) Approved by: ports-secteam (delphij) Added: branches/2015Q2/japanese/k10/files/fonts.alias - copied unchanged from r387258, head/japanese/k10/files/fonts.alias branches/2015Q2/japanese/k10/files/pkg-message.in - copied unchanged from r387258, head/japanese/k10/files/pkg-message.in Deleted: branches/2015Q2/japanese/k10/pkg-deinstall branches/2015Q2/japanese/k10/pkg-install Modified: branches/2015Q2/japanese/k10/Makefile branches/2015Q2/japanese/k10/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/japanese/k10/Makefile ============================================================================== --- branches/2015Q2/japanese/k10/Makefile Tue May 26 16:55:40 2015 (r387492) +++ branches/2015Q2/japanese/k10/Makefile Tue May 26 17:15:43 2015 (r387493) @@ -3,12 +3,12 @@ PORTNAME= naga10 PORTVERSION= 1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= japanese x11-fonts MASTER_SITES= http://hp.vector.co.jp/authors/VA013391/fonts/ DISTNAME= knj10-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= CQG00620@nifty.ne.jp COMMENT= X11 10-dot Kanji font 'naga10 font' BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ @@ -17,6 +17,7 @@ BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fo USES= fonts MAKE_ENV= FONTSDIR=${FONTSDIR:S,${PREFIX},,} +SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS @@ -26,5 +27,6 @@ post-extract: post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR} .include Copied: branches/2015Q2/japanese/k10/files/fonts.alias (from r387258, head/japanese/k10/files/fonts.alias) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/japanese/k10/files/fonts.alias Tue May 26 17:15:43 2015 (r387493, copy of r387258, head/japanese/k10/files/fonts.alias) @@ -0,0 +1,12 @@ +k10 -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0 +k10i -misc-fixed-medium-i-normal--10-90-75-75-c-100-jisx0208.1983-0 +k10b -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0 +k10bi -misc-fixed-bold-i-normal--10-90-75-75-c-100-jisx0208.1983-0 +a10 -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1 +a10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-iso8859-1 +a10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1 +a10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-iso8859-1 +r10 -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0 +r10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-jisx0201.1976-0 +r10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-jisx0201.1976-0 +r10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-jisx0201.1976-0 Copied: branches/2015Q2/japanese/k10/files/pkg-message.in (from r387258, head/japanese/k10/files/pkg-message.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/japanese/k10/files/pkg-message.in Tue May 26 17:15:43 2015 (r387493, copy of r387258, head/japanese/k10/files/pkg-message.in) @@ -0,0 +1,15 @@ +******************************************************************* +You can start using the font(s) by following these instructions: + +Eiter type the following in an X terminal: + + xset fp+ %%FONTSDIR%% + xset fp rehash + +Or, more permanently, add the following line to the "Files" section +of your X.Org configuration file (typically /etc/X11/xorg.conf): + + FontPath "%%FONTSDIR%%/" + +then restart X. +******************************************************************* Modified: branches/2015Q2/japanese/k10/pkg-plist ============================================================================== --- branches/2015Q2/japanese/k10/pkg-plist Tue May 26 16:55:40 2015 (r387492) +++ branches/2015Q2/japanese/k10/pkg-plist Tue May 26 17:15:43 2015 (r387493) @@ -1,3 +1,4 @@ +%%FONTSDIR%%/fonts.alias %%FONTSDIR%%/5x10B.pcf.gz %%FONTSDIR%%/5x10a.pcf.gz %%FONTSDIR%%/5x10rk.pcf.gz From owner-svn-ports-branches@FreeBSD.ORG Wed May 27 01:08:18 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1587B228; Wed, 27 May 2015 01:08:18 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 034029D3; Wed, 27 May 2015 01:08:18 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4R18Hnn007240; Wed, 27 May 2015 01:08:17 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4R18Hxd007239; Wed, 27 May 2015 01:08:17 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201505270108.t4R18Hxd007239@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Wed, 27 May 2015 01:08:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387533 - branches/2015Q2/emulators/javatari X-SVN-Group: ports-branches 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.20 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, 27 May 2015 01:08:18 -0000 Author: danilo Date: Wed May 27 01:08:17 2015 New Revision: 387533 URL: https://svnweb.freebsd.org/changeset/ports/387533 Log: MFH: r387506 - Fix MASTER_SITES. The jar file was moved. Approved by: portmgr (erwin) Modified: branches/2015Q2/emulators/javatari/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/emulators/javatari/Makefile ============================================================================== --- branches/2015Q2/emulators/javatari/Makefile Wed May 27 00:53:53 2015 (r387532) +++ branches/2015Q2/emulators/javatari/Makefile Wed May 27 01:08:17 2015 (r387533) @@ -4,7 +4,7 @@ PORTNAME= javatari PORTVERSION= 4.1 CATEGORIES= emulators java -MASTER_SITES= http://javatari.org/files/ +MASTER_SITES= http://javatari.org/java/files/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//} EXTRACT_SUFX= .jar EXTRACT_ONLY= From owner-svn-ports-branches@FreeBSD.ORG Wed May 27 19:09:36 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C7AFB15; Wed, 27 May 2015 19:09:36 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AA83670; Wed, 27 May 2015 19:09:36 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4RJ9aCo070961; Wed, 27 May 2015 19:09:36 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4RJ9ZMF070959; Wed, 27 May 2015 19:09:35 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505271909.t4RJ9ZMF070959@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 27 May 2015 19:09:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387670 - branches/2015Q2/lang/php5 X-SVN-Group: ports-branches 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.20 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, 27 May 2015 19:09:36 -0000 Author: delphij Date: Wed May 27 19:09:35 2015 New Revision: 387670 URL: https://svnweb.freebsd.org/changeset/ports/387670 Log: MFH: r387331 (ale) Update to 5.4.41 release. Approved by: ports-secteam Modified: branches/2015Q2/lang/php5/Makefile branches/2015Q2/lang/php5/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/lang/php5/Makefile ============================================================================== --- branches/2015Q2/lang/php5/Makefile Wed May 27 18:57:52 2015 (r387669) +++ branches/2015Q2/lang/php5/Makefile Wed May 27 19:09:35 2015 (r387670) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php5 -PORTVERSION= 5.4.40 +PORTVERSION= 5.4.41 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q2/lang/php5/distinfo ============================================================================== --- branches/2015Q2/lang/php5/distinfo Wed May 27 18:57:52 2015 (r387669) +++ branches/2015Q2/lang/php5/distinfo Wed May 27 19:09:35 2015 (r387670) @@ -1,4 +1,4 @@ -SHA256 (php-5.4.40.tar.bz2) = 4898ffe8ac3ccb2d8cc94f7d76a9ea0414d954f5d4479895ddfccdc2e158a51a -SIZE (php-5.4.40.tar.bz2) = 12272787 +SHA256 (php-5.4.41.tar.bz2) = 5bc4b45a1280ff80a3cf5b8563716f325cfd0121d7fd25aa54d56ff38b3b8272 +SIZE (php-5.4.41.tar.bz2) = 12487089 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344 SIZE (php-5.4.x-mail-header.patch) = 3379 From owner-svn-ports-branches@FreeBSD.ORG Wed May 27 19:10:18 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5679C04; Wed, 27 May 2015 19:10:18 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D38886AC; Wed, 27 May 2015 19:10:18 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4RJAIJA071781; Wed, 27 May 2015 19:10:18 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4RJAIIi071779; Wed, 27 May 2015 19:10:18 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505271910.t4RJAIIi071779@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 27 May 2015 19:10:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387671 - branches/2015Q2/lang/php55 X-SVN-Group: ports-branches 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.20 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, 27 May 2015 19:10:19 -0000 Author: delphij Date: Wed May 27 19:10:17 2015 New Revision: 387671 URL: https://svnweb.freebsd.org/changeset/ports/387671 Log: MFH: r387332 (ale) Update to 5.5.25 release. Approved by: ports-secteam Modified: branches/2015Q2/lang/php55/Makefile branches/2015Q2/lang/php55/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/lang/php55/Makefile ============================================================================== --- branches/2015Q2/lang/php55/Makefile Wed May 27 19:09:35 2015 (r387670) +++ branches/2015Q2/lang/php55/Makefile Wed May 27 19:10:17 2015 (r387671) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.24 +PORTVERSION= 5.5.25 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q2/lang/php55/distinfo ============================================================================== --- branches/2015Q2/lang/php55/distinfo Wed May 27 19:09:35 2015 (r387670) +++ branches/2015Q2/lang/php55/distinfo Wed May 27 19:10:17 2015 (r387671) @@ -1,4 +1,4 @@ -SHA256 (php-5.5.24.tar.bz2) = 801b5cf2e0c01b07314d4ac3c8a7c28d524bdd8263ebdd0e33a99008251316a2 -SIZE (php-5.5.24.tar.bz2) = 13337043 +SHA256 (php-5.5.25.tar.bz2) = 68df37e725ddd05675c0df906041038127938ecc52113a54d10e1e4029262c63 +SIZE (php-5.5.25.tar.bz2) = 13422002 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 From owner-svn-ports-branches@FreeBSD.ORG Wed May 27 19:10:49 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BDA28DD5; Wed, 27 May 2015 19:10:49 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AC07C751; Wed, 27 May 2015 19:10:49 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4RJAneV072795; Wed, 27 May 2015 19:10:49 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4RJAnrh072793; Wed, 27 May 2015 19:10:49 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505271910.t4RJAnrh072793@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 27 May 2015 19:10:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387673 - branches/2015Q2/lang/php56 X-SVN-Group: ports-branches 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.20 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, 27 May 2015 19:10:49 -0000 Author: delphij Date: Wed May 27 19:10:48 2015 New Revision: 387673 URL: https://svnweb.freebsd.org/changeset/ports/387673 Log: MFH: r387334 (ale) Update to 5.6.9 release. Approved by: ports-secteam Modified: branches/2015Q2/lang/php56/Makefile branches/2015Q2/lang/php56/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/lang/php56/Makefile ============================================================================== --- branches/2015Q2/lang/php56/Makefile Wed May 27 19:10:19 2015 (r387672) +++ branches/2015Q2/lang/php56/Makefile Wed May 27 19:10:48 2015 (r387673) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.8 +PORTVERSION= 5.6.9 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q2/lang/php56/distinfo ============================================================================== --- branches/2015Q2/lang/php56/distinfo Wed May 27 19:10:19 2015 (r387672) +++ branches/2015Q2/lang/php56/distinfo Wed May 27 19:10:48 2015 (r387673) @@ -1,4 +1,4 @@ -SHA256 (php-5.6.8.tar.bz2) = 0af0045745d61eeb74a3ea744529a2481b27cb689da720e6c0250675043724e4 -SIZE (php-5.6.8.tar.bz2) = 13724681 +SHA256 (php-5.6.9.tar.bz2) = 19d3b87b7b8bba3be24cf6d757d16b723a98881c3af8d15469fd25501e9abcb9 +SIZE (php-5.6.9.tar.bz2) = 14037070 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 From owner-svn-ports-branches@FreeBSD.ORG Wed May 27 19:15:23 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BFF91F7D; Wed, 27 May 2015 19:15:23 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A23AE911; Wed, 27 May 2015 19:15:23 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4RJFNR6076062; Wed, 27 May 2015 19:15:23 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4RJFM7S076055; Wed, 27 May 2015 19:15:22 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505271915.t4RJFM7S076055@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 27 May 2015 19:15:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387674 - in branches/2015Q2/ftp/curl: . files X-SVN-Group: ports-branches 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.20 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, 27 May 2015 19:15:24 -0000 Author: delphij Date: Wed May 27 19:15:22 2015 New Revision: 387674 URL: https://svnweb.freebsd.org/changeset/ports/387674 Log: MFC r384502,384716,385098 (sunpoet): Update to 7.42.1. Approved by: ports-secteam Modified: branches/2015Q2/ftp/curl/Makefile branches/2015Q2/ftp/curl/distinfo branches/2015Q2/ftp/curl/files/patch-lib-url.c branches/2015Q2/ftp/curl/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/ftp/curl/Makefile ============================================================================== --- branches/2015Q2/ftp/curl/Makefile Wed May 27 19:10:48 2015 (r387673) +++ branches/2015Q2/ftp/curl/Makefile Wed May 27 19:15:22 2015 (r387674) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.41.0 +PORTVERSION= 7.42.1 CATEGORIES= ftp www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet Modified: branches/2015Q2/ftp/curl/distinfo ============================================================================== --- branches/2015Q2/ftp/curl/distinfo Wed May 27 19:10:48 2015 (r387673) +++ branches/2015Q2/ftp/curl/distinfo Wed May 27 19:15:22 2015 (r387674) @@ -1,2 +1,2 @@ -SHA256 (curl-7.41.0.tar.lzma) = c2c40bcc1eb3e598387a1d1243b01117cd0f253e79247bd4f0f17fd760dec722 -SIZE (curl-7.41.0.tar.lzma) = 2722527 +SHA256 (curl-7.42.1.tar.lzma) = 3d6c196ab5083ab2ea3691819602e7b9698404ce8480d4008e3ba64822cc2c47 +SIZE (curl-7.42.1.tar.lzma) = 2732330 Modified: branches/2015Q2/ftp/curl/files/patch-lib-url.c ============================================================================== --- branches/2015Q2/ftp/curl/files/patch-lib-url.c Wed May 27 19:10:48 2015 (r387673) +++ branches/2015Q2/ftp/curl/files/patch-lib-url.c Wed May 27 19:15:22 2015 (r387674) @@ -3,9 +3,9 @@ Forwarded: not-needed Author: Peter Pentchev Last-Update: 2010-12-18 ---- lib/url.c.orig 2012-01-23 23:31:30.000000000 +0800 -+++ lib/url.c 2012-02-26 17:52:21.937920303 +0800 -@@ -797,6 +797,10 @@ +--- lib/url.c.orig 2015-04-22 05:55:54 UTC ++++ lib/url.c +@@ -658,6 +658,10 @@ CURLcode Curl_open(struct SessionHandle data->progress.flags |= PGRS_HIDE; data->state.current_speed = -1; /* init to negative == impossible */ Modified: branches/2015Q2/ftp/curl/pkg-plist ============================================================================== --- branches/2015Q2/ftp/curl/pkg-plist Wed May 27 19:10:48 2015 (r387673) +++ branches/2015Q2/ftp/curl/pkg-plist Wed May 27 19:15:22 2015 (r387674) @@ -141,6 +141,8 @@ man/man3/CURLOPT_NOSIGNAL.3.gz man/man3/CURLOPT_OPENSOCKETDATA.3.gz man/man3/CURLOPT_OPENSOCKETFUNCTION.3.gz man/man3/CURLOPT_PASSWORD.3.gz +man/man3/CURLOPT_PATH_AS_IS.3.gz +man/man3/CURLOPT_PINNEDPUBLICKEY.3.gz man/man3/CURLOPT_PORT.3.gz man/man3/CURLOPT_POST.3.gz man/man3/CURLOPT_POSTFIELDS.3.gz @@ -206,6 +208,7 @@ man/man3/CURLOPT_SSL_CTX_DATA.3.gz man/man3/CURLOPT_SSL_CTX_FUNCTION.3.gz man/man3/CURLOPT_SSL_ENABLE_ALPN.3.gz man/man3/CURLOPT_SSL_ENABLE_NPN.3.gz +man/man3/CURLOPT_SSL_FALSESTART.3.gz man/man3/CURLOPT_SSL_OPTIONS.3.gz man/man3/CURLOPT_SSL_SESSIONID_CACHE.3.gz man/man3/CURLOPT_SSL_VERIFYHOST.3.gz From owner-svn-ports-branches@FreeBSD.ORG Wed May 27 22:09:16 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D023E3B; Wed, 27 May 2015 22:09:16 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 205AE878; Wed, 27 May 2015 22:09:16 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4RM9GTf065503; Wed, 27 May 2015 22:09:16 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4RM9FvF065502; Wed, 27 May 2015 22:09:15 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505272209.t4RM9FvF065502@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 27 May 2015 22:09:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387683 - branches/2015Q2/net/openldap24-server/files X-SVN-Group: ports-branches 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.20 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, 27 May 2015 22:09:16 -0000 Author: delphij Date: Wed May 27 22:09:15 2015 New Revision: 387683 URL: https://svnweb.freebsd.org/changeset/ports/387683 Log: MFH: r387682 Add a patch to resolve symbol conflict between SHA2 module with OpenSSL's SHA2 implementation. Without this, e.g. SSHA512 scheme would result in a crash due to stack corruption, which is a result of different SHA512 context size in the contributed SHA2 implementation and the OpenSSL one, plus the allocation is on stack. PR: 197004 Approved by: ports-secteam Added: branches/2015Q2/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h - copied unchanged from r387682, head/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h Modified: Directory Properties: branches/2015Q2/ (props changed) Copied: branches/2015Q2/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h (from r387682, head/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h Wed May 27 22:09:15 2015 (r387683, copy of r387682, head/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h) @@ -0,0 +1,24 @@ +--- contrib/slapd-modules/passwd/sha2/sha2.h.orig 2014-09-19 01:48:49 UTC ++++ contrib/slapd-modules/passwd/sha2/sha2.h +@@ -142,6 +142,21 @@ typedef struct _SHA512_CTX { + + typedef SHA512_CTX SHA384_CTX; + ++#define SHA256_Init _sha2_SHA256_Init ++#define SHA256_Update _sha2_SHA256_Update ++#define SHA256_Final _sha2_SHA256_Final ++#define SHA256_End _sha2_SHA256_End ++#define SHA256_Data _sha2_SHA256_Data ++#define SHA384_Init _sha2_SHA384_Init ++#define SHA384_Update _sha2_SHA384_Update ++#define SHA384_Final _sha2_SHA384_Final ++#define SHA384_End _sha2_SHA384_End ++#define SHA384_Data _sha2_SHA384_Data ++#define SHA512_Init _sha2_SHA512_Init ++#define SHA512_Update _sha2_SHA512_Update ++#define SHA512_Final _sha2_SHA512_Final ++#define SHA512_End _sha2_SHA512_End ++#define SHA512_Data _sha2_SHA512_Data + + /*** SHA-256/384/512 Function Prototypes ******************************/ + #ifndef NOPROTO From owner-svn-ports-branches@FreeBSD.ORG Thu May 28 16:12:04 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4ECEF2; Thu, 28 May 2015 16:12:04 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F88C19D; Thu, 28 May 2015 16:12:04 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4SGC4Ff009964; Thu, 28 May 2015 16:12:04 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4SGC0gI009930; Thu, 28 May 2015 16:12:00 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201505281612.t4SGC0gI009930@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 28 May 2015 16:12:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387741 - in branches/2015Q2/mail: ezmlm ezmlm-idx mess822 qmail qmail-conf qmail-contrib qmail-dk qmailadmin qmailanalog qmhandle qtools queue-fix queue-repair serialmail vpopmail X-SVN-Group: ports-branches 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.20 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, 28 May 2015 16:12:04 -0000 Author: bdrewery Date: Thu May 28 16:11:59 2015 New Revision: 387741 URL: https://svnweb.freebsd.org/changeset/ports/387741 Log: MFH: r387740 Farewell qmail. You were good but the lack of an upstream maintainer or ecosystem maintainers makes this not a viable mail system today. Personally I am moving to postfix and have so far found it incredibly easy to setup and already prefer it over qmail. Modified: branches/2015Q2/mail/ezmlm-idx/Makefile branches/2015Q2/mail/ezmlm/Makefile branches/2015Q2/mail/mess822/Makefile branches/2015Q2/mail/qmail-conf/Makefile branches/2015Q2/mail/qmail-contrib/Makefile branches/2015Q2/mail/qmail-dk/Makefile branches/2015Q2/mail/qmail/Makefile branches/2015Q2/mail/qmailadmin/Makefile branches/2015Q2/mail/qmailanalog/Makefile branches/2015Q2/mail/qmhandle/Makefile branches/2015Q2/mail/qtools/Makefile branches/2015Q2/mail/queue-fix/Makefile branches/2015Q2/mail/queue-repair/Makefile branches/2015Q2/mail/serialmail/Makefile branches/2015Q2/mail/vpopmail/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/mail/ezmlm-idx/Makefile ============================================================================== --- branches/2015Q2/mail/ezmlm-idx/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/ezmlm-idx/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -8,7 +8,7 @@ CATEGORIES= mail MASTER_SITES= http://www.ezmlm.org/archive/${PORTVERSION}/ \ http://ezmlm.sericyb.com.au/archive/${PORTVERSION}/ -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Improved version of the ezmlm mailing list manager MAKE_JOBS_UNSAFE= yes Modified: branches/2015Q2/mail/ezmlm/Makefile ============================================================================== --- branches/2015Q2/mail/ezmlm/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/ezmlm/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -13,7 +13,7 @@ MASTER_SITES= http://cr.yp.to/software/ ftp://ftp.nl.uu.net/pub/unix/mail/qmail/ \ ftp://ftp.archive.de.uu.net/pub/unix/mail/qmail/ -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Easy-to-use, high-speed mailing list manager for qmail LEGAL_TEXT= No license -- see http://cr.yp.to/softwarelaw.html Modified: branches/2015Q2/mail/mess822/Makefile ============================================================================== --- branches/2015Q2/mail/mess822/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/mess822/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -10,7 +10,7 @@ MASTER_SITES= http://cr.yp.to/software/ ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/ \ ftp://mirror.pipex.net/pub/unix/mail/qmail/ -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= RFC 822 mail message parsing library and rewriting utilities USES= qmail:vars Modified: branches/2015Q2/mail/qmail-conf/Makefile ============================================================================== --- branches/2015Q2/mail/qmail-conf/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/qmail-conf/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -11,7 +11,7 @@ DISTFILES= ${DISTNAME}.tar.gz \ ${DJBDNS_DIST} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Configure various qmail services to run under daemontools USES= qmail:run Modified: branches/2015Q2/mail/qmail-contrib/Makefile ============================================================================== --- branches/2015Q2/mail/qmail-contrib/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/qmail-contrib/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= distfiles DISTFILES= dot-forward-${DF_VER}.tar.gz \ fastforward-${FF_VER}.tar.gz -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Contributed programs for qmail OPTIONS_DEFINE= DOCS Modified: branches/2015Q2/mail/qmail-dk/Makefile ============================================================================== --- branches/2015Q2/mail/qmail-dk/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/qmail-dk/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -9,7 +9,7 @@ PKGNAMEPREFIX= qmail- DISTFILES= qmail-1.03.tar.gz DIST_SUBDIR= qmail -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= DomainKeys implementation for qmail LIB_DEPENDS+= libdomainkeys.so:${PORTSDIR}/mail/libdomainkeys Modified: branches/2015Q2/mail/qmail/Makefile ============================================================================== --- branches/2015Q2/mail/qmail/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/qmail/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${QMAIL_VERSION} DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY?= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER?= bdrewery@FreeBSD.org +MAINTAINER?= ports@FreeBSD.org COMMENT?= Secure, reliable, efficient, simple, and fast MTA DIST_SUBDIR= qmail Modified: branches/2015Q2/mail/qmailadmin/Makefile ============================================================================== --- branches/2015Q2/mail/qmailadmin/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/qmailadmin/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -9,7 +9,7 @@ CATEGORIES= mail www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \ http://mirror.shatow.net/freebsd/${PORTNAME}/ -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= CGI program for administering Qmail with vchkpw/vpopmail LICENSE= GPLv2 GPLv3 Modified: branches/2015Q2/mail/qmailanalog/Makefile ============================================================================== --- branches/2015Q2/mail/qmailanalog/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/qmailanalog/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -8,7 +8,7 @@ CATEGORIES= mail MASTER_SITES= http://cr.yp.to/software/ \ http://www.emaillab.org/djb/qmailanalog/ -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Tools to analyze qmail-send activity USES= qmail:run Modified: branches/2015Q2/mail/qmhandle/Makefile ============================================================================== --- branches/2015Q2/mail/qmhandle/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/qmhandle/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1.3/${PORTNAME}-${PORTVERSION} -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Tool to view and manage a qmail queue LICENSE= GPLv2 Modified: branches/2015Q2/mail/qtools/Makefile ============================================================================== --- branches/2015Q2/mail/qtools/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/qtools/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -7,7 +7,7 @@ PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.superscript.com/qtools/ -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Tools to use in .qmail files RUN_DEPENDS= ${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm Modified: branches/2015Q2/mail/queue-fix/Makefile ============================================================================== --- branches/2015Q2/mail/queue-fix/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/queue-fix/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -8,7 +8,7 @@ MASTER_SITES= http://www.netmeridian.com ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Repairs or generates a qmail queue structure USES= qmail:run Modified: branches/2015Q2/mail/queue-repair/Makefile ============================================================================== --- branches/2015Q2/mail/queue-repair/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/queue-repair/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= mail python MASTER_SITES= http://pyropus.ca/software/${PORTNAME}/ -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Qmail queue diagnostic and repair tool LICENSE= GPLv2 Modified: branches/2015Q2/mail/serialmail/Makefile ============================================================================== --- branches/2015Q2/mail/serialmail/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/serialmail/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -10,7 +10,7 @@ MASTER_SITES= http://cr.yp.to/software/ ftp://ftp.de.uu.net/pub/unix/mail/qmail/ \ ftp://ftp.iway.fr/pub/unix/mail/qmail/ -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Tools for passing mail across serial links RUN_DEPENDS= tcpserver:${PORTSDIR}/sysutils/ucspi-tcp Modified: branches/2015Q2/mail/vpopmail/Makefile ============================================================================== --- branches/2015Q2/mail/vpopmail/Makefile Thu May 28 15:56:59 2015 (r387740) +++ branches/2015Q2/mail/vpopmail/Makefile Thu May 28 16:11:59 2015 (r387741) @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Easy virtual domain and authentication package for use with qmail LICENSE= GPLv2 GPLv3 From owner-svn-ports-branches@FreeBSD.ORG Thu May 28 17:49:13 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 31C28AC9; Thu, 28 May 2015 17:49:13 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1FBE7C9B; Thu, 28 May 2015 17:49:13 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4SHnC8M057556; Thu, 28 May 2015 17:49:12 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4SHnCVq057553; Thu, 28 May 2015 17:49:12 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505281749.t4SHnCVq057553@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 28 May 2015 17:49:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387748 - in branches/2015Q2/security/krb5-112: . files X-SVN-Group: ports-branches 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.20 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, 28 May 2015 17:49:13 -0000 Author: delphij Date: Thu May 28 17:49:12 2015 New Revision: 387748 URL: https://svnweb.freebsd.org/changeset/ports/387748 Log: MFH: r387747 Apply vendor patch for CVE-2015-2694 (changeset b0c571e709c72da799ccc15fb5755f7910170e33) to prevent requires_preauth bypass. Obtained from: https://github.com/krb5/krb5/commit/b0c571e709c72da799ccc15fb5755f7910170e33.diff Security: CVE-2015-2694 Security: 0b040e24-f751-11e4-b24d-5453ed2e2b49 Approved by: ports-secteam Added: branches/2015Q2/security/krb5-112/files/patch-CVE-2015-2694 - copied unchanged from r387747, head/security/krb5-112/files/patch-CVE-2015-2694 Modified: branches/2015Q2/security/krb5-112/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/security/krb5-112/Makefile ============================================================================== --- branches/2015Q2/security/krb5-112/Makefile Thu May 28 17:48:17 2015 (r387747) +++ branches/2015Q2/security/krb5-112/Makefile Thu May 28 17:49:12 2015 (r387748) @@ -3,7 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.12.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PKGNAMESUFFIX= -112 Copied: branches/2015Q2/security/krb5-112/files/patch-CVE-2015-2694 (from r387747, head/security/krb5-112/files/patch-CVE-2015-2694) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/security/krb5-112/files/patch-CVE-2015-2694 Thu May 28 17:49:12 2015 (r387748, copy of r387747, head/security/krb5-112/files/patch-CVE-2015-2694) @@ -0,0 +1,65 @@ +--- plugins/preauth/otp/main.c.orig 2015-02-18 22:31:13 UTC ++++ plugins/preauth/otp/main.c +@@ -42,6 +42,7 @@ static krb5_preauthtype otp_pa_type_list + struct request_state { + krb5_kdcpreauth_verify_respond_fn respond; + void *arg; ++ krb5_enc_tkt_part *enc_tkt_reply; + }; + + static krb5_error_code +@@ -159,6 +160,9 @@ on_response(void *data, krb5_error_code + if (retval == 0 && response != otp_response_success) + retval = KRB5_PREAUTH_FAILED; + ++ if (retval == 0) ++ rs.enc_tkt_reply->flags |= TKT_FLG_PRE_AUTH; ++ + rs.respond(rs.arg, retval, NULL, NULL, NULL); + } + +@@ -263,8 +267,6 @@ otp_verify(krb5_context context, krb5_da + krb5_data d, plaintext; + char *config; + +- enc_tkt_reply->flags |= TKT_FLG_PRE_AUTH; +- + /* Get the FAST armor key. */ + armor_key = cb->fast_armor(context, rock); + if (armor_key == NULL) { +@@ -298,12 +300,14 @@ otp_verify(krb5_context context, krb5_da + goto error; + } + +- /* Create the request state. */ ++ /* Create the request state. Save the response callback, and the ++ * enc_tkt_reply pointer so we can set the TKT_FLG_PRE_AUTH flag later. */ + rs = k5alloc(sizeof(struct request_state), &retval); + if (rs == NULL) + goto error; + rs->arg = arg; + rs->respond = respond; ++ rs->enc_tkt_reply = enc_tkt_reply; + + /* Get the principal's OTP configuration string. */ + retval = cb->get_string(context, rock, "otp", &config); +--- plugins/preauth/pkinit/pkinit_srv.c.orig 2015-02-18 22:31:13 UTC ++++ plugins/preauth/pkinit/pkinit_srv.c +@@ -306,7 +306,7 @@ pkinit_server_verify_padata(krb5_context + + pkiDebug("pkinit_verify_padata: entered!\n"); + if (data == NULL || data->length <= 0 || data->contents == NULL) { +- (*respond)(arg, 0, NULL, NULL, NULL); ++ (*respond)(arg, EINVAL, NULL, NULL, NULL); + return; + } + +@@ -318,7 +318,7 @@ pkinit_server_verify_padata(krb5_context + + plgctx = pkinit_find_realm_context(context, moddata, request->server); + if (plgctx == NULL) { +- (*respond)(arg, 0, NULL, NULL, NULL); ++ (*respond)(arg, EINVAL, NULL, NULL, NULL); + return; + } + From owner-svn-ports-branches@FreeBSD.ORG Thu May 28 20:41:23 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59227BDE; Thu, 28 May 2015 20:41:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47BBBE15; Thu, 28 May 2015 20:41:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4SKfNSX049924; Thu, 28 May 2015 20:41:23 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4SKfNJU049923; Thu, 28 May 2015 20:41:23 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201505282041.t4SKfNJU049923@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 28 May 2015 20:41:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387774 - branches/2015Q2/mail/dovecot X-SVN-Group: ports-branches 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.20 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, 28 May 2015 20:41:23 -0000 Author: bdrewery Date: Thu May 28 20:41:22 2015 New Revision: 387774 URL: https://svnweb.freebsd.org/changeset/ports/387774 Log: MFH: r387773 Release maintainership Modified: branches/2015Q2/mail/dovecot/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/mail/dovecot/Makefile ============================================================================== --- branches/2015Q2/mail/dovecot/Makefile Thu May 28 20:40:58 2015 (r387773) +++ branches/2015Q2/mail/dovecot/Makefile Thu May 28 20:41:22 2015 (r387774) @@ -8,7 +8,7 @@ CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/ \ http://www.rename-it.nl/dovecot/${PORTVERSION:R}/ -MAINTAINER= bdrewery@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Secure and compact IMAP and POP3 servers LICENSE= LGPL21 MIT From owner-svn-ports-branches@FreeBSD.ORG Fri May 29 04:59:47 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8EBCEB66; Fri, 29 May 2015 04:59:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D553167D; Fri, 29 May 2015 04:59:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4T4xlwp095586; Fri, 29 May 2015 04:59:47 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4T4xlxU095585; Fri, 29 May 2015 04:59:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201505290459.t4T4xlxU095585@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 29 May 2015 04:59:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387783 - branches/2015Q2/devel/renpy X-SVN-Group: ports-branches 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.20 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, 29 May 2015 04:59:47 -0000 Author: jbeich Date: Fri May 29 04:59:46 2015 New Revision: 387783 URL: https://svnweb.freebsd.org/changeset/ports/387783 Log: MFH: r387782 devel/renpy: fix TKINTER regressing after r382557 Traceback (most recent call last): File "choose_directory.rpy", line 61, in choose_directory File "/usr/local/lib/python2.7/subprocess.py", line 710, in __init__ errread, errwrite) File "/usr/local/lib/python2.7/subprocess.py", line 1335, in _execute_child raise child_exception OSError: [Errno 2] No such file or directory Approved by: ports-secteam (shebang blanket) Modified: branches/2015Q2/devel/renpy/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/renpy/Makefile ============================================================================== --- branches/2015Q2/devel/renpy/Makefile Fri May 29 04:56:20 2015 (r387782) +++ branches/2015Q2/devel/renpy/Makefile Fri May 29 04:59:46 2015 (r387783) @@ -3,7 +3,7 @@ PORTNAME= renpy PORTVERSION= 6.99.1 DISTVERSIONSUFFIX=-source -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel games MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \ GENTOO/distfiles @@ -62,7 +62,7 @@ PORTDATA+= the_question tutorial post-patch: @${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' \ - ${WRKSRC}/launcher/game/project.rpy + ${WRKSRC}/launcher/game/choose_directory.rpy # Avoid having to add -I/usr/include -L/usr/lib @${REINPLACE_CMD} '/library("z")/d' ${BUILD_WRKSRC}/${PYSETUP} From owner-svn-ports-branches@FreeBSD.ORG Sat May 30 06:37:56 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0E3F094C; Sat, 30 May 2015 06:37:56 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0638175D; Sat, 30 May 2015 06:37:55 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4U6btDo084036; Sat, 30 May 2015 06:37:55 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4U6btSm084034; Sat, 30 May 2015 06:37:55 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201505300637.t4U6btSm084034@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 30 May 2015 06:37:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387914 - branches/2015Q2/audio/aacgain X-SVN-Group: ports-branches 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.20 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, 30 May 2015 06:37:56 -0000 Author: riggs Date: Sat May 30 06:37:55 2015 New Revision: 387914 URL: https://svnweb.freebsd.org/changeset/ports/387914 Log: MFH: r387913 Un-break build (MASTER_SITE updated, distfile is fetchable again) PR: 200479 Submitted by: root@cooltrainer.org Approved by: ports-secteam (build fix blanket) Modified: branches/2015Q2/audio/aacgain/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/audio/aacgain/Makefile ============================================================================== --- branches/2015Q2/audio/aacgain/Makefile Sat May 30 06:31:47 2015 (r387913) +++ branches/2015Q2/audio/aacgain/Makefile Sat May 30 06:37:55 2015 (r387914) @@ -5,7 +5,7 @@ PORTNAME= aacgain PORTVERSION= 1.8 PORTREVISION= 1 CATEGORIES= audio -MASTER_SITES= http://altosdesign.com/aacgain/alvarez/ +MASTER_SITES= http://aacgain.altosdesign.com/alvarez/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Normalizes the volume of mp3 and AAC (mp4/m4a/QuickTime) media files From owner-svn-ports-branches@FreeBSD.ORG Sat May 30 08:46:54 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B10C9D8F; Sat, 30 May 2015 08:46:54 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F03F144A; Sat, 30 May 2015 08:46:54 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4U8ksss049111; Sat, 30 May 2015 08:46:54 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4U8ksCx049110; Sat, 30 May 2015 08:46:54 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201505300846.t4U8ksCx049110@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sat, 30 May 2015 08:46:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387918 - branches/2015Q2/multimedia/gstreamer1-vaapi X-SVN-Group: ports-branches 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.20 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, 30 May 2015 08:46:54 -0000 Author: tijl Date: Sat May 30 08:46:53 2015 New Revision: 387918 URL: https://svnweb.freebsd.org/changeset/ports/387918 Log: MFH: r387035 (partially) - Fix build on FreeBSD 8/9 by using modern compiler - Make build log more verbose Approved by: ports-secteam (build fix blanket) Modified: branches/2015Q2/multimedia/gstreamer1-vaapi/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/multimedia/gstreamer1-vaapi/Makefile ============================================================================== --- branches/2015Q2/multimedia/gstreamer1-vaapi/Makefile Sat May 30 08:27:46 2015 (r387917) +++ branches/2015Q2/multimedia/gstreamer1-vaapi/Makefile Sat May 30 08:46:53 2015 (r387918) @@ -16,9 +16,9 @@ LIB_DEPENDS= libva.so:${PORTSDIR}/multim GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-wayland --with-gstreamer-api=1.4 \ - --disable-builtin-libvpx + --disable-builtin-libvpx --disable-silent-rules INSTALL_TARGET= install-strip -USES= gmake libtool pkgconfig tar:bzip2 +USES= compiler:c11 gmake libtool pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_GSTREAMER1= yes USE_GL= gl From owner-svn-ports-branches@FreeBSD.ORG Sat May 30 17:52:08 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC1B0DC5; Sat, 30 May 2015 17:52:08 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D7E2F1CCF; Sat, 30 May 2015 17:52:08 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4UHq8EC028030; Sat, 30 May 2015 17:52:08 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4UHq7p2028024; Sat, 30 May 2015 17:52:07 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201505301752.t4UHq7p2028024@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 30 May 2015 17:52:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387975 - in branches/2015Q2/mail/davmail: . files X-SVN-Group: ports-branches 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.20 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, 30 May 2015 17:52:09 -0000 Author: pi Date: Sat May 30 17:52:07 2015 New Revision: 387975 URL: https://svnweb.freebsd.org/changeset/ports/387975 Log: mail/davmail: Security update to 4.6.1 MFH: r387179, r387243 PR: 198297 Security: CVE-2014-3566 Approved by: ports-secteam Deleted: branches/2015Q2/mail/davmail/files/patch-src__etc__davmail.properties Modified: branches/2015Q2/mail/davmail/Makefile branches/2015Q2/mail/davmail/distinfo branches/2015Q2/mail/davmail/files/patch-build.xml branches/2015Q2/mail/davmail/pkg-plist Modified: branches/2015Q2/mail/davmail/Makefile ============================================================================== --- branches/2015Q2/mail/davmail/Makefile Sat May 30 17:03:01 2015 (r387974) +++ branches/2015Q2/mail/davmail/Makefile Sat May 30 17:52:07 2015 (r387975) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= davmail -PORTVERSION= 4.5.1 +PORTVERSION= 4.6.1 CATEGORIES= mail java MASTER_SITES= SF/davmail/davmail/${PORTVERSION} DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION} @@ -14,11 +14,12 @@ LICENSE= GPLv2 USES= dos2unix tar:tgz DOS2UNIX_FILES= build.xml +NO_ARCH= yes USE_ANT= yes USE_JAVA= yes JAVA_VERSION= 1.6+ ALL_TARGET= release -REVISION= 2303 +REVISION= 2343 # port build number, same as on DISTNAME MAKE_ARGS= -Drevision=${REVISION} MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8" @@ -46,9 +47,9 @@ do-install: -not -name "*.rpm" \ -not -name "*.desktop" \ -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \; - @${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail - @${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \ + ${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail + ${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \ ${STAGEDIR}${PREFIX}/etc/davmail.properties.sample - @${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/ + ${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/ .include Modified: branches/2015Q2/mail/davmail/distinfo ============================================================================== --- branches/2015Q2/mail/davmail/distinfo Sat May 30 17:03:01 2015 (r387974) +++ branches/2015Q2/mail/davmail/distinfo Sat May 30 17:52:07 2015 (r387975) @@ -1,2 +1,2 @@ -SHA256 (davmail-src-4.5.1-2303.tgz) = 2621a5cbc81c06d0345ec05c93664a052e2e9d2d2bfda8e731a8fb94fd70f752 -SIZE (davmail-src-4.5.1-2303.tgz) = 22670415 +SHA256 (davmail-src-4.6.1-2343.tgz) = 1e6f5c88469416276fd7301990ddaa048dd177eb90e3348ae8d54b22df38997e +SIZE (davmail-src-4.6.1-2343.tgz) = 22659201 Modified: branches/2015Q2/mail/davmail/files/patch-build.xml ============================================================================== --- branches/2015Q2/mail/davmail/files/patch-build.xml Sat May 30 17:03:01 2015 (r387974) +++ branches/2015Q2/mail/davmail/files/patch-build.xml Sat May 30 17:52:07 2015 (r387975) @@ -1,6 +1,6 @@ ---- build.xml.orig 2013-04-23 16:50:41.883412959 +0200 -+++ build.xml 2013-04-23 16:51:32.230415374 +0200 -@@ -58,7 +58,7 @@ +--- build.xml.orig 2015-05-23 02:27:12 UTC ++++ build.xml +@@ -59,7 +59,7 @@ Modified: branches/2015Q2/mail/davmail/pkg-plist ============================================================================== --- branches/2015Q2/mail/davmail/pkg-plist Sat May 30 17:03:01 2015 (r387974) +++ branches/2015Q2/mail/davmail/pkg-plist Sat May 30 17:52:07 2015 (r387975) @@ -14,6 +14,7 @@ share/applications/davmail.desktop %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcifs-1.3.14.jar %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jdom-1.0.jar %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl-0.2.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl.jnilib %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/log4j-1.2.16.jar %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/mail-1.4.3.jar %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-api-1.3.1.jar @@ -24,8 +25,6 @@ share/applications/davmail.desktop %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/xercesImpl-2.8.1.jar %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/davmail %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/libgrowl.jnilib -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/PkgInfo -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/en.lproj/Localizable.strings %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/tray.icns %%JAVASHAREDIR%%/davmail/davmail.jar %%JAVASHAREDIR%%/davmail/davmail.png From owner-svn-ports-branches@FreeBSD.ORG Sat May 30 17:55:06 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82836EDE; Sat, 30 May 2015 17:55:06 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F02E1CEB; Sat, 30 May 2015 17:55:06 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4UHt66N028593; Sat, 30 May 2015 17:55:06 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4UHt5PF028587; Sat, 30 May 2015 17:55:05 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201505301755.t4UHt5PF028587@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 30 May 2015 17:55:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387976 - in branches/2015Q2/net/chrony: . files X-SVN-Group: ports-branches 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.20 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, 30 May 2015 17:55:06 -0000 Author: pi Date: Sat May 30 17:55:04 2015 New Revision: 387976 URL: https://svnweb.freebsd.org/changeset/ports/387976 Log: net/chrony: Security update to 1.31.1 MFH: r387180 PR: 199508 Security: CVE-2015-1799, CVE-2015-1821, CVE-2015-1822 Approved by: ports-secteam Modified: branches/2015Q2/net/chrony/Makefile branches/2015Q2/net/chrony/distinfo branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example2 Modified: branches/2015Q2/net/chrony/Makefile ============================================================================== --- branches/2015Q2/net/chrony/Makefile Sat May 30 17:52:07 2015 (r387975) +++ branches/2015Q2/net/chrony/Makefile Sat May 30 17:55:04 2015 (r387976) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chrony -PORTVERSION= 1.31 +PORTVERSION= 1.31.1 CATEGORIES= net MASTER_SITES= http://download.tuxfamily.org/chrony/ @@ -15,7 +15,8 @@ LICENSE= GPLv2 # with ``Could not open any NTP socket'' message on startup :( ONLY_FOR_ARCHS= i386 amd64 -USES= gmake makeinfo readline +USES= cpe gmake makeinfo readline +CPE_VENDOR= tuxfamily HAS_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \ --datarootdir=${DATADIR} --docdir=${DOCSDIR} @@ -33,6 +34,10 @@ OPTIONS_DEFAULT= IPV6 IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_OFF= --disable-ipv6 +post-stage: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd + post-install: .for f in chrony.conf.example chrony.conf.example2 chrony.keys.example ${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${PREFIX}/etc Modified: branches/2015Q2/net/chrony/distinfo ============================================================================== --- branches/2015Q2/net/chrony/distinfo Sat May 30 17:52:07 2015 (r387975) +++ branches/2015Q2/net/chrony/distinfo Sat May 30 17:55:04 2015 (r387976) @@ -1,2 +1,2 @@ -SHA256 (chrony-1.31.tar.gz) = a35e1cae46ecbe14af2023bb47a72a03d79591b2ff65f0072b3400153224996d -SIZE (chrony-1.31.tar.gz) = 395742 +SHA256 (chrony-1.31.1.tar.gz) = 0ba9f4b58e20b2eaae921eb8c798108ef72d8ea6fdcc7eb0167b56690d212348 +SIZE (chrony-1.31.1.tar.gz) = 395797 Modified: branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example ============================================================================== --- branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example Sat May 30 17:52:07 2015 (r387975) +++ branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example Sat May 30 17:55:04 2015 (r387976) @@ -1,4 +1,4 @@ ---- examples/chrony.conf.example.orig 2014-01-31 20:12:59 +0800 +--- examples/chrony.conf.example.orig 2015-04-07 14:35:16 UTC +++ examples/chrony.conf.example @@ -42,6 +42,13 @@ # Failing that, there are a lot of public NTP servers. There is a list @@ -23,7 +23,7 @@ # Tell chronyd which numbered key in the file is used as the password # for chronyc. (You can pick any integer up to 2**32-1. '1' is just a -@@ -129,7 +136,7 @@ commandkey 1 +@@ -132,7 +139,7 @@ generatecommandkey # still running and bail out. If you want to change the path to the PID # file, uncomment this line and edit it. The default path is shown. @@ -32,7 +32,7 @@ ####################################################################### ### INITIAL CLOCK CORRECTION -@@ -152,8 +159,8 @@ commandkey 1 +@@ -155,8 +162,8 @@ generatecommandkey # produce some graphs of your system's timekeeping performance, or you # need help in debugging a problem. Modified: branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example2 ============================================================================== --- branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example2 Sat May 30 17:52:07 2015 (r387975) +++ branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example2 Sat May 30 17:55:04 2015 (r387976) @@ -1,4 +1,4 @@ ---- examples/chrony.conf.example2.orig 2014-01-31 20:12:59 +0800 +--- examples/chrony.conf.example2.orig 2015-04-07 14:35:16 UTC +++ examples/chrony.conf.example2 @@ -1,9 +1,17 @@ # Use public servers from the pool.ntp.org project.