From owner-svn-ports-branches@freebsd.org Sun Dec 20 02:12:39 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE569A4CA4E; Sun, 20 Dec 2015 02:12:39 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 620E71374; Sun, 20 Dec 2015 02:12:39 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBK2Ccos042616; Sun, 20 Dec 2015 02:12:38 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBK2Ccha042614; Sun, 20 Dec 2015 02:12:38 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201512200212.tBK2Ccha042614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Sun, 20 Dec 2015 02:12:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404038 - in branches/2015Q4/devel/libvirt: . 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: Sun, 20 Dec 2015 02:12:39 -0000 Author: novel Date: Sun Dec 20 02:12:38 2015 New Revision: 404038 URL: https://svnweb.freebsd.org/changeset/ports/404038 Log: devel/libvirt: fix CVE-2015-5313 Approved by: ports-secteam (delphij) Added: branches/2015Q4/devel/libvirt/files/patch-CVE-2015-5313 (contents, props changed) Modified: branches/2015Q4/devel/libvirt/Makefile Modified: branches/2015Q4/devel/libvirt/Makefile ============================================================================== --- branches/2015Q4/devel/libvirt/Makefile Sun Dec 20 02:08:38 2015 (r404037) +++ branches/2015Q4/devel/libvirt/Makefile Sun Dec 20 02:12:38 2015 (r404038) @@ -3,7 +3,7 @@ PORTNAME= libvirt PORTVERSION= 1.2.19 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ Added: branches/2015Q4/devel/libvirt/files/patch-CVE-2015-5313 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/devel/libvirt/files/patch-CVE-2015-5313 Sun Dec 20 02:12:38 2015 (r404038) @@ -0,0 +1,26 @@ +--- src/storage/storage_backend_fs.c ++++ src/storage/storage_backend_fs.c +@@ -1,7 +1,7 @@ + /* + * storage_backend_fs.c: storage backend for FS and directory handling + * +- * Copyright (C) 2007-2014 Red Hat, Inc. ++ * Copyright (C) 2007-2015 Red Hat, Inc. + * Copyright (C) 2007-2008 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or +@@ -1057,6 +1057,14 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn ATTRIBUTE_UNUSED, + else + vol->type = VIR_STORAGE_VOL_FILE; + ++ /* Volumes within a directory pools are not recursive; do not ++ * allow escape to ../ or a subdir */ ++ if (strchr(vol->name, '/')) { ++ virReportError(VIR_ERR_OPERATION_INVALID, ++ _("volume name '%s' cannot contain '/'"), vol->name); ++ return -1; ++ } ++ + VIR_FREE(vol->target.path); + if (virAsprintf(&vol->target.path, "%s/%s", + pool->def->target.path, From owner-svn-ports-branches@freebsd.org Sun Dec 20 20:15:28 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A57F3A4D63D; Sun, 20 Dec 2015 20:15:28 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2F1161E2B; Sun, 20 Dec 2015 20:15:28 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBKKFRZi059188; Sun, 20 Dec 2015 20:15:27 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBKKFNnS059151; Sun, 20 Dec 2015 20:15:23 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201512202015.tBKKFNnS059151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sun, 20 Dec 2015 20:15:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404073 - in branches/2015Q4/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: Sun, 20 Dec 2015 20:15:28 -0000 Author: rene Date: Sun Dec 20 20:15:23 2015 New Revision: 404073 URL: https://svnweb.freebsd.org/changeset/ports/404073 Log: MFH: r404050 www/chromium: update to 47.0.2526.106 Submitted by: Christoph Moench-Tegeder via GitHub Security: http://vuxml.freebsd.org/freebsd/bb7d4791-a5bf-11e5-a0e5-00262d5ed8ee.html Approved by: ports-secteam (feld) Added: branches/2015Q4/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc - copied unchanged from r404050, head/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h - copied unchanged from r404050, head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc - copied unchanged from r404050, head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.cc - copied unchanged from r404050, head/www/chromium/files/patch-media__audio__audio_manager.cc branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.h - copied unchanged from r404050, head/www/chromium/files/patch-media__audio__audio_manager.h branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py - copied unchanged from r404050, head/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni - copied unchanged from r404050, head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni Deleted: branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h Modified: branches/2015Q4/www/chromium/Makefile branches/2015Q4/www/chromium/distinfo branches/2015Q4/www/chromium/files/extra-patch-clang branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h branches/2015Q4/www/chromium/files/patch-media__media.gyp branches/2015Q4/www/chromium/files/patch-net__net.gypi branches/2015Q4/www/chromium/files/patch-net__proxy__proxy_service.cc branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp branches/2015Q4/www/chromium/files/patch-third_party__sfntly__sfntly.gyp branches/2015Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc branches/2015Q4/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc branches/2015Q4/www/chromium/files/patch-ui__gl__gl_surface_glx.cc branches/2015Q4/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc branches/2015Q4/www/chromium/files/patch-ui__resources__ui_resources.grd branches/2015Q4/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc branches/2015Q4/www/chromium/files/patch-ui__views__controls__button__label_button.cc Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/chromium/Makefile ============================================================================== --- branches/2015Q4/www/chromium/Makefile Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/Makefile Sun Dec 20 20:15:23 2015 (r404073) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 47.0.2526.80 +PORTVERSION= 47.0.2526.106 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on @@ -23,7 +23,6 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}ply>0:${PORTSDIR}/devel/py-ply \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:${PORTSDIR}/www/py-beautifulsoup \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ @@ -244,9 +243,6 @@ post-patch: ${WRKSRC}/base/base.gyp pre-configure: -.if ! ${PORT_OPTIONS:MTEST} - ${ECHO_CMD} > ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html -.endif # phajdan-jr: list of things *not* to remove, so maybe the script # should be called "keep_bundled_libraries.py" cd ${WRKSRC} && ${PYTHON_CMD} \ @@ -275,6 +271,13 @@ pre-configure: 'third_party/brotli' \ 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ + 'third_party/catapult' \ + 'third_party/catapult/third_party/beautifulsoup' \ + 'third_party/catapult/tracing' \ + 'third_party/catapult/tracing/third_party' \ + 'third_party/catapult/tracing/third_party/tvcm' \ + 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \ + 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \ 'third_party/cld' \ 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ @@ -299,11 +302,9 @@ pre-configure: 'third_party/libsrtp' \ 'third_party/libvpx_new' \ 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \ + 'third_party/libwebm' \ 'third_party/libxml/chromium' \ 'third_party/libXNVCtrl' \ - 'third_party/libwebm' \ - 'third_party/libwebm/source' \ - 'third_party/libwebm/source/common' \ 'third_party/libyuv' \ 'third_party/lss' \ 'third_party/lzma_sdk' \ @@ -332,13 +333,6 @@ pre-configure: 'third_party/sqlite' \ 'third_party/tcmalloc' \ 'third_party/tlslite' \ - 'third_party/catapult' \ - 'third_party/catapult/tracing' \ - 'third_party/catapult/tracing/third_party' \ - 'third_party/catapult/tracing/third_party/tvcm/third_party' \ - 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \ - 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \ - 'third_party/catapult/tracing/third_party/tvcm/tvcm' \ 'third_party/usrsctp' \ 'third_party/web-animations-js' \ 'third_party/webdriver' \ @@ -356,6 +350,10 @@ pre-configure: ${GYP_DEFINES:C/^/-D/} || ${FALSE} # allow removal of third_party/adobe ${ECHO_CMD} > ${WRKSRC}/flapper_version.h + # missing file: file is in -testdata only, but configure stage + # will fail if it's not there. do not break TESTS build while + # allowing regular build without pulling in -testdata. + ${TOUCH} ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ Modified: branches/2015Q4/www/chromium/distinfo ============================================================================== --- branches/2015Q4/www/chromium/distinfo Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/distinfo Sun Dec 20 20:15:23 2015 (r404073) @@ -1,4 +1,4 @@ -SHA256 (chromium-47.0.2526.80.tar.xz) = b107148323a3b641eae29bfeda298183c0d1c110ef96a04a13f329015d614d05 -SIZE (chromium-47.0.2526.80.tar.xz) = 1210266772 -SHA256 (chromium-47.0.2526.80-testdata.tar.xz) = 155165253d232cc2fd5f072d45aec98efca7ca38e29661890b3debc9ad310bfd -SIZE (chromium-47.0.2526.80-testdata.tar.xz) = 117394704 +SHA256 (chromium-47.0.2526.106.tar.xz) = 64535073330a3d37aad228d10a15cdcbb5b389e59d079d1a3b22d023b99a58e6 +SIZE (chromium-47.0.2526.106.tar.xz) = 1433438428 +SHA256 (chromium-47.0.2526.106-testdata.tar.xz) = 327fe48a9611f55005654c49ce79349b1caed283fba2df6283ebdc486ce348b8 +SIZE (chromium-47.0.2526.106-testdata.tar.xz) = 117395412 Modified: branches/2015Q4/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2015Q4/www/chromium/files/extra-patch-clang Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/extra-patch-clang Sun Dec 20 20:15:23 2015 (r404073) @@ -224,7 +224,7 @@ --- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig 2015-09-03 09:31:11.815462000 -0400 +++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-09-03 09:31:50.974163000 -0400 -@@ -844,7 +844,7 @@ +@@ -1028,7 +1028,7 @@ const AudioEncoder* AudioCodingImpl::GetSenderInfo() const { FATAL() << "Not implemented yet."; @@ -233,7 +233,7 @@ } const CodecInst* AudioCodingImpl::GetSenderCodecInst() { -@@ -864,7 +864,7 @@ +@@ -1048,7 +1048,7 @@ const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const { FATAL() << "Not implemented yet."; Modified: branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- base/process/memory_unittest.cc.orig 2015-10-14 03:01:18.000000000 -0400 -+++ base/process/memory_unittest.cc 2015-10-23 11:11:40.281381000 -0400 +--- base/process/memory_unittest.cc.orig 2015-12-04 20:12:12.356919000 +0100 ++++ base/process/memory_unittest.cc 2015-12-04 20:14:11.966272000 +0100 @@ -137,11 +137,11 @@ #endif // defined(OS_MACOSX) @@ -19,5 +19,5 @@ } #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !(defined(OS_WIN) && -+#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) ++#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !(defined(OS_WIN) && // !defined(ALLOCATOR_SHIM)) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) Modified: branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- base/process/process_info_linux.cc.orig 2015-10-06 22:42:06.000000000 -0400 -+++ base/process/process_info_linux.cc 2015-10-14 08:06:38.761855000 -0400 +--- base/process/process_info_linux.cc.orig 2015-10-14 16:18:44.939415000 +0200 ++++ base/process/process_info_linux.cc 2015-10-14 16:22:36.086176000 +0200 @@ -10,10 +10,28 @@ #include "base/process/process_handle.h" #include "base/time/time.h" Modified: branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- base/process/process_posix.cc.orig 2015-10-14 03:01:18.000000000 -0400 -+++ base/process/process_posix.cc 2015-10-23 11:23:26.411838000 -0400 +--- base/process/process_posix.cc.orig 2015-12-04 20:16:14.101666000 +0100 ++++ base/process/process_posix.cc 2015-12-04 20:32:34.362201000 +0100 @@ -17,8 +17,18 @@ #include #endif @@ -28,7 +28,16 @@ // Using kqueue on Mac so that we can wait on non-child processes. // We can't use kqueues on child processes because we need to reap // our own children using wait. -@@ -180,7 +190,7 @@ +@@ -172,7 +182,7 @@ + + return true; + } +-#endif // OS_MACOSX ++#endif // OS_MACOSX || OS_BSD + + bool WaitForExitWithTimeoutImpl(base::ProcessHandle handle, + int* exit_code, +@@ -180,13 +190,13 @@ base::ProcessHandle parent_pid = base::GetParentProcessId(handle); base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); if (parent_pid != our_pid) { @@ -37,34 +46,51 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -258,7 +268,11 @@ - #if !defined(OS_LINUX) + // Currently on Linux we can't handle non child processes. + NOTIMPLEMENTED(); +-#endif // OS_MACOSX ++#endif // OS_MACOSX || OS_BSD + } + + int status; +@@ -255,12 +265,16 @@ + return Process(handle); + } + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_FREEBSD) // static bool Process::CanBackgroundProcesses() { -+#if defined(OS_BSD) -+ return true; -+#else return false; -+#endif } - #endif // !defined(OS_LINUX) - -@@ -358,17 +372,21 @@ +-#endif // !defined(OS_LINUX) ++#elif defined(OS_FREEBSD) ++bool Process::CanBackgroundProcesses() { ++ return true; ++} ++#endif // !defined(OS_LINUX) && !defined(OS_FREEBSD) - #if !defined(OS_LINUX) + bool Process::IsValid() const { + return process_ != kNullProcessHandle; +@@ -360,15 +374,32 @@ bool Process::IsProcessBackgrounded() const { -- // See SetProcessBackgrounded(). + // See SetProcessBackgrounded(). DCHECK(IsValid()); -- return false; -+ return GetPriority() == kBackgroundPriority; ++#if defined(OS_FREEBSD) ++ return true; ++#else + return false; ++#endif } bool Process::SetProcessBackgrounded(bool value) { -- // Not implemented for POSIX systems other than Linux. With POSIX, if we were -- // to lower the process priority we wouldn't be able to raise it back to its -- // initial priority. -- NOTIMPLEMENTED(); -- return false; ++#if !defined(OS_FREEBSD) + // Not implemented for POSIX systems other than Linux. With POSIX, if we were + // to lower the process priority we wouldn't be able to raise it back to its + // initial priority. + NOTIMPLEMENTED(); + return false; ++#else + DCHECK(IsValid()); + + if (!CanBackgroundProcesses()) @@ -75,6 +101,7 @@ + + DPCHECK(result == 0); + return result == 0; ++#endif // !defined(OS_FREEBSD) } #endif // !defined(OS_LINUX) Modified: branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,11 +1,24 @@ ---- chrome/browser/net/cookie_store_util.cc.orig 2015-07-21 21:42:54.358730000 -0400 -+++ chrome/browser/net/cookie_store_util.cc 2015-07-21 21:43:07.938330000 -0400 -@@ -85,7 +85,7 @@ - new ChromeCookieMonsterDelegate(profile)); - } +--- chrome/browser/net/cookie_store_util.cc.orig 2015-10-14 19:42:28.950909000 +0200 ++++ chrome/browser/net/cookie_store_util.cc 2015-10-14 19:43:32.447326000 +0200 +@@ -15,7 +15,7 @@ + + namespace chrome_browser_net { -#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 +@@ -67,10 +67,10 @@ + net::CookieCryptoDelegate* GetCookieCryptoDelegate() { + return g_cookie_crypto_delegate.Pointer(); + } +-#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + net::CookieCryptoDelegate* GetCookieCryptoDelegate() { + return NULL; + } +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + } // namespace chrome_browser_net Copied: branches/2015Q4/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc (from r404050, head/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-chrome__browser__ssl__bad_blocking_page.cc) @@ -0,0 +1,11 @@ +--- ./chrome/browser/ssl/bad_clock_blocking_page.cc.orig 2015-12-04 22:09:59.759216000 +0100 ++++ ./chrome/browser/ssl/bad_clock_blocking_page.cc 2015-12-04 22:10:08.964486000 +0100 +@@ -93,7 +93,7 @@ + // iOS does not have a way to launch the date and time settings. + NOTREACHED(); + +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + struct ClockCommand { + const char* pathname; + const char* argument; Modified: branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-10-13 15:04:32.000000000 -0400 -+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-10-14 08:16:21.359565000 -0400 +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-10-14 16:37:51.456856000 +0200 ++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-10-14 16:38:21.306588000 +0200 @@ -273,7 +273,7 @@ #if !defined(OS_ANDROID) || url.host() == chrome::kChromeUITermsHost Modified: branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi Sun Dec 20 20:15:23 2015 (r404073) @@ -1,6 +1,6 @@ ---- chrome/chrome_browser.gypi.orig 2015-10-21 18:00:37.000000000 -0400 -+++ chrome/chrome_browser.gypi 2015-10-23 12:31:48.047090000 -0400 -@@ -3365,6 +3365,13 @@ +--- chrome/chrome_browser.gypi.orig 2015-12-04 22:23:49.106516000 +0100 ++++ chrome/chrome_browser.gypi 2015-12-04 22:27:43.886261000 +0100 +@@ -3369,6 +3369,13 @@ 'browser/download/download_dir_policy_handler.h', ], }], @@ -14,7 +14,7 @@ ['OS=="mac"', { 'dependencies': [ 'app_shim', -@@ -3518,7 +3525,7 @@ +@@ -3522,7 +3529,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], @@ -23,16 +23,16 @@ 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3572,7 +3579,7 @@ +@@ -3576,7 +3583,7 @@ ['use_x11==1', { 'sources': [ '<@(chrome_browser_x11_sources)' ], }], - ['os_posix == 1 and OS != "mac" and OS != "ios"', { -+ ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', { ++ ['os_posix == 1 and os_bsd != 1 and OS != "mac" and OS != "ios"', { 'sources': [ 'app/chrome_crash_reporter_client.cc', 'app/chrome_crash_reporter_client.h', -@@ -3813,7 +3820,7 @@ +@@ -3817,7 +3824,7 @@ }], ], }], Modified: branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- chrome/chrome_browser_ui.gypi.orig 2015-10-13 15:04:32.000000000 -0400 -+++ chrome/chrome_browser_ui.gypi 2015-10-14 08:19:30.748417000 -0400 +--- chrome/chrome_browser_ui.gypi.orig 2015-10-14 16:42:08.849931000 +0200 ++++ chrome/chrome_browser_ui.gypi 2015-10-14 16:45:35.205417000 +0200 @@ -2921,7 +2921,7 @@ }], ], Modified: branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,14 @@ ---- chrome/common/chrome_paths.h.orig 2015-10-14 03:01:20.000000000 -0400 -+++ chrome/common/chrome_paths.h 2015-10-23 12:35:13.801677000 -0400 +--- chrome/common/chrome_paths.h.orig 2015-12-04 22:29:29.523602000 +0100 ++++ chrome/common/chrome_paths.h 2015-12-04 22:31:37.428818000 +0100 +@@ -50,7 +50,7 @@ + DIR_USER_APPLICATIONS, // ~/Applications + DIR_USER_LIBRARY, // ~/Library + #endif +-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ ++#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions + // on Chrome Mac and Chromium Linux. @@ -117,7 +117,7 @@ DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are @@ -9,3 +18,16 @@ DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts +@@ -136,10 +136,10 @@ + DIR_GEN_TEST_DATA, // Directory where generated test data resides. + DIR_TEST_DATA, // Directory where unit test data resides. + DIR_TEST_TOOLS, // Directory where unit test tools reside. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to + // the component updated flash plugin. +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + PATH_END + }; Copied: branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h (from r404050, head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h) @@ -0,0 +1,14 @@ +--- chrome/common/component_flash_hint_file_linux.h.orig 2015-10-15 10:25:32.927627000 +0200 ++++ chrome/common/component_flash_hint_file_linux.h 2015-10-15 10:25:53.911624000 +0200 +@@ -7,9 +7,9 @@ + + #include "build/build_config.h" + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_FREEBSD) + #error "This file only applies to the Linux component update of Flash." +-#endif // !defined(OS_LINUX) ++#endif // !defined(OS_LINUX) && !defined(OS_FREEBSD) + + #include + Modified: branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- chrome/common/variations/fieldtrial_testing_config.gyp.orig 2015-10-15 09:32:40.670879000 -0400 -+++ chrome/common/variations/fieldtrial_testing_config.gyp 2015-10-15 09:27:09.909117000 -0400 +--- chrome/common/variations/fieldtrial_testing_config.gyp.orig 2015-12-16 21:13:34.948159764 +0100 ++++ chrome/common/variations/fieldtrial_testing_config.gyp 2015-12-16 21:14:00.477158698 +0100 @@ -19,7 +19,7 @@ 'conditions': [ ['OS!="android"', {'sources/': [['exclude', '_android\\.json$']]}], Modified: branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- components/metrics/drive_metrics_provider_linux.cc.orig 2015-10-14 08:11:50.411251000 -0400 -+++ components/metrics/drive_metrics_provider_linux.cc 2015-10-14 08:12:35.355093000 -0400 +--- components/metrics/drive_metrics_provider_linux.cc.orig 2015-10-14 16:34:04.903957000 +0200 ++++ components/metrics/drive_metrics_provider_linux.cc 2015-10-14 16:34:35.113096000 +0200 @@ -4,7 +4,13 @@ #include "components/metrics/drive_metrics_provider.h" Copied: branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc (from r404050, head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc) @@ -0,0 +1,10 @@ +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2015-10-14 23:20:02.027419000 +0200 ++++ content/browser/renderer_host/render_process_host_impl.cc 2015-10-14 23:20:29.597226000 +0200 +@@ -38,6 +38,7 @@ + #include "base/tracked_objects.h" + #include "cc/base/switches.h" + #include "components/tracing/tracing_switches.h" ++#include "content/common/bluetooth/bluetooth_scan_filter.h" + #include "content/browser/appcache/appcache_dispatcher_host.h" + #include "content/browser/appcache/chrome_appcache_service.h" + #include "content/browser/background_sync/background_sync_service_impl.h" Modified: branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2015-11-04 18:00:50.000000000 -0500 -+++ content/renderer/renderer_blink_platform_impl.cc 2015-11-06 16:14:45.473476000 -0500 +--- content/renderer/renderer_blink_platform_impl.cc.orig 2015-11-24 21:00:55.000000000 +0100 ++++ content/renderer/renderer_blink_platform_impl.cc 2015-12-06 14:27:00.785767410 +0100 @@ -104,7 +104,7 @@ #if defined(OS_POSIX) Modified: branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- device/serial/serial_io_handler_posix.cc.orig 2015-10-06 22:42:12.000000000 -0400 -+++ device/serial/serial_io_handler_posix.cc 2015-10-14 10:57:52.264932000 -0400 +--- device/serial/serial_io_handler_posix.cc.orig 2015-10-14 16:49:00.395597000 +0200 ++++ device/serial/serial_io_handler_posix.cc 2015-10-14 17:18:20.515698000 +0200 @@ -59,7 +59,7 @@ BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) Modified: branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,11 +1,11 @@ ---- device/usb/usb_service_impl.cc.orig 2015-10-21 18:00:38.000000000 -0400 -+++ device/usb/usb_service_impl.cc 2015-10-23 12:39:46.908676000 -0400 +--- device/usb/usb_service_impl.cc.orig 2015-12-04 22:33:43.708484000 +0100 ++++ device/usb/usb_service_impl.cc 2015-12-04 22:39:47.903086000 +0100 @@ -20,7 +20,11 @@ #include "device/usb/usb_device_handle.h" #include "device/usb/usb_error.h" #include "device/usb/webusb_descriptors.h" +#if defined(OS_FREEBSD) -+#include "libusb.h" ++#include +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif @@ -20,11 +20,16 @@ rv = libusb_hotplug_register_callback( context_->context(), static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -559,12 +564,15 @@ - device_observer_.Add(device_monitor); +@@ -553,6 +558,8 @@ } - #endif // OS_WIN -+#endif // OS_FREEBSD + + RefreshDevices(); ++#endif // !defined(OS_FREEBSD) ++ + #if defined(OS_WIN) + DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); + if (device_monitor) { +@@ -562,9 +569,11 @@ } UsbServiceImpl::~UsbServiceImpl() { @@ -32,11 +37,11 @@ if (hotplug_enabled_) { libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); } -+#endif // OS_FREEBSD ++#endif // !defined(OS_FREEBSD) for (const auto& map_entry : devices_) { map_entry.second->OnDisconnect(); } -@@ -802,6 +810,7 @@ +@@ -802,6 +811,7 @@ device->OnDisconnect(); } @@ -44,11 +49,11 @@ // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -839,6 +848,7 @@ +@@ -839,6 +849,7 @@ return 0; } -+#endif // !OS_FREEBSD ++#endif // !defined(OS_FREEBSD) void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { DCHECK(CalledOnValidThread()); Copied: branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.cc (from r404050, head/www/chromium/files/patch-media__audio__audio_manager.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.cc Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-media__audio__audio_manager.cc) @@ -0,0 +1,29 @@ +--- media/audio/audio_manager.cc.orig 2015-12-05 21:00:28.652308000 +0100 ++++ media/audio/audio_manager.cc 2015-12-05 21:00:59.340983000 +0100 +@@ -157,7 +157,7 @@ + } + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + void set_app_name(const std::string& app_name) { + app_name_ = app_name; + } +@@ -184,7 +184,7 @@ + scoped_ptr com_initializer_for_testing_; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + std::string app_name_; + #endif + +@@ -267,7 +267,7 @@ + #endif + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + // static + void AudioManager::SetGlobalAppName(const std::string& app_name) { + g_helper.Pointer()->set_app_name(app_name); Copied: branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.h (from r404050, head/www/chromium/files/patch-media__audio__audio_manager.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__audio__audio_manager.h Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-media__audio__audio_manager.h) @@ -0,0 +1,11 @@ +--- media/audio/audio_manager.h.orig 2015-12-05 22:20:38.929937000 +0100 ++++ media/audio/audio_manager.h 2015-12-05 22:21:06.651164000 +0100 +@@ -61,7 +61,7 @@ + // called previously to start the hang monitor. Does nothing on OSX. + static void EnableHangMonitor(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + // Sets the name of the audio source as seen by external apps. Only actually + // used with PulseAudio as of this writing. + static void SetGlobalAppName(const std::string& app_name); Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2015-10-14 11:08:16.489018000 -0400 -+++ media/capture/video/fake_video_capture_device_factory.cc 2015-10-14 11:09:19.850751000 -0400 +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2015-10-14 17:33:35.934406000 +0200 ++++ media/capture/video/fake_video_capture_device_factory.cc 2015-10-14 17:34:01.687650000 +0200 @@ -51,7 +51,7 @@ for (int n = 0; n < number_of_devices_; ++n) { VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n), Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/capture/video/file_video_capture_device_factory.cc.orig 2015-10-14 11:10:41.842256000 -0400 -+++ media/capture/video/file_video_capture_device_factory.cc 2015-10-14 11:11:13.400581000 -0400 +--- media/capture/video/file_video_capture_device_factory.cc.orig 2015-10-14 17:42:06.832425000 +0200 ++++ media/capture/video/file_video_capture_device_factory.cc 2015-10-14 17:42:45.561757000 +0200 @@ -49,7 +49,7 @@ device_names->push_back(VideoCaptureDevice::Name( command_line_file_path.value(), kFileVideoCaptureDeviceName, Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,57 +1,62 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2015-10-21 18:00:38.000000000 -0400 -+++ media/capture/video/linux/video_capture_device_linux.cc 2015-10-23 12:49:31.985359000 -0400 -@@ -43,6 +43,7 @@ +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2015-11-24 21:00:55.000000000 +0100 ++++ media/capture/video/linux/video_capture_device_linux.cc 2015-12-05 22:01:43.229465000 +0100 +@@ -41,6 +41,7 @@ + return true; + } ++#if !defined(OS_FREEBSD) // Translates Video4Linux pixel formats to Chromium pixel formats. // static -+#if !defined(OS_FREEBSD) VideoPixelFormat - VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(uint32 v4l2_fourcc) { - return V4L2CaptureDelegate::V4l2FourCcToChromiumPixelFormat(v4l2_fourcc); @@ -54,6 +55,7 @@ bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } -+#endif // !defined(OS_FREEBSD) ++#endif // !defined(OS_FREEBSD) const std::string VideoCaptureDevice::Name::GetModel() const { // |unique_id| is of the form "/dev/video2". |file_name| is "video2". -@@ -91,6 +93,7 @@ +@@ -88,6 +90,7 @@ + v4l2_thread_.Stop(); + } + ++#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, scoped_ptr client) { -+#if !defined(OS_FREEBSD) - DCHECK(!capture_impl_); - if (v4l2_thread_.IsRunning()) - return; // Wrong state. -@@ -110,9 +113,11 @@ - params.requested_format.frame_size.width(), +@@ -111,7 +114,13 @@ params.requested_format.frame_size.height(), params.requested_format.frame_rate, base::Passed(&client))); -+#endif } ++#else // !defined(OS_FREEBSD) ++void VideoCaptureDeviceLinux::AllocateAndStart( ++ const VideoCaptureParams& params, ++ scoped_ptr client) {} ++#endif // !defined(OS_FREEBSD) - void VideoCaptureDeviceLinux::StopAndDeAllocate() { +#if !defined(OS_FREEBSD) + void VideoCaptureDeviceLinux::StopAndDeAllocate() { if (!v4l2_thread_.IsRunning()) return; // Wrong state. - v4l2_thread_.message_loop()->PostTask( -@@ -121,8 +126,10 @@ - v4l2_thread_.Stop(); +@@ -122,7 +131,11 @@ capture_impl_ = NULL; -+#endif } ++#else // !defined(OS_FREEBSD) ++void VideoCaptureDeviceLinux::StopAndDeAllocate() {} ++#endif // !defined(OS_FREEBSD) +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::SetRotation(int rotation) { if (v4l2_thread_.IsRunning()) { v4l2_thread_.message_loop()->PostTask( -@@ -130,6 +137,7 @@ +@@ -130,6 +143,9 @@ base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); } } -+#endif // !defined(OS_FREEBSD) ++#else // !defined(OS_FREEBSD) ++void VideoCaptureDeviceLinux::SetRotation(int rotation) {} ++#endif // !defined(OS_FREEBSD) // static int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(int frequency) { Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/capture/video/video_capture_device.cc.orig 2015-10-21 18:00:38.000000000 -0400 -+++ media/capture/video/video_capture_device.cc 2015-10-23 12:51:56.086998000 -0400 +--- media/capture/video/video_capture_device.cc.orig 2015-12-04 22:51:59.984494000 +0100 ++++ media/capture/video/video_capture_device.cc 2015-12-04 22:53:28.114262000 +0100 @@ -11,6 +11,10 @@ namespace media { Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/capture/video/video_capture_device.h.orig 2015-10-14 11:35:25.088073000 -0400 -+++ media/capture/video/video_capture_device.h 2015-10-14 11:37:56.457208000 -0400 +--- media/capture/video/video_capture_device.h.orig 2015-10-14 18:04:30.325845000 +0200 ++++ media/capture/video/video_capture_device.h 2015-10-14 18:06:41.271627000 +0200 @@ -43,7 +43,7 @@ Name(); Name(const std::string& name, const std::string& id); Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2015-10-14 11:42:17.044891000 -0400 -+++ media/capture/video/video_capture_device_factory.cc 2015-10-14 11:43:44.770286000 -0400 +--- media/capture/video/video_capture_device_factory.cc.orig 2015-10-14 18:11:45.655658000 +0200 ++++ media/capture/video/video_capture_device_factory.cc 2015-10-14 18:13:09.785092000 +0200 @@ -14,6 +14,10 @@ // static scoped_ptr VideoCaptureDeviceFactory::CreateFactory( @@ -15,7 +15,7 @@ return scoped_ptr( CreateVideoCaptureDeviceFactory(ui_task_runner)); } -+#endif ++#endif } VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { Modified: branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- media/filters/vp9_parser.h.orig 2015-11-13 12:04:18.000000000 +0100 -+++ media/filters/vp9_parser.h 2015-12-06 01:55:30.382338000 +0100 +--- media/filters/vp9_parser.h.orig 2015-12-16 23:46:15.092527599 +0100 ++++ media/filters/vp9_parser.h 2015-12-16 23:46:43.476526238 +0100 @@ -14,6 +14,7 @@ #include Modified: branches/2015Q4/www/chromium/files/patch-media__media.gyp ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__media.gyp Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-media__media.gyp Sun Dec 20 20:15:23 2015 (r404073) @@ -1,6 +1,6 @@ ---- media/media.gyp.orig 2015-10-21 18:00:38.000000000 -0400 -+++ media/media.gyp 2015-10-23 12:57:14.545450000 -0400 -@@ -780,13 +780,19 @@ +--- media/media.gyp.orig 2015-12-04 22:55:01.017572000 +0100 ++++ media/media.gyp 2015-12-04 22:58:02.692056000 +0100 +@@ -782,13 +782,19 @@ ['exclude', '_alsa\\.(h|cc)$'], ], }], @@ -22,7 +22,7 @@ 'conditions': [ ['use_x11==1', { 'dependencies': [ -@@ -1122,7 +1128,7 @@ +@@ -1124,7 +1130,7 @@ 'base/simd/filter_yuv_sse2.cc', ], }], Modified: branches/2015Q4/www/chromium/files/patch-net__net.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-net__net.gypi Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-net__net.gypi Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- net/net.gypi.orig 2015-10-21 18:00:38.000000000 -0400 -+++ net/net.gypi 2015-10-23 12:58:44.791781000 -0400 +--- net/net.gypi.orig 2015-12-04 22:59:49.506305000 +0100 ++++ net/net.gypi 2015-12-04 23:00:47.269128000 +0100 @@ -392,8 +392,8 @@ 'android/network_library.h', 'android/traffic_stats.cc', @@ -16,7 +16,7 @@ 'android/traffic_stats_unittest.cc', 'base/address_list_unittest.cc', - 'base/address_tracker_linux_unittest.cc', -+ #'base/address_tracker_linux_unittest.cc', ++# 'base/address_tracker_linux_unittest.cc', 'base/backoff_entry_serializer_unittest.cc', 'base/backoff_entry_unittest.cc', 'base/chunked_upload_data_stream_unittest.cc', Modified: branches/2015Q4/www/chromium/files/patch-net__proxy__proxy_service.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-net__proxy__proxy_service.cc Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-net__proxy__proxy_service.cc Sun Dec 20 20:15:23 2015 (r404073) @@ -1,5 +1,5 @@ ---- net/proxy/proxy_service.cc.orig 2015-10-21 18:00:38.000000000 -0400 -+++ net/proxy/proxy_service.cc 2015-10-23 13:27:56.693933000 -0400 +--- net/proxy/proxy_service.cc.orig 2015-12-04 23:02:25.675097000 +0100 ++++ net/proxy/proxy_service.cc 2015-12-04 23:04:16.821354000 +0100 @@ -43,7 +43,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" Modified: branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi Sun Dec 20 19:34:39 2015 (r404072) +++ branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi Sun Dec 20 20:15:23 2015 (r404073) @@ -1,14 +1,14 @@ ---- skia/skia_chrome.gypi.orig 2015-10-13 15:04:33.000000000 -0400 -+++ skia/skia_chrome.gypi 2015-10-14 11:46:34.142959000 -0400 -@@ -55,6 +55,11 @@ - 'ext/skia_utils_win.cc', - ], - 'conditions': [ +--- skia/skia_chrome.gypi.orig 2015-10-14 18:24:42.938769000 +0200 ++++ skia/skia_chrome.gypi 2015-10-14 18:22:24.515306000 +0200 +@@ -60,6 +60,11 @@ + 'ext/platform_canvas.cc', + ], + }], + [ 'use_cairo == 1', { + 'dependencies': [ + '../build/linux/system.gyp:pangocairo', + ], + }], - [ 'OS == "ios"', { + [ 'OS == "android" and ' + 'enable_basic_printing==0 and enable_print_preview==0', { 'sources!': [ - 'ext/platform_canvas.cc', Copied: branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py (from r404050, head/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py) @@ -0,0 +1,20 @@ +--- third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig 2015-12-06 15:33:39.820492707 +0100 ++++ third_party/ffmpeg/chromium/scripts/generate_gyp.py 2015-12-06 18:01:30.369881976 +0100 +@@ -43,6 +43,8 @@ + COPYRIGHT = """# Copyright %d The Chromium Authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. ++# ++# modified: cmt@burggraben.net + + # NOTE: this file is autogenerated by ffmpeg/chromium/scripts/generate_gyp.py + +@@ -372,6 +374,8 @@ + + if condition.PLATFORM == '*': + platform_condition = None ++ elif condition.PLATFORM == 'linux': ++ platform_condition = '(OS == "%s" or os_bsd == 1)' % condition.PLATFORM + else: + platform_condition = 'OS == "%s"' % condition.PLATFORM + Copied: branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni (from r404050, head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni Sun Dec 20 20:15:23 2015 (r404073, copy of r404050, head/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni) @@ -0,0 +1,301 @@ +--- third_party/ffmpeg/ffmpeg_generated.gni.orig 2015-12-06 19:48:34.878438301 +0100 ++++ third_party/ffmpeg/ffmpeg_generated.gni 2015-12-06 19:52:33.782420758 +0100 +@@ -12,7 +12,7 @@ + ffmpeg_gas_sources = [] + ffmpeg_yasm_sources = [] + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is _linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ff mpeg_branding == "Chrome") || (is_linux && c! urrent_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ar m_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS"! ) || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ff mpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { + ffmpeg_c_sources += [ + "libavcodec/allcodecs.c", + "libavcodec/autorename_libavcodec_utils.c", +@@ -138,7 +138,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") | | (is_win && current_cpu == "x64" && ffmpeg_! branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == " arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpe g_branding == "ChromeOS") || ((is_linux || o! s_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { + ffmpeg_c_sources += [ + "libavcodec/h264pred.c", + "libavcodec/hpeldsp.c", +@@ -153,13 +153,13 @@ + ] + } + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && c urrent_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == ! "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { + ffmpeg_c_sources += [ + "libavformat/rawdec.c", + ] + } + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x 64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding = = "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { + ffmpeg_c_sources += [ + "libavcodec/aac_ac3_parser.c", + "libavcodec/aac_parser.c", +@@ -195,7 +195,7 @@ + ] + } + +-if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { ++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { + ffmpeg_c_sources += [ + "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", + "libavcodec/x86/constants.c", +@@ -213,7 +213,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_b randing == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome ") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { + ffmpeg_c_sources += [ + "libavcodec/cabac.c", + "libavcodec/h264.c", +@@ -242,7 +242,7 @@ + ] + } + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/arm/fft_fixed_init_arm.c", + "libavcodec/arm/fft_init_arm.c", +@@ -258,7 +258,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg _branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/flac.c", + "libavcodec/flac_parser.c", +@@ -269,7 +269,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/arm/h264pred_init_arm.c", + "libavcodec/arm/hpeldsp_init_arm.c", +@@ -289,7 +289,7 @@ + ] + } + +-if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && curre nt_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { + ffmpeg_c_sources += [ + "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c", + "libavcodec/x86/h264_intrapred_init.c", +@@ -309,7 +309,7 @@ + ] + } + +-if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { ++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { + ffmpeg_c_sources += [ + "libavcodec/x86/aacpsdsp_init.c", + "libavcodec/x86/dct_init.c", +@@ -324,7 +324,7 @@ + ] + } + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavutil/arm/float_dsp_init_neon.c", + ] +@@ -339,7 +339,7 @@ + ] + } + +-if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { ++if ((is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { + ffmpeg_c_sources += [ + "libavcodec/arm/aacpsdsp_init_arm.c", + "libavcodec/arm/mpegaudiodsp_init_arm.c", +@@ -350,7 +350,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { + ffmpeg_c_sources += [ + "libavcodec/acelp_filters.c", + "libavcodec/acelp_pitch_delay.c", +@@ -405,13 +405,13 @@ + ] + } + +-if ((is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { ++if ((is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavutil/mips/float_dsp_mips.c", + ] + } + +-if ((is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/mips/h264pred_init_mips.c", + "libavcodec/mips/hpeldsp_init_mips.c", +@@ -419,7 +419,7 @@ + ] + } + +-if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { ++if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/aarch64/fft_init_aarch64.c", + "libavcodec/aarch64/vorbisdsp_init.c", +@@ -434,7 +434,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/aarch64/h264pred_init.c", + "libavcodec/aarch64/hpeldsp_init_aarch64.c", +@@ -447,7 +447,7 @@ + ] + } + +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { ++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { + ffmpeg_c_sources += [ + "libavcodec/arm/flacdsp_init_arm.c", + ] +@@ -456,7 +456,7 @@ + ] + } + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Mon Dec 21 00:20:40 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5779CA4E535; Mon, 21 Dec 2015 00:20:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3104A10E7; Mon, 21 Dec 2015 00:20:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBL0KdvK029022; Mon, 21 Dec 2015 00:20:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBL0KdNx029018; Mon, 21 Dec 2015 00:20:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201512210020.tBL0KdNx029018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 21 Dec 2015 00:20:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404077 - in branches/2015Q4/www: firefox firefox/files seamonkey seamonkey/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, 21 Dec 2015 00:20:40 -0000 Author: jbeich Date: Mon Dec 21 00:20:38 2015 New Revision: 404077 URL: https://svnweb.freebsd.org/changeset/ports/404077 Log: MFH: r404012 www/firefox: bump required harfbuzz version In file included from gfx/thebes/Unified_cpp_gfx_thebes1.cpp:11: gfx/thebes/gfxHarfBuzzShaper.cpp:1571:41: error: use of undeclared identifier 'HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS' hb_buffer_set_cluster_level(buffer, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS); ^ Reported by: graemeg on forums.freebsd.org Approved by: ports-secteam (feld) Modified: branches/2015Q4/www/firefox/Makefile branches/2015Q4/www/firefox/files/patch-bug847568 branches/2015Q4/www/seamonkey/Makefile branches/2015Q4/www/seamonkey/files/patch-bug847568 Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/firefox/Makefile ============================================================================== --- branches/2015Q4/www/firefox/Makefile Sun Dec 20 23:44:59 2015 (r404076) +++ branches/2015Q4/www/firefox/Makefile Mon Dec 21 00:20:38 2015 (r404077) @@ -16,7 +16,7 @@ BUILD_DEPENDS= nspr>=4.10.10:${PORTSDIR} nss>=3.19.4:${PORTSDIR}/security/nss \ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ - harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \ + harfbuzz>=0.9.42:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ Modified: branches/2015Q4/www/firefox/files/patch-bug847568 ============================================================================== --- branches/2015Q4/www/firefox/files/patch-bug847568 Sun Dec 20 23:44:59 2015 (r404076) +++ branches/2015Q4/www/firefox/files/patch-bug847568 Mon Dec 21 00:20:38 2015 (r404077) @@ -46,7 +46,7 @@ index ac38f40..87536b7 100644 +MOZ_NATIVE_HARFBUZZ=) + +if test -n "$MOZ_NATIVE_HARFBUZZ"; then -+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34) ++ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.42) +fi + +AC_SUBST(MOZ_NATIVE_HARFBUZZ) Modified: branches/2015Q4/www/seamonkey/Makefile ============================================================================== --- branches/2015Q4/www/seamonkey/Makefile Sun Dec 20 23:44:59 2015 (r404076) +++ branches/2015Q4/www/seamonkey/Makefile Mon Dec 21 00:20:38 2015 (r404077) @@ -17,7 +17,7 @@ BUILD_DEPENDS= nspr>=4.10.10:${PORTSDIR} nss>=3.19.4:${PORTSDIR}/security/nss \ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ - harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \ + harfbuzz>=0.9.42:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ Modified: branches/2015Q4/www/seamonkey/files/patch-bug847568 ============================================================================== --- branches/2015Q4/www/seamonkey/files/patch-bug847568 Sun Dec 20 23:44:59 2015 (r404076) +++ branches/2015Q4/www/seamonkey/files/patch-bug847568 Mon Dec 21 00:20:38 2015 (r404077) @@ -46,7 +46,7 @@ index ac38f40..87536b7 100644 +MOZ_NATIVE_HARFBUZZ=) + +if test -n "$MOZ_NATIVE_HARFBUZZ"; then -+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34) ++ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.42) +fi + +AC_SUBST(MOZ_NATIVE_HARFBUZZ) From owner-svn-ports-branches@freebsd.org Mon Dec 21 00:21:54 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4EABA4E677; Mon, 21 Dec 2015 00:21:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AF3AD137B; Mon, 21 Dec 2015 00:21:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBL0LrGE031760; Mon, 21 Dec 2015 00:21:53 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBL0LrVb031758; Mon, 21 Dec 2015 00:21:53 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201512210021.tBL0LrVb031758@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 21 Dec 2015 00:21:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404078 - branches/2015Q4/security/nss 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, 21 Dec 2015 00:21:55 -0000 Author: jbeich Date: Mon Dec 21 00:21:53 2015 New Revision: 404078 URL: https://svnweb.freebsd.org/changeset/ports/404078 Log: MFH: r404007 security/nss: update to 3.20.2 Changes: https://hg.mozilla.org/projects/nss/rev/891676aa0d85 Approved by: ports-secteam (feld) Modified: branches/2015Q4/security/nss/Makefile branches/2015Q4/security/nss/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/security/nss/Makefile ============================================================================== --- branches/2015Q4/security/nss/Makefile Mon Dec 21 00:20:38 2015 (r404077) +++ branches/2015Q4/security/nss/Makefile Mon Dec 21 00:21:53 2015 (r404078) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.20.1 +PORTVERSION= 3.20.2 #DISTVERSIONSUFFIX= -with-ckbi-1.98 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: branches/2015Q4/security/nss/distinfo ============================================================================== --- branches/2015Q4/security/nss/distinfo Mon Dec 21 00:20:38 2015 (r404077) +++ branches/2015Q4/security/nss/distinfo Mon Dec 21 00:21:53 2015 (r404078) @@ -1,2 +1,2 @@ -SHA256 (nss-3.20.1.tar.gz) = ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97 -SIZE (nss-3.20.1.tar.gz) = 6958956 +SHA256 (nss-3.20.2.tar.gz) = 141a3a59d57fbcd00b669bcaa4ccd2fd632a9306e2fb4623e89eed0a2e93f286 +SIZE (nss-3.20.2.tar.gz) = 6959455 From owner-svn-ports-branches@freebsd.org Mon Dec 21 13:01:03 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07161A4DF9E; Mon, 21 Dec 2015 13:01:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 990491F1B; Mon, 21 Dec 2015 13:01:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBLD11Zg052202; Mon, 21 Dec 2015 13:01:01 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLD107h052185; Mon, 21 Dec 2015 13:01:00 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201512211301.tBLD107h052185@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 21 Dec 2015 13:01:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404095 - in branches/2015Q4: Mk Mk/Uses www/firefox www/firefox-i18n www/firefox/files www/linux-firefox 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, 21 Dec 2015 13:01:03 -0000 Author: jbeich Date: Mon Dec 21 13:01:00 2015 New Revision: 404095 URL: https://svnweb.freebsd.org/changeset/ports/404095 Log: MFH: r404010 www/firefox: update to 43.0.1 Changes: https://www.mozilla.org/en-US/firefox/43.0/releasenotes/ PR: 205357 Submitted by: Christoph Moench-Tegeder Security: 2c2d1c39-1396-459a-91f5-ca03ee7c64c6 Approved by: ports-secteam (feld) Added: branches/2015Q4/www/firefox/files/patch-bug1228742 - copied unchanged from r404010, head/www/firefox/files/patch-bug1228742 Deleted: branches/2015Q4/www/firefox/files/patch-media_libav_config__unix.h Modified: branches/2015Q4/Mk/Uses/gecko.mk branches/2015Q4/Mk/bsd.gecko.mk branches/2015Q4/www/firefox-i18n/Makefile branches/2015Q4/www/firefox-i18n/distinfo branches/2015Q4/www/firefox/Makefile branches/2015Q4/www/firefox/distinfo branches/2015Q4/www/firefox/files/patch-bug1026499 branches/2015Q4/www/firefox/files/patch-bug702179 branches/2015Q4/www/firefox/files/patch-bug847568 branches/2015Q4/www/firefox/files/patch-bug991253 branches/2015Q4/www/firefox/files/patch-soundtouch-no-factory branches/2015Q4/www/linux-firefox/Makefile branches/2015Q4/www/linux-firefox/distinfo branches/2015Q4/www/linux-firefox/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/Mk/Uses/gecko.mk ============================================================================== --- branches/2015Q4/Mk/Uses/gecko.mk Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/Mk/Uses/gecko.mk Mon Dec 21 13:01:00 2015 (r404095) @@ -37,12 +37,12 @@ RUN_DEPENDS+= libxul>=38:${PORTSDIR}/www .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 38 -_GECKO_VERSIONS= 38 42 +_GECKO_VERSIONS= 38 43 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -42_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +43_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null Modified: branches/2015Q4/Mk/bsd.gecko.mk ============================================================================== --- branches/2015Q4/Mk/bsd.gecko.mk Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/Mk/bsd.gecko.mk Mon Dec 21 13:01:00 2015 (r404095) @@ -129,8 +129,8 @@ CPPFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZILLA} .if ${OPSYS} != DragonFly # XXX xpcshell crash during install -# use jemalloc 3.0.0 API for stats/tuning -MOZ_EXPORT+= MOZ_JEMALLOC3=1 +# use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning +MOZ_EXPORT+= MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100079 . if ${MOZILLA_VER:R:R} < 43 # system jemalloc 4.0.0 vs. bundled jemalloc 3.6.0-204-gb4acf73 @@ -578,7 +578,7 @@ gecko-post-patch: ${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \ ${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${MOZSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp + ${MOZSRC}/extensions/spellcheck/hunspell/*/mozHunspell.cpp # handles mozilla pis scripts. gecko-moz-pis-patch: Modified: branches/2015Q4/www/firefox-i18n/Makefile ============================================================================== --- branches/2015Q4/www/firefox-i18n/Makefile Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/firefox-i18n/Makefile Mon Dec 21 13:01:00 2015 (r404095) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 42.0 +PORTVERSION= 43.0.1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} @@ -15,7 +15,7 @@ COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:firefox,42,build +USES= zip:infozip gecko:firefox,43,build USE_XPI= firefox linux-firefox NO_ARCH= yes Modified: branches/2015Q4/www/firefox-i18n/distinfo ============================================================================== --- branches/2015Q4/www/firefox-i18n/distinfo Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/firefox-i18n/distinfo Mon Dec 21 13:01:00 2015 (r404095) @@ -1,178 +1,178 @@ -SHA256 (xpi/firefox-i18n-42.0/ach.xpi) = 80b7f285d462ea72b49e482519c8d6265ad4767e89b1bfdc2e2d82eabff45be8 -SIZE (xpi/firefox-i18n-42.0/ach.xpi) = 484101 -SHA256 (xpi/firefox-i18n-42.0/af.xpi) = 087fc72613b98336eefc5db701b361188d7e3950365650651c2b53ced362eea6 -SIZE (xpi/firefox-i18n-42.0/af.xpi) = 491004 -SHA256 (xpi/firefox-i18n-42.0/an.xpi) = 7b99498a270e20066f9791e92841ee61a1da88b883c36e611cfe79a4abeb7285 -SIZE (xpi/firefox-i18n-42.0/an.xpi) = 469526 -SHA256 (xpi/firefox-i18n-42.0/ar.xpi) = c4bd2e007fffa25743e8f20f70baf3abcef6aee59b82fc1360a9a2ebf120da69 -SIZE (xpi/firefox-i18n-42.0/ar.xpi) = 527045 -SHA256 (xpi/firefox-i18n-42.0/as.xpi) = 397f51b49a9a5c754079561e5245e2e61508e61b1f1386e80fb9aaa91b4424c8 -SIZE (xpi/firefox-i18n-42.0/as.xpi) = 516804 -SHA256 (xpi/firefox-i18n-42.0/ast.xpi) = a6dd8e3b2439f047c8aa929050df202b1128f54a01c7d55e86a0d582c4372096 -SIZE (xpi/firefox-i18n-42.0/ast.xpi) = 409860 -SHA256 (xpi/firefox-i18n-42.0/az.xpi) = fe56a7bd0694dd42946cfc1723c4c7d2075f2588baff2ca742afd2761df434d0 -SIZE (xpi/firefox-i18n-42.0/az.xpi) = 498264 -SHA256 (xpi/firefox-i18n-42.0/be.xpi) = 0fb8d84bbe69b6402847fe9be3392e50f867a8949b3597947287d1cb5723e40d -SIZE (xpi/firefox-i18n-42.0/be.xpi) = 458684 -SHA256 (xpi/firefox-i18n-42.0/bg.xpi) = 68f2334cbd91976b12de4d489d46f0a1a02720a02b848d0f1ead2d1475f94b35 -SIZE (xpi/firefox-i18n-42.0/bg.xpi) = 497770 -SHA256 (xpi/firefox-i18n-42.0/bn-BD.xpi) = c49c4df26fa1396efec68ddecde3947204baf7f5040c4380e4ab0742592db27e -SIZE (xpi/firefox-i18n-42.0/bn-BD.xpi) = 545583 -SHA256 (xpi/firefox-i18n-42.0/bn-IN.xpi) = 5b91351ccdcf064eb22f8d3077573d94ed2005e434885535a6018532ca67dfba -SIZE (xpi/firefox-i18n-42.0/bn-IN.xpi) = 537276 -SHA256 (xpi/firefox-i18n-42.0/br.xpi) = 5372bf36dbad0f368c6e1926c8c9d6ca40136f25c7dd818d933ca5568f3a1e9f -SIZE (xpi/firefox-i18n-42.0/br.xpi) = 449190 -SHA256 (xpi/firefox-i18n-42.0/bs.xpi) = 78784ccf40c531ebecf58bedf96db046a9eed42062ca05c80c5ecc5d5dbb6f48 -SIZE (xpi/firefox-i18n-42.0/bs.xpi) = 488131 -SHA256 (xpi/firefox-i18n-42.0/ca.xpi) = f60be77d1edc340303d0580d6da07812e5b536223859226cb26adc4b837fa5e9 -SIZE (xpi/firefox-i18n-42.0/ca.xpi) = 465823 -SHA256 (xpi/firefox-i18n-42.0/cs.xpi) = ff4f81fbc34e17b6c742a20927a8dee0dc7cdf8743d6c5219f898ffd0d750ba6 -SIZE (xpi/firefox-i18n-42.0/cs.xpi) = 455106 -SHA256 (xpi/firefox-i18n-42.0/cy.xpi) = 3d01d9210c7bd2708f99add6299c089654030a8b47e87e9a6debb9d58ab2eeeb -SIZE (xpi/firefox-i18n-42.0/cy.xpi) = 451680 -SHA256 (xpi/firefox-i18n-42.0/da.xpi) = af056943a836fb36b8433e64e9b3003452280787ae155518559b1525d3566368 -SIZE (xpi/firefox-i18n-42.0/da.xpi) = 458413 -SHA256 (xpi/firefox-i18n-42.0/de.xpi) = 0301696932c69da60274dc19de58d50cc6a8beabb0387ad4d4526bdba1557790 -SIZE (xpi/firefox-i18n-42.0/de.xpi) = 460744 -SHA256 (xpi/firefox-i18n-42.0/dsb.xpi) = b6a5a998fad95e082b4c94b69c36680de7c5908efb85e222c4f9448f233458ee -SIZE (xpi/firefox-i18n-42.0/dsb.xpi) = 479637 -SHA256 (xpi/firefox-i18n-42.0/el.xpi) = 93479275cc21ce09597de19b841642120100ab00916f23ed9bfd71bb67cfd9b6 -SIZE (xpi/firefox-i18n-42.0/el.xpi) = 505735 -SHA256 (xpi/firefox-i18n-42.0/en-GB.xpi) = e282b2425bbbb60a3eebfa3e16cb6d747a72da505ee2a48378ee2d08dba6ab57 -SIZE (xpi/firefox-i18n-42.0/en-GB.xpi) = 443856 -SHA256 (xpi/firefox-i18n-42.0/en-US.xpi) = 9bf74eaccbe740c513be7e406f582907c578838b6d0f14e4c346689490517167 -SIZE (xpi/firefox-i18n-42.0/en-US.xpi) = 475844 -SHA256 (xpi/firefox-i18n-42.0/en-ZA.xpi) = 0ea29117a55aca8acab2df176790c1024510ac5db23b61ccccb14223fbd12b3d -SIZE (xpi/firefox-i18n-42.0/en-ZA.xpi) = 449903 -SHA256 (xpi/firefox-i18n-42.0/eo.xpi) = f4c24c83b2dd4ece852d4bba0ce902233408eaf45aed5185b9f462d737d6d527 -SIZE (xpi/firefox-i18n-42.0/eo.xpi) = 491605 -SHA256 (xpi/firefox-i18n-42.0/es-AR.xpi) = 92fc906a1957ca00d8bdfde61fcc59feb367338857b3f2740ac15ae6931c2127 -SIZE (xpi/firefox-i18n-42.0/es-AR.xpi) = 459408 -SHA256 (xpi/firefox-i18n-42.0/es-CL.xpi) = 776b59c03dbabda037e65902b1a87c6634beca0449cd9c35f300db64d88d5fc9 -SIZE (xpi/firefox-i18n-42.0/es-CL.xpi) = 386944 -SHA256 (xpi/firefox-i18n-42.0/es-ES.xpi) = 1abbe63ebcd37cf44ad6d60759916d81f272910b9edcda0e36ab16090ba2e629 -SIZE (xpi/firefox-i18n-42.0/es-ES.xpi) = 373753 -SHA256 (xpi/firefox-i18n-42.0/es-MX.xpi) = 041dcad0d1840f79ae1f4769796aa080c9834261ede4e55f55300411808b940b -SIZE (xpi/firefox-i18n-42.0/es-MX.xpi) = 465414 -SHA256 (xpi/firefox-i18n-42.0/et.xpi) = af4b17647e9e88652b352aa40b3aae87c254d025e8fd488c08b0f96d82176e07 -SIZE (xpi/firefox-i18n-42.0/et.xpi) = 450258 -SHA256 (xpi/firefox-i18n-42.0/eu.xpi) = cfe32d285ffe379aa7307d4de3fb639ffb961b1ebba857406f12cc15e7f61b64 -SIZE (xpi/firefox-i18n-42.0/eu.xpi) = 474713 -SHA256 (xpi/firefox-i18n-42.0/fa.xpi) = 5c0dbc5f709145ca93e89e0ad67c688821a3080476f5202c987d9d2b035800ce -SIZE (xpi/firefox-i18n-42.0/fa.xpi) = 526702 -SHA256 (xpi/firefox-i18n-42.0/ff.xpi) = d43f31eae539b6616f88e7dc0023eef4e4e64940ca4f625ab983fc52e7135321 -SIZE (xpi/firefox-i18n-42.0/ff.xpi) = 461016 -SHA256 (xpi/firefox-i18n-42.0/fi.xpi) = 6db03ffb84a02132ad852a9e6a223834ba00182ce34fab5e19b7c16dad6d2269 -SIZE (xpi/firefox-i18n-42.0/fi.xpi) = 452032 -SHA256 (xpi/firefox-i18n-42.0/fr.xpi) = 8eeec5d50b169f4102921941dfd43c8bb02f82e82c8f6a38a291c322914f17ce -SIZE (xpi/firefox-i18n-42.0/fr.xpi) = 470271 -SHA256 (xpi/firefox-i18n-42.0/fy-NL.xpi) = 2471d52f5bfeb516e7569b8fd0167109d46ec4c2fc774f8c93bca2809f3dc47f -SIZE (xpi/firefox-i18n-42.0/fy-NL.xpi) = 463484 -SHA256 (xpi/firefox-i18n-42.0/ga-IE.xpi) = fa5cda49e9284d9dae817132cdbfee504078e2140b4bfe18ead9089dce790f37 -SIZE (xpi/firefox-i18n-42.0/ga-IE.xpi) = 476090 -SHA256 (xpi/firefox-i18n-42.0/gd.xpi) = a41b6b5a51cd8dfab903a74086c26c8b6c2c05705d256b801f40530575e5d5a0 -SIZE (xpi/firefox-i18n-42.0/gd.xpi) = 462140 -SHA256 (xpi/firefox-i18n-42.0/gl.xpi) = fc16ccf790b551df573b9de347eeb36719fdb98af44f9afa4ebd2c67853e1587 -SIZE (xpi/firefox-i18n-42.0/gl.xpi) = 451687 -SHA256 (xpi/firefox-i18n-42.0/gu-IN.xpi) = 28e86b4cdbb7c1af4a00b7968a1c79005f594af9f44c4ff940686cecea8ea9cb -SIZE (xpi/firefox-i18n-42.0/gu-IN.xpi) = 492282 -SHA256 (xpi/firefox-i18n-42.0/he.xpi) = c86ff630372f014409b8ff97ba10eed5b267cb90f74fca5958c3d988c00f96ff -SIZE (xpi/firefox-i18n-42.0/he.xpi) = 481468 -SHA256 (xpi/firefox-i18n-42.0/hi-IN.xpi) = 4bf1ebfd071d5393b9cc8503732bbf5e6afd7534f7bf5b1e67a105cf8882a602 -SIZE (xpi/firefox-i18n-42.0/hi-IN.xpi) = 515516 -SHA256 (xpi/firefox-i18n-42.0/hr.xpi) = f60a9effb51f85d798528ef947c37dd40e9e11f4c7081371ef1a2c184d51fbd7 -SIZE (xpi/firefox-i18n-42.0/hr.xpi) = 486308 -SHA256 (xpi/firefox-i18n-42.0/hsb.xpi) = ba43533196c1de882708e3f2c5f33508bdbedbf3987a060e51891b3cbdfdb5df -SIZE (xpi/firefox-i18n-42.0/hsb.xpi) = 477291 -SHA256 (xpi/firefox-i18n-42.0/hu.xpi) = d6e158f3b5c4fe9745feed9be76276898c4d06a34c6af41e9d6f7d9574c1cb02 -SIZE (xpi/firefox-i18n-42.0/hu.xpi) = 461934 -SHA256 (xpi/firefox-i18n-42.0/hy-AM.xpi) = 20d38d82634a0f7fac0aba10cd33def9bd07860343f50b51b977e9ba9d4298e0 -SIZE (xpi/firefox-i18n-42.0/hy-AM.xpi) = 544379 -SHA256 (xpi/firefox-i18n-42.0/id.xpi) = a9b186a33c58dc26eacfd23b77eb3fb07a4169a65043ae6454f53a3076c8f361 -SIZE (xpi/firefox-i18n-42.0/id.xpi) = 438845 -SHA256 (xpi/firefox-i18n-42.0/is.xpi) = 36d483f995a23672548076cf493bb5d74067194e45357fcdaa8ccf89f081e54e -SIZE (xpi/firefox-i18n-42.0/is.xpi) = 493033 -SHA256 (xpi/firefox-i18n-42.0/it.xpi) = 12f52bcd404059126fd5291e185e152b65a22cc80562c736cf441088ea7e8659 -SIZE (xpi/firefox-i18n-42.0/it.xpi) = 367659 -SHA256 (xpi/firefox-i18n-42.0/ja.xpi) = 836403f5c69d4ce9304d123de794acfb297870b5dea084c8c5dc1f2d2fa88ba8 -SIZE (xpi/firefox-i18n-42.0/ja.xpi) = 488656 -SHA256 (xpi/firefox-i18n-42.0/kk.xpi) = c956039afb31cdbc87177e9da7604dea5f396971cc005ba2b2f39bcccd07f0c9 -SIZE (xpi/firefox-i18n-42.0/kk.xpi) = 513387 -SHA256 (xpi/firefox-i18n-42.0/km.xpi) = 831517e7a4526a8fe66bed319f07f3043a2b59d8f335e087468be241ee73d055 -SIZE (xpi/firefox-i18n-42.0/km.xpi) = 578547 -SHA256 (xpi/firefox-i18n-42.0/kn.xpi) = 85f1b02e7dad0eff2df2d42f0f48ac7c87ee4ae3074304a07dbf72826de3fff5 -SIZE (xpi/firefox-i18n-42.0/kn.xpi) = 544136 -SHA256 (xpi/firefox-i18n-42.0/ko.xpi) = 5ba6764e73adbd14eea69b6fdef7bed1302ae79a3fbefc84a99846f6c8424277 -SIZE (xpi/firefox-i18n-42.0/ko.xpi) = 474547 -SHA256 (xpi/firefox-i18n-42.0/lij.xpi) = 7b926543d7ba6e3ba3bcd62846715f88ba2b08ccb069174e1c93817c4ed30270 -SIZE (xpi/firefox-i18n-42.0/lij.xpi) = 456396 -SHA256 (xpi/firefox-i18n-42.0/lt.xpi) = 9cea89aec036c26dbb25ac560045ea31014bfdc799735894439ef081c84e724d -SIZE (xpi/firefox-i18n-42.0/lt.xpi) = 495227 -SHA256 (xpi/firefox-i18n-42.0/lv.xpi) = dead267a4f72a36ce73119f9d37cd62ee8c9aca800886c744ce3a7b871d232b5 -SIZE (xpi/firefox-i18n-42.0/lv.xpi) = 475294 -SHA256 (xpi/firefox-i18n-42.0/mai.xpi) = 8fc086207679c75f6d4165d4a12333871078e60aa0476249409fcf3ac05ed284 -SIZE (xpi/firefox-i18n-42.0/mai.xpi) = 523801 -SHA256 (xpi/firefox-i18n-42.0/mk.xpi) = 5dabd571b25070ba83b7bc539a150714001339e7a986df8b364424b1312109d1 -SIZE (xpi/firefox-i18n-42.0/mk.xpi) = 535199 -SHA256 (xpi/firefox-i18n-42.0/ml.xpi) = 7345b33597ecad8e9306f5f483b872d4d62c86561b3bfd7eb514853f67f9a86a -SIZE (xpi/firefox-i18n-42.0/ml.xpi) = 533776 -SHA256 (xpi/firefox-i18n-42.0/mr.xpi) = 734a252d6a87a468568ac8ebdf9cf2e2ddb692997b67890ba846001cbacfe1f8 -SIZE (xpi/firefox-i18n-42.0/mr.xpi) = 522304 -SHA256 (xpi/firefox-i18n-42.0/ms.xpi) = cf16f7c807915297a132ad8d71fe20012c54eb82f8153f66b954b71a143cccc7 -SIZE (xpi/firefox-i18n-42.0/ms.xpi) = 497644 -SHA256 (xpi/firefox-i18n-42.0/nb-NO.xpi) = f18376647b559b56b94dd54a92c4589dd4313e18870f7c5ccde520ab5baaaac2 -SIZE (xpi/firefox-i18n-42.0/nb-NO.xpi) = 453245 -SHA256 (xpi/firefox-i18n-42.0/nl.xpi) = a2470132d8b8a80b71471527a4c2468e7cd9e2440e1666950c591e09f78138bd -SIZE (xpi/firefox-i18n-42.0/nl.xpi) = 451272 -SHA256 (xpi/firefox-i18n-42.0/nn-NO.xpi) = 4bff7cf5b4178a6d85da579ad1356af88d332d9b48cfbfaa067d51c8f190dd27 -SIZE (xpi/firefox-i18n-42.0/nn-NO.xpi) = 447406 -SHA256 (xpi/firefox-i18n-42.0/or.xpi) = c3f211d325a7bac64c71b239ccc95918153f5d5ae987b29031245bf7475eb329 -SIZE (xpi/firefox-i18n-42.0/or.xpi) = 533314 -SHA256 (xpi/firefox-i18n-42.0/pa-IN.xpi) = af2e3dec61be29064b9a72846fd1148f0ff02e7e2290a3ed60077e932cdb614a -SIZE (xpi/firefox-i18n-42.0/pa-IN.xpi) = 507205 -SHA256 (xpi/firefox-i18n-42.0/pl.xpi) = 34498568481fc7d720742e2add62e0ea55c6150bf90abc3040186ca5d26881f2 -SIZE (xpi/firefox-i18n-42.0/pl.xpi) = 403227 -SHA256 (xpi/firefox-i18n-42.0/pt-BR.xpi) = b0c9a80cd76142fd9886fd70a141dc0d8e4203e8fbdb72b649c84ee3b0d373bf -SIZE (xpi/firefox-i18n-42.0/pt-BR.xpi) = 468096 -SHA256 (xpi/firefox-i18n-42.0/pt-PT.xpi) = 63b5e59bd240b67fe683618b9be9d824ae8f77133d8345889b32ba0930d77687 -SIZE (xpi/firefox-i18n-42.0/pt-PT.xpi) = 448920 -SHA256 (xpi/firefox-i18n-42.0/rm.xpi) = d5ab15132c13db755ec05efbf255a53ae4411d2724ecc5ecc5bda08c4eef5681 -SIZE (xpi/firefox-i18n-42.0/rm.xpi) = 454529 -SHA256 (xpi/firefox-i18n-42.0/ro.xpi) = d62cff13bc6ae437f1a224ad2e11e8d4de338f8b6b3e405baa1d8c0764b7edef -SIZE (xpi/firefox-i18n-42.0/ro.xpi) = 502634 -SHA256 (xpi/firefox-i18n-42.0/ru.xpi) = ac454a85ea58c5a3297550fe7a10eef8487f37bb0310df4a5a9fb533d7c1c712 -SIZE (xpi/firefox-i18n-42.0/ru.xpi) = 416137 -SHA256 (xpi/firefox-i18n-42.0/si.xpi) = 763543a1f7433309be01d89e30436b7bff4fcd2b50e8f496f54be26f0c730688 -SIZE (xpi/firefox-i18n-42.0/si.xpi) = 543889 -SHA256 (xpi/firefox-i18n-42.0/sk.xpi) = beb7004124240fd83f64841ff415cb692aab327b5ac925e6db27e4b9ba7f01ca -SIZE (xpi/firefox-i18n-42.0/sk.xpi) = 477255 -SHA256 (xpi/firefox-i18n-42.0/sl.xpi) = 0079e2ca640efe4d2c7dd29a570634cc5072f632bf064149bf9b9d8f3aa518d8 -SIZE (xpi/firefox-i18n-42.0/sl.xpi) = 450532 -SHA256 (xpi/firefox-i18n-42.0/son.xpi) = 811356dfb2552f5c2d2832b7a208233e27eeab1e064d694cf36532ddcbfc458d -SIZE (xpi/firefox-i18n-42.0/son.xpi) = 457298 -SHA256 (xpi/firefox-i18n-42.0/sq.xpi) = fabeef51543439772b6ef5643d0ac57ec196d64c6ef83e75ddcd275dc6624a81 -SIZE (xpi/firefox-i18n-42.0/sq.xpi) = 494612 -SHA256 (xpi/firefox-i18n-42.0/sr.xpi) = 692019f3542e0da8ff64589b488eab0d7e6d16906655d5a86ebcc53c00731edc -SIZE (xpi/firefox-i18n-42.0/sr.xpi) = 486210 -SHA256 (xpi/firefox-i18n-42.0/sv-SE.xpi) = 6e7e0eff3c480a302fa0ed1a4ed720ac432f0819c55549afc6bda028ea1b23a5 -SIZE (xpi/firefox-i18n-42.0/sv-SE.xpi) = 460188 -SHA256 (xpi/firefox-i18n-42.0/ta.xpi) = 542761640fbe8dd6cf3e60be45a12735bbfe6c38c96b0073833544c85c5cf10a -SIZE (xpi/firefox-i18n-42.0/ta.xpi) = 515601 -SHA256 (xpi/firefox-i18n-42.0/te.xpi) = 7287fc6577b0892df46ea1fc2f185fc73ad94c4d8050cdd3a4be47150f1f7a2e -SIZE (xpi/firefox-i18n-42.0/te.xpi) = 532920 -SHA256 (xpi/firefox-i18n-42.0/th.xpi) = f254f7c40a194ae3c082d9b77f155fc290b0e6abe969d7c06788ea7abe4039ad -SIZE (xpi/firefox-i18n-42.0/th.xpi) = 542239 -SHA256 (xpi/firefox-i18n-42.0/tr.xpi) = f343c4f3b2cb5541fc9f98d5953101f5e5d1ee1d5c30968d6564828c5701119b -SIZE (xpi/firefox-i18n-42.0/tr.xpi) = 489512 -SHA256 (xpi/firefox-i18n-42.0/uk.xpi) = 88c881749bae293d9614a77ed9458345399573a6ab5583626ef98041ae78da32 -SIZE (xpi/firefox-i18n-42.0/uk.xpi) = 505718 -SHA256 (xpi/firefox-i18n-42.0/uz.xpi) = faeacd2ec9af20cde5032415f0bbeba487ed4d276f778672ae6a340615099725 -SIZE (xpi/firefox-i18n-42.0/uz.xpi) = 505180 -SHA256 (xpi/firefox-i18n-42.0/vi.xpi) = 1481521a62561266ea14389cdb579b1757e791a5473c981e399aa9bff14ddcdd -SIZE (xpi/firefox-i18n-42.0/vi.xpi) = 472290 -SHA256 (xpi/firefox-i18n-42.0/xh.xpi) = 1a1776e5770dd361d0adc85ed80bb1e81dd5436a0727009b91cb89e92e4d381e -SIZE (xpi/firefox-i18n-42.0/xh.xpi) = 455527 -SHA256 (xpi/firefox-i18n-42.0/zh-CN.xpi) = 46bb4b1b67494004441135dbf3051501e0580fb8da29548de73f2e0fe12f7834 -SIZE (xpi/firefox-i18n-42.0/zh-CN.xpi) = 491278 -SHA256 (xpi/firefox-i18n-42.0/zh-TW.xpi) = ef4e9b5e01b85564b935a5f9bc663ffac61ce0f3ca166c316b1aee648832d458 -SIZE (xpi/firefox-i18n-42.0/zh-TW.xpi) = 482387 +SHA256 (xpi/firefox-i18n-43.0.1/ach.xpi) = 0bc91ee7b43096b5464be7433602ee56c4eda1792531a28dd071c378a71892fb +SIZE (xpi/firefox-i18n-43.0.1/ach.xpi) = 486758 +SHA256 (xpi/firefox-i18n-43.0.1/af.xpi) = 2201ef901b678e787e0ba8c911975e9d54af613ef3a9f2b3ce51475b68f362af +SIZE (xpi/firefox-i18n-43.0.1/af.xpi) = 493735 +SHA256 (xpi/firefox-i18n-43.0.1/an.xpi) = 8d1a70ac9ef5fb29e6904b5931602e5a91c1496b1842dcf0a4f27db1582c9e89 +SIZE (xpi/firefox-i18n-43.0.1/an.xpi) = 472422 +SHA256 (xpi/firefox-i18n-43.0.1/ar.xpi) = c19d31e37d0b5c934a58bff60c70074ad98d5efab43cf3682ba7c20137cf7c9f +SIZE (xpi/firefox-i18n-43.0.1/ar.xpi) = 531445 +SHA256 (xpi/firefox-i18n-43.0.1/as.xpi) = 0665629107ba40ef2e038cef1c2178a371edbff7fe5bd23ad573591f00920f6e +SIZE (xpi/firefox-i18n-43.0.1/as.xpi) = 520380 +SHA256 (xpi/firefox-i18n-43.0.1/ast.xpi) = e034f807e6be2ad88a7185f0810482b70b9bfe847985525201578b0266ea22ca +SIZE (xpi/firefox-i18n-43.0.1/ast.xpi) = 414848 +SHA256 (xpi/firefox-i18n-43.0.1/az.xpi) = 76a247cd2bdfbadcf8842b300c1a72b52ac6b0a32d1f6448608c0305892f067a +SIZE (xpi/firefox-i18n-43.0.1/az.xpi) = 501044 +SHA256 (xpi/firefox-i18n-43.0.1/be.xpi) = 933720d18b0284c6502cc46b9b9a2d745d52554ec8dd6f56b1f736ff960ee719 +SIZE (xpi/firefox-i18n-43.0.1/be.xpi) = 462186 +SHA256 (xpi/firefox-i18n-43.0.1/bg.xpi) = 287e00cf6a2e9f31c52c3a2b45fb9b7fec78778c6578cbadc0863df129b2d41a +SIZE (xpi/firefox-i18n-43.0.1/bg.xpi) = 503615 +SHA256 (xpi/firefox-i18n-43.0.1/bn-BD.xpi) = 7da5c54c4a5c9836d5fc2b667f26b7010875772ebfb45c271ab601d1fd056d61 +SIZE (xpi/firefox-i18n-43.0.1/bn-BD.xpi) = 550339 +SHA256 (xpi/firefox-i18n-43.0.1/bn-IN.xpi) = 97b5e214358950cbe2fa84730a0d20803d8be0a5b50ebcd2375f620e5ae94739 +SIZE (xpi/firefox-i18n-43.0.1/bn-IN.xpi) = 541700 +SHA256 (xpi/firefox-i18n-43.0.1/br.xpi) = 79f0b81f27e1185f0b2d7c3f05919bad39a680e8f5c036235f95e8a253a7ff11 +SIZE (xpi/firefox-i18n-43.0.1/br.xpi) = 452046 +SHA256 (xpi/firefox-i18n-43.0.1/bs.xpi) = 5ef0354b7a2eacef71720ff18821bcf2a4551aac4041dc58e438393f3fd84e75 +SIZE (xpi/firefox-i18n-43.0.1/bs.xpi) = 491002 +SHA256 (xpi/firefox-i18n-43.0.1/ca.xpi) = 06d63af42adff1b885d1e00fa199fbdeeb5b9a7e8625202b46ca109583fe53f9 +SIZE (xpi/firefox-i18n-43.0.1/ca.xpi) = 469149 +SHA256 (xpi/firefox-i18n-43.0.1/cs.xpi) = 8ef921e6fee1a164f09408791eb80ad5f617b47a80c91f6013443d883bbf256c +SIZE (xpi/firefox-i18n-43.0.1/cs.xpi) = 458384 +SHA256 (xpi/firefox-i18n-43.0.1/cy.xpi) = 834ccdbb97e69f6abe1bf449ae2addb33adc4c1d9bdda3aa26d1827e29c82831 +SIZE (xpi/firefox-i18n-43.0.1/cy.xpi) = 454625 +SHA256 (xpi/firefox-i18n-43.0.1/da.xpi) = 0f684c6e38075111a620096739fa9c67e27d6b7a0e3ab2939f2923683e309e04 +SIZE (xpi/firefox-i18n-43.0.1/da.xpi) = 462528 +SHA256 (xpi/firefox-i18n-43.0.1/de.xpi) = 6167c119b0274ae3ce837cabe7c29d75e30f99caf9cf028fbe223db8714b8e3c +SIZE (xpi/firefox-i18n-43.0.1/de.xpi) = 463840 +SHA256 (xpi/firefox-i18n-43.0.1/dsb.xpi) = 757471503d2c88b823846126308af511ee324a404a70f17a1165a50ca697660e +SIZE (xpi/firefox-i18n-43.0.1/dsb.xpi) = 482634 +SHA256 (xpi/firefox-i18n-43.0.1/el.xpi) = 2399e6114e7d8c6510af6628b2a323c46b9d1f88e3275e48a1b71b2b08a915f0 +SIZE (xpi/firefox-i18n-43.0.1/el.xpi) = 508364 +SHA256 (xpi/firefox-i18n-43.0.1/en-GB.xpi) = 37da8df3d067018386237c3fd6a9fdc898efadf804d6b971d62b88e169a1c0ef +SIZE (xpi/firefox-i18n-43.0.1/en-GB.xpi) = 448389 +SHA256 (xpi/firefox-i18n-43.0.1/en-US.xpi) = 65e194d30544cec4871e82080755afa7dbb41cb2603672e6a76cb1fef8abdff7 +SIZE (xpi/firefox-i18n-43.0.1/en-US.xpi) = 500719 +SHA256 (xpi/firefox-i18n-43.0.1/en-ZA.xpi) = 2adf4eaef132bfa6c3ee868cac1ef5733a90cc2f3d810293a6f4ecec51f369d6 +SIZE (xpi/firefox-i18n-43.0.1/en-ZA.xpi) = 453306 +SHA256 (xpi/firefox-i18n-43.0.1/eo.xpi) = 70eab0eba9a878aa30b77a43d76a2a39fbd81a49c54957353f903e8e7a530454 +SIZE (xpi/firefox-i18n-43.0.1/eo.xpi) = 494360 +SHA256 (xpi/firefox-i18n-43.0.1/es-AR.xpi) = 087bde7d635fe0b34a80343daeaf3560e0eabc84e0e151cd3e1ad5238d0a31b3 +SIZE (xpi/firefox-i18n-43.0.1/es-AR.xpi) = 462418 +SHA256 (xpi/firefox-i18n-43.0.1/es-CL.xpi) = 50ca3669cf24ef0a130d2cca348b8e50adea3981ed84f2d5a29f3a839aab957a +SIZE (xpi/firefox-i18n-43.0.1/es-CL.xpi) = 388434 +SHA256 (xpi/firefox-i18n-43.0.1/es-ES.xpi) = 1e19eaa893bdd1c3f2b2b826ef5b7b3b437efd6f35a6878467d029c16cb3a022 +SIZE (xpi/firefox-i18n-43.0.1/es-ES.xpi) = 375333 +SHA256 (xpi/firefox-i18n-43.0.1/es-MX.xpi) = 062136d7651fa993f1183b80310e474cc17c7f65fa085a2358db787e819e9cad +SIZE (xpi/firefox-i18n-43.0.1/es-MX.xpi) = 468294 +SHA256 (xpi/firefox-i18n-43.0.1/et.xpi) = 00c2c023bccd5f6af7fd4563282789990714b45a66e28f4a576f70c448e9c9f3 +SIZE (xpi/firefox-i18n-43.0.1/et.xpi) = 455409 +SHA256 (xpi/firefox-i18n-43.0.1/eu.xpi) = 7136556411350f14b9b842b30912beae55997a43f8a693f2709d0a7ce4bbf249 +SIZE (xpi/firefox-i18n-43.0.1/eu.xpi) = 477496 +SHA256 (xpi/firefox-i18n-43.0.1/fa.xpi) = 47b586b814ec2a7bf757f90483b2c058f3898fd32d5e23dc63e77ba7e95f8bf1 +SIZE (xpi/firefox-i18n-43.0.1/fa.xpi) = 529698 +SHA256 (xpi/firefox-i18n-43.0.1/ff.xpi) = 5063b9ed95e285d7f7c0443125e276a9ab37b225f3f18b360fb20fd632ebe5ee +SIZE (xpi/firefox-i18n-43.0.1/ff.xpi) = 465024 +SHA256 (xpi/firefox-i18n-43.0.1/fi.xpi) = 95662d7f686a3fcd0ee33354f2164dd980cb77145825a82c3373e0a5c136add9 +SIZE (xpi/firefox-i18n-43.0.1/fi.xpi) = 454718 +SHA256 (xpi/firefox-i18n-43.0.1/fr.xpi) = a6bc8f2b8089661871feea30eca73a52d26e70a8e3420c3a6e51a9ba8b44e59c +SIZE (xpi/firefox-i18n-43.0.1/fr.xpi) = 473568 +SHA256 (xpi/firefox-i18n-43.0.1/fy-NL.xpi) = e51e397bedee90d1baad9c1a00d8c402becf09f1472d106bf6f550421acbb673 +SIZE (xpi/firefox-i18n-43.0.1/fy-NL.xpi) = 466648 +SHA256 (xpi/firefox-i18n-43.0.1/ga-IE.xpi) = 45147b40e2df9e0681a792f29a458ffdced48a1aac0ff509fcd9c9f7d2337ccb +SIZE (xpi/firefox-i18n-43.0.1/ga-IE.xpi) = 478966 +SHA256 (xpi/firefox-i18n-43.0.1/gd.xpi) = 728e66d24f28df817ac6fcdec287910ccc1bd3e782860585a4b9f01809823628 +SIZE (xpi/firefox-i18n-43.0.1/gd.xpi) = 464868 +SHA256 (xpi/firefox-i18n-43.0.1/gl.xpi) = bd57e80913a03c3fc00cba9a4a43b2ef6b45a74e92fe487cde4e5aaeb5966f12 +SIZE (xpi/firefox-i18n-43.0.1/gl.xpi) = 454573 +SHA256 (xpi/firefox-i18n-43.0.1/gu-IN.xpi) = 239f5415f8a98b1690f4fa625da5f254ec13741b93d0d271f63a536ee85fe988 +SIZE (xpi/firefox-i18n-43.0.1/gu-IN.xpi) = 495781 +SHA256 (xpi/firefox-i18n-43.0.1/he.xpi) = 1d2e30088e2a7dc39cef292e406f01f64cd0d5fb962fadb1dbcd76fb880d86f8 +SIZE (xpi/firefox-i18n-43.0.1/he.xpi) = 484111 +SHA256 (xpi/firefox-i18n-43.0.1/hi-IN.xpi) = 3f078cfdd0c4cd546b5c131a8c3e3dca2c791dad673b1636b7388921a8121eb4 +SIZE (xpi/firefox-i18n-43.0.1/hi-IN.xpi) = 519473 +SHA256 (xpi/firefox-i18n-43.0.1/hr.xpi) = 71ed3c23ed4fc0406bb3e6a35bf40419612a9c92a84e5da89ea19209d63c928d +SIZE (xpi/firefox-i18n-43.0.1/hr.xpi) = 489139 +SHA256 (xpi/firefox-i18n-43.0.1/hsb.xpi) = 2848deb917fb68739f343516898d92da318cedcf55f67ee79f7ee55d3952238e +SIZE (xpi/firefox-i18n-43.0.1/hsb.xpi) = 480278 +SHA256 (xpi/firefox-i18n-43.0.1/hu.xpi) = 801e37925ea212681f2c936487bf5e9a47116ec66d2e5b181b04abaa632fc984 +SIZE (xpi/firefox-i18n-43.0.1/hu.xpi) = 464706 +SHA256 (xpi/firefox-i18n-43.0.1/hy-AM.xpi) = 8f8c5e2b1cf96f8161d636f396fa3bd8f26be40a465ff3cf8982b11c56d11238 +SIZE (xpi/firefox-i18n-43.0.1/hy-AM.xpi) = 548747 +SHA256 (xpi/firefox-i18n-43.0.1/id.xpi) = 639a94028c05ec4a98a79ca40d37ddef23604b9f5bb1ef4db0790b42caf35632 +SIZE (xpi/firefox-i18n-43.0.1/id.xpi) = 443809 +SHA256 (xpi/firefox-i18n-43.0.1/is.xpi) = 513b9a3f1102f6fda79e56c60c654a74bd5279497ccb0322fcfe441c1a0e01c1 +SIZE (xpi/firefox-i18n-43.0.1/is.xpi) = 495909 +SHA256 (xpi/firefox-i18n-43.0.1/it.xpi) = e6c9dbb3d033b60ce8b59caf7789a0731ab2a0474e4719fa97c4667c4c713b22 +SIZE (xpi/firefox-i18n-43.0.1/it.xpi) = 369329 +SHA256 (xpi/firefox-i18n-43.0.1/ja.xpi) = ce2057dacd531266aa67e9cce52ac596485f8b8877aa67e6665c9af6d8f6a7ee +SIZE (xpi/firefox-i18n-43.0.1/ja.xpi) = 491472 +SHA256 (xpi/firefox-i18n-43.0.1/kk.xpi) = cb3b96f10de74db89c9226a5fac0c3f98c1a793adaca778adacf6e38b86ee15e +SIZE (xpi/firefox-i18n-43.0.1/kk.xpi) = 516825 +SHA256 (xpi/firefox-i18n-43.0.1/km.xpi) = 94da44d6aae5f7e59a203f0f2a26c46048d8914eb23141e0955601f2bf30ddb7 +SIZE (xpi/firefox-i18n-43.0.1/km.xpi) = 581657 +SHA256 (xpi/firefox-i18n-43.0.1/kn.xpi) = 102bb7743a7754dcd52a34f060dab4c7e56b943bea0080887a4c752f31a4cbef +SIZE (xpi/firefox-i18n-43.0.1/kn.xpi) = 548586 +SHA256 (xpi/firefox-i18n-43.0.1/ko.xpi) = 2d5cb122f2e880628b741cea86c0c549708d0c33c4539b1007ee83574f97d3cc +SIZE (xpi/firefox-i18n-43.0.1/ko.xpi) = 477482 +SHA256 (xpi/firefox-i18n-43.0.1/lij.xpi) = 7d4eb50ef0086a5b7ccb4654a581b4c29a55448f05778a0af10afcddd88f520d +SIZE (xpi/firefox-i18n-43.0.1/lij.xpi) = 403511 +SHA256 (xpi/firefox-i18n-43.0.1/lt.xpi) = 44306a6e3d72c48bfc7e325afb00d001acaf2cfdadcbfdad2d3de24ae1f1f4d3 +SIZE (xpi/firefox-i18n-43.0.1/lt.xpi) = 498173 +SHA256 (xpi/firefox-i18n-43.0.1/lv.xpi) = eb77909a47839fb8572bc535330aa3753613bc7c80a8db08bf305debd4a1883b +SIZE (xpi/firefox-i18n-43.0.1/lv.xpi) = 478097 +SHA256 (xpi/firefox-i18n-43.0.1/mai.xpi) = 7d8421d82cc58988827b65d252cf0131cf6b56ddd558a6e0dd15175832114764 +SIZE (xpi/firefox-i18n-43.0.1/mai.xpi) = 527786 +SHA256 (xpi/firefox-i18n-43.0.1/mk.xpi) = 8b02aa5f64157a3fe05bcfd54047067aedba336f7bbf7971167526a00da94cc2 +SIZE (xpi/firefox-i18n-43.0.1/mk.xpi) = 537952 +SHA256 (xpi/firefox-i18n-43.0.1/ml.xpi) = 9af1f75ce059da56c98a0b1553c158fbecf765bcba31c9102017f7622d9052a8 +SIZE (xpi/firefox-i18n-43.0.1/ml.xpi) = 537548 +SHA256 (xpi/firefox-i18n-43.0.1/mr.xpi) = 110128c1c545b430424cdad5861ab6e68be754b48b604dd2865652fa325732d8 +SIZE (xpi/firefox-i18n-43.0.1/mr.xpi) = 527027 +SHA256 (xpi/firefox-i18n-43.0.1/ms.xpi) = 11a6721bc259d31221e503234b9e11688849a83bb0df0359e4960c30c73e451c +SIZE (xpi/firefox-i18n-43.0.1/ms.xpi) = 502123 +SHA256 (xpi/firefox-i18n-43.0.1/nb-NO.xpi) = 403de48e800f4d41231dc47e47a425d8068f8d66aac082aa4707d794cf8b2f21 +SIZE (xpi/firefox-i18n-43.0.1/nb-NO.xpi) = 456065 +SHA256 (xpi/firefox-i18n-43.0.1/nl.xpi) = 05244c64999026a6d1fc66978553835f85e21e0ebf7f88bb7f9726fab080be87 +SIZE (xpi/firefox-i18n-43.0.1/nl.xpi) = 454468 +SHA256 (xpi/firefox-i18n-43.0.1/nn-NO.xpi) = e720918d8c65bca8f89131ce4236f94f2b135e785940a449891d0ee91d726237 +SIZE (xpi/firefox-i18n-43.0.1/nn-NO.xpi) = 450234 +SHA256 (xpi/firefox-i18n-43.0.1/or.xpi) = f2eeb085741f36d4ca81f552de4adc76a3e4d61e4e728f955b59ffa83114ba60 +SIZE (xpi/firefox-i18n-43.0.1/or.xpi) = 536915 +SHA256 (xpi/firefox-i18n-43.0.1/pa-IN.xpi) = 6dac3af3fde5a299402d92cb307fabc6f231dbbc55adc6b18d42642a98142749 +SIZE (xpi/firefox-i18n-43.0.1/pa-IN.xpi) = 511160 +SHA256 (xpi/firefox-i18n-43.0.1/pl.xpi) = 0b37430cc49c8e2fc1cb155c865ba58ddf36da8fe795b13ffc6ba3f69f9c41ab +SIZE (xpi/firefox-i18n-43.0.1/pl.xpi) = 404460 +SHA256 (xpi/firefox-i18n-43.0.1/pt-BR.xpi) = 5ce088a6e2d47baee81d82fe35d6bd70220c6db3369823688da197f88476def5 +SIZE (xpi/firefox-i18n-43.0.1/pt-BR.xpi) = 473005 +SHA256 (xpi/firefox-i18n-43.0.1/pt-PT.xpi) = 5d814b2b74eee74aacea4762198b023d68d053b970f6915e63ff3e9e5c21ed92 +SIZE (xpi/firefox-i18n-43.0.1/pt-PT.xpi) = 451858 +SHA256 (xpi/firefox-i18n-43.0.1/rm.xpi) = c15a606cbed0665a39b139d9fbf898ae14c6122d5cabede166596d702df0943d +SIZE (xpi/firefox-i18n-43.0.1/rm.xpi) = 457315 +SHA256 (xpi/firefox-i18n-43.0.1/ro.xpi) = 5122609b34eeee2bf3c7319874a0dece164eb7c6c010d70ebfaa30dc63823633 +SIZE (xpi/firefox-i18n-43.0.1/ro.xpi) = 505833 +SHA256 (xpi/firefox-i18n-43.0.1/ru.xpi) = 99de1c972f3018896421c171c0dbc266d04f923b8a5510ef52145f4464fbd276 +SIZE (xpi/firefox-i18n-43.0.1/ru.xpi) = 417904 +SHA256 (xpi/firefox-i18n-43.0.1/si.xpi) = 0e20ef5b83bd71ff4ea954266d2815def7018c15f827eb67faa004bc3cbaf646 +SIZE (xpi/firefox-i18n-43.0.1/si.xpi) = 548393 +SHA256 (xpi/firefox-i18n-43.0.1/sk.xpi) = aa553f5359d74ca650f2df84e0e6fef6eaff37a6486a12e04c71ad84a455e2d6 +SIZE (xpi/firefox-i18n-43.0.1/sk.xpi) = 480519 +SHA256 (xpi/firefox-i18n-43.0.1/sl.xpi) = dd784a712282453889e36442dca10b5d5b96b36ed9774e4914fce5e87ebc14e9 +SIZE (xpi/firefox-i18n-43.0.1/sl.xpi) = 453338 +SHA256 (xpi/firefox-i18n-43.0.1/son.xpi) = bbf9fba2bba5cfb022cac1697dfbc287eeebc23e222991c29268138e051c2625 +SIZE (xpi/firefox-i18n-43.0.1/son.xpi) = 462151 +SHA256 (xpi/firefox-i18n-43.0.1/sq.xpi) = 97fd1266c586533de47dc18218b67668713cf0a4651f1d2760de86a0316688fc +SIZE (xpi/firefox-i18n-43.0.1/sq.xpi) = 497506 +SHA256 (xpi/firefox-i18n-43.0.1/sr.xpi) = f15c54379fdbe92201184323d23b874e8f6ebc809fcaff6777d480a80eaa18b1 +SIZE (xpi/firefox-i18n-43.0.1/sr.xpi) = 489348 +SHA256 (xpi/firefox-i18n-43.0.1/sv-SE.xpi) = 73021ec80fdaf07f4a69d0d7763013e9eef8be24cc42b4b028bf05a2f16fa3eb +SIZE (xpi/firefox-i18n-43.0.1/sv-SE.xpi) = 463026 +SHA256 (xpi/firefox-i18n-43.0.1/ta.xpi) = adafa9645f4f9142eb9de9d5979779f449916d6e4a7f66f69dda90a17ec8966d +SIZE (xpi/firefox-i18n-43.0.1/ta.xpi) = 519590 +SHA256 (xpi/firefox-i18n-43.0.1/te.xpi) = e1b5e68282f0473794df03a7c7db5c75ffcbd3d8eece1d177a8416d0654982a2 +SIZE (xpi/firefox-i18n-43.0.1/te.xpi) = 537274 +SHA256 (xpi/firefox-i18n-43.0.1/th.xpi) = 5844e3090137a832ddfab289450cab560211322a0af96dd8f7d9343e7154eeb1 +SIZE (xpi/firefox-i18n-43.0.1/th.xpi) = 546510 +SHA256 (xpi/firefox-i18n-43.0.1/tr.xpi) = 306aafaec0cb1a35c86696504a249a4a8609013b98709293d42a775850178de2 +SIZE (xpi/firefox-i18n-43.0.1/tr.xpi) = 492360 +SHA256 (xpi/firefox-i18n-43.0.1/uk.xpi) = c7dbe7a5a4c574e0a75791e2764b26271fc16d12db5f70eb12d30a1d74c56e98 +SIZE (xpi/firefox-i18n-43.0.1/uk.xpi) = 508886 +SHA256 (xpi/firefox-i18n-43.0.1/uz.xpi) = fb248e58ef958f6224deefcc45781f0cda971f3e8d7ddb120da76bc9ef8e9cf4 +SIZE (xpi/firefox-i18n-43.0.1/uz.xpi) = 510089 +SHA256 (xpi/firefox-i18n-43.0.1/vi.xpi) = 2c0db4ad703316e57be639c4011d2ec7dcdcf03e2a2819e69077a8a020f70171 +SIZE (xpi/firefox-i18n-43.0.1/vi.xpi) = 476613 +SHA256 (xpi/firefox-i18n-43.0.1/xh.xpi) = 46c4116c97abf9efd29022b3881eddad4768c084905b559637e24c2ba26c8b93 +SIZE (xpi/firefox-i18n-43.0.1/xh.xpi) = 458721 +SHA256 (xpi/firefox-i18n-43.0.1/zh-CN.xpi) = ddc7b79f99742fd8ea23b9aa5bbd47e3f7e82a41ad141e4a34e3fe784912a934 +SIZE (xpi/firefox-i18n-43.0.1/zh-CN.xpi) = 493641 +SHA256 (xpi/firefox-i18n-43.0.1/zh-TW.xpi) = 4a35399a932e05e0f8469c8f25732b37ec7f56319d2d0169acd6f47809590af2 +SIZE (xpi/firefox-i18n-43.0.1/zh-TW.xpi) = 485318 Modified: branches/2015Q4/www/firefox/Makefile ============================================================================== --- branches/2015Q4/www/firefox/Makefile Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/firefox/Makefile Mon Dec 21 13:01:00 2015 (r404095) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 42.0 +DISTVERSION= 43.0.1 DISTVERSIONSUFFIX=.source PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla Modified: branches/2015Q4/www/firefox/distinfo ============================================================================== --- branches/2015Q4/www/firefox/distinfo Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/firefox/distinfo Mon Dec 21 13:01:00 2015 (r404095) @@ -1,2 +1,2 @@ -SHA256 (firefox-42.0.source.tar.xz) = 994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae -SIZE (firefox-42.0.source.tar.xz) = 165766832 +SHA256 (firefox-43.0.1.source.tar.xz) = b1f9173c6ddbd2bf868d94a815fde364bc37aa46a00981903fd1fe86a8f873d8 +SIZE (firefox-43.0.1.source.tar.xz) = 175453060 Modified: branches/2015Q4/www/firefox/files/patch-bug1026499 ============================================================================== --- branches/2015Q4/www/firefox/files/patch-bug1026499 Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/firefox/files/patch-bug1026499 Mon Dec 21 13:01:00 2015 (r404095) @@ -53,16 +53,3 @@ index 48b0988..bc914cf 100644 def visitParam(self, p): self.visitDecl(p) -diff --git ipc/ipdl/ipdl/lower.py ipc/ipdl/ipdl/lower.py -index e97a34c..9360f3c 100644 ---- ipc/ipdl/ipdl/lower.py -+++ ipc/ipdl/ipdl/lower.py -@@ -768,7 +768,7 @@ IPDL union type.""" - if self.recursive: - return self.ptrToType() - else: -- return TypeArray(Type('char'), ExprSizeof(self.internalType())) -+ return TypeArray(Type('char'), ExprSizeof(self.internalType()), self.internalType()) - - def unionValue(self): - # NB: knows that Union's storage C union is named |mValue| Copied: branches/2015Q4/www/firefox/files/patch-bug1228742 (from r404010, head/www/firefox/files/patch-bug1228742) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/firefox/files/patch-bug1228742 Mon Dec 21 13:01:00 2015 (r404095, copy of r404010, head/www/firefox/files/patch-bug1228742) @@ -0,0 +1,13 @@ +--- toolkit/crashreporter/test/moz.build.orig 2015-12-16 16:15:25.278076000 +0100 ++++ toolkit/crashreporter/test/moz.build 2015-12-16 16:15:35.254959000 +0100 +@@ -19,10 +19,6 @@ + + GeckoSharedLibrary('testcrasher') + +-EXTRA_JS_MODULES += [ +- 'CrashTestUtils.jsm', +-] +- + DEFINES['SHARED_LIBRARY'] = '%s%s%s' % ( + CONFIG['DLL_PREFIX'], + LIBRARY_NAME, Modified: branches/2015Q4/www/firefox/files/patch-bug702179 ============================================================================== --- branches/2015Q4/www/firefox/files/patch-bug702179 Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/firefox/files/patch-bug702179 Mon Dec 21 13:01:00 2015 (r404095) @@ -1,9 +1,9 @@ ---- js/src/moz.build.orig 2015-10-29 22:17:54 UTC -+++ js/src/moz.build -@@ -613,7 +613,3 @@ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] +--- js/src/moz.build.orig 2015-12-16 12:32:04.574425000 +0100 ++++ js/src/moz.build 2015-12-16 12:32:09.032032000 +0100 +@@ -637,7 +637,3 @@ - if CONFIG['GNU_CXX']: - FAIL_ON_WARNINGS = True + if not CONFIG['GNU_CXX']: + ALLOW_COMPILER_WARNINGS = True - -NO_EXPAND_LIBS = True - Modified: branches/2015Q4/www/firefox/files/patch-bug847568 ============================================================================== --- branches/2015Q4/www/firefox/files/patch-bug847568 Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/firefox/files/patch-bug847568 Mon Dec 21 13:01:00 2015 (r404095) @@ -101,9 +101,9 @@ diff --git gfx/graphite2/moz-gr-update.s index f3d76ea..a9e7fb6 100644 --- gfx/graphite2/moz-gr-update.sh +++ gfx/graphite2/moz-gr-update.sh -@@ -23,8 +23,14 @@ echo "\nSee" $0 "for update procedure.\n" >> gfx/graphite2/README.mozilla - find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; +@@ -37,6 +37,12 @@ + #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; + #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; +# closest tag/release to require for system version +TAG=$(cd ../graphitedev/ && hg parents --template {latesttag}) @@ -112,11 +112,8 @@ index f3d76ea..a9e7fb6 100644 + if /GR2_VERSION_REQUIRE/" configure.in + # summarize what's been touched --echo Updated to $CHANGESET. -+echo Updated to $CHANGESET \($TAG for --with-system-graphite2\) + echo Updated to $RELEASE. echo Here is what changed in the gfx/graphite2 directory: - echo - diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla index ca57d16..1ce21fe 100644 --- gfx/harfbuzz/README-mozilla @@ -207,16 +204,14 @@ diff --git intl/unicharutil/util/moz.bui index d736943..41a931f 100644 --- intl/unicharutil/util/moz.build +++ intl/unicharutil/util/moz.build -@@ -42,6 +42,9 @@ if CONFIG['_MSC_VER']: - if CONFIG['ENABLE_INTL_API']: +@@ -43,4 +43,7 @@ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] + USE_LIBS += ['icu'] +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - if CONFIG['GNU_CXX']: - FAIL_ON_WARNINGS = True - + DIST_INSTALL = True diff --git netwerk/dns/moz.build netwerk/dns/moz.build index 0b0717a..2e665c9 100644 --- netwerk/dns/moz.build Modified: branches/2015Q4/www/firefox/files/patch-bug991253 ============================================================================== --- branches/2015Q4/www/firefox/files/patch-bug991253 Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/firefox/files/patch-bug991253 Mon Dec 21 13:01:00 2015 (r404095) @@ -1,6 +1,6 @@ ---- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ -+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo +--- extensions/spellcheck/hunspell/glue/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/glue/mozHunspell.cpp +@@ -392,6 +392,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } Modified: branches/2015Q4/www/firefox/files/patch-soundtouch-no-factory ============================================================================== --- branches/2015Q4/www/firefox/files/patch-soundtouch-no-factory Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/firefox/files/patch-soundtouch-no-factory Mon Dec 21 13:01:00 2015 (r404095) @@ -8,9 +8,9 @@ diff --git dom/media/AudioStream.cpp dom , mWritten(0) , mAudioClock(this) - , mTimeStretcher(nullptr) - , mLatencyRequest(HighLatency) - , mReadPoint(0) , mDumpFile(nullptr) + , mBytesPerFrame(0) + , mState(INITIALIZED) @@ -152,9 +151,6 @@ if (mDumpFile) { fclose(mDumpFile); @@ -48,9 +48,9 @@ diff --git dom/media/AudioStream.h dom/m AudioClock mAudioClock; - soundtouch::SoundTouch* mTimeStretcher; + nsAutoPtr mTimeStretcher; - nsRefPtr mLatencyLog; - // copy of Latency logger's starting time for offset calculations + // Stream start time for stream open delay telemetry. + TimeStamp mStartTime; diff --git media/libsoundtouch/src/moz.build media/libsoundtouch/src/moz.build --- media/libsoundtouch/src/moz.build +++ media/libsoundtouch/src/moz.build Modified: branches/2015Q4/www/linux-firefox/Makefile ============================================================================== --- branches/2015Q4/www/linux-firefox/Makefile Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/linux-firefox/Makefile Mon Dec 21 13:01:00 2015 (r404095) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 42.0 +DISTVERSION= 43.0.1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/linux-i686/en-US + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla Modified: branches/2015Q4/www/linux-firefox/distinfo ============================================================================== --- branches/2015Q4/www/linux-firefox/distinfo Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/linux-firefox/distinfo Mon Dec 21 13:01:00 2015 (r404095) @@ -1,5 +1,5 @@ -SHA256 (firefox-42.0.tar.bz2) = 2c44f8ef07896f3e4c4ee555e35ebe5658f2721fdbdee4c70b153387472b781e -SIZE (firefox-42.0.tar.bz2) = 50938529 +SHA256 (firefox-43.0.1.tar.bz2) = a8530e2b5d5c16c1afef6759a9015e83767271046537a050442fd6c457986746 +SIZE (firefox-43.0.1.tar.bz2) = 53521330 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b Modified: branches/2015Q4/www/linux-firefox/pkg-plist ============================================================================== --- branches/2015Q4/www/linux-firefox/pkg-plist Mon Dec 21 12:35:03 2015 (r404094) +++ branches/2015Q4/www/linux-firefox/pkg-plist Mon Dec 21 13:01:00 2015 (r404095) @@ -19,7 +19,6 @@ lib/%%APP_NAME%%/browser/omni.ja lib/%%APP_NAME%%/browser/plugins lib/%%APP_NAME%%/chrome.manifest lib/%%APP_NAME%%/components/components.manifest -lib/%%APP_NAME%%/components/libdbusservice.so lib/%%APP_NAME%%/components/libmozgnome.so lib/%%APP_NAME%%/crashreporter lib/%%APP_NAME%%/crashreporter.ini From owner-svn-ports-branches@freebsd.org Mon Dec 21 15:43:04 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DC39A4DE29; Mon, 21 Dec 2015 15:43:04 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5730715B3; Mon, 21 Dec 2015 15:43:04 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBLFh3t9002858; Mon, 21 Dec 2015 15:43:03 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLFh312002856; Mon, 21 Dec 2015 15:43:03 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201512211543.tBLFh312002856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 21 Dec 2015 15:43:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404120 - in branches/2015Q4/irc/quassel: . 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, 21 Dec 2015 15:43:04 -0000 Author: feld Date: Mon Dec 21 15:43:03 2015 New Revision: 404120 URL: https://svnweb.freebsd.org/changeset/ports/404120 Log: MFH: r404119 irc/quassel: Import patch to resolve DoS CVE Approved by: ports-secteam (with hat) Security: CVE-2015-8547 Added: branches/2015Q4/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp - copied unchanged from r404119, head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp Modified: branches/2015Q4/irc/quassel/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/irc/quassel/Makefile ============================================================================== --- branches/2015Q4/irc/quassel/Makefile Mon Dec 21 15:41:30 2015 (r404119) +++ branches/2015Q4/irc/quassel/Makefile Mon Dec 21 15:43:03 2015 (r404120) @@ -3,6 +3,7 @@ PORTNAME= quassel PORTVERSION= 0.11.1 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://www.quassel-irc.org/pub/ Copied: branches/2015Q4/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp (from r404119, head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp Mon Dec 21 15:43:03 2015 (r404120, copy of r404119, head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp) @@ -0,0 +1,12 @@ +Fix CVE-2015-8547 +--- src/core/coreuserinputhandler.cpp.orig 2015-04-23 20:47:17 UTC ++++ src/core/coreuserinputhandler.cpp +@@ -228,7 +228,7 @@ void CoreUserInputHandler::doMode(const + if (!isNumber || maxModes == 0) maxModes = 1; + + QStringList nickList; +- if (nicks == "*") { // All users in channel ++ if (nicks == "*" && bufferInfo.type() == BufferInfo::ChannelBuffer) { // All users in channel + const QList users = network()->ircChannel(bufferInfo.bufferName())->ircUsers(); + foreach(IrcUser *user, users) { + if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode)) From owner-svn-ports-branches@freebsd.org Mon Dec 21 16:26:19 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD514A4EC9D; Mon, 21 Dec 2015 16:26:19 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A988138E; Mon, 21 Dec 2015 16:26:19 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBLGQIWW015369; Mon, 21 Dec 2015 16:26:18 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLGQIdr015368; Mon, 21 Dec 2015 16:26:18 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201512211626.tBLGQIdr015368@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 21 Dec 2015 16:26:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404128 - branches/2015Q4/editors/calligra-l10n-tr 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, 21 Dec 2015 16:26:19 -0000 Author: rakuco Date: Mon Dec 21 16:26:18 2015 New Revision: 404128 URL: https://svnweb.freebsd.org/changeset/ports/404128 Log: MFH: r404127 Drop "Bokmaal" from COMMENT. This was likely copied from editors/calligra-l10n-nb and does not make sense for Turkish. Approved by: portmgr blanket Modified: branches/2015Q4/editors/calligra-l10n-tr/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/editors/calligra-l10n-tr/Makefile ============================================================================== --- branches/2015Q4/editors/calligra-l10n-tr/Makefile Mon Dec 21 16:24:31 2015 (r404127) +++ branches/2015Q4/editors/calligra-l10n-tr/Makefile Mon Dec 21 16:26:18 2015 (r404128) @@ -6,7 +6,7 @@ PORTREVISION= 3 CATEGORIES= editors kde MAINTAINER= kde@FreeBSD.org -COMMENT= Turkish Bokmaal messages and documentation for Calligra +COMMENT= Turkish messages and documentation for Calligra CALLIGRA_L10N= tr From owner-svn-ports-branches@freebsd.org Mon Dec 21 16:30:07 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6F5FA4EF36; Mon, 21 Dec 2015 16:30:07 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA45B1781; Mon, 21 Dec 2015 16:30:07 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBLGU6Zk015644; Mon, 21 Dec 2015 16:30:06 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLGU65h015643; Mon, 21 Dec 2015 16:30:06 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201512211630.tBLGU65h015643@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 21 Dec 2015 16:30:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404129 - branches/2015Q4/math/pspp 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, 21 Dec 2015 16:30:08 -0000 Author: rakuco Date: Mon Dec 21 16:30:06 2015 New Revision: 404129 URL: https://svnweb.freebsd.org/changeset/ports/404129 Log: MFH: r404106 Drop dependency on graphics/plotutils. According to the port's NEWS and ChangeLog, charts are currently produced with Cairo and Pango, so the dependency on libplot is useless nowadays. Approved by: portmgr blanket Modified: branches/2015Q4/math/pspp/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/math/pspp/Makefile ============================================================================== --- branches/2015Q4/math/pspp/Makefile Mon Dec 21 16:26:18 2015 (r404128) +++ branches/2015Q4/math/pspp/Makefile Mon Dec 21 16:30:06 2015 (r404129) @@ -3,6 +3,7 @@ PORTNAME= pspp PORTVERSION= 0.8.5 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= GNU @@ -12,8 +13,7 @@ COMMENT= Program for statistical analysi LICENSE= GPLv3 BUILD_DEPENDS= texinfo>0:${PORTSDIR}/print/texinfo -LIB_DEPENDS= libplot.so:${PORTSDIR}/graphics/plotutils \ - libgslcblas.so:${PORTSDIR}/math/gsl +LIB_DEPENDS= libgslcblas.so:${PORTSDIR}/math/gsl USES= charsetfix gmake iconv libtool perl5 pkgconfig readline USE_GNOME= libxml2 From owner-svn-ports-branches@freebsd.org Mon Dec 21 16:31:20 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97684A4D084; Mon, 21 Dec 2015 16:31:20 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 64BA91A26; Mon, 21 Dec 2015 16:31:20 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBLGVJui016524; Mon, 21 Dec 2015 16:31:19 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLGVJwE016523; Mon, 21 Dec 2015 16:31:19 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201512211631.tBLGVJwE016523@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 21 Dec 2015 16:31:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404131 - branches/2015Q4/audio/fdmf 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, 21 Dec 2015 16:31:20 -0000 Author: rakuco Date: Mon Dec 21 16:31:19 2015 New Revision: 404131 URL: https://svnweb.freebsd.org/changeset/ports/404131 Log: MFH: r404097 Make graphics/plotutils a runtime dependency. This port does not link against libplot.so at all; it just invokes the `spline' program at runtime. Approved by: portmgr blanket Modified: branches/2015Q4/audio/fdmf/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/audio/fdmf/Makefile ============================================================================== --- branches/2015Q4/audio/fdmf/Makefile Mon Dec 21 16:30:15 2015 (r404130) +++ branches/2015Q4/audio/fdmf/Makefile Mon Dec 21 16:31:19 2015 (r404131) @@ -3,7 +3,7 @@ PORTNAME= fdmf DISTVERSION= 0.0.9s -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio MASTER_SITES= http://w140.com/audio/ @@ -13,12 +13,12 @@ COMMENT= Find similar music by perceptua LICENSE= GPLv2 LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm \ - libplot.so:${PORTSDIR}/graphics/plotutils \ libfftw3.so:${PORTSDIR}/math/fftw3 RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \ mpg123:${PORTSDIR}/audio/mpg123 \ ogg123:${PORTSDIR}/audio/vorbis-tools \ - p5-GDBM>=0:${PORTSDIR}/databases/p5-GDBM + p5-GDBM>=0:${PORTSDIR}/databases/p5-GDBM \ + spline:${PORTSDIR}/graphics/plotutils USES= perl5 shebangfix SHEBANG_FILES= ${SCRS} From owner-svn-ports-branches@freebsd.org Mon Dec 21 16:32:43 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A209A4D214; Mon, 21 Dec 2015 16:32:43 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 374071C9E; Mon, 21 Dec 2015 16:32:43 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBLGWgg3018638; Mon, 21 Dec 2015 16:32:42 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLGWgcT018637; Mon, 21 Dec 2015 16:32:42 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201512211632.tBLGWgcT018637@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 21 Dec 2015 16:32:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404132 - branches/2015Q4/graphics/enblend 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, 21 Dec 2015 16:32:43 -0000 Author: rakuco Date: Mon Dec 21 16:32:42 2015 New Revision: 404132 URL: https://svnweb.freebsd.org/changeset/ports/404132 Log: MFH: r404098 Drop dependency on graphics/plotutils. As the ports's NEWS file says, since the 4.1.x series "Enblend no longer relies on libXMI". Approved by: portmgr blanket Modified: branches/2015Q4/graphics/enblend/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/graphics/enblend/Makefile ============================================================================== --- branches/2015Q4/graphics/enblend/Makefile Mon Dec 21 16:31:19 2015 (r404131) +++ branches/2015Q4/graphics/enblend/Makefile Mon Dec 21 16:32:42 2015 (r404132) @@ -3,7 +3,7 @@ PORTNAME= enblend PORTVERSION= 4.1.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R} DISTNAME= enblend-enfuse-${PORTVERSION} @@ -14,7 +14,6 @@ COMMENT= Tool for image blending with mu BUILD_DEPENDS= ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo \ OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 \ - libxmi.so:${PORTSDIR}/graphics/plotutils \ libtiff.so:${PORTSDIR}/graphics/tiff \ libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \ libvigraimpex.so:${PORTSDIR}/graphics/vigra \ From owner-svn-ports-branches@freebsd.org Mon Dec 21 17:08:17 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58120A4ECF2; Mon, 21 Dec 2015 17:08:17 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 27371177D; Mon, 21 Dec 2015 17:08:17 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBLH8G2Z028056; Mon, 21 Dec 2015 17:08:16 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLH8GuS028055; Mon, 21 Dec 2015 17:08:16 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201512211708.tBLH8GuS028055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 21 Dec 2015 17:08:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404137 - branches/2015Q4/finance/electrum 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, 21 Dec 2015 17:08:17 -0000 Author: amdmi3 Date: Mon Dec 21 17:08:16 2015 New Revision: 404137 URL: https://svnweb.freebsd.org/changeset/ports/404137 Log: MFH: r404136 - Fix fetch PR: 205330 Submitted by: amdmi3 Approved by: portmgr blanket Approved by: ports-secteam blanket Modified: branches/2015Q4/finance/electrum/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/finance/electrum/Makefile ============================================================================== --- branches/2015Q4/finance/electrum/Makefile Mon Dec 21 17:07:27 2015 (r404136) +++ branches/2015Q4/finance/electrum/Makefile Mon Dec 21 17:08:16 2015 (r404137) @@ -4,7 +4,8 @@ PORTNAME= electrum PORTVERSION= 2.3.2 CATEGORIES= finance python -MASTER_SITES= https://download.electrum.org/ http://download.electrum.org/ +MASTER_SITES= https://download.electrum.org/${PORTVERSION}/ \ + http://download.electrum.org/${PORTVERSION}/ DISTNAME= Electrum-${PORTVERSION} MAINTAINER= kyuupichan@gmail.com From owner-svn-ports-branches@freebsd.org Tue Dec 22 08:46:34 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9C1E2A4EA68; Tue, 22 Dec 2015 08:46:34 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D2E41FCE; Tue, 22 Dec 2015 08:46:34 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBM8kXkc023035; Tue, 22 Dec 2015 08:46:33 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBM8kXvY023028; Tue, 22 Dec 2015 08:46:33 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201512220846.tBM8kXvY023028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Tue, 22 Dec 2015 08:46:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404223 - in branches/2015Q4/databases: db48 db5 db6 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, 22 Dec 2015 08:46:34 -0000 Author: mandree Date: Tue Dec 22 08:46:33 2015 New Revision: 404223 URL: https://svnweb.freebsd.org/changeset/ports/404223 Log: MFH: r401088 r404013 As with armv6 we need to use POSIX mutexes. Without this the ports try to use fcntl mutexes and fails as they are deprecated. Approved by: mandree (maintainer) Differential Revision: https://reviews.freebsd.org/D4107 Fix crash by using POSIX mutexes on all armv6* ARCHes not just armv6. This is to fix illegal-instruction crashes on armv6hf. PR: 205001 Submitted by: dave@dogwood.com Reviewed by: mikael.urankar@gmail.com Approved by: ports-secteam (feld@) Modified: branches/2015Q4/databases/db48/Makefile branches/2015Q4/databases/db5/Makefile branches/2015Q4/databases/db6/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/databases/db48/Makefile ============================================================================== --- branches/2015Q4/databases/db48/Makefile Tue Dec 22 08:31:52 2015 (r404222) +++ branches/2015Q4/databases/db48/Makefile Tue Dec 22 08:46:33 2015 (r404223) @@ -35,7 +35,7 @@ USE_LDCONFIG= yes .include -.if ${ARCH} == "armv6" +.if ${ARCH} == "aarch64" || ${ARCH} == "armv6" # db48 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227 CONFIGURE_ARGS+= --enable-posixmutexes .endif Modified: branches/2015Q4/databases/db5/Makefile ============================================================================== --- branches/2015Q4/databases/db5/Makefile Tue Dec 22 08:31:52 2015 (r404222) +++ branches/2015Q4/databases/db5/Makefile Tue Dec 22 08:46:33 2015 (r404223) @@ -3,7 +3,7 @@ PORTNAME= db5 PORTVERSION= 5.3.28 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= @@ -39,8 +39,9 @@ SQL_DESC= Enable SQL API (EXPERIMENTAL) .include -.if ${ARCH} == "armv6" +.if ${ARCH} == "aarch64" || ${ARCH:Marmv6*} # db5 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227 +# also bug#205001 CONFIGURE_ARGS+= --enable-posixmutexes .endif Modified: branches/2015Q4/databases/db6/Makefile ============================================================================== --- branches/2015Q4/databases/db6/Makefile Tue Dec 22 08:31:52 2015 (r404222) +++ branches/2015Q4/databases/db6/Makefile Tue Dec 22 08:46:33 2015 (r404223) @@ -3,6 +3,7 @@ PORTNAME= db6 PORTVERSION= 6.1.19 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= @@ -40,8 +41,9 @@ SQL_DESC= Enable SQL API (EXPERIMENTAL) .include -.if ${ARCH} == "armv6" +.if ${ARCH} == "aarch64" || ${ARCH:Marmv6*} # db6 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227 +# and also bug #205001 CONFIGURE_ARGS+= --enable-posixmutexes .endif From owner-svn-ports-branches@freebsd.org Tue Dec 22 16:34:55 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1D4F4A4FC8B; Tue, 22 Dec 2015 16:34:55 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E4FA91DB4; Tue, 22 Dec 2015 16:34:54 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBMGYr5F073543; Tue, 22 Dec 2015 16:34:53 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBMGYrIh073536; Tue, 22 Dec 2015 16:34:53 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201512221634.tBMGYrIh073536@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 22 Dec 2015 16:34:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404249 - in branches/2015Q4: databases/ldb databases/ldb/files databases/tdb databases/tdb/files devel/talloc devel/talloc/files devel/tevent 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, 22 Dec 2015 16:34:55 -0000 Author: feld Date: Tue Dec 22 16:34:53 2015 New Revision: 404249 URL: https://svnweb.freebsd.org/changeset/ports/404249 Log: MFH: r402636 Update Samba supplimentary libs Approved by: ports-secteam (with hat) Deleted: branches/2015Q4/databases/ldb/files/patch-lib_replace_replace.c branches/2015Q4/databases/tdb/files/patch-lib_replace_replace.c branches/2015Q4/devel/talloc/files/patch-lib_replace_replace.c Modified: branches/2015Q4/databases/ldb/Makefile branches/2015Q4/databases/ldb/distinfo branches/2015Q4/databases/tdb/Makefile branches/2015Q4/databases/tdb/distinfo branches/2015Q4/devel/talloc/Makefile branches/2015Q4/devel/talloc/distinfo branches/2015Q4/devel/tevent/Makefile branches/2015Q4/devel/tevent/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/databases/ldb/Makefile ============================================================================== --- branches/2015Q4/databases/ldb/Makefile Tue Dec 22 16:21:33 2015 (r404248) +++ branches/2015Q4/databases/ldb/Makefile Tue Dec 22 16:34:53 2015 (r404249) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= ldb -PORTVERSION= 1.1.21 -PORTREVISION= 1 +PORTVERSION= 1.1.23 +PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= databases MASTER_SITES= SAMBA @@ -32,9 +32,9 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/m OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) -BUILD_DEPENDS+= talloc>=2.1.1:${PORTSDIR}/devel/talloc \ - tevent>=0.9.22:${PORTSDIR}/devel/tevent \ - tdb>=1.3.4,1:${PORTSDIR}/databases/tdb \ +BUILD_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc \ + tevent>=0.9.26:${PORTSDIR}/devel/tevent \ + tdb>=1.3.8,1:${PORTSDIR}/databases/tdb \ popt>=0:${PORTSDIR}/devel/popt RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -87,6 +87,7 @@ PLIST_FILES+= include/pyldb.h \ lib/libpyldb-util.so \ lib/libpyldb-util.so.1 \ %%PYTHON_SITELIBDIR%%/ldb.so \ + %%PYTHON_SITELIBDIR%%/_ldb_text.py \ %%PKGCONFIGDIR%%/pyldb-util.pc LDB_MAN1= man/man1/ldbadd.1.gz \ Modified: branches/2015Q4/databases/ldb/distinfo ============================================================================== --- branches/2015Q4/databases/ldb/distinfo Tue Dec 22 16:21:33 2015 (r404248) +++ branches/2015Q4/databases/ldb/distinfo Tue Dec 22 16:34:53 2015 (r404249) @@ -1,2 +1,2 @@ -SHA256 (ldb-1.1.21.tar.gz) = 267bbb7f278068eaf0de27adffda2e691a070a93c5c15ee27c828e87b4c7dbf1 -SIZE (ldb-1.1.21.tar.gz) = 1244825 +SHA256 (ldb-1.1.23.tar.gz) = 8f8b2f7f04b24c847d088a091e6a2261ac6c7810fc711f553d3b61a3dee39559 +SIZE (ldb-1.1.23.tar.gz) = 1258249 Modified: branches/2015Q4/databases/tdb/Makefile ============================================================================== --- branches/2015Q4/databases/tdb/Makefile Tue Dec 22 16:21:33 2015 (r404248) +++ branches/2015Q4/databases/tdb/Makefile Tue Dec 22 16:34:53 2015 (r404249) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= tdb -PORTVERSION= 1.3.7 -PORTREVISION= 1 +PORTVERSION= 1.3.8 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SAMBA Modified: branches/2015Q4/databases/tdb/distinfo ============================================================================== --- branches/2015Q4/databases/tdb/distinfo Tue Dec 22 16:21:33 2015 (r404248) +++ branches/2015Q4/databases/tdb/distinfo Tue Dec 22 16:34:53 2015 (r404249) @@ -1,2 +1,2 @@ -SHA256 (tdb-1.3.7.tar.gz) = a64d95ca0cc06a28fed24c6e952aed7660cae04983108735d6bc30b925136412 -SIZE (tdb-1.3.7.tar.gz) = 493847 +SHA256 (tdb-1.3.8.tar.gz) = 0605ac0427eac9c23bf61ebfd8206a07d5ece198498eab1769cd0cfb6e7de6b1 +SIZE (tdb-1.3.8.tar.gz) = 494106 Modified: branches/2015Q4/devel/talloc/Makefile ============================================================================== --- branches/2015Q4/devel/talloc/Makefile Tue Dec 22 16:21:33 2015 (r404248) +++ branches/2015Q4/devel/talloc/Makefile Tue Dec 22 16:34:53 2015 (r404249) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= talloc -PORTVERSION= 2.1.3 -PORTREVISION= 1 +PORTVERSION= 2.1.5 +PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= devel MASTER_SITES= SAMBA Modified: branches/2015Q4/devel/talloc/distinfo ============================================================================== --- branches/2015Q4/devel/talloc/distinfo Tue Dec 22 16:21:33 2015 (r404248) +++ branches/2015Q4/devel/talloc/distinfo Tue Dec 22 16:34:53 2015 (r404249) @@ -1,2 +1,2 @@ -SHA256 (talloc-2.1.3.tar.gz) = 7aa5f75b22d4ef9c737b25515f2a2837ddc13014ff4ac6e58dd9e311f41f2cb0 -SIZE (talloc-2.1.3.tar.gz) = 434093 +SHA256 (talloc-2.1.5.tar.gz) = 3833e750cf0b8c3439186cba38800cba9e26adfbce10ee98ba709c24eb1cdddd +SIZE (talloc-2.1.5.tar.gz) = 436193 Modified: branches/2015Q4/devel/tevent/Makefile ============================================================================== --- branches/2015Q4/devel/tevent/Makefile Tue Dec 22 16:21:33 2015 (r404248) +++ branches/2015Q4/devel/tevent/Makefile Tue Dec 22 16:34:53 2015 (r404249) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tevent -PORTVERSION= 0.9.25 +PORTVERSION= 0.9.26 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= devel @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/m OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) -BUILD_DEPENDS+= talloc>=2.1.1:${PORTSDIR}/devel/talloc +BUILD_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc RUN_DEPENDS:= ${BUILD_DEPENDS} .include Modified: branches/2015Q4/devel/tevent/distinfo ============================================================================== --- branches/2015Q4/devel/tevent/distinfo Tue Dec 22 16:21:33 2015 (r404248) +++ branches/2015Q4/devel/tevent/distinfo Tue Dec 22 16:34:53 2015 (r404249) @@ -1,2 +1,2 @@ -SHA256 (tevent-0.9.25.tar.gz) = fedeb0d55a11b3593b562ec09b32e44bd67619ed10e5fa10d1868adb1649c669 -SIZE (tevent-0.9.25.tar.gz) = 573357 +SHA256 (tevent-0.9.26.tar.gz) = 262c14d78ede13f2c4fc5e61485ae7250a201782d94735a1d8412652453370bd +SIZE (tevent-0.9.26.tar.gz) = 581664 From owner-svn-ports-branches@freebsd.org Tue Dec 22 16:35:47 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5CBBFA4FCD4; Tue, 22 Dec 2015 16:35:47 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2DB3C1E97; Tue, 22 Dec 2015 16:35:47 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBMGZkvu073733; Tue, 22 Dec 2015 16:35:46 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBMGZkev073731; Tue, 22 Dec 2015 16:35:46 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201512221635.tBMGZkev073731@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 22 Dec 2015 16:35:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404250 - branches/2015Q4/databases/ldb 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, 22 Dec 2015 16:35:47 -0000 Author: feld Date: Tue Dec 22 16:35:45 2015 New Revision: 404250 URL: https://svnweb.freebsd.org/changeset/ports/404250 Log: MFH: r403876 Update ldb to the latest version, needed by Samba 4.3.3 Approved by: ports-secteam (with hat) Modified: branches/2015Q4/databases/ldb/Makefile branches/2015Q4/databases/ldb/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/databases/ldb/Makefile ============================================================================== --- branches/2015Q4/databases/ldb/Makefile Tue Dec 22 16:34:53 2015 (r404249) +++ branches/2015Q4/databases/ldb/Makefile Tue Dec 22 16:35:45 2015 (r404250) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ldb -PORTVERSION= 1.1.23 +PORTVERSION= 1.1.24 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= databases Modified: branches/2015Q4/databases/ldb/distinfo ============================================================================== --- branches/2015Q4/databases/ldb/distinfo Tue Dec 22 16:34:53 2015 (r404249) +++ branches/2015Q4/databases/ldb/distinfo Tue Dec 22 16:35:45 2015 (r404250) @@ -1,2 +1,2 @@ -SHA256 (ldb-1.1.23.tar.gz) = 8f8b2f7f04b24c847d088a091e6a2261ac6c7810fc711f553d3b61a3dee39559 -SIZE (ldb-1.1.23.tar.gz) = 1258249 +SHA256 (ldb-1.1.24.tar.gz) = 45e9f52473f0d013f0ea090cce35d6836a6e67e8d4dcdd7077dabdf8b1314b21 +SIZE (ldb-1.1.24.tar.gz) = 1258405 From owner-svn-ports-branches@freebsd.org Tue Dec 22 18:59:36 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9825EA4FBE1; Tue, 22 Dec 2015 18:59:36 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68CBB1481; Tue, 22 Dec 2015 18:59:36 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBMIxZ1f015768; Tue, 22 Dec 2015 18:59:35 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBMIxZ3h015766; Tue, 22 Dec 2015 18:59:35 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201512221859.tBMIxZ3h015766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 22 Dec 2015 18:59:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404263 - branches/2015Q4/net/samba41 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, 22 Dec 2015 18:59:36 -0000 Author: feld Date: Tue Dec 22 18:59:35 2015 New Revision: 404263 URL: https://svnweb.freebsd.org/changeset/ports/404263 Log: net/samba41: Update to 4.1.22 Direct commit as MFH of r404031 was not possible Security: CVE-2015-3223 CVE-2015-5252 CVE-2015-5299 CVE-2015-5296 CVE-2015-8467 CVE-2015-5330 Approved by: ports-secteam (with hat) Modified: branches/2015Q4/net/samba41/Makefile branches/2015Q4/net/samba41/distinfo Modified: branches/2015Q4/net/samba41/Makefile ============================================================================== --- branches/2015Q4/net/samba41/Makefile Tue Dec 22 18:59:05 2015 (r404262) +++ branches/2015Q4/net/samba41/Makefile Tue Dec 22 18:59:35 2015 (r404263) @@ -17,7 +17,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.1.18 +SAMBA4_VERSION= 4.1.22 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} Modified: branches/2015Q4/net/samba41/distinfo ============================================================================== --- branches/2015Q4/net/samba41/distinfo Tue Dec 22 18:59:05 2015 (r404262) +++ branches/2015Q4/net/samba41/distinfo Tue Dec 22 18:59:35 2015 (r404263) @@ -1,2 +1,2 @@ -SHA256 (samba-4.1.18.tar.gz) = 5bd302355c82195271de41d4f1e0c6353bde652a23886940b310b7734256f156 -SIZE (samba-4.1.18.tar.gz) = 19550894 +SHA256 (samba-4.1.22.tar.gz) = 5563a1c94a2dac837ccffd1f0821bb25e097affaa7389fef186f9cfb3486cfe5 +SIZE (samba-4.1.22.tar.gz) = 19557688 From owner-svn-ports-branches@freebsd.org Tue Dec 22 19:17:19 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B4FDA4F01D; Tue, 22 Dec 2015 19:17:19 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC70B1C46; Tue, 22 Dec 2015 19:17:18 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBMJHIHi021616; Tue, 22 Dec 2015 19:17:18 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBMJHHgn021611; Tue, 22 Dec 2015 19:17:17 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201512221917.tBMJHHgn021611@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 22 Dec 2015 19:17:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404264 - in branches/2015Q4/net/samba42: . 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, 22 Dec 2015 19:17:19 -0000 Author: feld Date: Tue Dec 22 19:17:17 2015 New Revision: 404264 URL: https://svnweb.freebsd.org/changeset/ports/404264 Log: net/samba42: Update to 4.2.7 Direct commit as MFH of r404031 was not possible Security: CVE-2015-3223 CVE-2015-5252 CVE-2015-5299 CVE-2015-5296 CVE-2015-8467 CVE-2015-5330 Approved by: ports-secteam (with hat) Added: branches/2015Q4/net/samba42/files/extra-patch-security - copied unchanged from r404263, head/net/samba42/files/extra-patch-security Modified: branches/2015Q4/net/samba42/Makefile branches/2015Q4/net/samba42/distinfo branches/2015Q4/net/samba42/files/pkg-message.in branches/2015Q4/net/samba42/pkg-plist Modified: branches/2015Q4/net/samba42/Makefile ============================================================================== --- branches/2015Q4/net/samba42/Makefile Tue Dec 22 18:59:35 2015 (r404263) +++ branches/2015Q4/net/samba42/Makefile Tue Dec 22 19:17:17 2015 (r404264) @@ -13,11 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC serve LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* +CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.* + +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.2.4 +SAMBA4_VERSION= 4.2.7 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -91,24 +93,24 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " # talloc -BUILD_DEPENDS+= talloc>=2.1.3_1:${PORTSDIR}/devel/talloc -RUN_DEPENDS+= talloc>=2.1.3_1:${PORTSDIR}/devel/talloc +BUILD_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc +RUN_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent BUILD_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent RUN_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb -BUILD_DEPENDS+= tdb>=1.3.7_1:${PORTSDIR}/databases/tdb -RUN_DEPENDS+= tdb>=1.3.7_1:${PORTSDIR}/databases/tdb +BUILD_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb +RUN_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ntdb BUILD_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb RUN_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb SAMBA4_BUNDLED_LIBS+= !ntdb # ldb -BUILD_DEPENDS+= ldb>=1.1.21_1:${PORTSDIR}/databases/ldb -RUN_DEPENDS+= ldb>=1.1.21_1:${PORTSDIR}/databases/ldb +BUILD_DEPENDS+= ldb>=1.1.24:${PORTSDIR}/databases/ldb +RUN_DEPENDS+= ldb>=1.1.24:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err @@ -174,6 +176,8 @@ SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" +.else +SUB_LIST+= NSUPDATE="@comment " .endif .if ${PORT_OPTIONS:MDEBUG} @@ -239,8 +243,10 @@ CONFIGURE_ARGS+= --without-acl-support .if ! ${PORT_OPTIONS:MAD_DC} CONFIGURE_ARGS+= --without-ad-dc PLIST_SUB+= AD_DC="@comment " +SUB_LIST+= AD_DC="@comment " .else PLIST_SUB+= AD_DC="" +SUB_LIST+= AD_DC="" .endif .if ${PORT_OPTIONS:MADS} Modified: branches/2015Q4/net/samba42/distinfo ============================================================================== --- branches/2015Q4/net/samba42/distinfo Tue Dec 22 18:59:35 2015 (r404263) +++ branches/2015Q4/net/samba42/distinfo Tue Dec 22 19:17:17 2015 (r404264) @@ -1,2 +1,2 @@ -SHA256 (samba-4.2.4.tar.gz) = fb326ea486973ab684f183774e93bb943fc231ab89937512e70331b86acdf6ae -SIZE (samba-4.2.4.tar.gz) = 20735687 +SHA256 (samba-4.2.7.tar.gz) = f586ab3166ce4c663360f15b1de24ef083816a5471856e3ad49bc26b35f0104a +SIZE (samba-4.2.7.tar.gz) = 20741971 Copied: branches/2015Q4/net/samba42/files/extra-patch-security (from r404263, head/net/samba42/files/extra-patch-security) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/net/samba42/files/extra-patch-security Tue Dec 22 19:17:17 2015 (r404264, copy of r404263, head/net/samba42/files/extra-patch-security) @@ -0,0 +1,647 @@ +From 6a25f2a8c651523a272c0019895e1d2b1e83b022 Mon Sep 17 00:00:00 2001 +From: Volker Lendecke +Date: Sat, 18 Jul 2015 21:50:55 +0200 +Subject: [PATCH 1/5] dbwrap_rbt: Make "key" and "value" aligned to 16 byte +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reported by Uri Simchoni . Thanks! + +Signed-off-by: Volker Lendecke +Reviewed-by: Ralph Boehme + +Autobuild-User(master): Ralph Böhme +Autobuild-Date(master): Mon Jul 20 23:18:23 CEST 2015 on sn-devel-104 + +(cherry picked from commit 64a88f74ca5309dce1d3ec0755ceba4af5144dbd) +--- + lib/dbwrap/dbwrap_rbt.c | 51 +++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 39 insertions(+), 12 deletions(-) + +diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c +index 3f97086..03f2f57 100644 +--- a/lib/dbwrap/dbwrap_rbt.c ++++ b/lib/dbwrap/dbwrap_rbt.c +@@ -38,13 +38,6 @@ struct db_rbt_rec { + struct db_rbt_node { + struct rb_node rb_node; + size_t keysize, valuesize; +- +- /* +- * key and value are appended implicitly, "data" is only here as a +- * target for offsetof() +- */ +- +- char data[1]; + }; + + /* +@@ -83,12 +76,43 @@ static int db_rbt_compare(TDB_DATA a, TDB_DATA b) + static void db_rbt_parse_node(struct db_rbt_node *node, + TDB_DATA *key, TDB_DATA *value) + { +- key->dptr = ((uint8_t *)node) + offsetof(struct db_rbt_node, data); ++ size_t key_offset, value_offset; ++ ++ key_offset = DBWRAP_RBT_ALIGN(sizeof(struct db_rbt_node)); ++ key->dptr = ((uint8_t *)node) + key_offset; + key->dsize = node->keysize; +- value->dptr = key->dptr + node->keysize; ++ ++ value_offset = DBWRAP_RBT_ALIGN(node->keysize); ++ value->dptr = key->dptr + value_offset; + value->dsize = node->valuesize; + } + ++static ssize_t db_rbt_reclen(size_t keylen, size_t valuelen) ++{ ++ size_t len, tmp; ++ ++ len = DBWRAP_RBT_ALIGN(sizeof(struct db_rbt_node)); ++ ++ tmp = DBWRAP_RBT_ALIGN(keylen); ++ if (tmp < keylen) { ++ goto overflow; ++ } ++ ++ len += tmp; ++ if (len < tmp) { ++ goto overflow; ++ } ++ ++ len += valuelen; ++ if (len < valuelen) { ++ goto overflow; ++ } ++ ++ return len; ++overflow: ++ return -1; ++} ++ + static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) + { + struct db_rbt_ctx *db_ctx = talloc_get_type_abort( +@@ -99,6 +123,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) + struct rb_node ** p; + struct rb_node * parent; + ++ ssize_t reclen; + TDB_DATA this_key, this_val; + + if (rec_priv->node != NULL) { +@@ -123,10 +148,12 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) + } + } + +- node = (struct db_rbt_node *)talloc_size(db_ctx, +- offsetof(struct db_rbt_node, data) + rec->key.dsize +- + data.dsize); ++ reclen = db_rbt_reclen(rec->key.dsize, data.dsize); ++ if (reclen == -1) { ++ return NT_STATUS_INSUFFICIENT_RESOURCES; ++ } + ++ node = talloc_size(db_ctx, reclen); + if (node == NULL) { + return NT_STATUS_NO_MEMORY; + } +-- +1.9.1 + + +From b4d52184a113851954b1b901f478db200e9fd7a8 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 25 Nov 2015 10:17:34 +0100 +Subject: [PATCH 2/5] dbwrap_rbt: use talloc_zero_size() instead of a partial + ZERO_STRUCT() + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375 +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: Volker Lendecke +(cherry picked from commit f3d1fc1d06822a951a2a3eeb5aa53748b9b5b299) +--- + lib/dbwrap/dbwrap_rbt.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c +index 03f2f57..2d65647 100644 +--- a/lib/dbwrap/dbwrap_rbt.c ++++ b/lib/dbwrap/dbwrap_rbt.c +@@ -153,7 +153,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) + return NT_STATUS_INSUFFICIENT_RESOURCES; + } + +- node = talloc_size(db_ctx, reclen); ++ node = talloc_zero_size(db_ctx, reclen); + if (node == NULL) { + return NT_STATUS_NO_MEMORY; + } +@@ -172,8 +172,6 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) + */ + } + +- ZERO_STRUCT(node->rb_node); +- + node->keysize = rec->key.dsize; + node->valuesize = data.dsize; + +-- +1.9.1 + + +From 10abdaf5c7f99eca742c84a7d55b7bb9c324aeab Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 25 Nov 2015 09:22:08 +0100 +Subject: [PATCH 3/5] dbwrap_rbt: add nested traverse protection + +Multiple dbwrap_traverse_read() calls are possible. + +store() and delete() on a fetch locked record +are rejected during dbwrap_traverse_read(). + +A dbwrap_traverse() within a dbwrap_traverse_read() +behaves like a dbwrap_traverse_read(). + +Nested dbwrap_traverse() calls are not possible. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375 +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: Volker Lendecke +(cherry picked from commit 590507951fc514a679f44b8bfdd03c721189c3fa) +--- + lib/dbwrap/dbwrap_rbt.c | 71 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 40 insertions(+), 31 deletions(-) + +diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c +index 2d65647..d4cb40d 100644 +--- a/lib/dbwrap/dbwrap_rbt.c ++++ b/lib/dbwrap/dbwrap_rbt.c +@@ -27,6 +27,8 @@ + + struct db_rbt_ctx { + struct rb_root tree; ++ size_t traverse_read; ++ bool traverse_write; + }; + + struct db_rbt_rec { +@@ -126,6 +128,10 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) + ssize_t reclen; + TDB_DATA this_key, this_val; + ++ if (db_ctx->traverse_read > 0) { ++ return NT_STATUS_MEDIA_WRITE_PROTECTED; ++ } ++ + if (rec_priv->node != NULL) { + + /* +@@ -222,6 +228,10 @@ static NTSTATUS db_rbt_delete(struct db_record *rec) + rec->db->private_data, struct db_rbt_ctx); + struct db_rbt_rec *rec_priv = (struct db_rbt_rec *)rec->private_data; + ++ if (db_ctx->traverse_read > 0) { ++ return NT_STATUS_MEDIA_WRITE_PROTECTED; ++ } ++ + if (rec_priv->node == NULL) { + return NT_STATUS_OK; + } +@@ -232,16 +242,6 @@ static NTSTATUS db_rbt_delete(struct db_record *rec) + return NT_STATUS_OK; + } + +-static NTSTATUS db_rbt_store_deny(struct db_record *rec, TDB_DATA data, int flag) +-{ +- return NT_STATUS_MEDIA_WRITE_PROTECTED; +-} +- +-static NTSTATUS db_rbt_delete_deny(struct db_record *rec) +-{ +- return NT_STATUS_MEDIA_WRITE_PROTECTED; +-} +- + struct db_rbt_search_result { + TDB_DATA key; + TDB_DATA val; +@@ -414,13 +414,8 @@ static int db_rbt_traverse_internal(struct db_context *db, + ZERO_STRUCT(rec); + rec.db = db; + rec.private_data = &rec_priv; +- if (rw) { +- rec.store = db_rbt_store; +- rec.delete_rec = db_rbt_delete; +- } else { +- rec.store = db_rbt_store_deny; +- rec.delete_rec = db_rbt_delete_deny; +- } ++ rec.store = db_rbt_store; ++ rec.delete_rec = db_rbt_delete; + db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value); + + ret = f(&rec, private_data); +@@ -440,18 +435,21 @@ static int db_rbt_traverse_internal(struct db_context *db, + return db_rbt_traverse_internal(db, rb_right, f, private_data, count, rw); + } + +-static int db_rbt_traverse(struct db_context *db, +- int (*f)(struct db_record *db, +- void *private_data), +- void *private_data) ++static int db_rbt_traverse_read(struct db_context *db, ++ int (*f)(struct db_record *db, ++ void *private_data), ++ void *private_data) + { + struct db_rbt_ctx *ctx = talloc_get_type_abort( + db->private_data, struct db_rbt_ctx); + uint32_t count = 0; ++ int ret; + +- int ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, +- f, private_data, &count, +- true /* rw */); ++ ctx->traverse_read++; ++ ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, ++ f, private_data, &count, ++ false /* rw */); ++ ctx->traverse_read--; + if (ret != 0) { + return -1; + } +@@ -461,18 +459,29 @@ static int db_rbt_traverse(struct db_context *db, + return count; + } + +-static int db_rbt_traverse_read(struct db_context *db, +- int (*f)(struct db_record *db, +- void *private_data), +- void *private_data) ++static int db_rbt_traverse(struct db_context *db, ++ int (*f)(struct db_record *db, ++ void *private_data), ++ void *private_data) + { + struct db_rbt_ctx *ctx = talloc_get_type_abort( + db->private_data, struct db_rbt_ctx); + uint32_t count = 0; ++ int ret; ++ ++ if (ctx->traverse_write) { ++ return -1; ++ }; ++ ++ if (ctx->traverse_read > 0) { ++ return db_rbt_traverse_read(db, f, private_data); ++ } + +- int ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, +- f, private_data, &count, +- false /* rw */); ++ ctx->traverse_write = true; ++ ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, ++ f, private_data, &count, ++ true /* rw */); ++ ctx->traverse_write = false; + if (ret != 0) { + return -1; + } +-- +1.9.1 + + +From fd6bcd4cb3752554dd1041f0a41fd7e9edac602d Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 25 Nov 2015 09:22:08 +0100 +Subject: [PATCH 4/5] dbwrap_rbt: fix modifying the db during traverse + +We delete and add of records rebalace the tree, but our +traverse code doesn't handle that and skips records +randomly. + +We maintain records in a linked list for now +in addition to the rbtree and use that list during +traverse. + +This add a bit overhead, but at least it works reliable. +If someone finds a way to do reliable traverse with the +rebalanced tree, we can replace this commit. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375 +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: Volker Lendecke +(cherry picked from commit 0f46da08e160e6712e5282af14e1ec4012614fc7) +--- + lib/dbwrap/dbwrap_rbt.c | 104 ++++++++++++++++++++++++++---------------------- + 1 file changed, 57 insertions(+), 47 deletions(-) + +diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c +index d4cb40d..a9cc641 100644 +--- a/lib/dbwrap/dbwrap_rbt.c ++++ b/lib/dbwrap/dbwrap_rbt.c +@@ -22,13 +22,15 @@ + #include "dbwrap/dbwrap_private.h" + #include "dbwrap/dbwrap_rbt.h" + #include "../lib/util/rbtree.h" ++#include "../lib/util/dlinklist.h" + + #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15) + + struct db_rbt_ctx { + struct rb_root tree; ++ struct db_rbt_node *nodes; + size_t traverse_read; +- bool traverse_write; ++ struct db_rbt_node **traverse_nextp; + }; + + struct db_rbt_rec { +@@ -40,6 +42,7 @@ struct db_rbt_rec { + struct db_rbt_node { + struct rb_node rb_node; + size_t keysize, valuesize; ++ struct db_rbt_node *prev, *next; + }; + + /* +@@ -123,7 +126,8 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) + struct db_rbt_node *node; + + struct rb_node ** p; +- struct rb_node * parent; ++ struct rb_node *parent = NULL; ++ struct db_rbt_node *parent_node = NULL; + + ssize_t reclen; + TDB_DATA this_key, this_val; +@@ -165,12 +169,19 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) + } + + if (rec_priv->node != NULL) { ++ if (db_ctx->traverse_nextp != NULL) { ++ if (*db_ctx->traverse_nextp == rec_priv->node) { ++ *db_ctx->traverse_nextp = node; ++ } ++ } ++ + /* + * We need to delete the key from the tree and start fresh, + * there's not enough space in the existing record + */ + + rb_erase(&rec_priv->node->rb_node, &db_ctx->tree); ++ DLIST_REMOVE(db_ctx->nodes, rec_priv->node); + + /* + * Keep the existing node around for a while: If the record +@@ -197,10 +208,11 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) + TDB_DATA search_key, search_val; + int res; + +- parent = (*p); +- + r = db_rbt2node(*p); + ++ parent = (*p); ++ parent_node = r; ++ + db_rbt_parse_node(r, &search_key, &search_val); + + res = db_rbt_compare(this_key, search_key); +@@ -217,6 +229,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) + } + + rb_link_node(&node->rb_node, parent, p); ++ DLIST_ADD_AFTER(db_ctx->nodes, node, parent_node); + rb_insert_color(&node->rb_node, &db_ctx->tree); + + return NT_STATUS_OK; +@@ -236,7 +249,14 @@ static NTSTATUS db_rbt_delete(struct db_record *rec) + return NT_STATUS_OK; + } + ++ if (db_ctx->traverse_nextp != NULL) { ++ if (*db_ctx->traverse_nextp == rec_priv->node) { ++ *db_ctx->traverse_nextp = rec_priv->node->next; ++ } ++ } ++ + rb_erase(&rec_priv->node->rb_node, &db_ctx->tree); ++ DLIST_REMOVE(db_ctx->nodes, rec_priv->node); + TALLOC_FREE(rec_priv->node); + + return NT_STATUS_OK; +@@ -383,56 +403,48 @@ static NTSTATUS db_rbt_parse_record(struct db_context *db, TDB_DATA key, + } + + static int db_rbt_traverse_internal(struct db_context *db, +- struct rb_node *n, + int (*f)(struct db_record *db, + void *private_data), + void *private_data, uint32_t* count, + bool rw) + { +- struct rb_node *rb_right; +- struct rb_node *rb_left; +- struct db_record rec; +- struct db_rbt_rec rec_priv; ++ struct db_rbt_ctx *ctx = talloc_get_type_abort( ++ db->private_data, struct db_rbt_ctx); ++ struct db_rbt_node *cur = NULL; ++ struct db_rbt_node *next = NULL; + int ret; + +- if (n == NULL) { +- return 0; +- } +- +- rb_left = n->rb_left; +- rb_right = n->rb_right; ++ for (cur = ctx->nodes; cur != NULL; cur = next) { ++ struct db_record rec; ++ struct db_rbt_rec rec_priv; + +- ret = db_rbt_traverse_internal(db, rb_left, f, private_data, count, rw); +- if (ret != 0) { +- return ret; +- } ++ rec_priv.node = cur; ++ next = rec_priv.node->next; + +- rec_priv.node = db_rbt2node(n); +- /* n might be altered by the callback function */ +- n = NULL; ++ ZERO_STRUCT(rec); ++ rec.db = db; ++ rec.private_data = &rec_priv; ++ rec.store = db_rbt_store; ++ rec.delete_rec = db_rbt_delete; ++ db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value); + +- ZERO_STRUCT(rec); +- rec.db = db; +- rec.private_data = &rec_priv; +- rec.store = db_rbt_store; +- rec.delete_rec = db_rbt_delete; +- db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value); +- +- ret = f(&rec, private_data); +- (*count) ++; +- if (ret != 0) { +- return ret; +- } +- +- if (rec_priv.node != NULL) { +- /* +- * If the current record is still there +- * we should take the current rb_right. +- */ +- rb_right = rec_priv.node->rb_node.rb_right; ++ if (rw) { ++ ctx->traverse_nextp = &next; ++ } ++ ret = f(&rec, private_data); ++ (*count) ++; ++ if (rw) { ++ ctx->traverse_nextp = NULL; ++ } ++ if (ret != 0) { ++ return ret; ++ } ++ if (rec_priv.node != NULL) { ++ next = rec_priv.node->next; ++ } + } + +- return db_rbt_traverse_internal(db, rb_right, f, private_data, count, rw); ++ return 0; + } + + static int db_rbt_traverse_read(struct db_context *db, +@@ -446,7 +458,7 @@ static int db_rbt_traverse_read(struct db_context *db, + int ret; + + ctx->traverse_read++; +- ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, ++ ret = db_rbt_traverse_internal(db, + f, private_data, &count, + false /* rw */); + ctx->traverse_read--; +@@ -469,7 +481,7 @@ static int db_rbt_traverse(struct db_context *db, + uint32_t count = 0; + int ret; + +- if (ctx->traverse_write) { ++ if (ctx->traverse_nextp != NULL) { + return -1; + }; + +@@ -477,11 +489,9 @@ static int db_rbt_traverse(struct db_context *db, + return db_rbt_traverse_read(db, f, private_data); + } + +- ctx->traverse_write = true; +- ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, ++ ret = db_rbt_traverse_internal(db, + f, private_data, &count, + true /* rw */); +- ctx->traverse_write = false; + if (ret != 0) { + return -1; + } +-- +1.9.1 + + +From 5b555ac802ce714c26411b48a375d1cc6699b22c Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 25 Nov 2015 00:13:17 +0100 +Subject: [PATCH 5/5] s3:torture: add traverse testing to LOCAL-RBTREE + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375 +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: Volker Lendecke + +Autobuild-User(master): Stefan Metzmacher +Autobuild-Date(master): Fri Nov 27 13:16:59 CET 2015 on sn-devel-104 + +(cherry picked from commit bb9f13ab4165f150e01a88ddcc51605a7c176f5d) +--- + source3/torture/torture.c | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +diff --git a/source3/torture/torture.c b/source3/torture/torture.c +index 594d28f..0b37e5c 100644 +--- a/source3/torture/torture.c ++++ b/source3/torture/torture.c +@@ -8352,11 +8352,29 @@ static bool rbt_testval(struct db_context *db, const char *key, + return ret; + } + ++static int local_rbtree_traverse_read(struct db_record *rec, void *private_data) ++{ ++ int *count2 = (int *)private_data; ++ (*count2)++; ++ return 0; ++} ++ ++static int local_rbtree_traverse_delete(struct db_record *rec, void *private_data) ++{ ++ int *count2 = (int *)private_data; ++ (*count2)++; ++ dbwrap_record_delete(rec); ++ return 0; ++} ++ + static bool run_local_rbtree(int dummy) + { + struct db_context *db; + bool ret = false; + int i; ++ NTSTATUS status; ++ int count = 0; ++ int count2 = 0; + + db = db_open_rbt(NULL); + +@@ -8399,6 +8417,27 @@ static bool run_local_rbtree(int dummy) + } + + ret = true; ++ count = 0; count2 = 0; ++ status = dbwrap_traverse_read(db, local_rbtree_traverse_read, ++ &count2, &count); ++ printf("%s: read1: %d %d, %s\n", __func__, count, count2, nt_errstr(status)); ++ if ((count != count2) || (count != 1000)) { ++ ret = false; ++ } ++ count = 0; count2 = 0; ++ status = dbwrap_traverse(db, local_rbtree_traverse_delete, ++ &count2, &count); ++ printf("%s: delete: %d %d, %s\n", __func__, count, count2, nt_errstr(status)); ++ if ((count != count2) || (count != 1000)) { ++ ret = false; ++ } ++ count = 0; count2 = 0; ++ status = dbwrap_traverse_read(db, local_rbtree_traverse_read, ++ &count2, &count); ++ printf("%s: read2: %d %d, %s\n", __func__, count, count2, nt_errstr(status)); ++ if ((count != count2) || (count != 0)) { ++ ret = false; ++ } + + done: + TALLOC_FREE(db); +-- +1.9.1 + Modified: branches/2015Q4/net/samba42/files/pkg-message.in ============================================================================== --- branches/2015Q4/net/samba42/files/pkg-message.in Tue Dec 22 18:59:35 2015 (r404263) +++ branches/2015Q4/net/samba42/files/pkg-message.in Tue Dec 22 19:17:17 2015 (r404264) @@ -8,8 +8,8 @@ How to start: http://wiki.samba.org/inde * All the logs are under: %%SAMBA4_LOGDIR%% -* Provisioning script is: %%PREFIX%%/bin/samba-tool - +%%AD_DC%%* Provisioning script is: %%PREFIX%%/bin/samba-tool +%%AD_DC%% %%NSUPDATE%%You will need to specify location of the 'nsupdate' command in the %%NSUPDATE%%%%SAMBA4_CONFIG%% file: %%NSUPDATE%% Modified: branches/2015Q4/net/samba42/pkg-plist ============================================================================== --- branches/2015Q4/net/samba42/pkg-plist Tue Dec 22 18:59:35 2015 (r404263) +++ branches/2015Q4/net/samba42/pkg-plist Tue Dec 22 19:17:17 2015 (r404264) @@ -1,3 +1,4 @@ +bin/async_connect_send_test bin/cifsdd bin/dbwrap_tool bin/eventlogadm @@ -306,7 +307,7 @@ lib/samba/libsmb-transport-samba4.so lib/samba/libsmbd-base-samba4.so lib/samba/libsmbd-conn-samba4.so lib/samba/libsmbd-shim-samba4.so -lib/samba/libsmbldaphelper-samba4.so +%%LDAP%%lib/samba/libsmbldaphelper-samba4.so lib/samba/libsmbpasswdparser-samba4.so lib/samba/libsmbregistry-samba4.so lib/samba/libsocket-blocking-samba4.so From owner-svn-ports-branches@freebsd.org Wed Dec 23 06:44:38 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AFFFA4FBA7; Wed, 23 Dec 2015 06:44:38 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1193F1BEA; Wed, 23 Dec 2015 06:44:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBN6ibWq023054; Wed, 23 Dec 2015 06:44:37 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBN6iboX023053; Wed, 23 Dec 2015 06:44:37 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201512230644.tBN6iboX023053@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 23 Dec 2015 06:44:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404278 - branches/2015Q4/www/firefox/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, 23 Dec 2015 06:44:38 -0000 Author: jbeich Date: Wed Dec 23 06:44:36 2015 New Revision: 404278 URL: https://svnweb.freebsd.org/changeset/ports/404278 Log: MFH: r404277 www/firefox: prune unused/upstreamed patch PR: 205357 Approved by: ports-secteam blanket Deleted: branches/2015Q4/www/firefox/files/extra-patch-bug1125514 Modified: Directory Properties: branches/2015Q4/ (props changed) From owner-svn-ports-branches@freebsd.org Wed Dec 23 15:29:46 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84188A4F322; Wed, 23 Dec 2015 15:29:46 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 430FB1178; Wed, 23 Dec 2015 15:29:46 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNFTjrj074754; Wed, 23 Dec 2015 15:29:45 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNFTjHv074749; Wed, 23 Dec 2015 15:29:45 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201512231529.tBNFTjHv074749@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Wed, 23 Dec 2015 15:29:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404298 - in branches/2015Q4/devel/bugzilla50: . 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, 23 Dec 2015 15:29:46 -0000 Author: ohauer Date: Wed Dec 23 15:29:44 2015 New Revision: 404298 URL: https://svnweb.freebsd.org/changeset/ports/404298 Log: MFH: r404284 - update to 5.0.2 This release fixes two security issues. See the Security Advisory for details. [1] This release also contains the following bug fixes: o mod_perl now works correctly with mod_access_compat turned off on Apache 2.4. To regenerate the .htaccess files, you must first delete all existing ones in subdirectories: find . -mindepth 2 -name .htaccess -exec rm -f {} \; You must then run checksetup.pl again to recreate them with the correct syntax. (Bug 1223790) o Emails sent by Bugzilla are now correctly encoded as UTF-8. (Bug 714724) o Strawberry Perl is now fully supported on Windows. (Bug 1089448 and bug 987742) o The XML-RPC API now works with IIS on Windows. (Bug 708252) o Some queries should now be faster on PostgreSQL. (Bug 1184431) [1] https://www.bugzilla.org/security/4.2.15/ Security: CVE-2015-8508 CVE-2015-8509 vid="54075861-a95a-11e5-8b40-20cf30e32f6d" Approved by: portmgr (feld@) Modified: branches/2015Q4/devel/bugzilla50/Makefile branches/2015Q4/devel/bugzilla50/distinfo branches/2015Q4/devel/bugzilla50/files/pkg-message.in branches/2015Q4/devel/bugzilla50/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/bugzilla50/Makefile ============================================================================== --- branches/2015Q4/devel/bugzilla50/Makefile Wed Dec 23 15:01:14 2015 (r404297) +++ branches/2015Q4/devel/bugzilla50/Makefile Wed Dec 23 15:29:44 2015 (r404298) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 5.0.1 +PORTVERSION= 5.0.2 CATEGORIES= devel MASTER_SITES= MOZILLA/webtools MOZILLA/webtools/archived @@ -202,9 +202,8 @@ do-install: .SILENT ${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf - @${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!} -.if ${PORT_OPTIONS:MCONTRIB} +do-install-CONTRIB-on: @${MKDIR} ${STAGEDIR}${WWWDIR}/contrib (cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/contrib) -.endif .include Modified: branches/2015Q4/devel/bugzilla50/distinfo ============================================================================== --- branches/2015Q4/devel/bugzilla50/distinfo Wed Dec 23 15:01:14 2015 (r404297) +++ branches/2015Q4/devel/bugzilla50/distinfo Wed Dec 23 15:29:44 2015 (r404298) @@ -1,2 +1,2 @@ -SHA256 (bugzilla/bugzilla-5.0.1.tar.gz) = f0f85bf405984770d65f60f5a828ea4d173acaca4aa85e4e58b4e88b1ae186a5 -SIZE (bugzilla/bugzilla-5.0.1.tar.gz) = 4061348 +SHA256 (bugzilla/bugzilla-5.0.2.tar.gz) = 82fa7bc8e27cfc9fe42d3fce3bfb6e7536bba245d76c2ee268d56253d16e3de3 +SIZE (bugzilla/bugzilla-5.0.2.tar.gz) = 4004728 Modified: branches/2015Q4/devel/bugzilla50/files/pkg-message.in ============================================================================== --- branches/2015Q4/devel/bugzilla50/files/pkg-message.in Wed Dec 23 15:01:14 2015 (r404297) +++ branches/2015Q4/devel/bugzilla50/files/pkg-message.in Wed Dec 23 15:29:44 2015 (r404298) @@ -25,9 +25,14 @@ For upgrades: 0. Back up your data. - 1. Run "./checksetup.pl" inside %%WWWDIR%%. You may need to + + 1. Run the command inside %%WWWDIR%% + find . -mindepth 2 -name .htaccess -exec rm -f {} \; + + 2. Run "./checksetup.pl" inside %%WWWDIR%%. You may need to run it several times. - 2. Restart your Web server, especially if you're using mod_perl: this + + 3. Restart your Web server, especially if you're using mod_perl: this will save you from a number of troubles. ========================================================================== Modified: branches/2015Q4/devel/bugzilla50/pkg-plist ============================================================================== --- branches/2015Q4/devel/bugzilla50/pkg-plist Wed Dec 23 15:01:14 2015 (r404297) +++ branches/2015Q4/devel/bugzilla50/pkg-plist Wed Dec 23 15:29:44 2015 (r404298) @@ -86,6 +86,7 @@ %%WWWDIR%%/Bugzilla/JobQueue.pm %%WWWDIR%%/Bugzilla/JobQueue/Runner.pm %%WWWDIR%%/Bugzilla/Keyword.pm +%%WWWDIR%%/Bugzilla/MIME.pm %%WWWDIR%%/Bugzilla/Mailer.pm %%WWWDIR%%/Bugzilla/Memcached.pm %%WWWDIR%%/Bugzilla/Migrate.pm @@ -687,9 +688,9 @@ %%WWWDIR%%/template/en/default/search/type-select.html.tmpl %%WWWDIR%%/template/en/default/setup/strings.txt.pl %%WWWDIR%%/template/en/default/welcome-admin.html.tmpl +%%WWWDIR%%/template/en/default/whine/header.txt.tmpl %%WWWDIR%%/template/en/default/whine/mail.html.tmpl %%WWWDIR%%/template/en/default/whine/mail.txt.tmpl -%%WWWDIR%%/template/en/default/whine/multipart-mime.txt.tmpl %%WWWDIR%%/template/en/default/whine/schedule.html.tmpl %%WWWDIR%%/testagent.cgi %%WWWDIR%%/testserver.pl From owner-svn-ports-branches@freebsd.org Wed Dec 23 15:30:39 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D612A4F38D; Wed, 23 Dec 2015 15:30:39 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4468012AB; Wed, 23 Dec 2015 15:30:39 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNFUcDo074952; Wed, 23 Dec 2015 15:30:38 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNFUc6c074949; Wed, 23 Dec 2015 15:30:38 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201512231530.tBNFUc6c074949@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Wed, 23 Dec 2015 15:30:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404299 - in branches/2015Q4/devel/bugzilla44: . 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, 23 Dec 2015 15:30:39 -0000 Author: ohauer Date: Wed Dec 23 15:30:37 2015 New Revision: 404299 URL: https://svnweb.freebsd.org/changeset/ports/404299 Log: MFH: r404285 - update to 4.4.11 This release fixes two security issues. See the Security Advisory for details. [1] This release also contains the following bug fix: o mod_perl now works correctly with mod_access_compat turned off on Apache 2.4. The (incorrect) fix implemented in Bugzilla 4.4.9 has been backed out. To regenerate the .htaccess files, you must first delete all existing ones in subdirectories: find . -mindepth 2 -name .htaccess -exec rm -f {} \; You must then run checksetup.pl again to recreate them with the correct syntax. (Bug 1223790) [1] https://www.bugzilla.org/security/4.2.15/ Security: CVE-2015-8508 CVE-2015-8509 vid="54075861-a95a-11e5-8b40-20cf30e32f6d" Approved by: portmgr (feld@) Modified: branches/2015Q4/devel/bugzilla44/Makefile branches/2015Q4/devel/bugzilla44/distinfo branches/2015Q4/devel/bugzilla44/files/pkg-message.in Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/bugzilla44/Makefile ============================================================================== --- branches/2015Q4/devel/bugzilla44/Makefile Wed Dec 23 15:29:44 2015 (r404298) +++ branches/2015Q4/devel/bugzilla44/Makefile Wed Dec 23 15:30:37 2015 (r404299) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 4.4.10 +PORTVERSION= 4.4.11 CATEGORIES= devel MASTER_SITES= MOZILLA/webtools MOZILLA/webtools/archived @@ -199,9 +199,8 @@ do-install: .SILENT @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -.if ${PORT_OPTIONS:MCONTRIB} +do-install-CONTRIB-on: @${MKDIR} ${STAGEDIR}${WWWDIR}/contrib (cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/contrib) -.endif .include Modified: branches/2015Q4/devel/bugzilla44/distinfo ============================================================================== --- branches/2015Q4/devel/bugzilla44/distinfo Wed Dec 23 15:29:44 2015 (r404298) +++ branches/2015Q4/devel/bugzilla44/distinfo Wed Dec 23 15:30:37 2015 (r404299) @@ -1,2 +1,2 @@ -SHA256 (bugzilla/bugzilla-4.4.10.tar.gz) = c4226699d084da2f9a265a3d4dd422ffa16a9babca9ab677ed8b6e988a4055ac -SIZE (bugzilla/bugzilla-4.4.10.tar.gz) = 4943339 +SHA256 (bugzilla/bugzilla-4.4.11.tar.gz) = 10082b506a822f36098597fce1079494ef50bab91b213c3f448c738257db182a +SIZE (bugzilla/bugzilla-4.4.11.tar.gz) = 4943814 Modified: branches/2015Q4/devel/bugzilla44/files/pkg-message.in ============================================================================== --- branches/2015Q4/devel/bugzilla44/files/pkg-message.in Wed Dec 23 15:29:44 2015 (r404298) +++ branches/2015Q4/devel/bugzilla44/files/pkg-message.in Wed Dec 23 15:30:37 2015 (r404299) @@ -25,9 +25,14 @@ For upgrades: 0. Back up your data. - 1. Run "./checksetup.pl" inside %%WWWDIR%%. You may need to + + 1. Run the command inside %%WWWDIR%% + find . -mindepth 2 -name .htaccess -exec rm -f {} \; + + 2. Run "./checksetup.pl" inside %%WWWDIR%%. You may need to run it several times. - 2. Restart your Web server, especially if you're using mod_perl: this + + 3. Restart your Web server, especially if you're using mod_perl: this will save you from a number of troubles. ========================================================================== From owner-svn-ports-branches@freebsd.org Wed Dec 23 15:31:19 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22D96A4F495; Wed, 23 Dec 2015 15:31:19 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E09C814EA; Wed, 23 Dec 2015 15:31:18 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNFVHse075106; Wed, 23 Dec 2015 15:31:17 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNFVHdD075105; Wed, 23 Dec 2015 15:31:17 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201512231531.tBNFVHdD075105@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Wed, 23 Dec 2015 15:31:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404300 - branches/2015Q4/german/bugzilla44 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, 23 Dec 2015 15:31:19 -0000 Author: ohauer Date: Wed Dec 23 15:31:17 2015 New Revision: 404300 URL: https://svnweb.freebsd.org/changeset/ports/404300 Log: MFH: r404286 - fix against bugzilla 4.4.11 - use WRKSRC instead WRKDIR Approved by: portmgr (feld@) Modified: branches/2015Q4/german/bugzilla44/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/german/bugzilla44/Makefile ============================================================================== --- branches/2015Q4/german/bugzilla44/Makefile Wed Dec 23 15:30:37 2015 (r404299) +++ branches/2015Q4/german/bugzilla44/Makefile Wed Dec 23 15:31:17 2015 (r404300) @@ -2,7 +2,7 @@ PORTNAME= bugzilla PORTVERSION= 4.4.10 -#PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= german MASTER_SITES= SF/bugzilla-de/${PORTVERSION:R}/${PORTVERSION} DISTNAME= ${PORTNAME}-de-${PORTVERSION}-1.utf-8 @@ -16,7 +16,7 @@ NO_WRKSUBDIR= yes # adjust BZ_REVNUM if bugzilla revision was incremented and there are no # changes in bugzilla/templates/en. If not used simply comment the line. -#BZ_REVNUM= 10 +BZ_REVNUM= 11 .include "${.CURDIR}/../../devel/bugzilla44/Makefile.common" @@ -25,8 +25,8 @@ LANGDIR= ${WWWDIR}/template/de .if defined(BZ_REVNUM) && !empty(BZ_REVNUM) post-patch: ${REINPLACE_CMD} -e 's/${PORTVERSION}/${PORTVERSION:R}.${BZ_REVNUM}/' \ - ${WRKDIR}/de/default/global/gzversion.html.tmpl - @${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete + ${WRKSRC}/de/default/global/gzversion.html.tmpl + @${FIND} ${WRKSRC}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete .endif do-install: From owner-svn-ports-branches@freebsd.org Wed Dec 23 20:18:58 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 440E2A4F615; Wed, 23 Dec 2015 20:18:58 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 11AC21A6E; Wed, 23 Dec 2015 20:18:57 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNKIvK2060648; Wed, 23 Dec 2015 20:18:57 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNKIvS1060647; Wed, 23 Dec 2015 20:18:57 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201512232018.tBNKIvS1060647@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Wed, 23 Dec 2015 20:18:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404317 - branches/2015Q4/security/keepass 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, 23 Dec 2015 20:18:58 -0000 Author: junovitch Date: Wed Dec 23 20:18:56 2015 New Revision: 404317 URL: https://svnweb.freebsd.org/changeset/ports/404317 Log: MFH: r404272 security/keepass: fix XSEL option dependency - Switch x11/xsel -> x11/xsel-conrad. This resolves a run time issue when copying passwords to the clipboard. PR: 204397 Reported by: Alex Zhukov Submitted by: Ben Woods (maintainer) Approved by: ports-secteam (feld) Modified: branches/2015Q4/security/keepass/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/security/keepass/Makefile ============================================================================== --- branches/2015Q4/security/keepass/Makefile Wed Dec 23 19:39:42 2015 (r404316) +++ branches/2015Q4/security/keepass/Makefile Wed Dec 23 20:18:56 2015 (r404317) @@ -3,6 +3,7 @@ PORTNAME= keepass PORTVERSION= 2.30 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/KeePass%202.x/${PORTVERSION} DISTNAME= KeePass-${PORTVERSION}-Source @@ -39,7 +40,7 @@ XSEL_DESC= Use the xsel utility for clip OPTIONS_DEFAULT= XDOTOOL XSEL XDOTOOL_RUN_DEPENDS= xdotool:${PORTSDIR}/x11/xdotool -XSEL_RUN_DEPENDS= xsel:${PORTSDIR}/x11/xsel +XSEL_RUN_DEPENDS= xsel:${PORTSDIR}/x11/xsel-conrad do-build: # Extract icons From owner-svn-ports-branches@freebsd.org Wed Dec 23 20:19:52 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3506A4F69C; Wed, 23 Dec 2015 20:19:52 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7AEBA1B71; Wed, 23 Dec 2015 20:19:52 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNKJp2d060850; Wed, 23 Dec 2015 20:19:51 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNKJpJq060848; Wed, 23 Dec 2015 20:19:51 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201512232019.tBNKJpJq060848@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Wed, 23 Dec 2015 20:19:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404318 - branches/2015Q4/security/keepassx 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, 23 Dec 2015 20:19:52 -0000 Author: junovitch Date: Wed Dec 23 20:19:51 2015 New Revision: 404318 URL: https://svnweb.freebsd.org/changeset/ports/404318 Log: MFH: r404271 security/keepassx: update 0.4.3 -> 0.4.4 - Update MASTER_SITES. Upstream no longer uses SVN or SourceForge infrastructure. See http://sourceforge.net/p/keepassx/code/387/ - USES: Add desktop-file-utils PR: 205105 Approved by: maintainer timeout (2 weeks) Approved by: ports-secteam (feld) Security: CVE-2015-8378 Security: https://vuxml.FreeBSD.org/freebsd/918a5d1f-9d40-11e5-8f5c-002590263bf5.html Modified: branches/2015Q4/security/keepassx/Makefile branches/2015Q4/security/keepassx/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/security/keepassx/Makefile ============================================================================== --- branches/2015Q4/security/keepassx/Makefile Wed Dec 23 20:18:56 2015 (r404317) +++ branches/2015Q4/security/keepassx/Makefile Wed Dec 23 20:19:51 2015 (r404318) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= KeePassX -PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTVERSION= 0.4.4 CATEGORIES= security -MASTER_SITES= SF/${PORTNAME:tl}/KeePassX/${PORTVERSION}/ +MASTER_SITES= https://www.keepassx.org/releases/${PORTVERSION}/ \ + http://www.keepassx.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME:tl}-${PORTVERSION} MAINTAINER= swills@FreeBSD.org @@ -14,7 +14,7 @@ COMMENT= Cross Platform Password Manager DATADIR= ${PREFIX}/share/${PORTNAME:tl} WRKSRC= ${WRKDIR}/${PORTNAME:tl}-${PORTVERSION} -USES= qmake shared-mime-info +USES= desktop-file-utils qmake shared-mime-info USE_QT4= moc_build uic_build qt3support_build rcc_build \ corelib gui xml USE_XORG= xt inputproto xtst xrender xrandr xfixes xcursor\ Modified: branches/2015Q4/security/keepassx/distinfo ============================================================================== --- branches/2015Q4/security/keepassx/distinfo Wed Dec 23 20:18:56 2015 (r404317) +++ branches/2015Q4/security/keepassx/distinfo Wed Dec 23 20:19:51 2015 (r404318) @@ -1,2 +1,2 @@ -SHA256 (keepassx-0.4.3.tar.gz) = cd901a0611ce57e62cf6df7eeeb1b690b5232302bdad8626994eb54adcfa1e85 -SIZE (keepassx-0.4.3.tar.gz) = 1368766 +SHA256 (keepassx-0.4.4.tar.gz) = 3e27068ca85e68705347f0921c6b3c9248d7c5a84c79c0483daf22d141c0adc4 +SIZE (keepassx-0.4.4.tar.gz) = 1371560 From owner-svn-ports-branches@freebsd.org Wed Dec 23 20:20:57 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED989A4F71E; Wed, 23 Dec 2015 20:20:57 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3A311CAA; Wed, 23 Dec 2015 20:20:57 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNKKuOA061588; Wed, 23 Dec 2015 20:20:56 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNKKuIj061585; Wed, 23 Dec 2015 20:20:56 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201512232020.tBNKKuIj061585@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Wed, 23 Dec 2015 20:20:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404319 - branches/2015Q4/graphics/librsvg2 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, 23 Dec 2015 20:20:58 -0000 Author: junovitch Date: Wed Dec 23 20:20:56 2015 New Revision: 404319 URL: https://svnweb.freebsd.org/changeset/ports/404319 Log: MFH: r404275 graphics/librsvg2: update 2.40.10 -> 2.40.12 PR: 205502 Approved by: gnome (kwm) Approved by: ports-secteam (feld) Security: CVE-2015-7558 Security: https://vuxml.FreeBSD.org/freebsd/d6c51737-a84b-11e5-8f5c-002590263bf5.html Modified: branches/2015Q4/graphics/librsvg2/Makefile branches/2015Q4/graphics/librsvg2/distinfo branches/2015Q4/graphics/librsvg2/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/graphics/librsvg2/Makefile ============================================================================== --- branches/2015Q4/graphics/librsvg2/Makefile Wed Dec 23 20:19:51 2015 (r404318) +++ branches/2015Q4/graphics/librsvg2/Makefile Wed Dec 23 20:20:56 2015 (r404319) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= librsvg -PORTVERSION= 2.40.10 +PORTVERSION= 2.40.12 CATEGORIES= graphics gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 2 Modified: branches/2015Q4/graphics/librsvg2/distinfo ============================================================================== --- branches/2015Q4/graphics/librsvg2/distinfo Wed Dec 23 20:19:51 2015 (r404318) +++ branches/2015Q4/graphics/librsvg2/distinfo Wed Dec 23 20:20:56 2015 (r404319) @@ -1,2 +1,2 @@ -SHA256 (gnome2/librsvg-2.40.10.tar.xz) = 965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479 -SIZE (gnome2/librsvg-2.40.10.tar.xz) = 522668 +SHA256 (gnome2/librsvg-2.40.12.tar.xz) = ffe40c4378bf3899f4d679a475726bab03a127a5bdccddec86404cc329ffb550 +SIZE (gnome2/librsvg-2.40.12.tar.xz) = 548648 Modified: branches/2015Q4/graphics/librsvg2/pkg-plist ============================================================================== --- branches/2015Q4/graphics/librsvg2/pkg-plist Wed Dec 23 20:19:51 2015 (r404318) +++ branches/2015Q4/graphics/librsvg2/pkg-plist Wed Dec 23 20:20:56 2015 (r404319) @@ -9,7 +9,7 @@ lib/girepository-1.0/Rsvg-2.0.typelib lib/librsvg-2.a lib/librsvg-2.so lib/librsvg-2.so.2 -lib/librsvg-2.so.2.40.10 +lib/librsvg-2.so.2.40.12 libdata/pkgconfig/librsvg-2.0.pc man/man1/rsvg-convert.1.gz share/doc/rsvg-2.0/RsvgHandle.html From owner-svn-ports-branches@freebsd.org Thu Dec 24 06:03:36 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8B5FA4F6ED; Thu, 24 Dec 2015 06:03:36 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3569114A; Thu, 24 Dec 2015 06:03:36 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBO63ZH9033573; Thu, 24 Dec 2015 06:03:35 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBO63ZDq033567; Thu, 24 Dec 2015 06:03:35 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201512240603.tBO63ZDq033567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 24 Dec 2015 06:03:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404333 - in branches/2015Q4/www: mediawiki123 mediawiki124 mediawiki125 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, 24 Dec 2015 06:03:36 -0000 Author: delphij Date: Thu Dec 24 06:03:35 2015 New Revision: 404333 URL: https://svnweb.freebsd.org/changeset/ports/404333 Log: MFH: r404004 - Update mediaWiki to 1.26.1, 1.25.4, 1.24.5, and 1.23.12 (security update) Requested by: wen Approved by: ports-secteam Modified: branches/2015Q4/www/mediawiki123/Makefile branches/2015Q4/www/mediawiki123/distinfo branches/2015Q4/www/mediawiki124/Makefile branches/2015Q4/www/mediawiki124/distinfo branches/2015Q4/www/mediawiki125/Makefile branches/2015Q4/www/mediawiki125/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/mediawiki123/Makefile ============================================================================== --- branches/2015Q4/www/mediawiki123/Makefile Thu Dec 24 00:01:18 2015 (r404332) +++ branches/2015Q4/www/mediawiki123/Makefile Thu Dec 24 06:03:35 2015 (r404333) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mediawiki -PORTVERSION= 1.23.11 +PORTVERSION= 1.23.12 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 123 Modified: branches/2015Q4/www/mediawiki123/distinfo ============================================================================== --- branches/2015Q4/www/mediawiki123/distinfo Thu Dec 24 00:01:18 2015 (r404332) +++ branches/2015Q4/www/mediawiki123/distinfo Thu Dec 24 06:03:35 2015 (r404333) @@ -1,2 +1,2 @@ -SHA256 (mediawiki-1.23.11.tar.gz) = 6cc9c3021a91632a4b7572287a4fe9d166762fb6c138a774e1c5c5ba295238c4 -SIZE (mediawiki-1.23.11.tar.gz) = 20868357 +SHA256 (mediawiki-1.23.12.tar.gz) = 298b5188bc244d13bde2c55e7778a6e86be6bb36d8602e52ff1cb96ab0697bce +SIZE (mediawiki-1.23.12.tar.gz) = 20871447 Modified: branches/2015Q4/www/mediawiki124/Makefile ============================================================================== --- branches/2015Q4/www/mediawiki124/Makefile Thu Dec 24 00:01:18 2015 (r404332) +++ branches/2015Q4/www/mediawiki124/Makefile Thu Dec 24 06:03:35 2015 (r404333) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mediawiki -PORTVERSION= 1.24.4 +PORTVERSION= 1.24.5 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 124 Modified: branches/2015Q4/www/mediawiki124/distinfo ============================================================================== --- branches/2015Q4/www/mediawiki124/distinfo Thu Dec 24 00:01:18 2015 (r404332) +++ branches/2015Q4/www/mediawiki124/distinfo Thu Dec 24 06:03:35 2015 (r404333) @@ -1,2 +1,2 @@ -SHA256 (mediawiki-1.24.4.tar.gz) = 2d714937c39313a78ebc65f05c85f49e35ef493a2fbe37d4ae107e64726b2b89 -SIZE (mediawiki-1.24.4.tar.gz) = 21735851 +SHA256 (mediawiki-1.24.5.tar.gz) = d8e772b20f36834044f3619cfe69feb654f9a589a24d6b8b22f9c7fadcbc9957 +SIZE (mediawiki-1.24.5.tar.gz) = 21739117 Modified: branches/2015Q4/www/mediawiki125/Makefile ============================================================================== --- branches/2015Q4/www/mediawiki125/Makefile Thu Dec 24 00:01:18 2015 (r404332) +++ branches/2015Q4/www/mediawiki125/Makefile Thu Dec 24 06:03:35 2015 (r404333) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mediawiki -PORTVERSION= 1.25.3 +PORTVERSION= 1.25.4 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 125 @@ -60,8 +60,7 @@ XCACHE_RUN_DEPENDS= ${LOCALBASE}/lib/php pre-install: @${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST} - @${ECHO} "@dir %%WWWDIR%%/vendor/zordius/lightncandy/specs/mustache" >> ${PLIST} - @${ECHO} "@dir %%WWWDIR%%/vendor/zordius/lightncandy/specs/handlebars" >> ${PLIST} + @${ECHO} "@dir %%WWWDIR%%/vendor/monolog/monolog/tests/Monolog/Handler/Fixtures" >> ${PLIST} @${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST} do-install: Modified: branches/2015Q4/www/mediawiki125/distinfo ============================================================================== --- branches/2015Q4/www/mediawiki125/distinfo Thu Dec 24 00:01:18 2015 (r404332) +++ branches/2015Q4/www/mediawiki125/distinfo Thu Dec 24 06:03:35 2015 (r404333) @@ -1,2 +1,2 @@ -SHA256 (mediawiki-1.25.3.tar.gz) = 53f3dc6fc7108c835fbfefb09d76e84067112538aaed433d89d7d4551dc205ba -SIZE (mediawiki-1.25.3.tar.gz) = 23486518 +SHA256 (mediawiki-1.25.4.tar.gz) = 6183d822cb5f2c2532f631f105685cc505b7b07cf52a329d4e3301802253aafe +SIZE (mediawiki-1.25.4.tar.gz) = 23775438 From owner-svn-ports-branches@freebsd.org Thu Dec 24 12:50:52 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 539FFA5186F; Thu, 24 Dec 2015 12:50:52 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 257D11AFD; Thu, 24 Dec 2015 12:50:52 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBOCop2B053056; Thu, 24 Dec 2015 12:50:51 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBOCop3d053052; Thu, 24 Dec 2015 12:50:51 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201512241250.tBOCop3d053052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 24 Dec 2015 12:50:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404352 - in branches/2015Q4: Mk lang/ruby22 lang/ruby22/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, 24 Dec 2015 12:50:52 -0000 Author: sunpoet Date: Thu Dec 24 12:50:50 2015 New Revision: 404352 URL: https://svnweb.freebsd.org/changeset/ports/404352 Log: MFH: r404312 - Update to 2.2.4 - Add LICENSE_FILE - Use USES=autoreconf instead of USE_AUTOTOOLS=autoconf - Use USES=libedit - Silence patch and build messages Changes: https://www.ruby-lang.org/en/news/2015/12/16/ruby-2-2-4-released/ http://svn.ruby-lang.org/repos/ruby/tags/v2_2_4/ChangeLog Security: 3b50881d-1860-4721-aab1-503290e23f6c Differential Revision: https://reviews.freebsd.org/D4668 PR: 205487 Exp-run by: antoine Approved by: ports-secteam (feld) Deleted: branches/2015Q4/lang/ruby22/files/patch-ext_openssl_extconf.rb Modified: branches/2015Q4/Mk/bsd.ruby.mk branches/2015Q4/lang/ruby22/Makefile branches/2015Q4/lang/ruby22/distinfo branches/2015Q4/lang/ruby22/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/Mk/bsd.ruby.mk ============================================================================== --- branches/2015Q4/Mk/bsd.ruby.mk Thu Dec 24 12:49:23 2015 (r404351) +++ branches/2015Q4/Mk/bsd.ruby.mk Thu Dec 24 12:50:50 2015 (r404352) @@ -191,7 +191,7 @@ RUBY21= "" # PLIST_SUB helpers # # Ruby 2.2 # -RUBY_RELVERSION= 2.2.3 +RUBY_RELVERSION= 2.2.4 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 Modified: branches/2015Q4/lang/ruby22/Makefile ============================================================================== --- branches/2015Q4/lang/ruby22/Makefile Thu Dec 24 12:49:23 2015 (r404351) +++ branches/2015Q4/lang/ruby22/Makefile Thu Dec 24 12:50:50 2015 (r404352) @@ -15,6 +15,8 @@ COMMENT?= Object-oriented interpreted sc LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual +LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL +LICENSE_FILE_RUBY= ${WRKSRC}/COPYING # Using LIB_DEPENDS finds the libffi from gcc which causes problems BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi @@ -34,10 +36,9 @@ GNU_CONFIGURE= yes # Keep this, else ruby will fail to load libraries dependent of libpthread. LIBS+= -lpthread -L${LOCALBASE}/lib MAKE_ENV= LC_ALL=C -USE_AUTOTOOLS= autoconf USE_LDCONFIG= yes USE_OPENSSL= yes -USES= cpe execinfo tar:xz +USES= autoreconf cpe execinfo tar:xz WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 2.2 @@ -61,9 +62,8 @@ CAPIDOCS_BUILD_DEPENDS= doxygen>0:${PORT CAPIDOCS_CONFIGURE_ENABLE= install-capi GMP_CONFIGURE_WITH= gmp GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp -LIBEDIT_BUILD_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-prefix=${LOCALBASE} -LIBEDIT_RUN_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit +LIBEDIT_USES= libedit RDOC_CONFIGURE_ENABLE= install-rdoc READLINE_BUILD_DEPENDS= readline>=0:${PORTSDIR}/devel/readline READLINE_CONFIGURE_ON= --disable-libedit --with-readline-prefix=${LOCALBASE} @@ -138,20 +138,20 @@ post-patch: # Remove modules we don't want # .for d in win32ole - ${RM} -rf ${BUILD_WRKSRC}/ext/${d} + @${RM} -rf ${BUILD_WRKSRC}/ext/${d} .endfor # We get rake from ports. .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb - ${RM} -rf ${BUILD_WRKSRC}/${d} + @${RM} -rf ${BUILD_WRKSRC}/${d} .endfor # We get the gem executable from ports. - ${RM} ${BUILD_WRKSRC}/bin/gem + @${RM} ${BUILD_WRKSRC}/bin/gem # # Prepare modules we are wanting to build via external ports # .for d in gdbm tk - ${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/ + @${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/ .endfor post-build: @@ -166,7 +166,7 @@ post-build: @${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'" post-build-CAPIDOCS-on: - ${FIND} ${WRKSRC}/doc -type d -empty -delete + @${FIND} ${WRKSRC}/doc -type d -empty -delete pre-install: ${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR} Modified: branches/2015Q4/lang/ruby22/distinfo ============================================================================== --- branches/2015Q4/lang/ruby22/distinfo Thu Dec 24 12:49:23 2015 (r404351) +++ branches/2015Q4/lang/ruby22/distinfo Thu Dec 24 12:50:50 2015 (r404352) @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-2.2.3.tar.xz) = c6ec90e9ed018e6d9a578fc93755d8565839908d5796809e1aecd1798c7ea8a7 -SIZE (ruby/ruby-2.2.3.tar.xz) = 10453204 +SHA256 (ruby/ruby-2.2.4.tar.xz) = d28bff4641e382681c58072ddc244d025ac47ff71dd9426a92fcfc3830d1773c +SIZE (ruby/ruby-2.2.4.tar.xz) = 10464500 Modified: branches/2015Q4/lang/ruby22/pkg-plist ============================================================================== --- branches/2015Q4/lang/ruby22/pkg-plist Thu Dec 24 12:49:23 2015 (r404351) +++ branches/2015Q4/lang/ruby22/pkg-plist Thu Dec 24 12:50:50 2015 (r404352) @@ -875,6 +875,7 @@ man/man1/%%RUBY_NAME%%.1.gz %%DOCS%%%%RUBY_DOCDIR%%/NEWS-1.9.3 %%DOCS%%%%RUBY_DOCDIR%%/NEWS-2.0.0 %%DOCS%%%%RUBY_DOCDIR%%/NEWS-2.1.0 +%%DOCS%%%%RUBY_DOCDIR%%/README %%DOCS%%%%RUBY_DOCDIR%%/README.EXT %%DOCS%%%%RUBY_DOCDIR%%/README.EXT.ja %%DOCS%%%%RUBY_DOCDIR%%/README.ja.md @@ -4297,95 +4298,95 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dfc/version_8h_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dfd/sha2init_8c.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dfd/sha2init_8c_source.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_0228a161d5561e83d5d8aaba27afe366.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_02be784bbaa190c6d4ef47da654d268f.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_0575755d2600c90654166739dcf95752.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_06143c11bbd6ea200a937d89377f0e4b.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_0dd75dbc8f7e48b16a69294335ded17c.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_0e12b1bc32508cedcff3897df86edb49.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_15e8070afaccd2443d0ad4d0bdc3aa3a.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_1a8fa036e7a5425baff157221e7f0678.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_1b208f2bb7de8e600dadc194b6929951.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_1eac1e9e2af023830d8bbbe7dabf7201.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_214c767474c6de9dc4ec4674154f1607.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_227ad6751e7bf28b6fdcdc1357f14b5f.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_22991fa2bb820b11ee90770041238235.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_255cf693428d31ba4404df1c8fca0a4f.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_295dcadc83b2830cd1512c9a2e78dd2e.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2973e48ba4eac5fee8f4415e511ab1a7.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2a4568f2aeb29b4a7a7e0abe49beb461.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2aaf89a7b9f84c1f6330cef46da79024.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2e569d47efce41b8d79cc41e070f4150.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2f0764a5bbf70fa7cf868001bf008e21.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_3185d9fe9e224164d9ec8fbe8bba45d8.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_3784fde63147f87b85dee85e9765419d.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_380b7e5f3deff11483000f1294defdef.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_3902469b0c0a5977e5409675a7b46e42.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_3cd68734e62c97dcafde6697f9e81d3e.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_3d8eab95bc8c47f54989d91b2dbaba81.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_3da6b25c14d7e52169cf9a0fdf03bd38.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_3e4b1f83ed27f14f7939f30d6418d8e9.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_414d8cfff5ecd7cc65bbe9971ae6ab17.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_423e65efd39f89698314b741ba8cd081.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_4708ae3813a79332db5319bf3ccef2ed.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_48ae81336cd5a47ae61588b15840cc5a.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_49612868f1c65001bef4c152db0130b5.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_49add4049f8d5b5693c8982a925e6aff.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_4fcb93338823e70acdf4e13815571e52.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_50cb3291388ed3ed6b92e47e6c1c15dc.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_5150ba00f20109e728455e52d59b306d.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_520343561da6e31078660825676fc1cf.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_540ed8970eb158d8334ad01683be1139.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_5593970dab2d5958f5cb3e4223435ff6.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_55f151fd7b7ebc3052362ee4d99f9865.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_568c9ee9c9b7e20bc5977486a7b6c6a3.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_5a1c0fd7c2e6612942d6073162e79784.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_5ba5b7337863f2ecf06377013918e727.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_5cbfff1a56101fff967cb724eddb6e34.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_5d995522455ec2e7534db7486d088fb0.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_60694245fae93046ca34ae1703681d22.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_6339b80ff15e17ba9af23124dc270147.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_64609cd0a2da8a333f46474c706802d6.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_66ec047cb0c5878d4f8503e4bfcf82f0.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_67106c78e920c87d8ed68901cd6e41ca.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_774031fa5903e11e3bf2ceae70b9753d.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_7d5d9a4539915219cd84df55dc000e16.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_86d0ecb3cc61b37c66e19fef1ae447e1.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_87387afe317c728977040d25562a2992.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_890784373f725fc7513c11d452b7b150.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_8b4bf035e47954dfdaada3b8736aa08e.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_8cc3b80094a6fc535700ce329e2f48ce.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_8ead0d7253c5a7a18b923f9558a85fed.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_8f8b3c78421c4b80296948b02c2a871d.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_9341d76f03f82494d515aac019b51e86.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_9365ed6e0512368a3cf1189de4111ae8.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_94a754f1c4c97184e1a662697e2287a2.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_94d22519b57479ff9f8ec128f55c2e40.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_976ee99d51150a755f6eefc679dc58d5.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_9e5d82689fecb6b56694674b211693a0.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_9f0ca0a686c46955c48f11b374e0fffa.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_a18d3bf3d53aee83e293e7e5e30b4e2b.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_aaa8603bc084c4348f70a6bce368e607.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_ac8502ae8f22ab181e39b0bc01ba32d3.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_ad04c1613f5b2c6ffa49b3fc16616fd5.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_ae7d780f3834948e382f39d02f467955.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_b8a7f24dddf40ac61858cd432d8962b5.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_b9c2eca5726936eba9c818655c328e36.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_bf43a9aa4c6547425a546fe1ea898ef5.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_cac21c976ed64d56f2ae7cb15c09d473.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_d01654d6102c9c707d7f7b5e8c5d437d.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_d6721c3d1cd16ef88b207d8d9fdcaa8f.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_dbe7221aa8b4bdfc0b5ddc088d85de56.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_df7cd552b401de3351ad25ca0b44db34.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e1512c490188098ac84ba3284ec45017.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e67372c36735cded5cd31eb9b145afad.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e6fa28fee3b2a0683adb4f6264ffa8f0.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e9bf0b28c4e282467e9eef7805388825.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_ea29fb8de748d71965d87c89af0fe469.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_f50a1309da1981e72cb8a2158d5b3ae0.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_f7cc488eb898fac402feb17f2034e6f0.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_fb14eed875f476092a93be83bab08d19.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_fb363f8914ca5b8524de94bc8c4ea1f7.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_00734e4acbca60e82eac962c08453a82.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_02ae6d781fec5faa885a88e1baefc2ad.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_033ef75ca8ad6fe5e1dd2206da85938e.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_05bb8e47872dde2b82daffd506c06530.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_09cedcf13477ddbf319bbfd3d17af536.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_0e3c3982eea36061b325a007422329e4.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_0fb2ca1e1f84b4e491a14cc3d8a68037.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_124a7b29f070a805b64501b842129b41.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_18a4b443e90d71a04280e2a5f56589e7.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_1ac76cef68fa200f03979e445c377cf1.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_1b97ccf6e78cc6cf13439ed45457a032.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_1dcbbbc7ef9eb896cac6f110c934b3dc.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_1e1320cec6793205d5f0aaafb473d1c8.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_1ec104b61b0fc75e5f14b4eeeb0859b1.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2016aa8f2bd965b9c3c0ef722a9006b6.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_22a3374d806d23e7a4f15d246354400f.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_23551e45a6b90ab6a2d429c6df114fef.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2465014b29f9edde8125bc434b5d75a5.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_25c8641c04b2cfa467bf3f9e9d4da8ae.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2664ddbe8175b067a5e4f1da5f4af8fd.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2a4b7042d289bc00813e50aa18f7ad46.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2a6be4eaeb59f55f0f4f7ab4272db286.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_2c5a8139a546eff6f0079df1fff1c130.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_35a7b504912026a44b1e7a00bcbfd7ad.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_38a746f16e3873582bbf6e064b184c3b.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_441e90253180d11108edddc4505c0c74.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_4434c68caf698fc5cbbc22a6664e8550.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_49d43ecfeda5bfdd0ab9f8ff8ba16e2d.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_4a5542b64ded7822573acd20971aa43f.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_4db3edf314cffd9e10f2559ea6f25ce8.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_52951e692579ea7c0db03f52b8bf98bb.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_560a02cd7955ab0dfb59aeb5afe2172a.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_5d05ef0c9724c3cfa5a75f89ec31e1f3.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_5f32ef40ab26acef118edd60c4e97cf6.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_61506306f4ffe53f42de69809ea4f090.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_6205fc662bd3a5786c5572a80bc7cc7c.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_640f14f96f0c8d27b859244f4d9077c6.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_666e0b301b59c3c10cd1a75cffad0c58.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_69b208734e4a4d8339f214d128987750.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_6b783f85bb875cd02563eca397b56ce9.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_762fb40d91069cb40afd649401d9bf91.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_7760e84176f2852f0149744177f1e4eb.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_7ac3fd7b0c3fdf4ab26292897dbbbda4.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_7c5817905ee01adb6cd095eac98cdd26.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_7c7691b420d2c79e91306d69a33ca144.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_7caca146255934c6ec1fcf4b8e0d6334.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_7ce729f57625947993a16604d23a0a1b.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_7f18759feddea78518ff86c7a095417c.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_87897644a75ea500b4a4eae08be0fd2a.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_89ad7be81cde8a38f4e1106131325d0b.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_8a2afcd954a475cba8e38a6910c8050e.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_8b719092fbef54f5da6e1f7de20bc521.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_8cab0ed746a3aa2ec343fafe9ce35754.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_8f7689a9073de0a9b12ac61b14c89bd9.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_91239d706855f18f575e596a55838b41.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_9179423ed9f8ea4b1e7daf116c99fcca.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_96bd04a40ccc1256cf36401237ce49a8.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_96f4bab03e3921e08929dace10868e7b.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_9ac85b7a98e77fe9b515ac5cee55c386.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_9bc72580c95af4f0242cd96747978365.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_a0fc336bcbc199281c1cab8168b97208.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_a3b0aa81b2929d9b3cc7b1f4ff875c12.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_a4186047682e7f353bb7317ff4bff430.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_b286853ba083b88b75036aa9d44a9432.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_b5e649ee77b175d3295bb05678682a15.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_bae33bda057b0d11adc95f3cb42a05a4.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_bb91a3788bc89a23feca91f24f51b9b8.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_bc6f117b8259f4861caae0ce3ae146e0.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_bd1ac024f93108061b1fd2de3bf88b35.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_bf4e8e74624c9c1059a54a2ab5e11519.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_bf84d971d0daf95049bd8f739cf348bf.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_c961dd6e0372e6397bd9da5cc447063d.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_caf4f341c378207c9991f180096334a7.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_cbb3ab811da3a915363208446f00a882.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_cc10aa965f2eb96eace964da9d5f6795.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_ce18e2897c516711c94e18aed75d5641.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_cf561fcb6a1e32f3fd005a5fab5c60e3.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_d042f9759304fdfa74b4b07e60210ff7.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_d2504d39a3fc51d378f02b568291278b.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_d9b90f1acdd14bb44b10d82ae889d162.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_da1458a9e72b6a574d5b5c4f03dc5559.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_dc8c6d44f32931a398739e129be4e365.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e43e80309ab78b24c048a563ca1958cc.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e5ca44a5cc223e0dd63d3486eb798063.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e604649e8255304d9318a47653abad44.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_ea49662283bd391444af4efb122ed353.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_ef6cb7ae520fe2f820bf73262c0bc442.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_f7e138256ddfc8adb3fe06aca0e30e47.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_fdb0a32de512dee23d2402ef0787285f.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/doc.png %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/doxygen.css %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/doxygen.png @@ -17882,6 +17883,7 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/page-NEWS-2_0_0.ri %%RDOC%%%%RUBY_RIDIR%%/page-NEWS-2_1_0.ri %%RDOC%%%%RUBY_RIDIR%%/page-NEWS.ri +%%RDOC%%%%RUBY_RIDIR%%/page-README.ri %%RDOC%%%%RUBY_RIDIR%%/page-README_EXT.ri %%RDOC%%%%RUBY_RIDIR%%/page-contributing_rdoc.ri %%RDOC%%%%RUBY_RIDIR%%/page-contributors_rdoc.ri From owner-svn-ports-branches@freebsd.org Thu Dec 24 12:53:36 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 787FBA51A28; Thu, 24 Dec 2015 12:53:36 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 374E11E5A; Thu, 24 Dec 2015 12:53:36 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBOCrZ21053344; Thu, 24 Dec 2015 12:53:35 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBOCrY2A053340; Thu, 24 Dec 2015 12:53:34 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201512241253.tBOCrY2A053340@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 24 Dec 2015 12:53:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404353 - in branches/2015Q4: Mk lang/ruby21 lang/ruby21/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, 24 Dec 2015 12:53:36 -0000 Author: sunpoet Date: Thu Dec 24 12:53:34 2015 New Revision: 404353 URL: https://svnweb.freebsd.org/changeset/ports/404353 Log: MFH: r404313 - Update to 2.1.8 - Add LICENSE_FILE - Use USES=autoreconf instead of USE_AUTOTOOLS=autoconf - Use USES=libedit - Silence patch and build messages Changes: https://www.ruby-lang.org/en/news/2015/12/16/ruby-2-1-8-released/ http://svn.ruby-lang.org/repos/ruby/tags/v2_1_8/ChangeLog Security: 3b50881d-1860-4721-aab1-503290e23f6c Differential Revision: https://reviews.freebsd.org/D4668 PR: 205487 Exp-run by: antoine Approved by: ports-secteam (feld) Modified: branches/2015Q4/Mk/bsd.ruby.mk branches/2015Q4/lang/ruby21/Makefile branches/2015Q4/lang/ruby21/distinfo branches/2015Q4/lang/ruby21/files/patch-ext_openssl_extconf.rb Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/Mk/bsd.ruby.mk ============================================================================== --- branches/2015Q4/Mk/bsd.ruby.mk Thu Dec 24 12:50:50 2015 (r404352) +++ branches/2015Q4/Mk/bsd.ruby.mk Thu Dec 24 12:53:34 2015 (r404353) @@ -181,7 +181,7 @@ RUBY20= "" # PLIST_SUB helpers # # Ruby 2.1 # -RUBY_RELVERSION= 2.1.7 +RUBY_RELVERSION= 2.1.8 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 Modified: branches/2015Q4/lang/ruby21/Makefile ============================================================================== --- branches/2015Q4/lang/ruby21/Makefile Thu Dec 24 12:50:50 2015 (r404352) +++ branches/2015Q4/lang/ruby21/Makefile Thu Dec 24 12:53:34 2015 (r404353) @@ -15,6 +15,8 @@ COMMENT?= Object-oriented interpreted sc LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual +LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL +LICENSE_FILE_RUBY= ${WRKSRC}/COPYING # Using LIB_DEPENDS finds the libffi from gcc which causes problems BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi @@ -34,10 +36,9 @@ GNU_CONFIGURE= yes # Keep this, else ruby will fail to load libraries dependent of libpthread. LIBS+= -lpthread -L${LOCALBASE}/lib MAKE_ENV= LC_ALL=C -USE_AUTOTOOLS= autoconf USE_LDCONFIG= yes USE_OPENSSL= yes -USES= cpe execinfo tar:xz +USES= autoreconf cpe execinfo tar:xz WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 2.1 @@ -45,6 +46,9 @@ USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes +NOT_FOR_ARCHS= ia64 +NOT_FOR_ARCHS_REASON_ia64= does not build + OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC OPTIONS_DEFAULT= RDOC LIBEDIT OPTIONS_SINGLE= EDIT @@ -61,9 +65,8 @@ CAPIDOCS_BUILD_DEPENDS= doxygen>0:${PORT CAPIDOCS_CONFIGURE_ENABLE= install-capi GMP_CONFIGURE_WITH= gmp GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp -LIBEDIT_BUILD_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-prefix=${LOCALBASE} -LIBEDIT_RUN_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit +LIBEDIT_USES= libedit RDOC_CONFIGURE_ENABLE= install-rdoc READLINE_BUILD_DEPENDS= readline>=0:${PORTSDIR}/devel/readline READLINE_CONFIGURE_ON= --disable-libedit --with-readline-prefix=${LOCALBASE} @@ -138,20 +141,20 @@ post-patch: # Remove modules we don't want # .for d in win32ole - ${RM} -rf ${BUILD_WRKSRC}/ext/${d} + @${RM} -rf ${BUILD_WRKSRC}/ext/${d} .endfor # We get rake from ports. .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb - ${RM} -rf ${BUILD_WRKSRC}/${d} + @${RM} -rf ${BUILD_WRKSRC}/${d} .endfor # We get the gem executable from ports. - ${RM} ${BUILD_WRKSRC}/bin/gem + @${RM} ${BUILD_WRKSRC}/bin/gem # # Prepare modules we are wanting to build via external ports # .for d in gdbm tk - ${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/ + @${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/ .endfor post-build: @@ -166,7 +169,7 @@ post-build: @${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'" post-build-CAPIDOCS-on: - ${FIND} ${WRKSRC}/doc -type d -empty -delete + @${FIND} ${WRKSRC}/doc -type d -empty -delete pre-install: ${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR} Modified: branches/2015Q4/lang/ruby21/distinfo ============================================================================== --- branches/2015Q4/lang/ruby21/distinfo Thu Dec 24 12:50:50 2015 (r404352) +++ branches/2015Q4/lang/ruby21/distinfo Thu Dec 24 12:53:34 2015 (r404353) @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-2.1.7.tar.xz) = 225c067d9820fe52fcffbfb91d5b5243708a0b666b9929bea466e9379eb40ad7 -SIZE (ruby/ruby-2.1.7.tar.xz) = 9371208 +SHA256 (ruby/ruby-2.1.8.tar.xz) = 94eeae3b3e3ac93cfd205e1aaef4c5325227b7656cbb2fc1ee217618145dd19d +SIZE (ruby/ruby-2.1.8.tar.xz) = 9382672 Modified: branches/2015Q4/lang/ruby21/files/patch-ext_openssl_extconf.rb ============================================================================== --- branches/2015Q4/lang/ruby21/files/patch-ext_openssl_extconf.rb Thu Dec 24 12:50:50 2015 (r404352) +++ branches/2015Q4/lang/ruby21/files/patch-ext_openssl_extconf.rb Thu Dec 24 12:53:34 2015 (r404353) @@ -10,6 +10,6 @@ +have_func("SSLv23_method") +have_func("SSLv23_server_method") +have_func("SSLv23_client_method") - have_func("TLSv1_1_method") - have_func("TLSv1_1_server_method") - have_func("TLSv1_1_client_method") + have_func("SSLv3_method") + have_func("SSLv3_server_method") + have_func("SSLv3_client_method") From owner-svn-ports-branches@freebsd.org Thu Dec 24 13:00:18 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3358DA51BF2; Thu, 24 Dec 2015 13:00:18 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAD7D118C; Thu, 24 Dec 2015 13:00:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBOD0HT3053877; Thu, 24 Dec 2015 13:00:17 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBOD0GR8053874; Thu, 24 Dec 2015 13:00:16 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201512241300.tBOD0GR8053874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 24 Dec 2015 13:00:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404355 - in branches/2015Q4: Mk lang/ruby20 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, 24 Dec 2015 13:00:18 -0000 Author: sunpoet Date: Thu Dec 24 13:00:16 2015 New Revision: 404355 URL: https://svnweb.freebsd.org/changeset/ports/404355 Log: MFH: r404314 - Update to 2.0.0p648 - Add LICENSE_FILE - Use USES=autoreconf instead of USE_AUTOTOOLS=autoconf - Use USES=libedit - Use USES=tar:xz - Silence patch and build messages Changes: https://www.ruby-lang.org/en/news/2015/12/16/ruby-2-0-0-p648-released/ http://svn.ruby-lang.org/repos/ruby/tags/v2_0_0_648/ChangeLog Security: 3b50881d-1860-4721-aab1-503290e23f6c Differential Revision: https://reviews.freebsd.org/D4668 PR: 205487 Exp-run by: antoine Approved by: ports-secteam (feld) Modified: branches/2015Q4/Mk/bsd.ruby.mk branches/2015Q4/lang/ruby20/Makefile branches/2015Q4/lang/ruby20/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/Mk/bsd.ruby.mk ============================================================================== --- branches/2015Q4/Mk/bsd.ruby.mk Thu Dec 24 12:59:38 2015 (r404354) +++ branches/2015Q4/Mk/bsd.ruby.mk Thu Dec 24 13:00:16 2015 (r404355) @@ -174,7 +174,7 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} RUBY_RELVERSION= 2.0.0 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 -RUBY_PATCHLEVEL= 647 +RUBY_PATCHLEVEL= 648 RUBY20= "" # PLIST_SUB helpers . elif ${RUBY_VER} == 2.1 Modified: branches/2015Q4/lang/ruby20/Makefile ============================================================================== --- branches/2015Q4/lang/ruby20/Makefile Thu Dec 24 12:59:38 2015 (r404354) +++ branches/2015Q4/lang/ruby20/Makefile Thu Dec 24 13:00:16 2015 (r404355) @@ -15,6 +15,8 @@ COMMENT?= Object-oriented interpreted sc LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual +LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL +LICENSE_FILE_RUBY= ${WRKSRC}/COPYING # Using LIB_DEPENDS finds the libffi from gcc which causes problems BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi @@ -34,10 +36,9 @@ GNU_CONFIGURE= yes # Keep this, else ruby will fail to load libraries dependent of libpthread. LIBS+= -lpthread -L${LOCALBASE}/lib MAKE_ENV= LC_ALL=C -USE_AUTOTOOLS= autoconf USE_LDCONFIG= yes USE_OPENSSL= yes -USES= cpe execinfo tar:bzip2 +USES= autoreconf cpe execinfo tar:xz WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 2.0 @@ -45,6 +46,9 @@ USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes +NOT_FOR_ARCHS= ia64 +NOT_FOR_ARCHS_REASON_ia64= does not build + OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES RDOC OPTIONS_DEFAULT= RDOC LIBEDIT OPTIONS_SINGLE= EDIT @@ -58,9 +62,8 @@ READLINE_DESC= Use libreadline CAPIDOCS_BUILD_DEPENDS= doxygen>0:${PORTSDIR}/devel/doxygen \ dot:${PORTSDIR}/graphics/graphviz CAPIDOCS_CONFIGURE_ENABLE= install-capi -LIBEDIT_BUILD_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-prefix=${LOCALBASE} -LIBEDIT_RUN_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit +LIBEDIT_USES= libedit RDOC_CONFIGURE_ENABLE= install-rdoc READLINE_BUILD_DEPENDS= readline>=0:${PORTSDIR}/devel/readline READLINE_CONFIGURE_ON= --disable-libedit --with-readline-prefix=${LOCALBASE} @@ -139,20 +142,20 @@ post-patch: # Remove modules we don't want # .for d in win32ole - ${RM} -rf ${BUILD_WRKSRC}/ext/${d} + @${RM} -rf ${BUILD_WRKSRC}/ext/${d} .endfor # We get rake from ports. .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb - ${RM} -rf ${BUILD_WRKSRC}/${d} + @${RM} -rf ${BUILD_WRKSRC}/${d} .endfor # We get the gem executable from ports. - ${RM} ${BUILD_WRKSRC}/bin/gem + @${RM} ${BUILD_WRKSRC}/bin/gem # # Prepare modules we are wanting to build via external ports # .for d in gdbm tk - ${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/ + @${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/ .endfor post-build: @@ -167,7 +170,7 @@ post-build: @${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'" post-build-CAPIDOCS-on: - ${FIND} ${WRKSRC}/doc -type d -empty -delete + @${FIND} ${WRKSRC}/doc -type d -empty -delete pre-install: ${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR} Modified: branches/2015Q4/lang/ruby20/distinfo ============================================================================== --- branches/2015Q4/lang/ruby20/distinfo Thu Dec 24 12:59:38 2015 (r404354) +++ branches/2015Q4/lang/ruby20/distinfo Thu Dec 24 13:00:16 2015 (r404355) @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-2.0.0-p647.tar.bz2) = 3c3782e313d1ec3ed06c104eafd133cc54ff5183b991786ece9e957fd6cf1cb9 -SIZE (ruby/ruby-2.0.0-p647.tar.bz2) = 10785285 +SHA256 (ruby/ruby-2.0.0-p648.tar.xz) = 22fe97739110ba9171b13fc4dcd1a92e767f16769de3593ee41ef1283d218402 +SIZE (ruby/ruby-2.0.0-p648.tar.xz) = 8303584 From owner-svn-ports-branches@freebsd.org Thu Dec 24 17:51:39 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C033A519DA; Thu, 24 Dec 2015 17:51:39 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C373A1294; Thu, 24 Dec 2015 17:51:38 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBOHpbpd050219; Thu, 24 Dec 2015 17:51:37 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBOHpbOR050217; Thu, 24 Dec 2015 17:51:37 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201512241751.tBOHpbOR050217@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Thu, 24 Dec 2015 17:51:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404383 - branches/2015Q4/www/py-django 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, 24 Dec 2015 17:51:39 -0000 Author: miwi Date: Thu Dec 24 17:51:37 2015 New Revision: 404383 URL: https://svnweb.freebsd.org/changeset/ports/404383 Log: MFH: r404368 - Update to 1.8.7 PR: 205348 Submitted by: Pierre Guinoiseau Security: 11c52bc6-97aa-11e5-b8df-14dae9d210b8 Approved by: ports-secteam Modified: branches/2015Q4/www/py-django/Makefile branches/2015Q4/www/py-django/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/py-django/Makefile ============================================================================== --- branches/2015Q4/www/py-django/Makefile Thu Dec 24 17:50:56 2015 (r404382) +++ branches/2015Q4/www/py-django/Makefile Thu Dec 24 17:51:37 2015 (r404383) @@ -2,16 +2,16 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.8.4 +PORTVERSION= 1.8.7 CATEGORIES= www python -MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION}/ \ - CHEESESHOP +MASTER_SITES= CHEESESHOP \ + https://www.djangoproject.com/m/releases/${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Django-${PORTVERSION} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org -COMMENT= High-level Python Web framework +COMMENT= High-level Python Web Framework LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE @@ -25,10 +25,12 @@ CONFLICTS= py[23][0-9]-django-devel-[0-9 DOCSDIR= ${PREFIX}/share/doc/py-django -OPTIONS_DEFINE= FASTCGI HTMLDOCS -OPTIONS_DEFAULT=SQLITE -OPTIONS_GROUP= DATABASE +OPTIONS_DEFINE= FASTCGI HTMLDOCS +OPTIONS_DEFAULT= SQLITE + +OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE + HTMLDOCS_DESC= Install HTML documentation (requires Sphinx) PLIST_FILES= man/man1/django-admin.1.gz Modified: branches/2015Q4/www/py-django/distinfo ============================================================================== --- branches/2015Q4/www/py-django/distinfo Thu Dec 24 17:50:56 2015 (r404382) +++ branches/2015Q4/www/py-django/distinfo Thu Dec 24 17:51:37 2015 (r404383) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.8.4.tar.gz) = 826996c81e1cc773500124d5c19212e4a7681a55ee169fab9085f2b3015a70d8 -SIZE (python/Django-1.8.4.tar.gz) = 7265101 +SHA256 (python/Django-1.8.7.tar.gz) = 17a66de5cf59b5ee81c3dc57609b145bb45adddc0dc06937b998597d6e7b4523 +SIZE (python/Django-1.8.7.tar.gz) = 7276831 From owner-svn-ports-branches@freebsd.org Fri Dec 25 20:11:07 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BC73A52016; Fri, 25 Dec 2015 20:11:07 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 587761FBB; Fri, 25 Dec 2015 20:11:07 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBPKB6pv022755; Fri, 25 Dec 2015 20:11:06 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBPKB6EB022753; Fri, 25 Dec 2015 20:11:06 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201512252011.tBPKB6EB022753@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Fri, 25 Dec 2015 20:11:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404468 - branches/2015Q4/archivers/dpkg 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, 25 Dec 2015 20:11:07 -0000 Author: pawel Date: Fri Dec 25 20:11:06 2015 New Revision: 404468 URL: https://svnweb.freebsd.org/changeset/ports/404468 Log: MFH: r404444 Update to version 1.18.4 Fixes security CVE-2015-0860 PR: 205599 Submitted by: rakuco Approved by: portmgr (erwin) Modified: branches/2015Q4/archivers/dpkg/Makefile branches/2015Q4/archivers/dpkg/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/archivers/dpkg/Makefile ============================================================================== --- branches/2015Q4/archivers/dpkg/Makefile Fri Dec 25 19:45:44 2015 (r404467) +++ branches/2015Q4/archivers/dpkg/Makefile Fri Dec 25 20:11:06 2015 (r404468) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dpkg -PORTVERSION= 1.18.3 +PORTVERSION= 1.18.4 CATEGORIES= archivers sysutils MASTER_SITES= DEBIAN_POOL DISTNAME= dpkg_${PORTVERSION} Modified: branches/2015Q4/archivers/dpkg/distinfo ============================================================================== --- branches/2015Q4/archivers/dpkg/distinfo Fri Dec 25 19:45:44 2015 (r404467) +++ branches/2015Q4/archivers/dpkg/distinfo Fri Dec 25 20:11:06 2015 (r404468) @@ -1,2 +1,2 @@ -SHA256 (dpkg_1.18.3.tar.xz) = a40ffe38d7f36d858a752189a306433cfc52c7d15d7b98f61d9f9dd49e0e4807 -SIZE (dpkg_1.18.3.tar.xz) = 4359884 +SHA256 (dpkg_1.18.4.tar.xz) = fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da +SIZE (dpkg_1.18.4.tar.xz) = 4377024 From owner-svn-ports-branches@freebsd.org Sat Dec 26 14:55:22 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5BFE0A52A2D; Sat, 26 Dec 2015 14:55:22 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2D3191A85; Sat, 26 Dec 2015 14:55:22 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBQEtLGF060760; Sat, 26 Dec 2015 14:55:21 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBQEtLIA060758; Sat, 26 Dec 2015 14:55:21 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201512261455.tBQEtLIA060758@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sat, 26 Dec 2015 14:55:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404524 - branches/2015Q4/databases/phpmyadmin 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, 26 Dec 2015 14:55:22 -0000 Author: matthew Date: Sat Dec 26 14:55:21 2015 New Revision: 404524 URL: https://svnweb.freebsd.org/changeset/ports/404524 Log: MFH: r404509 Security update to 4.5.3.1 This update fixes regressions in 4.5.3 and addresses a path disclosure vulnerability. Security: 88f75070-abcf-11e5-83d3-6805ca0b3d42 Approved by: ports-secteam (feld) Modified: branches/2015Q4/databases/phpmyadmin/Makefile branches/2015Q4/databases/phpmyadmin/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/databases/phpmyadmin/Makefile ============================================================================== --- branches/2015Q4/databases/phpmyadmin/Makefile Sat Dec 26 14:54:07 2015 (r404523) +++ branches/2015Q4/databases/phpmyadmin/Makefile Sat Dec 26 14:55:21 2015 (r404524) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpMyAdmin -DISTVERSION= 4.5.1 +DISTVERSION= 4.5.3.1 CATEGORIES= databases www MASTER_SITES= https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages Modified: branches/2015Q4/databases/phpmyadmin/distinfo ============================================================================== --- branches/2015Q4/databases/phpmyadmin/distinfo Sat Dec 26 14:54:07 2015 (r404523) +++ branches/2015Q4/databases/phpmyadmin/distinfo Sat Dec 26 14:55:21 2015 (r404524) @@ -1,2 +1,2 @@ -SHA256 (phpMyAdmin-4.5.1-all-languages.tar.xz) = 85147fb514900f03586fb885f843da71b0905c6995d921d80b0bb38bd8833022 -SIZE (phpMyAdmin-4.5.1-all-languages.tar.xz) = 5732856 +SHA256 (phpMyAdmin-4.5.3.1-all-languages.tar.xz) = 75be3589b5e4800afb21581761478ddc5b888d6a09d5235a0ba997401d04fc00 +SIZE (phpMyAdmin-4.5.3.1-all-languages.tar.xz) = 5757736